From fa9a264df8a1f89e7ed224d948d43c7acb56db8c Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 26 Aug 2024 09:07:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderCodeManService.java    | 16 +++++++---------
 .../service/collect/IoCollectOrderService.java   |  5 ++---
 2 files changed, 9 insertions(+), 12 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 761d6d01e..cb82feee7 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -1,6 +1,7 @@
 package com.glxp.api.service.collect;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -150,9 +151,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 } else {
                     ThrBusTypeOriginEntity one = thrBusTypeOriginService.getOne(new LambdaQueryWrapper<ThrBusTypeOriginEntity>()
                             .eq(ThrBusTypeOriginEntity::getAction, sysWorkplaceDocumentEntity.getDocumentTypeCode()));
-                    if (one != null){
+                    if (one != null) {
                         ThrSystemEntity thrSystemEntity = thrSystemService.getOne(new LambdaQueryWrapper<ThrSystemEntity>().eq(ThrSystemEntity::getThirdId, one.getThirdSys()));
-                        if (thrSystemEntity != null){
+                        if (thrSystemEntity != null) {
                             collectOrder.setFromType(thrSystemEntity.getThirdName());
                         }
                     }
@@ -312,7 +313,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                             collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder);
                             collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
                         } else {
-                            collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1);
+                            collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
                             if (IntUtil.value(collectOrder.getOrderCirType()) == 1) {
                                 collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + calCountUtil.getCirActCount(udiRelevanceResponse));
                             } else {
@@ -326,7 +327,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                     break;
             }
         }
-        collectOrderBizService.updateById(collectOrderBiz);
+        collectOrderBizService.saveOrUpdate(collectOrderBiz);
 
         IoCollectOrderCodeMan exitCode = this.findByCode(collectOrderBiz.getOrderIdFk(), code);
         if (StrUtil.isEmpty(udiEntity.getSerialNo()) && exitCode != null) {
@@ -387,6 +388,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
             actCount = calCountUtil.getUseActCount(udiRelevanceResponse);
         }
         return IoCollectOrderBiz.builder()
+                .id(IdUtil.getSnowflakeNextId())
                 .relId(udiRelevanceResponse.getId())
                 .thrCode(udiRelevanceResponse.getMainId())
                 .ybbm(udiRelevanceResponse.getYbbm())
@@ -411,18 +413,14 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
     public IoCollectOrderBiz vailByBatchNo(List<UdiRelevanceResponse> udiRelevanceResponses, List<IoCollectOrderBiz> collectOrderBizs, UdiEntity udiEntity) {
         for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
             for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
-                if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId()) &&
-                        (StrUtil.isNotEmpty(collectOrderBiz.getBatchNo()) && collectOrderBiz.getBatchNo().equals(udiEntity.getBatchNo()))
-                ) {
+                if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId()) && (StrUtil.emptyIfNull(collectOrderBiz.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo())))) {
                     return collectOrderBiz;
                 }
-
             }
         }
         return null;
     }
 
-
     public IoCollectOrderBiz vailNoBatchNo(List<UdiRelevanceResponse> udiRelevanceResponses, List<IoCollectOrderBiz> collectOrderBizs, UdiEntity udiEntity) {
         List<IoCollectOrderBiz> addList = new ArrayList<>();
         for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
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 baacf3fd5..087f7c540 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -239,7 +239,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                     .createTime(ioOrderEntity.getCreateTime())
                     .createUser(ioOrderEntity.getCreateUser())
                     .updateTime(new Date())
-                    .orderCirType(1)
+                    .orderCirType(sysWorkplaceDocumentEntity.getOrderCirType())
                     .splitStatus(0)
                     .tagStatus(0)
                     .build();
@@ -265,7 +265,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                         .productDate(bizEntity.getProductDate())
                         .expireDate(bizEntity.getExpireDate())
                         .count(bizEntity.getCount())
-
                         .measureUnit(bizEntity.getMeasname())
                         .tagStatus(1)
                         .unTagCount(bizEntity.getCount()).build();
@@ -340,7 +339,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                     .createTime(new Date())
                     .createUser(basicSkPrescribeEntity.getCreateUser())
                     .updateTime(new Date())
-                    .orderCirType(2)
+                    .orderCirType(sysWorkplaceDocumentEntity.getOrderCirType())
                     .splitStatus(0)
                     .tagStatus(0)
                     .build();