fix:修复

src/main/java/com/glxp/api/entity/basic/SysWorkplaceFreight.java

@@ -81,9 +81,9 @@ public class SysWorkplaceFreight implements Serializable {
     /**
      * 行数
      */
-    @TableField(value = "row")
+    @TableField(value = "freightRow")
     @ApiModelProperty(value = "")
-    private Integer row;
+    private Integer freightRow;
 
 
 

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

@@ -61,7 +61,7 @@ public class SysWorkplaceFreightResponse {
      * 受否单产品槽位
      */
     private Integer isSingQueue;
-    private Integer row;
+    private Integer freightRow;
 
 
 

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

@@ -60,7 +60,7 @@ public class SysWorkplaceFreightViewResponse {
      * 受否单产品槽位
      */
     private Integer isSingQueue;
-    private Integer row;
+    private Integer freightRow;
 
     private List<SysWorkplaceFreightResponse> sysWorkplaceFreightList;
 

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

@@ -101,12 +101,12 @@ public class SysWorkplaceFreightService extends ServiceImpl<SysWorkplaceFreightM
         if (CollUtil.isNotEmpty(list)){
 
             // 使用Stream API根据layerCode字段进行分组
-            Map<Integer, List<SysWorkplaceFreightResponse>> collect = list.stream().collect(Collectors.groupingBy(SysWorkplaceFreightResponse::getRow));
+            Map<Integer, List<SysWorkplaceFreightResponse>> collect = list.stream().collect(Collectors.groupingBy(SysWorkplaceFreightResponse::getFreightRow));
 
-            collect.forEach((row, responseList) -> {
+            collect.forEach((freightRow, responseList) -> {
                 SysWorkplaceFreightViewResponse sysWorkplaceFreightViewResponse = new SysWorkplaceFreightViewResponse();
                 sysWorkplaceFreightViewResponse.setSysWorkplaceFreightList(responseList);
-                sysWorkplaceFreightViewResponse.setRow(row);
+                sysWorkplaceFreightViewResponse.setFreightRow(freightRow);
                 respList.add(sysWorkplaceFreightViewResponse);
             });
         }
@@ -114,7 +114,7 @@ public class SysWorkplaceFreightService extends ServiceImpl<SysWorkplaceFreightM
         if (CollUtil.isNotEmpty(respList)) {
             // 使用 Stream API 对列表进行排序
             sortedRespList = respList.stream()
-                    .sorted(Comparator.comparing(SysWorkplaceFreightViewResponse::getRow))
+                    .sorted(Comparator.comparing(SysWorkplaceFreightViewResponse::getFreightRow))
                     .collect(Collectors.toList());
         }
 

src/main/resources/schemas/schema_v2.4.sql

@@ -5147,4 +5147,8 @@ CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'enableRemind',
                          1);
 
 
-CALL Pro_Temp_ColumnWork('io_order', 'warehouseId', 'int(10)', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'warehouseId', 'int(10)', 1);
+
+CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'freightRow',
+                         ' int NULL DEFAULT ''1''COMMENT ''区域编码''',
+                         1);