From fce6af7827ab423021a9315434380ee84590e66f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 31 May 2023 17:35:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=8D=E5=88=B6bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/IoOrderController.java   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 38a9021cb..b43342795 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -47,10 +47,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS;
@@ -767,11 +765,17 @@ public class IoOrderController extends BaseController {
         originOrder.setReplicateNo(orderNo);
         List<IoCodeTempEntity> supplementCodes = new ArrayList<>();
 
-
-        //            生成业务单
+        List<IoCodeEntity> products = addOrderChangeRequest.getProducts();
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(originOrder.getBillNo());
-        if (CollUtil.isNotEmpty(orderDetailBizEntities)) {
-            for (IoOrderDetailBizEntity orderDetailBizEntity : orderDetailBizEntities) {
+        // 计算出两个集合之间产品批次号组成的差异
+        List<IoOrderDetailBizEntity> IoStatDayEntityList = orderDetailBizEntities.stream()
+                .filter(comment -> products.stream()
+                        .anyMatch(p -> Objects.equals(p.getBatchNo(), comment.getBatchNo()) // 使用 Objects.equals 来进行非空判断
+                                && Objects.equals(p.getRelId(), comment.getBindRlFk())))
+                .collect(Collectors.toList());
+        //生成业务单
+        if (CollUtil.isNotEmpty(IoStatDayEntityList)) {
+            for (IoOrderDetailBizEntity orderDetailBizEntity : IoStatDayEntityList) {
                 orderDetailBizEntity.setOrderIdFk(newOrder.getBillNo());
                 orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId());
                 orderDetailBizService.insert(orderDetailBizEntity);
@@ -779,7 +783,7 @@ public class IoOrderController extends BaseController {
         }
 
 
-        List<IoCodeEntity> products = addOrderChangeRequest.getProducts();
+
         originCodes.forEach(
                 code -> {
                     //复制选中的产品