From 2aa6001a302f86e521584ccc738d3b009e200cd2 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 19 三月 2026 17:48:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 3f48070..f414b25 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -13,6 +13,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -179,9 +180,27 @@
                         if (null != locDetl) {
                             if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
 //                                exceptionHandle("鎷f枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+                                log.error("鎹℃枡鏇存柊搴撳瓨澶辫触锛屽簱浣�"+locMast.getLocNo()+",鐗╂枡鍙�"+wrkDetl.getMatnr());
                                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+
                                 return FAIL.setMsg("鎷f枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                             }
+                            List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>()
+                                    .eq("loc_no", wrkMast.getLocNo())
+                                    .eq("matnr", wrkDetl.getMatnr())
+                                    .eq(!Cools.isEmpty(wrkDetl.getBatch()), "batch", wrkDetl.getBatch())
+                                    .in(Cools.isEmpty(wrkDetl.getBatch()), "batch", null, "", " ")
+                            );
+                            if (locDetls1.size() != 1) {
+                                log.error("鎹℃枡鏇存柊搴撳瓨鍚庨噸鏌ュ簱瀛樺け璐ワ紝鏈壘鍒板簱瀛樻垨鏌ヨ鍒颁笉涓轰竴涓�");
+                            }else {
+                                BigDecimal newAnf = new BigDecimal(locDetls1.get(0).getAnfme().toString());
+                                BigDecimal subAnf = new BigDecimal((locDetl.getAnfme() - wrkDetl.getAnfme()));
+                                if (newAnf.compareTo(subAnf) != 0) {
+                                    log.error("鎹℃枡鏇存柊搴撳瓨鍚庯紝鍙嶆煡鏁伴噺寮傚父锛屽簱浣�"+locMast.getLocNo()+",鐗╂枡鍙�"+wrkDetl.getMatnr()+",閲嶆煡鏁伴噺"+newAnf+",搴斾负鏁伴噺"+subAnf);
+                                }
+
+                            }
                         } else {
                             if (Math.abs(wrkDetl.getAnfme())<=0){
                                 continue;

--
Gitblit v1.9.1