From 3395c439d17ea60ea1fe1e84cecad12cd2e716ca Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 30 Sep 2024 15:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/inout/IoCodeTempController.java  | 5 +++++
 .../java/com/glxp/api/entity/inout/IoSplitCodeEntity.java    | 2 +-
 src/main/resources/schemas/schema_v2.4.sql                   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 124c97b67..eab053517 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -1295,6 +1295,11 @@ public class IoCodeTempController extends BaseController {
             if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) {
                 return ResultVOUtils.error(500, "当前追溯码已存在！");
             }
+        } else {
+            IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null);
+            if (fifoCodeEntity == null) {
+                return ResultVOUtils.error(500, "当前追溯码未上货！");
+            }
         }
 
         if (addOrderRequest.getFromCorp() == null || StrUtil.isNotEmpty(addOrderRequest.getSickerAdNum())) {
diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
index aec43813e..21325a04d 100644
--- a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
@@ -186,7 +186,7 @@ public class IoSplitCodeEntity implements Serializable {
     /**
      * 拆包失效日期
      */
-    @TableField(value = "createTime")
+    @TableField(value = "unpackExpireTime")
     @ApiModelProperty(value = "拆包失效日期")
     private Date unpackExpireTime;
 
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 0d4a9b298..b4fe05604 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4509,7 +4509,7 @@ CALL Pro_Temp_ColumnWork('io_split_code', 'unpackTime',
                          ' datetime NULL DEFAULT NULL COMMENT ''拆包后可用时长(小时)''',
                          1);
 
-CALL Pro_Temp_ColumnWork('basic_udirel', 'unpackTime',
+CALL Pro_Temp_ColumnWork('basic_udirel', 'unpackUseTime',
                          ' datetime NULL DEFAULT NULL COMMENT ''拆包后可用时长(小时)''',
                          1);