垛位装车

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

@@ -313,18 +313,12 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         LoadingParams loadingParams = new LoadingParams();
         loadingParams.setBelongTable("stacking_and_loading_vehicles");
 
-        BilletHotsend billetHotsend = new BilletHotsend();
-        billetHotsend.setCcmNo(ccmNo);
-        billetHotsend.setShiftGroup(shiftGroupHandle(ccmNo));
-        billetHotsend.setShift(shiftHandle(ccmNo));
-        loadingParams.setBilletHotsend(billetHotsend);
-
         // 独立保存行车吊运单
         BilletLiftingBill billetLiftingBill = new BilletLiftingBill();
         billetLiftingBill.setId(String.valueOf(IdWorker.getId()));
         billetLiftingBill.setCcmNo(ccmNo);
-        billetLiftingBill.setShiftGroup(billetHotsend.getShiftGroup());
-        billetLiftingBill.setShift(billetHotsend.getShift());
+        billetLiftingBill.setShiftGroup(shiftGroupHandle(ccmNo));
+        billetLiftingBill.setShift(shiftHandle(ccmNo));
         billetLiftingBill.setAddress(address);
         billetLiftingBill.setLayer(layer);
         billetLiftingBill.setVehicleNumber(jsonObject.getString("vehicleNumber"));
@@ -409,6 +403,11 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             log.info("{}{}", "班组班别获取为空，C端自动化垛位装车<保存>失败！", JSON.toJSON(isStorageBill));
             return;
         }
+        BilletHotsend billetHotsend = new BilletHotsend();
+        billetHotsend.setCcmNo(ccmNo);
+        billetHotsend.setShiftGroup(shiftGroup);
+        billetHotsend.setShift(shift);
+        loadingParams.setBilletHotsend(billetHotsend);
         // 更新装运单铸机号、班别、班组
         if ("0".equals(isStorageBill.getCcmNo())) {
             // 更新铸机号，到装运单
@@ -433,6 +432,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         // 根据坯号查询吊运单信息。更新billetWeightTotal
         BilletLiftingBill billetLiftingBillUpdate = billetLiftingBillService.getById(billetLiftingBill.getId());
         if (oConvertUtils.isNotEmpty(billetLiftingBillUpdate)){
+            billetLiftingBillUpdate.setShiftGroup(shiftGroup);
+            billetLiftingBillUpdate.setShift(shift);
             // 维护吊运单，坯重、组坯号、炉号
             billetLiftingBillUpdate.setHeatNo(getHeatNo(billetBasicInfoList));
             billetLiftingBillUpdate.setBilletWeight(billetWeightTotal);