From 3afecad2b4da94e2e6f9659be08c0dda72c439f3 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 2 Dec 2024 19:12:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java     |  1 -
 .../collect/IoCollectOrderBackupService.java  |  4 +--
 .../collect/IoCollectOrderCodeManService.java | 24 ++++++-------
 .../collect/IoCollectOrderService.java        | 34 ++++++++++++++++---
 4 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index 2a8d9304e..fba28ad8c 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -404,7 +404,6 @@ public class IoCollectOrderController extends BaseController {
                 return ResultVOUtils.error(502, "该业务单据未全部赋码，是否强制完成单据？");
             }
         }
-        collectOrderRequest.setUpdateUser(getUserId());
         collectOrderService.finishOrder(collectOrderRequest, getUser(), false);
         return ResultVOUtils.success();
     }
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index 137d8c101..221a1f6c3 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -179,7 +179,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
             orderEntity.setAction(bussinessTypeEntity.getAction());
             orderEntity.setCreateTime(new Date());
-            orderEntity.setInvCode(sysWorkplaceDocumentEntity.getInvCode() + "");
+            orderEntity.setInvCode(collectOrder.getShipper() + "");
             orderEntity.setDeptCode("");
             orderEntity.setFromCorp(collectOrder.getFromCorp());
             orderEntity.setCorpOrderId(CustomUtil.getId() + "x");
@@ -192,6 +192,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             orderEntity.setUpdateTime(new Date());
             orderEntity.setCustomerId("110");
             orderEntity.setOrderType(2);
+            orderEntity.setProductType(bussinessTypeEntity.getProductType());
             orderEntity.setFromType(2);
             String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
             orderEntity.setBillNo(orderNo);
@@ -395,5 +396,4 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     }
 
 
-
 }
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 a7d6380d5..45acd6412 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -212,14 +212,14 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         .orderCirType(sysWorkplaceDocumentEntity.getOrderCirType())
                         .tagStatus(1)
                         .build();
-                if (StrUtil.isNotEmpty(addTagCodeReqeust.getShipper())){
+                if (StrUtil.isNotEmpty(addTagCodeReqeust.getShipper())) {
                     collectOrder.setShipper(addTagCodeReqeust.getShipper());
                     collectOrder.setShipperName(addTagCodeReqeust.getShipperName());
                 }
-                if (StrUtil.isNotEmpty(addTagCodeReqeust.getInvCode())) {
-                    InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addTagCodeReqeust.getInvCode());
-                    collectOrder.setShipperName(invWarehouseEntity.getName());
-                }
+//                if (StrUtil.isNotEmpty(addTagCodeReqeust.getInvCode())) {
+//                    InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addTagCodeReqeust.getInvCode());
+//                    collectOrder.setShipperName(invWarehouseEntity.getName());
+//                }
                 if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1) {
                     collectOrder.setFromType("药械追溯管理系统");
                 } else {
@@ -491,9 +491,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 }
 //                if (StrUtil.isEmpty(collectOrderCodeMan.getBatchNo())) {
                 //当关联关系存在的时候 以关联关系为准
-                    collectOrderCodeMan.setBatchNo(codeRelEntity.getBatchNo());
-                    collectOrderCodeMan.setProductDate(codeRelEntity.getMadeDate() + "");
-                    collectOrderCodeMan.setExpireDate(codeRelEntity.getValidateDate() + "");
+                collectOrderCodeMan.setBatchNo(codeRelEntity.getBatchNo());
+                collectOrderCodeMan.setProductDate(codeRelEntity.getMadeDate() + "");
+                collectOrderCodeMan.setExpireDate(codeRelEntity.getValidateDate() + "");
 //                }
             }
             this.save(collectOrderCodeMan);
@@ -549,7 +549,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
             for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
                 if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId()) &&
-                        (StrUtil.isNotEmpty(collectOrderBiz.getBatchNo()) && collectOrderBiz.getBatchNo().equals(udiEntity.getBatchNo()))
+                        (StrUtil.trimToEmpty(collectOrderBiz.getBatchNo()).equals(StrUtil.trimToEmpty(udiEntity.getBatchNo())))
                 ) {
                     int actCount = 0;
                     if (IntUtil.value(collectOrder.getOrderCirType()) == 1) {
@@ -583,9 +583,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 .batchNo(udiEntity.getBatchNo())
                 .productDate(udiEntity.getProduceDate())
                 .expireDate(udiEntity.getExpireDate())
-                .count(0)
-                .actCount(0)
-                .scanCount(1)
+                .count(actCount)
+                .actCount(actCount)
+                .scanCount(actCount)
                 .scanActCount(actCount)
                 .measureUnit(udiRelevanceResponse.getMeasname())
                 .createTime(new Date())
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 1cd1b0782..cc0e240eb 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -812,8 +812,27 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 //        if (sysWorkplacePutRel != null) {
 //            putWorkPlace = sysWorkplacePutRel.getWorkPlaceCode();
 //        }
-        splitCodeService.finishAutoTagCode(collectOrder, isAuto);
-
+        SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService
+                .getOne(new LambdaQueryWrapper<SysWorkplaceDocumentEntity>().eq(SysWorkplaceDocumentEntity::getDocumentTypeCode,
+                        collectOrderRequest.getBusType()));
+        if (sysWorkplaceDocumentEntity.getScanType() == 1) {
+            IoCollectOrder collectOrder1 =
+                    getOne(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, collectOrderRequest.getBillNo()));
+            collectOrder1.setTagStatus(3);
+            collectOrder1.setUpdateTime(new Date());
+            updateById(collectOrder1);
+            collectOrder = collectOrder1;
+            ArrayList<IoCollectOrderBizBackup> ioCollectOrderBizBackups = new ArrayList<>();
+            List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
+            for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs) {
+                IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
+                BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup);
+                ioCollectOrderBizBackups.add(ioCollectOrderBizBackup);
+            }
+            ioCollectOrderBizBackupService.saveBatch(ioCollectOrderBizBackups);
+        } else {
+            splitCodeService.finishAutoTagCode(collectOrder, isAuto);
+        }
 
         //插入备用表
         IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
@@ -821,18 +840,23 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         ioCollectOrderBackupService.save(ioCollectOrderBackup);
 
         //删除原来单据
-        removeOrderByBillNo(collectOrder);
-
+        IoCollectOrder finalCollectOrder = collectOrder;
         ThreadUtil.execAsync(() -> {
+            removeOrderByBillNo(finalCollectOrder);
             //插入到码表
             collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
             //更新数据至第三方系统
             //单据更新
-            ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(), authAdmin);
+            ioCollectOrderBackupService.generateOrder(finalCollectOrder.getBillNo(), authAdmin);
 //            spGetHttpClient.updateCheckStatus(orderEntity,collectOrder.getCreateUser());
         });
     }
 
+    public void busGenOrder(CollectOrderRequest collectOrderRequest) {
+
+
+    }
+
     public void confirmFinishOrder(CollectOrderRequest collectOrderRequest, AuthAdmin authAdmin) {
         IoCollectOrder collectOrder = new IoCollectOrder();
         BeanUtils.copyProperties(collectOrderRequest, collectOrder);