From c0363c564e0086cda7f44b5e0f0834b25d25785f Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 7 Dec 2024 13:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=95=B0=E9=87=8F=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/collect/IoCollectOrderBizMapper.java  |  4 +-
 .../api/entity/collect/IoCollectOrderBiz.java | 21 +++++++
 .../collect/IoCollectOrderBizService.java     |  6 ++
 .../collect/IoCollectOrderCodeManService.java | 24 +++++---
 .../collect/IoCollectOrderBizMapper.xml       | 56 ++++++++++++++++++-
 5 files changed, 100 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizMapper.java
index d6d1e0508..535f175ef 100644
--- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizMapper.java
+++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizMapper.java
@@ -14,5 +14,7 @@ public interface IoCollectOrderBizMapper extends BaseMapper<IoCollectOrderBiz> {
 
     List<CollectOrderBizResponse> filterList(CollectOrderBizRequest collectOrderRequest);
 
-    void updateAutoResCount(@Param("id") Long id,@Param("autoResCount")  int autoResCount);
+    void updateAutoResCount(@Param("id") Long id, @Param("autoResCount") int autoResCount);
+
+    boolean insertOrUpdate(IoCollectOrderBiz collectOrderBiz);
 }
diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java
index 656a304cf..d228cd725 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java
@@ -280,6 +280,27 @@ public class IoCollectOrderBiz implements Serializable {
     @TableField(value = "getConfirm")
     private Boolean getConfirm;
 
+    @TableField(exist = false)
+    private Integer addCount;
+
+    /**
+     * 实际数量
+     */
+    @TableField(exist = false)
+    private Integer addActCount;
+
+    /**
+     * 扫码数量
+     */
+    @TableField(exist = false)
+    private Integer addScanCount;
+
+    /**
+     * 扫码实际数量
+     */
+    @TableField(exist = false)
+    private Integer addScanActCount;
+
 
     private static final long serialVersionUID = 1L;
 }
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java
index 2d9619a00..14b667e8d 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java
@@ -44,4 +44,10 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
     public Boolean removeByBillNo(String billNo) {
         return remove(new LambdaQueryWrapper<IoCollectOrderBiz>().eq(IoCollectOrderBiz::getOrderIdFk, billNo));
     }
+
+    public Boolean insertOrUpdate(IoCollectOrderBiz collectOrderBiz) {
+        return collectOrderBizMapper.insertOrUpdate(collectOrderBiz);
+    }
+
+
 }
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 1746a5a5d..5a386ed85 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -347,7 +347,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 default:
                     break;
             }
-
+            collectOrderBizService.saveOrUpdate(collectOrderBiz);
         } else if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_UNVAIL_BATCH) {
             collectOrder = collectOrderService.getByBillNo(addTagCodeReqeust.getBillNo());
             collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode());
@@ -447,8 +447,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 default:
                     break;
             }
+            collectOrderBizService.insertOrUpdate(collectOrderBiz);
         }
-        collectOrderBizService.saveOrUpdate(collectOrderBiz);
 
         int count = 0;
         if (StrUtil.isEmpty(udiEntity.getSerialNo()) && exitCode != null) {
@@ -553,15 +553,19 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 ) {
                     int actCount = 0;
                     if (IntUtil.value(collectOrder.getOrderCirType()) == 1) {
-                        actCount = IntUtil.value(collectOrderBiz.getScanActCount()) + calCountUtil.getCirActCount(udiRelevanceResponse);
+                        actCount = +calCountUtil.getCirActCount(udiRelevanceResponse);
                     } else {
-                        actCount = IntUtil.value(collectOrderBiz.getScanActCount()) + calCountUtil.getUseActCount(udiRelevanceResponse);
+                        actCount = calCountUtil.getUseActCount(udiRelevanceResponse);
                     }
-                    collectOrderBiz.setScanActCount(actCount);
+                    collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + actCount);
                     collectOrderBiz.setCount(IntUtil.value(collectOrderBiz.getCount()) + 1);
+                    collectOrderBiz.setAddCount(1);
+                    collectOrderBiz.setAddScanCount(1);
+                    collectOrderBiz.setAddActCount(actCount);
+                    collectOrderBiz.setAddScanActCount(actCount);
+
                     return collectOrderBiz;
                 }
-
             }
         }
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
@@ -583,10 +587,14 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 .batchNo(udiEntity.getBatchNo())
                 .productDate(udiEntity.getProduceDate())
                 .expireDate(udiEntity.getExpireDate())
-                .count(actCount)
+                .count(1)
+                .addCount(1)
                 .actCount(actCount)
-                .scanCount(actCount)
+                .addActCount(actCount)
+                .scanCount(1)
+                .addScanCount(1)
                 .scanActCount(actCount)
+                .addScanActCount(actCount)
                 .measureUnit(udiRelevanceResponse.getMeasname())
                 .createTime(new Date())
                 .updateTime(new Date())
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
index dee069a24..59a7d6c5f 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
@@ -4,10 +4,10 @@
     <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderBizRequest"
             resultType="com.glxp.api.res.collect.CollectOrderBizResponse">
         SELECT icob.*,
-               bp.nameCode diCode,
+               bp.nameCode                     diCode,
                bp.zczbhhzbapzbh,
                bp.manufactory,
-               COALESCE(bp.bzgg,icob.ggxh) AS spec,
+               COALESCE(bp.bzgg, icob.ggxh) AS spec,
                sys_workplace_queue.code
         FROM io_collect_order_biz icob
                  left join basic_udirel bu on icob.relId = bu.id
@@ -45,4 +45,56 @@
         SET autoResCount = #{autoResCount}
         WHERE id = #{id}
     </update>
+
+
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.entity.collect.IoCollectOrderBiz" useGeneratedKeys="true">
+        insert into io_collect_order_biz
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            orderIdFk, relId, thrCode, ybbm, sptm, payFeeCode, cpmctymc, nameCode, ggxh, batchNo,
+            productDate,
+            expireDate,
+            count, actCount, scanCount, scanActCount, measureUnit, tagStatus, tagMsg, remark, createTime, updateTime,
+            unTagCount,
+            autoResCount, replaceCode, autoTagStatus, tempWorkPlaceCount, splitUnCheck, tempSplitCount, searchRemark1
+                , searchRemark2, searchRemark3, searchRemark4, searchRemark5, remark1, remark2
+                , remark3, remark4, remark5, remark6, remark7, remark8, remark9, remark10, getConfirm
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{orderIdFk}, #{relId}, #{thrCode}, #{ybbm}, #{sptm}, #{payFeeCode}, #{cpmctymc}, #{nameCode}, #{ggxh},
+            #{batchNo},
+            #{productDate}, #{expireDate}, #{count}, #{actCount}, #{scanCount}, #{scanActCount}, #{measureUnit},
+            #{tagStatus}, #{tagMsg}, #{remark}, #{createTime}, #{updateTime},
+            #{unTagCount}, #{autoResCount}, #{replaceCode}, #{autoTagStatus}, #{tempWorkPlaceCount}, #{splitUnCheck},
+            #{tempSplitCount}, #{searchRemark1},
+            #{searchRemark2}, #{searchRemark3}, #{searchRemark4}, #{searchRemark5}, #{remark1}, #{remark2},
+            #{remark3}, #{remark4}, #{remark5}, #{remark6}, #{remark7}, #{remark8}, #{remark9}, #{remark10},
+            #{getConfirm}
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            <if test="addCount != null">
+                count = count + #{addCount},
+            </if>
+            <if test="addActCount != null">
+                actCount = actCount + #{addActCount},
+            </if>
+            <if test="addScanCount != null">
+                scanCount = scanCount + #{addScanCount},
+            </if>
+            <if test="addScanActCount != null">
+                scanActCount = scanActCount + #{addScanActCount},
+            </if>
+        </trim>
+    </insert>
 </mapper>