From d46391615487fd1274b2963dc73e7b887132cacb Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Fri, 28 Mar 2025 15:12:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B5=8B=E7=A0=81?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=89=B9=E6=AC=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/service/inout/IoSplitCodeService.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
index be562f655..93f392fff 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -26,6 +26,7 @@ import com.glxp.api.service.thrsys.SysWorkplacePutRelService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.OrderNoTypeBean;
+import com.glxp.api.util.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -603,7 +604,18 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
             } else if (total > 0) {
                 collectOrderBiz.setAutoTagStatus(3);
             } else collectOrderBiz.setAutoTagStatus(1);
+
+
+            if(CollUtil.isNotEmpty(splitFifoCodeEntities)){
+                IoSplitFifoCodeEntity ioSplitFifoCodeEntity =  splitFifoCodeEntities.get(0);
+                if(ioSplitFifoCodeEntity!=null && StringUtils.isNotEmpty(ioSplitFifoCodeEntity.getBatchNo())){
+                    collectOrderBiz.setBatchNo(ioSplitFifoCodeEntity.getBatchNo());
+                    collectOrderBiz.setProductDate(ioSplitFifoCodeEntity.getProduceDate());
+                    collectOrderBiz.setExpireDate(ioSplitFifoCodeEntity.getExpireDate());
+                }
+            }
         }
+
         ThreadUtil.execAsync(() -> {
             ioCollectLedGroupService.openLed(collectOrderBizs);
         });

From f3763d28b5e24614409b4a24d3c11b805494b4d8 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 28 Mar 2025 15:14:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/collect/IoCollectOrderService.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 cfcf93a1b..424e804c2 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -583,18 +583,18 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
                 if (!collectOrder.getTagStatus().equals(4) && (IntUtil.value(collectSet.getAutoDealOrder()) || IntUtil.value(collectOrderRequest.getForceAllot()))) {//没出现耗材不匹配 且 开启了自动转成待处理单据
                     collectOrder.setTagStatus(1);
-                    allotCollects.add(collectOrder);
-                    allotCollectBizs.addAll(bizList);
+                    boolean isExit = collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, collectOrder.getBillNo()).eq(IoCollectOrder::getBusType, collectOrder.getBusType()));
+                    if (!isExit) {
+                        collectOrderMapper.insert(collectOrder);
+                        collectOrderBizService.saveBatch(bizList);
+                    }
+//                    saveBatch(allotCollects);
+//                    allotCollects.add(collectOrder);
+//                    allotCollectBizs.addAll(bizList);
                 }
             }
 
-            if (CollUtil.isNotEmpty(allotCollects)) {
-
-                    saveBatch(allotCollects);
-                    collectOrderBizService.saveBatch(allotCollectBizs);
 
-
-            }
         }
     }