From 18827ae1fab72c4e2e2814d00544269c0d4c310e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 28 四月 2023 09:00:38 +0800
Subject: [PATCH] 修复订单系统

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8407805..a73f28f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -672,7 +672,9 @@
         for (int i = 0; i < combMats.size(); i++) {
             OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
             OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
-                    .eq("order_no", jsonOrderNo));
+                    .eq("order_no", jsonOrderNo)
+                    .and()
+                    .eq("maktx",jsonOrderDetl.getMaktx()));
             if (Cools.isEmpty(orderDetl)) {
                 return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
             }
@@ -681,7 +683,7 @@
             }
             ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
                     .eq("loc_no", jsonLocNo)
-                    .eq("matnr", orderDetl.getMatnr()));
+                    .eq("maktx", jsonOrderDetl.getMaktx()));
             if (manLocDetl == null) {
                 return R.error("璇ュ簱浣嶆病鏈夊嚭搴撶殑鐗╂枡淇℃伅");
             }

--
Gitblit v1.9.1