update

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -335,7 +335,6 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         billetLiftingBill.setLayer(layer);
         billetLiftingBill.setVehicleNumber(jsonObject.getString("vehicleNumber"));
         billetLiftingBill.setPositionNum(Integer.valueOf(positionNum));
-        billetLiftingBill.setPlateOrStack(jsonObject.getString("plateOrStack"));
         billetLiftingBill.setLocation(jsonObject.getString("location"));
         String liftingTime = jsonObject.getString("liftingTime");
         if (oConvertUtils.isNotEmpty(liftingTime)){
@@ -381,6 +380,23 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             log.info("{}{}", "钢坯基础信息为空，C端自动化垛位装车保存失败", stackingAndLoadingVehiclesInfo.getBilletNos());
             return;
         }
+
+        // 2025 3.3，C端自动化推送保存、B端手动发车临时方案，
+        LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
+        queryWrapper2.eq(StorageBill::getCcmNo, ccmNo)
+                .eq(StorageBill::getPositionNum, Integer.valueOf(positionNum))
+                .isNull(StorageBill::getOutTime);
+        StorageBill isStorageBill = storageBillService.getOne(queryWrapper2);
+        if (oConvertUtils.isEmpty(isStorageBill)) {
+            log.info("未查询到钢坯装运单信息，车位号为:{}，C端自动化垛位装车保存失败！", positionNum);
+            return;
+        }
+        loadingParams.setStorageBill(isStorageBill);
+
+        log.info("{}{}", "自动化堆垛装车保存StorageBill数据：", JSON.toJSON(isStorageBill));
+
+        StorageBill storageBill = loadingParams.getStorageBill();
+
         final double billetWeightTotal = billetBasicInfoList.stream().mapToDouble(BilletBasicInfo::getBilletWeight).sum();
 
         // 根据坯号查询吊运单信息。更新billetWeightTotal
@@ -391,6 +407,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             billetLiftingBillUpdate.setBilletWeight(billetWeightTotal);
             billetLiftingBillUpdate.setAssemblyNumber(getAssemblyNumber(billetBasicInfoList));
             billetLiftingBillUpdate.setBilletsNo(allBilletNos);
+            billetLiftingBillUpdate.setPlateOrStack(storageBill.getLicensePlate());
             billetLiftingBillService.updateById(billetLiftingBillUpdate);
         }
 
@@ -403,24 +420,6 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             rollClubCommonList.add(rollClubCommon);
         });
 
-        // 2025 3.3，C端自动化推送保存、B端手动发车临时方案，
-        LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
-        queryWrapper2.eq(StorageBill::getCcmNo, ccmNo)
-                .eq(StorageBill::getPositionNum, Integer.valueOf(positionNum))
-//                .eq(StorageBill::getShiftGroup, shiftGroupHandle(ccmNo))
-//                .eq(StorageBill::getShift, shiftHandle(ccmNo))
-                .isNull(StorageBill::getOutTime);
-        StorageBill isStorageBill = storageBillService.getOne(queryWrapper2);
-        if (oConvertUtils.isEmpty(isStorageBill)) {
-            log.info("未查询到钢坯装运单信息，车位号为:{}，C端自动化垛位装车保存失败！", positionNum);
-            return;
-        }
-        loadingParams.setStorageBill(isStorageBill);
-
-        log.info("{}{}", "自动化堆垛装车保存StorageBill数据：", JSON.toJSON(isStorageBill));
-
-        StorageBill storageBill = loadingParams.getStorageBill();
-
         // 轧钢外运保存时，先判断装运单中的目的地ID是否为1024，如果为1024、明细暂存临时表billet_auto_tmp
         if ("1024".equals(isStorageBill.getTypeConfigId())){
             loadingParams.setBelongTable("billet_auto_tmp");
@@ -444,8 +443,6 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
 
         log.info("{}{}", "自动化堆垛装车保存热送单数据：", JSON.toJSON(billetHotsend));
 
-        log.info("{}{}", "自动化堆垛装车保存钢坯实绩数据：", JSON.toJSON(rollClubCommonList));
-
         //堆垛保存、堆垛发车公共处理
         handleStackDepartCommon(billetHotsend, loadingParams.getStackingAndLoadingVehiclesList(), loadingParams, billetHotsendTypeConfig, storageBill, rollClubCommonList);