From 19cc9a46a6326e48999be99a612f473acc9d8911 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 21 Sep 2024 12:50:31 +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

---
 .../inout/IoCodeTempController.java           |  9 +++++--
 .../req/collect/IoSplitDesOrderRequest.java   |  2 +-
 .../api/req/inout/FilterOrderRequest.java     |  2 ++
 .../api/req/inout/IoSplitCodeRequest.java     |  2 +-
 .../api/req/inout/IoSplitFifoInvRequest.java  |  2 +-
 .../api/service/inout/IoOrderService.java     |  5 +++-
 .../inout/impl/IoOrderServiceImpl.java        |  9 +++++++
 .../collect/IoCollectOrderOriginMapper.xml    | 17 +++++-------
 .../mapper/collect/IoSplitDesOrderMapper.xml  |  8 +++---
 .../mybatis/mapper/inout/IoOrderDao.xml       | 16 ++++++------
 .../mapper/inout/IoSplitCodeMapper.xml        | 18 ++++++-------
 .../mapper/inout/IoSplitFifoInvMapper.xml     | 26 +++++++++----------
 12 files changed, 66 insertions(+), 50 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 dc0783295..4bce6591d 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -481,6 +481,11 @@ public class IoCodeTempController extends BaseController {
 
             BaseResponse baseResponse = null;
             addOrderRequest.setCode(code);
+            IoOrderEntity ioOrderEntity = orderService.findCorpOrderId(addOrderCodeRequest.getCorpOrderId());
+            if (ioOrderEntity != null) {
+                addOrderRequest.setBillNo(ioOrderEntity.getBillNo());
+            }
+
             if (IntUtil.value(udiEntity.getProductType()) == 2) {
                 baseResponse = adddGrugOrder(addOrderRequest, udiEntity, code);
             } else {
@@ -2536,11 +2541,11 @@ public class IoCodeTempController extends BaseController {
 
         String orderFinishBillNo = addOrderCodeRequest.getOrderFinishBillNo();
         List<IoCollectCode> list = ioCollectCodeService.list(new LambdaUpdateWrapper<IoCollectCode>().eq(IoCollectCode::getBillNo, orderFinishBillNo));
-        if (CollUtil.isEmpty(list))  return ResultVOUtils.error(500, "未找到已完成单的码明细");
+        if (CollUtil.isEmpty(list)) return ResultVOUtils.error(500, "未找到已完成单的码明细");
         List<String> codeList = new ArrayList<>();
         list.forEach(item -> {
             String code = item.getCode();
-            Integer reCountObj  = item.getScanCount();
+            Integer reCountObj = item.getScanCount();
             int reCount = reCountObj != null ? reCountObj : 0; // 如果reCountObj为null，则默认为0次迭代
             for (int i = 0; i < reCount; i++) {
                 codeList.add(code);
diff --git a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java
index 3df259900..577f06e53 100644
--- a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java
@@ -40,7 +40,7 @@ public class IoSplitDesOrderRequest extends ListPageRequest {
      */
     private String endTime;
 
-    private String keywords;
+    private String keyWords;
 
 
 }
diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index dca7c3db3..eb8d98f9b 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -231,4 +231,6 @@ public class FilterOrderRequest extends ListPageRequest {
      * 工位编码
      */
     private String workPlaceCode;
+
+    private String keyWords;
 }
diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
index e4955a379..497c8c021 100644
--- a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
@@ -137,7 +137,7 @@ public class IoSplitCodeRequest extends ListPageRequest {
     /**
      * 关键字搜索
      */
-    private String keywords;
+    private String keyWords;
 
     private String startTime;
     private String endTime;
diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java
index 8be3a57aa..42900f039 100644
--- a/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java
@@ -117,7 +117,7 @@ public class IoSplitFifoInvRequest extends ListPageRequest {
     /**
      * 关键字搜索
      */
-    private String keywords;
+    private String keyWords;
 
     private String remind;
     private String cpmctymc;
diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java
index c7a1122c4..c94050ad7 100644
--- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java
@@ -102,7 +102,7 @@ public interface IoOrderService {
      * @param billNo
      * @return
      */
-    List<IoOrderEntity> filterOrderTrace(String billNo,Integer productType);
+    List<IoOrderEntity> filterOrderTrace(String billNo, Integer productType);
 
     /**
      * 单据实体数据转换VO
@@ -158,4 +158,7 @@ public interface IoOrderService {
     void updateOrderInventory(String billNo, Integer status);
 
 
+    IoOrderEntity findCorpOrderId(String billNo);
+
+
 }
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
index 1599a2955..12de4b676 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@@ -1063,6 +1063,15 @@ public class IoOrderServiceImpl implements IoOrderService {
         }
     }
 
+    @Override
+    public IoOrderEntity findCorpOrderId(String billNo) {
+        List<IoOrderEntity> orderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("corpOrderId", billNo));
+        if (CollUtil.isNotEmpty(orderEntities)) {
+            return orderEntities.get(0);
+        }
+        return null;
+    }
+
     /**
      * 查询此单据关联的所有单据
      *
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
index 69abca2d0..46746d48d 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.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.IoCollectOrderOriginMapper">
 
- <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
+<select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
             resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
         SELECT ico.billNo,
                ico.busType,
@@ -102,9 +102,6 @@
             <if test="fromCorpName != '' and fromCorpName != null">
                 AND ico.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
             </if>
-            <if test="collectCode != null and collectCode != ''">
-                AND collectCode = #{collectCode}
-            </if>
             <if test="busType != null and busType != ''">
                 AND busType = #{busType}
             </if>
@@ -157,12 +154,12 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
             </if>
-<!--            <if test="keywords != null and keywords != ''">-->
-<!--                and (ico.billNo like concat('%', #{keywords}, '%')-->
-<!--                    or ico.fromCorp like concat('%', #{keywords}, '%')-->
-<!--                    or ico.fromCorpName like concat('%', #{keywords}, '%')-->
-<!--                    or ico.fromType like concat('%', #{keywords}, '%'))-->
-<!--            </if>-->
+            <if test="keyWords != null and keyWords != ''">
+                and (ico.billNo like concat('%', #{keyWords}, '%')
+                    or ico.fromCorp like concat('%', #{keyWords}, '%')
+                    or ico.fromCorpName like concat('%', #{keyWords}, '%')
+                    or ico.fromType like concat('%', #{keyWords}, '%'))
+            </if>
         </where>
         GROUP BY
         ico.billNo
diff --git a/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml
index cad91bbab..65f17110f 100644
--- a/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml
@@ -25,10 +25,10 @@
                 AND date_format(isdo.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
                 date_format(#{endTime}, '%Y-%m-%d')
             </if>
-            <if test="keywords != null and keywords != ''">
-                and (isdo.billNo like concat('%', #{keywords}, '%')
-                or isdo.workPlaceCode like concat('%', #{keywords}, '%')
-                or isdo.busType like concat('%', #{keywords}, '%'))
+            <if test="keyWords != null and keyWords != ''">
+                and (isdo.billNo like concat('%', #{keyWords}, '%')
+                or isdo.workPlaceCode like concat('%', #{keyWords}, '%')
+                or isdo.busType like concat('%', #{keyWords}, '%'))
             </if>
         </where>
         ORDER BY isdo.createTime DESC
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 42217e9af..393827da4 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -193,14 +193,14 @@
             <if test="fromPatientCode != null">
                 AND io.fromPatientCode = #{fromPatientCode}
             </if>
-            <if test="keywords != null and keywords != ''">
-                and (io.billNo like concat('%', #{keywords}, '%')
-                or io.fromCorp like concat('%', #{keywords}, '%')
-                or io.workPlaceCode like concat('%', #{keywords}, '%')
-                or io.busType like concat('%', #{keywords}, '%')
-                or sw.workplaceName like concat('%', #{keywords}, '%')
-                or swd.busName like concat('%', #{keywords}, '%')
-                or io.fromType like concat('%', #{keywords}, '%'))
+            <if test="keyWords != null and keyWords != ''">
+                and (io.billNo like concat('%', #{keyWords}, '%')
+                or io.fromCorp like concat('%', #{keyWords}, '%')
+                or io.workPlaceCode like concat('%', #{keyWords}, '%')
+                or io.busType like concat('%', #{keyWords}, '%')
+                or sw.workplaceName like concat('%', #{keyWords}, '%')
+                or swd.busName like concat('%', #{keyWords}, '%')
+                or io.fromType like concat('%', #{keyWords}, '%'))
             </if>
 
             <if test="supInoivceSearch != null">
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
index e5e0775a9..29242237d 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
@@ -42,15 +42,15 @@
             <if test=" productName != null and productName != ''">
                 AND bp.cpmctymc = #{productName}
             </if>
-            <if test="keywords != null and keywords != ''">
-                and (isc.workPlaceCode like concat('%', #{keywords}, '%')
-                or isc.nameCode like concat('%', #{keywords}, '%')
-                or isc.batchNo like concat('%', #{keywords}, '%')
-                or isc.supId like concat('%', #{keywords}, '%')
-                or bp.cpmctymc like concat('%', #{keywords}, '%')
-                or bp.bzgg like concat('%', #{keywords}, '%')
-                or bp.ggxh like concat('%', #{keywords}, '%')
-                or isc.invCode like concat('%', #{keywords}, '%'))
+            <if test="keyWords != null and keyWords != ''">
+                and (isc.workPlaceCode like concat('%', #{keyWords}, '%')
+                or isc.nameCode like concat('%', #{keyWords}, '%')
+                or isc.batchNo like concat('%', #{keyWords}, '%')
+                or isc.supId like concat('%', #{keyWords}, '%')
+                or bp.cpmctymc like concat('%', #{keyWords}, '%')
+                or bp.bzgg like concat('%', #{keyWords}, '%')
+                or bp.ggxh like concat('%', #{keyWords}, '%')
+                or isc.invCode like concat('%', #{keyWords}, '%'))
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(isc.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
index ab2aa8bf5..e966a214d 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
@@ -89,20 +89,20 @@
           <if test="cpmctymc != null and cpmctymc != ''">
               AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
           </if>
-          <if test="keywords != null and keywords != ''">
+          <if test="keyWords != null and keyWords != ''">
               AND (
-              isfi.workPlaceCode like concat('%', #{keywords}, '%')
-              or bp.nameCode like concat('%', #{keywords}, '%')
-              or isfi.batchNo like concat('%', #{keywords}, '%')
-              or bp.cpmctymc like concat('%', #{keywords}, '%')
-              or bp.ggxh like concat('%', #{keywords}, '%')
-              or bp.bzgg like concat('%', #{keywords}, '%')
-              or bp.nameCode like concat('%', #{keywords}, '%')
-              or bp.zczbhhzbapzbh like concat('%', #{keywords}, '%')
-              or bp.ylqxzcrbarmc like concat('%', #{keywords}, '%')
-              or bp.manufactory like concat('%',#{keywords},'%')
-              or bc.name like concat('%',#{keywords},'%')
-              or swd.busName like concat('%',#{keywords},'%')
+              isfi.workPlaceCode like concat('%', #{keyWords}, '%')
+              or bp.nameCode like concat('%', #{keyWords}, '%')
+              or isfi.batchNo like concat('%', #{keyWords}, '%')
+              or bp.cpmctymc like concat('%', #{keyWords}, '%')
+              or bp.ggxh like concat('%', #{keyWords}, '%')
+              or bp.bzgg like concat('%', #{keyWords}, '%')
+              or bp.nameCode like concat('%', #{keyWords}, '%')
+              or bp.zczbhhzbapzbh like concat('%', #{keyWords}, '%')
+              or bp.ylqxzcrbarmc like concat('%', #{keyWords}, '%')
+              or bp.manufactory like concat('%',#{keyWords},'%')
+              or bc.name like concat('%',#{keyWords},'%')
+              or swd.busName like concat('%',#{keyWords},'%')
               )
           </if>
           <if test="remind != null and remind == 'yj' ">