From 42154bee1a0c755f8138248f31878d780bfbff47 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 20 Dec 2024 18:13:51 +0800
Subject: [PATCH] =?UTF-8?q?12/20=20bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/UdiContrastController.java          |  6 +++++-
 .../inout/IoOrderDetailBizController.java     |  3 ++-
 .../api/dao/inout/IoOrderDetailBizDao.java    |  2 ++
 .../api/req/basic/FilterUdiRelRequest.java    |  1 -
 .../api/service/basic/UdiContrastService.java |  1 +
 .../inout/IoOrderDetailBizService.java        |  2 ++
 .../impl/IoOrderDetailBizServiceImpl.java     |  5 +++++
 .../mapper/inout/IoOrderDetailBizDao.xml      | 21 +++++++++++++++++++
 8 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
index 6f02c806..68b3c623 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
@@ -88,7 +88,7 @@ public class UdiContrastController {
         if (keys != null && keys.size() > 0) {
             for (String key : keys) {
                 //关联添加
-                if (udiCombineRequest.getRelId() == null || udiCombineRequest.isIdSpliUdi()) {
+                if (udiCombineRequest.getRelId() == null) {
                     if (StrUtil.isNotEmpty(udiCombineRequest.getThirdId())) {
                         if (udiContrastService.isExit(key, udiCombineRequest.getThirdId(), null)) {
                             return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
@@ -443,6 +443,9 @@ public class UdiContrastController {
                 if (StrUtil.isEmpty(udiProductEntity.getCpms())) {
                     udiProductEntity.setCpms(originProductEntity.getCpms());
                 }
+                if (udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 0){
+                    udiProductEntity.setProductsType(originProductEntity.getProductsType());
+                }
                 if (StrUtil.isEmpty(udiProductEntity.getBasicPrductRemak1())) {
                     udiProductEntity.setBasicPrductRemak1(originProductEntity.getBasicPrductRemak1());
                 }
@@ -525,4 +528,5 @@ public class UdiContrastController {
     }
 
 
+
 }
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
index 04574e4e..d58da18e 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -454,11 +454,12 @@ public class IoOrderDetailBizController extends BaseController {
                     .sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode))
                     .collect(Collectors.toList());
         }
+        Integer total = orderDetailBizService.getCount(orderDetailBizRequest);
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk());
         ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
         PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
         PageSimpleResponse<IoOrderDetailBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setTotal(Long.valueOf(total));
         pageSimpleResponse.setList(list);
         return ResultVOUtils.success(pageSimpleResponse);
     }
diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
index e5b33347..7b8e6209 100644
--- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
@@ -47,4 +47,6 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
 
 
     IoOrderDetailBizEntity findByRelBatch(@Param("orderId") String orderId, @Param("relId") Long relId, @Param("batchNo") String batchNo);
+
+    Integer getCount(FilterOrderDetailBizRequest orderDetailBizRequest);
 }
diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
index 43f110d8..d51adc94 100644
--- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
@@ -128,5 +128,4 @@ public class FilterUdiRelRequest extends ListPageRequest {
 
     private String keyWords;
 
-
 }
diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
index 0c348fbd..10033192 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
@@ -247,6 +247,7 @@ public class UdiContrastService {
         udiRelevanceEntity.setSplitEnable(true);
         udiRelevanceEntity.setAutoCode(true);
         udiRelevanceEntity.setIsDisable(false);
+        udiRelevanceEntity.setProductsType(thrProductsEntity.getProductType());
 
         BasicInsMaterialEntity basicInsMaterialEntity = null;
         if (thrProductsEntity.getYbbm() != null) {
diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
index 8626fb15..99b1ac27 100644
--- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
@@ -68,4 +68,6 @@ public interface IoOrderDetailBizService {
     boolean copyOrderDetailBiz(String newBillNo, String oldBillNo);
 
     BaseResponse addBizProduct(AddBizProductReqeust addBizProductReqeust);
+
+    Integer getCount(FilterOrderDetailBizRequest orderDetailBizRequest);
 }
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
index 4d297880..9a319f96 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
@@ -454,4 +454,9 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ResultVOUtils.success(orderEntity);
     }
 
+    @Override
+    public Integer getCount(FilterOrderDetailBizRequest orderDetailBizRequest) {
+        return ioOrderDetailBizDao.getCount(orderDetailBizRequest);
+    }
+
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
index 62a75def..72dcaab3 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
@@ -190,4 +190,25 @@
         </where>
         group by io_order_detail_result.id
     </select>
+
+    <select id="getCount" resultType="java.lang.Integer">
+        select count(*)
+        from io_order_detail_biz
+                 left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
+                 left join basic_products bp on bu.uuid = bp.uuid
+        <where>
+        <if test="orderIdFk!= null and orderIdFk!= ''">
+            AND orderIdFk = #{orderIdFk}
+        </if>
+        <if test="relId!= null">
+            AND bindRlFk = #{relId}
+        </if>
+        <if test="batchNo!= null and batchNo!= ''">
+            AND batchNo = #{batchNo}
+        </if>
+        <if test="productName!= null and productName!= ''">
+            AND bp.cpmctymc like concat('%', #{productName}, '%')
+        </if>
+        </where>
+    </select>
 </mapper>