fix:修复

src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author : zhuzhu
@@ -63,7 +64,7 @@ public class SysWorkplaceFreightResponse {
     private Integer isSingQueue;
     private Integer freightRow;
     private Integer reCount;
-
+    private List<SysWorkplaceQueueViewResponse> sysWorkplaceQueueList;
 
 
 

src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java

@@ -144,7 +144,7 @@ public class IoSplitInvResponse {
     private Integer monopoly;
     private Integer queueRemindCount;
 
-    private Integer row;
+    private Integer freightRow;
 
 
     private Integer maxDrugCount;

src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java

@@ -11,29 +11,24 @@ import java.util.Date;
 @Data
 public class IoSplitInvViewResponse {
 
-
-    /**
-     * 出库数量
-     */
-    @ExcelProperty(value = "剩余数量", index = 6)
+    @ExcelProperty(value = "区域编码", index = 0)
     @ColumnWidth(30)
-    private Integer reCount;
+    private Integer freightRow;
 
 
-    /**
-     * 出货槽编码
-     */
     @ExcelProperty(value = "出货槽编码", index = 1)
     @ColumnWidth(30)
     private String workPlaceQueueCode;
 
-    @ExcelProperty(value = "产品通用名", index = 3)
+
+    @ExcelProperty(value = "出货槽名称", index = 2)
     @ColumnWidth(30)
-    private String cpmctymc;
+    private String workPlaceQueueCodeName;
 
-    @ExcelProperty(value = "规格型号", index = 5)
+
+    @ExcelProperty(value = "产品通用名", index = 3)
     @ColumnWidth(30)
-    private String ggxh;
+    private String cpmctymc;
 
 
     @ExcelProperty(value = "产品标识", index = 4)
@@ -41,17 +36,20 @@ public class IoSplitInvViewResponse {
     private String nameCode;
 
 
-    @ExcelProperty(value = "区域编码", index = 0)
+    @ExcelProperty(value = "规格型号", index = 5)
     @ColumnWidth(30)
-    private Integer row;
+    private String ggxh;
+
+
+    @ExcelProperty(value = "剩余数量", index = 6)
+    @ColumnWidth(30)
+    private Integer reCount;
+
 
     @ExcelProperty(value = "最大存药数量", index = 7)
     @ColumnWidth(30)
     private Integer maxDrugCount;
 
-    @ExcelProperty(value = "出货槽名称", index = 2)
-    @ColumnWidth(30)
-    private String workPlaceQueueCodeName;
 
     @ExcelProperty(value = "推荐上货数量", index = 8)
     @ColumnWidth(30)

src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java

@@ -99,6 +99,11 @@ public class SysWorkplaceFreightService extends ServiceImpl<SysWorkplaceFreightM
         List<SysWorkplaceFreightViewResponse>  sortedRespList = new ArrayList<>();
 
         if (CollUtil.isNotEmpty(list)){
+            for (int i = 0; i < list.size(); i++) {
+                SysWorkplaceFreightResponse sysWorkplaceFreightResponse = list.get(i);
+                List<SysWorkplaceQueueViewResponse> sysWorkplaceQueueList = sysWorkplaceQueueService.getListByFreightCodeView(sysWorkplaceFreightResponse.getCode());
+                sysWorkplaceFreightResponse.setSysWorkplaceQueueList(sysWorkplaceQueueList);
+            }
 
             // 使用Stream API根据layerCode字段进行分组
             Map<Integer, List<SysWorkplaceFreightResponse>> collect = list.stream().collect(Collectors.groupingBy(SysWorkplaceFreightResponse::getFreightRow));

src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml

@@ -48,7 +48,7 @@
            swq.enableRemind as queueEnableRemind,
            swq.remindCount as queueRemindCount,
            swq.maxDrugCount as maxDrugCount,
-           swf.row,
+           swf.freightRow,
            (ifnull(swq.maxDrugCount,0) - ifnull(isfi.reCount,0)) as suggestOutCount
         from
         (select relId,sum(reCount) as reCount,sum(availableCount) as availableCount,supId,workPlaceQueueCode,workPlaceCode,busType from io_split_fifo_inv