From 1698e7bcdace4a1cfc1b6697360f210bb059a06c Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 9 Sep 2024 14:16:09 +0800
Subject: [PATCH] =?UTF-8?q?9/9=20=E4=B8=9A=E5=8A=A1=E7=B1=BB=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/collect/IoFifoDesOrderController.java    | 3 +++
 .../glxp/api/entity/basic/SysWorkplaceDocumentEntity.java   | 6 ++++++
 .../java/com/glxp/api/res/thrsys/ThrProductsResponse.java   | 2 ++
 src/main/resources/schemas/schema_v2.4.sql                  | 4 ++++
 4 files changed, 15 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java
index de2b3da6b..80cb3ca11 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java
@@ -125,6 +125,9 @@ public class IoFifoDesOrderController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+        if (addInvDesDetaiRequest.getOutCount() == null && addInvDesDetaiRequest.getRemark() == null){
+            return ResultVOUtils.error("请输入损耗数量");
+        }
         Boolean save = splitDesOrderService.destroyOut(addInvDesDetaiRequest);
         if (!save) {
             return ResultVOUtils.error("错误");
diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
index 184cb3d58..abe07846b 100644
--- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
@@ -147,6 +147,12 @@ public class SysWorkplaceDocumentEntity {
     @TableField(value = "monopoly")
     private Integer monopoly;
 
+    /**
+     * 单据完成校验： 0:完全赋码 ; 1:部分赋码
+     */
+    @TableField(value = "orderFinishVerify")
+    private Integer orderFinishVerify;
+
 
 }
 
diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java
index b13574b1b..435eab3cc 100644
--- a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java
+++ b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java
@@ -54,6 +54,8 @@ public class ThrProductsResponse {
     private String prcitmcode;
     private String invCode;
     private Integer productType;
+    private String prepnSpec;
+    private String prepnUnit;
 
     public String getSpec() {
         if (StrUtil.isNotEmpty(spec)) {
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index e5e1bd57e..cc4baedbd 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4357,3 +4357,7 @@ CALL Pro_Temp_ColumnWork('thr_products', 'prepnUnit',
 CALL Pro_Temp_ColumnWork('io_collect_order', 'errorMsg',
                          'varchar(1024) NULL COMMENT ''异常信息''',
                          1);
+
+CALL Pro_Temp_ColumnWork('sys_workplace_document', 'orderFinishVerify',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''单据完成校验： 0:完全赋码 ; 1:部分赋码''',
+                         1);