From a9147f8c8b1ff703cc56661ad6cef786b8350974 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 20 六月 2023 09:35:28 +0800
Subject: [PATCH] #自动完成工作档时优化拣货单相关

---
 src/main/java/com/zy/asrs/controller/OutController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 3c6de9a..f3072fc 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -67,7 +67,7 @@
         for (OrderDetl orderDetl : orderDetls) {
             double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
             if (issued <= 0.0D) { continue; }
-            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
+            List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
             for (LocDetl locDetl : locDetls) {
                 if (issued > 0) {
                     LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -217,7 +217,7 @@
             ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
             if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>manLocDetl.getAnfme())) {
                 manLocDetl.setStatus(0);
-                if (manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("uuid", manLocDetl.getUuid()))) {
+                if (manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("loc_no", manLocDetl.getLocNo()).eq("matnr",manLocDetl.getMatnr()))) {
                     if (addPakOUT(locDto,uuid).equals(R.ok())) {
                         Order order = orderService.selectByNo(locDto.getOrderNo());
                         if (Cools.isEmpty(order)){
@@ -261,7 +261,7 @@
         manPakOut.setMatnr(locDto.getMatnr());
         manPakOut.setMaktx(locDto.getMaktx());
         manPakOut.setDocNum(locDto.getOrderNo());
-        manPakOut.setCount(0);
+        manPakOut.setCount(0.0);
         manPakOut.setStatus(0);
         manPakOut.setCreateTime(new Date());
         manPakOut.setBatch(locDto.getBatch());

--
Gitblit v1.9.1