From c64be1d9213643b301707c302a2b334f449fd435 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 18 Oct 2024 10:45:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E6=A2=B0=E6=89=AB=E7=A0=81=E6=8B=86?=
 =?UTF-8?q?=E9=9B=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderCodeManService.java |  2 +-
 .../api/service/inout/IoSplitCodeService.java | 43 ++++++++++---------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
index a18460bd5..2d8cf8233 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -414,7 +414,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         collectOrderBizService.saveOrUpdate(collectOrderBiz);
 
 
-
         if (StrUtil.isEmpty(udiEntity.getSerialNo()) && exitCode != null) {
             exitCode.setScanCount(IntUtil.value(exitCode.getScanCount()) + scanCount);
             exitCode.setBizIdFk(collectOrderBiz.getId());
@@ -436,6 +435,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                             .updateTime(new Date())
                             .updateUser(userId)
                             .scanCount(scanCount)
+                            .scanActCount(scanCount)
                             .build();
             this.save(collectOrderCodeMan);
         }
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 fc3168f91..9cce2f502 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -255,7 +255,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 //判断拆零表里是否存在，如果存在则剔除
                 IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(collectOrderCodeMan.getUdiCode(), putWorkPlaceCode);
                 if (splitCodeEntity != null && IntUtil.value(splitCodeEntity.getRemainCount()) > 0) {
-                    if (IntUtil.value(splitCodeEntity.getRemainCount()) > IntUtil.value(collectOrderCodeMan.getScanCount())) {
+                    if (IntUtil.value(splitCodeEntity.getRemainCount()) > IntUtil.value(collectOrderCodeMan.getScanActCount())) {
                         splitCodeEntity.setRemainCount(IntUtil.value(splitCodeEntity.getRemainCount()) - IntUtil.value(collectOrderCodeMan.getScanActCount()));
                     } else {
                         splitCodeEntity.setRemainCount(0);
@@ -299,25 +299,28 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                                 result = firstMatch1.get();
                             }
                         }
-                        IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder().code(result.getUdiCode())
-                                .errUdiCode(result.getUdiCode())
-                                .orderId(result.getOrderIdFk())
-                                .action(collectOrder.getBusType())
-                                .relId(result.getRelId())
-                                .nameCode(result.getNameCode())
-                                .batchNo(result.getBatchNo())
-                                .produceDate(result.getProductDate())
-                                .expireDate(result.getExpireDate())
-                                .serialNo(result.getSerialNo())
-                                .scanCount(result.getScanCount())
-                                .totalCount(result.getScanCount())
-                                .workPlaceCode(putWorkPlaceCode)
-                                .status(2)
-                                .fifoSplit(1)
-                                .createTime(new Date()).updateTime(new Date())
-                                .remainCount(-unTagCount).build();
-                        this.decorateUnpackExpireTime(ioSplitCodeEntity);
-                        splitCodeService.save(ioSplitCodeEntity);
+                        if (result != null) {
+                            IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder().code(result.getUdiCode())
+                                    .errUdiCode(result.getUdiCode())
+                                    .orderId(result.getOrderIdFk())
+                                    .action(collectOrder.getBusType())
+                                    .relId(result.getRelId())
+                                    .nameCode(result.getNameCode())
+                                    .batchNo(result.getBatchNo())
+                                    .produceDate(result.getProductDate())
+                                    .expireDate(result.getExpireDate())
+                                    .serialNo(result.getSerialNo())
+                                    .scanCount(result.getScanCount())
+                                    .totalCount(result.getScanCount())
+                                    .workPlaceCode(putWorkPlaceCode)
+                                    .status(2)
+                                    .fifoSplit(1)
+                                    .createTime(new Date()).updateTime(new Date())
+                                    .remainCount(-unTagCount).build();
+                            this.decorateUnpackExpireTime(ioSplitCodeEntity);
+                            splitCodeService.save(ioSplitCodeEntity);
+                        }
+
                     }
 
                 }