From 68057172b71cac5df4c93a849e91b3f489a73784 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 19 Dec 2024 11:32:19 +0800
Subject: [PATCH] =?UTF-8?q?12/19=20=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectCodeController.java      |  7 ++++--
 .../res/collect/CollectOrderBizResponse.java  |  8 +++++++
 .../api/service/inout/IoSplitCodeService.java |  9 ++++---
 .../mapper/collect/IoCollectCodeMapper.xml    | 24 +++++++++----------
 .../collect/IoCollectOrderBizMapper.xml       |  6 ++---
 5 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java
index 543f6546a..d3af03b5b 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java
@@ -7,12 +7,15 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.collect.IoCollectOrder;
+import com.glxp.api.entity.collect.IoCollectOrderBackup;
 import com.glxp.api.req.collect.CollectOrderCodeManRequest;
 import com.glxp.api.req.collect.IoCollectCodeRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.collect.CollectOrderCodeManResponse;
 import com.glxp.api.res.collect.IoCollectCodeResponse;
 import com.glxp.api.service.collect.IoCollectCodeService;
+import com.glxp.api.service.collect.IoCollectOrderBackupService;
+import com.glxp.api.service.collect.IoCollectOrderBizService;
 import com.glxp.api.service.collect.IoCollectOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.functions.Offset;
@@ -32,7 +35,7 @@ public class IoCollectCodeController extends BaseController {
     IoCollectCodeService collectCodeService;
 
     @Resource
-    IoCollectOrderService collectOrderService;
+    IoCollectOrderBackupService ioCollectOrderBackupService;
 
     /**
      * 追溯码查询
@@ -52,7 +55,7 @@ public class IoCollectCodeController extends BaseController {
             if (StrUtil.isEmpty(ioCollectCodeResponse.getManufactory())) {
                 ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc());
             }
-            IoCollectOrder byBillNo = collectOrderService.getByBillNo(ioCollectCodeResponse.getBillNo());
+            IoCollectOrderBackup byBillNo = ioCollectOrderBackupService.getByBillNo(ioCollectCodeResponse.getBillNo());
             ioCollectCodeResponse.setBillTime(byBillNo.getBillTime());
             if (byBillNo.getRemark() != null) {
                 ioCollectCodeResponse.setRemark(byBillNo.getRemark());
diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
index 2fb367581..0fb06bd19 100644
--- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
@@ -171,6 +171,14 @@ public class CollectOrderBizResponse {
 
     private String packUnit;
 
+    private String zczbhhzbapzbh;
+    private String manufactory;
+
+
+
+
+
+
 //    /**
 //     * 未赋码数量
 //     */
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 3647f8264..65a33e008 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -329,9 +329,12 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 }
                 continue;
             }
-
-            int quotient = collectOrderBiz.getUnTagCount() / IntUtil.value(udiRelevanceResponse.getBhxjsl());
-            int remainder = collectOrderBiz.getUnTagCount() % IntUtil.value(udiRelevanceResponse.getBhxjsl());
+            int quotient = 0;
+            int remainder = 0;
+            if(IntUtil.value(udiRelevanceResponse.getBhxjsl()) != 0){
+                quotient = collectOrderBiz.getUnTagCount() / IntUtil.value(udiRelevanceResponse.getBhxjsl());
+                remainder = collectOrderBiz.getUnTagCount() % IntUtil.value(udiRelevanceResponse.getBhxjsl());
+            }
             //2.如果整盒，从工位队列扣除   默认最后一个追溯码拆零
             if (quotient > 0) {
                 List<IoSplitFifoCodeEntity> ioSplitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(),queueCode );
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml
index d1408a5a0..0ed91383b 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.collect.IoCollectCodeMapper">
     <select id="filterList" resultType="com.glxp.api.res.collect.IoCollectCodeResponse">
-        SELECT icc.*,sw.workplaceName,
+        SELECT iccb.*,sw.workplaceName,
         COALESCE(thr_bustype_origin.name, basic_bussiness_type.name) as busTypeName,
         bp.nameCode,
         bp.cpmctymc,
@@ -10,29 +10,29 @@
         bp.zczbhhzbapzbh,
         bp.ylqxzcrbarmc,
         bp.manufactory
-        from io_collect_code icc
-        left join sys_workplace sw on sw.workplaceId = icc.workPlaceCode
-        left join thr_bustype_origin on icc.busType = thr_bustype_origin.action
-        left join basic_bussiness_type on icc.busType = basic_bussiness_type.action
-        left join basic_udirel bu on icc.relId = bu.id
+        from io_collect_code_backup iccb
+        left join sys_workplace sw on sw.workplaceId = iccb.workPlaceCode
+        left join thr_bustype_origin on iccb.busType = thr_bustype_origin.action
+        left join basic_bussiness_type on iccb.busType = basic_bussiness_type.action
+        left join basic_udirel bu on iccb.relId = bu.id
         left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="workPlaceCode != '' and workPlaceCode != null">
-                AND icc.workPlaceCode LIKE concat('%', #{workPlaceCode}, '%')
+                AND iccb.workPlaceCode LIKE concat('%', #{workPlaceCode}, '%')
             </if>
             <if test="code != '' and code != null">
-                AND icc.code LIKE concat('%', #{code}, '%')
+                AND iccb.code LIKE concat('%', #{code}, '%')
             </if>
             <if test="billNo != null and billNo != ''">
-                AND icc.billNo LIKE concat('%', #{billNo}, '%')
+                AND iccb.billNo LIKE concat('%', #{billNo}, '%')
             </if>
             <if test="fromType != null and fromType != ''">
-                AND icc.fromType LIKE concat('%', #{fromType}, '%')
+                AND iccb.fromType LIKE concat('%', #{fromType}, '%')
             </if>
             <if test="fromCorp != null and fromCorp != ''">
-                AND icc.fromCorp LIKE concat('%', #{fromCorp}, '%')
+                AND iccb.fromCorp LIKE concat('%', #{fromCorp}, '%')
             </if>
         </where>
-        group by icc.id
+        group by iccb.id
     </select>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
index 59a7d6c5f..d72f5611e 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
@@ -87,13 +87,13 @@
                 count = count + #{addCount},
             </if>
             <if test="addActCount != null">
-                actCount = actCount + #{addActCount},
+                actCount =  IFNULL(actCount, 0) + #{addActCount},
             </if>
             <if test="addScanCount != null">
-                scanCount = scanCount + #{addScanCount},
+                scanCount = IFNULL(scanCount, 0) + #{addScanCount},
             </if>
             <if test="addScanActCount != null">
-                scanActCount = scanActCount + #{addScanActCount},
+                scanActCount = IFNULL(scanActCount, 0) + #{addScanActCount},
             </if>
         </trim>
     </insert>