update002

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/entity/RollHeightDetails.java

@@ -110,4 +110,17 @@ public class RollHeightDetails implements Serializable {
     @Excel(name = "出坯量", width = 15)
     @ApiModelProperty(value = "出坯量")
     private Double blankOutput;
+
+    /**堆垛层号(1-20)*/
+    @Excel(name = "堆垛层号(1-20)", width = 15)
+    @ApiModelProperty(value = "堆垛层号(1-20)")
+    private String stackStorey;
+    /**堆垛编号(1-9)*/
+    @Excel(name = "堆垛编号(1-9)", width = 15)
+    @ApiModelProperty(value = "堆垛编号(1-9)")
+    private String stackNum;
+    /**垛位*/
+    @Excel(name = "垛位", width = 15)
+    @ApiModelProperty(value = "垛位")
+    private String stackAddr;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -836,6 +836,9 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollHeightDetails.setBilletNo(x.getBilletNos());
                 rollHeightDetails.setShiftGroup(x.getShiftGroup());
                 rollHeightDetails.setShift(x.getShift());
+                rollHeightDetails.setStackAddr(x.getStackAddr());
+                rollHeightDetails.setStackNum(x.getAddress());
+                rollHeightDetails.setStackStorey(x.getLayer());
                 rollHeightDetails.setLicensePlate("堆垛辊道");
                 rollHeightDetails.setStorageBillId(rollHeightStorageBillId);
                 rollHeightDetails.setId(String.valueOf(IdWorker.getId()));
@@ -1283,7 +1286,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
     private StorageBill createStorageBill(LoadingParams loadingParams, List<RollClubCommon> rollClubCommonList, List<String> sizeList) {
         StorageBill storageBillInfo = new StorageBill();
         storageBillInfo.setBtype("0");
-        storageBillInfo.setTypeConfigId(loadingParams.getBilletHotsendTypeConfigId());
+        storageBillInfo.setTypeConfigId(loadingParams.getDestinationId());
         storageBillInfo.setDestination("高线");
         storageBillInfo.setShiftGroup(loadingParams.getBilletHotsend().getShiftGroup());
         storageBillInfo.setSteel(loadingParams.getBilletHotsend().getSteel());