吊运单字段新增

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendBaseServiceImpl.java

@@ -168,6 +168,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			billetLiftingBill.setLocation(location);
 			billetLiftingBill.setCreateTime(new Date());
 			billetLiftingBill.setLiftingType("0");
+			billetLiftingBill.setBelongType("0");
 			billetLiftingBill.setDestination(destination);
 			billetLiftingBill.setBilletWeight(0.00);
 			billetLiftingBill.setRemark("热送高线吊运单");
@@ -293,6 +294,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		billetLiftingBill.setLocation(location);
 		billetLiftingBill.setAddress(address);
 		billetLiftingBill.setLiftingType("1");
+		billetLiftingBill.setBelongType("1");
 		billetLiftingBill.setDestination(destination);
 		billetLiftingBill.setLayer(layer);
 		billetLiftingBill.setPositionNum(Integer.valueOf(positionNum));

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetLiftingBill/entity/BilletLiftingBill.java

@@ -122,4 +122,8 @@ public class BilletLiftingBill implements Serializable {
     @Excel(name = "坯重", width = 15)
     @ApiModelProperty(value = "坯重",required = true)
     private Double billetWeight;
+    /**所属类型（0：热送，1：热装，2：起垛，3：下垛）*/
+    @Excel(name = "所属类型（0：热送，1：热装，2：起垛，3：下垛）", width = 15)
+    @ApiModelProperty(value = "所属类型（0：热送，1：热装，2：起垛，3：下垛）")
+    private String belongType;
 }

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

@@ -160,6 +160,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 billetLiftingBill.setAddress(item.getString("address"));
                 billetLiftingBill.setLayer(item.getString("layer"));
                 billetLiftingBill.setLiftingType("2");
+                billetLiftingBill.setBelongType("2");
                 billetLiftingBill.setBilletWeight(0.00);
                 billetLiftingBill.setRemark("自动化起跺吊运单");
                 billetLiftingBillList.add(billetLiftingBill);
@@ -404,6 +405,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         billetLiftingBill.setDestination(loadingParams.getDestination());
         billetLiftingBill.setRemark("自动化垛位装车吊运单");
         billetLiftingBill.setLiftingType("2");
+        billetLiftingBill.setBelongType("3");
         billetLiftingBill.setBilletWeight(0.00);
         saveBilletLiftingBills(billetLiftingBill);
 

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/storageBill/service/impl/StorageBillServiceImpl.java

@@ -114,13 +114,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                         storageBill.setLicensePlateStatus(0);
                         int carNum = calculateCarNum(ccmNo, licensePlate, shiftGroup, shift);
                         storageBill.setCarNum(carNum + 1);
+                        storageBill.setLicensePlate(licensePlate);
                     }else {
                         storageBill.setLicensePlateStatus(1);
                         storageBill.setCarNum(0);
+                        storageBill.setLicensePlate("");
                     }
                     log.info("{}{}", "C端自动化新增装运单对象信息：", JSON.toJSON(storageBill));
                 }
-                storageBill.setLicensePlate(licensePlate);
             }else {
                 storageBill.setLicensePlate("");
                 storageBill.setCarNum(0);
@@ -204,11 +205,12 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                         int carNum = calculateCarNum(ccmNo, licensePlate, isStorageBill.getShiftGroup(), isStorageBill.getShift());
                         isStorageBill.setCarNum(carNum + 1);
                         log.info("{}{}", "C端自动化更新车牌,本车车次序号：", isStorageBill.getCarNum());
+                        isStorageBill.setLicensePlate(licensePlate);
                     }else {
                         isStorageBill.setLicensePlateStatus(1);
+                        isStorageBill.setLicensePlate("");
                     }
                 }
-                isStorageBill.setLicensePlate(licensePlate);
                 baseMapper.updateById(isStorageBill);
                 log.info("{}{}", "C端自动化钢坯装运单车牌号更新成功: ", JSON.toJSON(isStorageBill));
             }