From 43efe016c156158b9fc3a8b647810f612fb126e6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 02 九月 2025 11:39:52 +0800
Subject: [PATCH] 自动补货单新增 1.订单中只能生成两笔自动补货单 2.CTU库是否有足够的空库位,空库位数需要大于100才会生成自动补货单 3.在补货时加上订单明细的数量进行判断

---
 src/main/java/com/zy/common/model/OrderDto.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/common/model/OrderDto.java b/src/main/java/com/zy/common/model/OrderDto.java
index 362b2b7..e7e38c6 100644
--- a/src/main/java/com/zy/common/model/OrderDto.java
+++ b/src/main/java/com/zy/common/model/OrderDto.java
@@ -15,11 +15,14 @@
 
     private String matnr;
 
+    private String batch;
+
     private Double anfme;
 
-    public OrderDto(String orderNo, String matnr, Double anfme) {
+    public OrderDto(String orderNo, String matnr, String batch, Double anfme) {
         this.orderNo = orderNo;
         this.matnr = matnr;
+        this.batch = batch;
         this.anfme = anfme;
     }
 
@@ -28,7 +31,7 @@
             return false;
         }
         for (OrderDto orderDto : list) {
-            if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr())) {
+            if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr()) && Cools.eq(orderDto.getBatch(), dto.getBatch())) {
                 return true;
             }
         }
@@ -40,7 +43,7 @@
             return null;
         }
         for (OrderDto orderDto : list) {
-            if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr())) {
+            if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr()) && Cools.eq(dto.getBatch(), orderDto.getBatch())) {
                 return orderDto;
             }
         }

--
Gitblit v1.9.1