From b47369fbc73269f0661ba169c6387e04fb037e87 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 16 三月 2026 14:26:23 +0800
Subject: [PATCH] 发货通知单打印日志

---
 src/main/java/com/zy/asrs/controller/OutStockController.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutStockController.java b/src/main/java/com/zy/asrs/controller/OutStockController.java
index 71f9b4e..c22a53f 100644
--- a/src/main/java/com/zy/asrs/controller/OutStockController.java
+++ b/src/main/java/com/zy/asrs/controller/OutStockController.java
@@ -19,6 +19,7 @@
 import com.zy.asrs.service.WorkService;
 import com.zy.asrs.utils.VersionUtils;
 import com.zy.common.service.erp.ErpService;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.zy.common.service.erp.entity.OutStockBill;
 import com.zy.common.service.erp.entity.OutStockBillEntry;
 import com.zy.common.web.BaseController;
@@ -66,7 +67,10 @@
     public R outStockQueryList(@RequestParam(defaultValue = "1")Integer curr,
                           @RequestParam(defaultValue = "10")Integer limit,
                           @RequestParam Map<String, Object> param){
-        return R.ok(outStockService.queryOutStock(toPage(curr, limit, param, OutStockBillEntry.class)));
+        Page<OutStockBillEntry> page = outStockService.queryOutStock(toPage(curr, limit, param, OutStockBillEntry.class));
+        log.info("outStock/query/list 鏌ヨ鏉′欢 FBillNo={}, FSourceBillNo={}, curr={}, limit={}, 缁撴灉 total={}, 鏈〉鏉℃暟={}锛堟暟鎹潵婧愶細WMS搴搙tyasrs锛屾潯浠讹細Fflag_finish!=1 涓� FQty>FAmount锛�",
+                param.get("FBillNo"), param.get("FSourceBillNo"), curr, limit, page.getTotal(), page.getRecords() != null ? page.getRecords().size() : 0);
+        return R.ok(page);
     }
 
     /**
@@ -95,8 +99,8 @@
      */
     @RequestMapping(value = "/outStock/query/locNormalList")
     @ManagerAuth
-    public R queryMatWithLocNormal(String fbillNo, String mnemonic) {
-        List<LocNormal> list = locNormalService.queryLocNorlMatnr(fbillNo, mnemonic);
+    public R queryMatWithLocNormal(String fbillNo, String mnemonic,String matnr) {
+        List<LocNormal> list = locNormalService.queryLocNorlMatnr(fbillNo, mnemonic,matnr);
         return R.ok(list);
     }
 
@@ -174,7 +178,8 @@
             Wrapper wrapper = new EntityWrapper<OutStockBillEntry>().eq("FInterID",FInterI).eq("Fnumber",locNormals.getMatnr());
             OutStockBillEntry outStockBillEntry = outStockService.selectOne(wrapper);
             outStockBillEntry.setFAuxCommitQty(outStockBillEntry.getFAuxCommitQty().add(locNormals.getAnfme()));
-            outStockBillEntry.setFAmount(outStockBillEntry.getFAmount().add(locNormals.getAnfme()));  //鍊熺敤amount瀛楁锛屾帶鍒朵笅鍙戝嚭搴撲换鍔℃暟閲�
+            outStockBillEntry.setFAmount(outStockBillEntry.getFAmount().add(locNormals.getAnfme()));  //鍊熺敤famount瀛楁锛屾帶鍒朵笅鍙戝嚭搴撲换鍔℃暟閲�
+            outStockBillEntry.setFAuxQty(outStockBillEntry.getFAuxQty().subtract(locNormals.getAnfme()));
             if(!outStockService.update(outStockBillEntry,wrapper)){
                 throw new CoolException("鏇存柊鍑哄簱閫氱煡妗f槑缁嗗け璐FInterID="+FInterI+",Fnumber="+locNormals.getMatnr()+"]");
             }
@@ -182,6 +187,7 @@
             // erp涓棿琛ㄦ洿鏂版暟鎹�
             if (!erpService.incrementCPakOut(FInterI, locNormals.getMatnr(), locNormals.getAnfme().doubleValue(), param.getSupplier())) {
                 log.error("鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={},FBillNo={}]澶辫触", locNormals.getMatnr(), param.getSupplier());
+                throw new CoolException("鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr=" + locNormals.getMatnr() + ",FBillNo=" + param.getSupplier() + "]澶辫触");
             }
 
         }

--
Gitblit v1.9.1