From eee555f527cb7de989a37cfed50c0a944c13fb33 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 03 七月 2024 14:14:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 23 +++++++++++++++++++++++
1 files changed, 23 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 7d518be..f821f84 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
@@ -23,6 +24,9 @@
@Transactional
public class WorkMastHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private MatService matService;
@Autowired
private WrkMastService wrkMastService;
@Autowired
@@ -161,6 +165,10 @@
return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
for (WrkDetl wrkDetl : wrkDetls53) {
+ String matnr = wrkDetl.getMatnr();
+ if (matnr.substring(0,1).equals("B")) {
+ wrkDetl.setMatnr(matnr.substring(1));
+ }
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
if (null != locDetl) {
@@ -169,6 +177,21 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
+ } else {
+ LocDetl detl = new LocDetl();
+
+// Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
+// detl.sync(mat);
+ detl.sync(wrkDetl);
+ detl.setOrderNo(wrkDetl.getOrderNo());//璁㈠崟缂栧彿
+ detl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ detl.setAnfme(Math.abs(wrkDetl.getAnfme())); // 鏁伴噺
+ detl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ detl.setModiTime(now);
+ detl.setAppeTime(now);
+ if (!locDetlService.insert(detl)) {
+ return FAIL.setMsg("琛ユ枡 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
}
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
--
Gitblit v1.9.1