From 8d6388c62ea057f9371580fe6c8e4733c4fc34ce Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 8 Nov 2024 11:23:11 +0800
Subject: [PATCH] =?UTF-8?q?11/8=20=E5=B7=A5=E4=BD=8D=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=A7=BD=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/entity/basic/SysWorkplaceQueue.java   | 22 +++++++++++++++++++
 .../glxp/api/entity/inout/IoSplitFifoInv.java |  9 ++++++++
 .../api/res/inout/IoSplitInvResponse.java     |  5 +++++
 .../service/inout/IoSplitFifoInvService.java  |  3 ++-
 src/main/resources/schemas/schema_v2.4.sql    | 18 ++++++++++++++-
 5 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java
index b482dc9b2..874a25588 100644
--- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java
+++ b/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;
 }
diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java
index a6e03f1c1..c7708781c 100644
--- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java
+++ b/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;
 }
diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
index 0852c076f..3a30d0e23 100644
--- a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
+++ b/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;
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
index ebe1df0b8..3799e9a0b 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/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());
 //                }
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 919b0aba6..cb3fec6b4 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/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);