From bd80bef8c6ea2763993ff3ef065ee474b11222a4 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 02 八月 2022 09:17:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
index 9581462..c32a211 100644
--- a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
@@ -112,9 +112,12 @@
                 }
             }
             if (complete) {
-                if (!completeCPakOut(FBillNo)) {
-                    log.error("{}鍑哄簱鍗曟爣璁板畬鎴愬け璐�", FBillNo);
-                }
+                List<OutStockBillEntry> select1 = this.selectList(new EntityWrapper<OutStockBillEntry>().eq("FInterID", FInterID));
+               if(select1.size()<=1){
+                    if (!completeCPakOut(FBillNo) )  {
+                        log.error("{}鍑哄簱鍗曟爣璁板畬鎴愬け璐�", FBillNo);
+                    }
+               }
             }
             return true;
         } else {
@@ -201,9 +204,9 @@
         // 鐢熸垚宸ヤ綔妗�
         for (OutLocDto dto : dtos) {
             // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷f枡鍑哄簱
-            if (ioType == null) {
+//            if (ioType == null) {
                 ioType = dto.isAll() ? 101 : 103;
-            }
+//            }
             // 鑾峰彇搴撲綅
             LocMast locMast = locMastService.selectById(dto.getLocNo());
             // 鑾峰彇璺緞
@@ -272,7 +275,8 @@
                 Integer FInterI = outStockService.queryOutStockFInterID(fbillNo); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
                 Wrapper wrapper1 = new EntityWrapper<OutStockBillEntry>().eq("FInterID",FInterI).eq("Fnumber",detlDto.getLocDetl().getMatnr());
                 OutStockBillEntry outStockBillEntry = outStockService.selectOne(wrapper1);
-                outStockBillEntry.setFAmount(outStockBillEntry.getFAmount().add(BigDecimal.valueOf(anfme)));  //鍊熺敤amount瀛楁锛屾帶鍒朵笅鍙戝嚭搴撲换鍔℃暟閲�
+                outStockBillEntry.setFAmount(outStockBillEntry.getFAmount().add(BigDecimal.valueOf(anfme)));  //鍊熺敤famount瀛楁锛屾帶鍒朵笅鍙戝嚭搴撲换鍔℃暟閲�
+                outStockBillEntry.setFAuxQty(outStockBillEntry.getFAuxQty().subtract(BigDecimal.valueOf(anfme)));
                 if(!outStockService.update(outStockBillEntry,wrapper1)){
                     throw new CoolException("鏇存柊鍑哄簱閫氱煡妗f槑缁咶Amount澶辫触[FInterID="+FInterI+",Fnumber="+detlDto.getLocDetl().getMatnr()+"]");
                 }

--
Gitblit v1.9.1