From 34a75705febab53efb753d4994744f83e9dc8f2f Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 22 Aug 2024 18:41:43 +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

---
 .../api/controller/inout/IoCodeTempController.java   | 12 ++++++------
 .../service/basic/BasicCollectBustypeService.java    |  5 +++++
 .../service/basic/SysWorkplaceDocumentService.java   |  3 +++
 .../api/service/collect/IoCollectOrderService.java   | 12 ++++++------
 .../glxp/api/service/inout/IoCheckInoutService.java  |  2 +-
 .../mybatis/mapper/collect/IoCollectOrderMapper.xml  |  2 +-
 6 files changed, 22 insertions(+), 14 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 71245def6..284468f32 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -1047,17 +1047,17 @@ public class IoCodeTempController extends BaseController {
                 genDetaiEntity.setCount(1);
 
                 if (bussinessTypeEntity.isUse()) {
-                    genDetaiEntity.setReCount( udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+                    genDetaiEntity.setReCount(udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
                 } else {
-                    genDetaiEntity.setReCount( udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+                    genDetaiEntity.setReCount(udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
                 }
 
                 exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1);
 
                 if (bussinessTypeEntity.isUse()) {
-                    exitLocalEntity.setReCount(exitLocalEntity.getMyCount() *  udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+                    exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
                 } else {
-                    exitLocalEntity.setReCount(exitLocalEntity.getMyCount() *  udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+                    exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
                 }
 
                 if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
@@ -1188,9 +1188,9 @@ public class IoCodeTempController extends BaseController {
                 //计算实际数量
 
                 if (bussinessTypeEntity.isUse()) {
-                    codeEnttity.setReCount(codeEnttity.getMyCount() *  udiCalCountUtil.getUseActCount(udiRelevanceResponse));
+                    codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
                 } else {
-                    codeEnttity.setReCount(codeEnttity.getMyCount() *  udiCalCountUtil.getCirActCount(udiRelevanceResponse));
+                    codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
                 }
             } else if (udiRelevanceResponses.size() == 0) {
                 if (unitFk == null)
diff --git a/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java b/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java
index 71c35a350..787c3bb3b 100644
--- a/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java
+++ b/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java
@@ -40,6 +40,11 @@ public class BasicCollectBustypeService extends ServiceImpl<BasicCollectBustypeM
         return basicCollectBustypeMapper.selectOne(new LambdaQueryWrapper<BasicCollectBustypeEntity>().eq(BasicCollectBustypeEntity::getCode, code).last("limit  1 "));
     }
 
+    public BasicCollectBustypeEntity findByFromCode(String code) {
+        return basicCollectBustypeMapper.selectOne(new LambdaQueryWrapper<BasicCollectBustypeEntity>().eq(BasicCollectBustypeEntity::getFromBusTypeCode, code).last("limit  1 "));
+    }
+
+
     public BasicCollectBustypeEntity findByAddr(String addr) {
         return basicCollectBustypeMapper.selectOne(new LambdaQueryWrapper<BasicCollectBustypeEntity>().eq(BasicCollectBustypeEntity::getFromInterAddress, addr).last("limit  1 "));
     }
diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java
index 0c6338e88..31fac7939 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java
@@ -34,6 +34,9 @@ public class SysWorkplaceDocumentService extends ServiceImpl<SysWorkplaceDocumen
         return list;
     }
 
+    public SysWorkplaceDocumentEntity findByBusType(String busType) {
+        return sysWorkplaceDocumentDao.selectOne(new LambdaQueryWrapper<SysWorkplaceDocumentEntity>().eq(SysWorkplaceDocumentEntity::getDocumentTypeCode, busType).last("limit 1"));
+    }
 
     public SysWorkplaceDocumentEntity findByWorkplaceCode(Long workplaceCode, String busType) {
         return sysWorkplaceDocumentDao.selectOne(new LambdaQueryWrapper<SysWorkplaceDocumentEntity>()
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 a7512e23d..8070fef5e 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -137,8 +137,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     public void importUdi() {
         //下载UDI内部单据
         FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
-//        filterOrderRequest.setPage(1);
-//        filterOrderRequest.setLimit(1000);
         filterOrderRequest.setStatus(7);
         filterOrderRequest.setProductType(null);
         List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
@@ -151,9 +149,11 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 //            BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByAddr(ioOrderEntity.getAction());
 //            if (collectBustypeEntity == null)
 //                continue;
+            SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(ioOrderEntity.getAction());
+            if (sysWorkplaceDocumentEntity == null)
+                continue;
             List<SysWorkplaceResponse> sysWorkplaces = sysWorkplaceService.getAllByBusType(ioOrderEntity.getAction());
 
-
             //自动分配工位
             final Long[] defaultWorkplace = {null};
             if (CollUtil.isNotEmpty(sysWorkplaces)) {
@@ -240,7 +240,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
         List<IoCollectOrder> collectOrderList = new ArrayList<>();
         for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) {
-            BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByCode(String.valueOf(basicSkPrescribeEntity.getAddr()));
+            BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByFromCode(String.valueOf(basicSkPrescribeEntity.getAddr()));
             if (collectBustypeEntity == null)
                 continue;
             if (collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) {
@@ -248,7 +248,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             }
             //自动分配工位
             final Long[] defaultWorkplace = {null};
-            List<SysWorkplaceResponse> sysWorkplaces = sysWorkplaceService.getAllByBusType(collectBustypeEntity.getCode());
+            List<SysWorkplaceResponse> sysWorkplaces = sysWorkplaceService.getAllByBusType(collectBustypeEntity.getFromDocumentType());
             if (CollUtil.isNotEmpty(sysWorkplaces)) {
                 if (sysWorkplaces.size() == 1) {
                     defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId();
@@ -276,7 +276,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
             IoCollectOrder collectOrder = IoCollectOrder.builder()
                     .billNo(basicSkPrescribeEntity.getCode())
-                    .busType(collectBustypeEntity.getCode())
+                    .busType(collectBustypeEntity.getFromDocumentType())
                     .fromType(collectBustypeEntity.getFromType())
                     .fromCorp(basicSkPrescribeEntity.getSickerCode())
                     .workPlaceCode(defaultWorkplace[0])
diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
index 0073beb2e..486e453d2 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
@@ -1253,7 +1253,7 @@ public class IoCheckInoutService {
                                 BeanUtils.copyProperties(codeEntity, splitCodeEntity);
                                 splitCodeEntity.setInBactchNo(codeEntity.getInBatchNo());
                                 splitCodeEntity.setScanCount(codeEntity.getCount());
-                                ioSplitFifoCodeEntity.setTotalCount(ioSplitFifoCodeEntity.getTotalCount() + codeEntity.getReCount());
+                                splitCodeEntity.setTotalCount(IntUtil.value(splitCodeEntity.getTotalCount()) + codeEntity.getReCount());
                                 splitCodeEntity.setSupId(Long.parseLong(codeEntity.getSupId()));
                                 splitCodeEntity.setWorkPlaceCode(orderEntity.getWorkPlaceCode());
                                 splitCodeEntity.setFifoSplit(codeEntity.getFifoSplit());
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index 10a7f9e46..611d18a26 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -41,7 +41,7 @@
                 AND tagStatus = #{tagStatus}
             </if>
             <if test="workPlaceCode != null ">
-                AND workPlaceCode = #{workPlaceCode}
+                AND ico.workPlaceCode = #{workPlaceCode}
             </if>
             <if test="tagStatusList != null and tagStatusList.size() > 0">
                 and tagStatus in