11/8 工位库存增加卡槽编码

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

@@ -91,5 +91,27 @@ public class SysWorkplaceQueue implements Serializable {
     @TableField(exist = false)
     private String labelId;
 
+    /**
+     * 是否特殊槽：1:是;0:否
+     */
+    @TableField(value = "specialQueue")
+    @ApiModelProperty(value = "")
+    private Integer specialQueue;
+
+    /**
+     * 分配条件1
+     */
+    @TableField(value = "assignmentTerms1")
+    @ApiModelProperty(value = "")
+    private String assignmentTerms1;
+
+    /**
+     * 分配条件2
+     */
+    @TableField(value = "assignmentTerms2")
+    @ApiModelProperty(value = "")
+    private String assignmentTerms2;
+
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java

@@ -170,6 +170,15 @@ public class IoSplitFifoInv implements Serializable {
     @ApiModelProperty(value = "工位库存预警数量")
     private Integer invRemindCount;
 
+    /**
+     * 出货槽编码
+     */
+    @TableField(value = "workPlaceQueueCode")
+    @ApiModelProperty(value = "出货槽编码")
+    private String workPlaceQueueCode;
+
+
+
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -113,6 +113,11 @@ public class IoSplitInvResponse {
      */
     private String remark;
 
+    /**
+     * 出货槽编码
+     */
+    private String workPlaceQueueCode;
+
     private Integer groupCount;
     //产品信息----------------------------start----------------------
     private String supName;

src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java

@@ -125,7 +125,8 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                         .updateTime(new Date())
                         .remark(null)
                         .enableRemind(false)
-                        .invRemindCount(0).build();
+                        .invRemindCount(0)
+                        .workPlaceQueueCode(orderEntity.getWorkPlaceQueueCode() == null ? "DMQ0010101" : orderEntity.getWorkPlaceQueueCode()).build();
 //                if (isOnlyInv) {
 //                    splitFifoInv.setBusType(ioSplitFifoCodeEntity.getBusType());
 //                }

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

@@ -4663,4 +4663,20 @@ CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'layerNum',
 
 CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'freightCode',
                          'varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''货架code''',
-                         1)
+                         1);
+
+CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'workPlaceQueueCode',
+                         'varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''出货槽编码''',
+                         1);
+
+
+CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'specialQueue',
+                         ' tinyint NULL DEFAULT b''0''COMMENT ''是否特殊槽：1:是;0:否''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'assignmentTerms1',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''分配条件1''',
+                         1);
+CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'assignmentTerms2',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''分配条件2''',
+                         1);