From 23c3b5d2880b8e50020947be891a7a16d7ad9027 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 1 Nov 2024 09:46:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/inout/IoCodeTempController.java   | 4 ++--
 .../com/glxp/api/service/collect/IoCollectOrderService.java   | 3 +++
 2 files changed, 5 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 802ebb49b..c5570825b 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -869,7 +869,7 @@ public class IoCodeTempController extends BaseController {
 
             IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null);
             if (fifoCodeEntity == null) {
-                return ResultVOUtils.error(500, "当前追溯码未上货！");
+                return ResultVOUtils.error(500, "当前追溯码未上货或已出库完毕！");
             }
             //校验码表是否已经存在追溯码 io_code_temp
             if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) {
@@ -1405,7 +1405,7 @@ public class IoCodeTempController extends BaseController {
         } else if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
             IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null);
             if (fifoCodeEntity == null) {
-                return ResultVOUtils.error(500, "当前追溯码未上货！");
+                return ResultVOUtils.error(500, "当前追溯码未上货或已出库完毕！");
             }
 
             IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code);
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index f8d131b54..4ef4212fa 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -454,6 +454,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                     .orderCirType(sysWorkplaceDocumentEntity.getOrderCirType())
                     .splitStatus(0)
                     .tagStatus(0)
+                    .remark(ioOrderEntity.getRemark())
                     .build();
             if (collectOrder.getWorkPlaceCode() != null) {
                 collectOrder.setTagStatus(1);
@@ -476,6 +477,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                         .count(bizEntity.getCount())
                         .measureUnit(bizEntity.getMeasname())
                         .tagStatus(1)
+                        .remark(bizEntity.getRemark())
                         .unTagCount(bizEntity.getCount()).build();
 
                 if (IntUtil.value(udiRelevanceResponse.getProductsType()) == 2) {
@@ -551,6 +553,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                     .orderCirType(sysWorkplaceDocumentEntity.getOrderCirType())
                     .splitStatus(0)
                     .tagStatus(0)
+                    .remark(basicSkPrescribeEntity.getRemark())
                     .build();
             if (collectOrder.getWorkPlaceCode() != null) {
                 collectOrder.setTagStatus(1);