From 9f095733d13185290cfedd242b5f299585fbcad0 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 07 四月 2025 10:05:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 97 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 79 insertions(+), 18 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 6665933..9ed7473 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -4,19 +4,18 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -38,6 +37,8 @@
private LocDetlService locDetlService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private MatService matService;
public ReturnT<String> start(WrkMast wrkMast) {
// 9.鍏ュ簱瀹屾垚
@@ -137,22 +138,83 @@
exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
}
log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛屾墭鐩樼爜锛�" + wrkMast.getBarcode() + "锛屽伐浣滄。鏄庣粏鍒楄〃锛�" + JSON.toJSONString(wrkDetls53));
+
+ // 鍘婚噸
+ List<DetlDto> detlDtos = new ArrayList<>();
+ String zpallet = wrkDetls53.get(0).getZpallet();
for (WrkDetl wrkDetl : wrkDetls53) {
- LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode());
- if (null != locDetl) {
- log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛屾墭鐩樼爜锛�" + wrkMast.getBarcode() + "锛屽伐浣滄。鏄庣粏锛�" + JSON.toJSONString(wrkDetl) + "锛屽簱瀛樻槑缁嗭細" + JSON.toJSONString(locDetl));
- if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),
- locMast.getLocNo(),
- wrkDetl.getMatnr(),
- wrkDetl.getBatch(),
- wrkDetl.getSuppCode(),
- wrkDetl.getThreeCode(),
- wrkDetl.getDeadTime())) {
- exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- }
+ DetlDto detlDto = new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme(), wrkDetl.getThreeCode(), wrkDetl.getDeadTime(),wrkDetl.getSuppCode());
+ if (DetlDto.has(detlDtos, detlDto)) {
+ DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());
+ assert one != null;
+ //褰撳墠鍓╀綑搴撳瓨 - 褰撳墠浣滀笟鏁伴噺
+ one.setAnfme(one.getAnfme() - detlDto.getAnfme());
+ } else {
+ //鏂板鐨勬椂鍊欑畻鍑哄綋鍓嶅墿浣欏簱瀛� stock涓烘�诲簱瀛�- 褰撳墠wrkdetl浣滀笟鏁伴噺
+ detlDto.setAnfme(wrkDetl.getStock() - detlDto.getAnfme());
+ detlDtos.add(detlDto);
}
+
+// double anfme = wrkDetl.getStock() - wrkDetl.getAnfme();
+// if (anfme <= 0) {//搴撳瓨 - 浣滀笟鏁伴噺 <= 0 娓呮帀璇ユ暟鎹�
+// continue;
+// }
+//
+// LocDetl locDetl = new LocDetl();
+// locDetl.sync(wrkDetl);
+// locDetl.setLocNo(wrkMast.getLocNo());
+// locDetl.setAnfme(anfme);
+// locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+// locDetl.setAppeTime(now);
+// locDetl.setAppeUser(9527L);
+// locDetl.setModiTime(now);
+// locDetl.setModiUser(9527L);
+// if (!locDetlService.insert(locDetl)) {
+// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+// }
+
+// LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode());
+// if (null != locDetl) {
+// log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛屾墭鐩樼爜锛�" + wrkMast.getBarcode() + "锛屽伐浣滄。鏄庣粏锛�" + JSON.toJSONString(wrkDetl) + "锛屽簱瀛樻槑缁嗭細" + JSON.toJSONString(locDetl));
+// if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),
+// locMast.getLocNo(),
+// wrkDetl.getMatnr(),
+// wrkDetl.getBatch(),
+// wrkDetl.getSuppCode(),
+// wrkDetl.getThreeCode(),
+// wrkDetl.getDeadTime())) {
+// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+// }
+// }
}
+
+ for (DetlDto detlDto : detlDtos) {
+ if(detlDto.getAnfme() <= 0 ){
+ continue;
+ }
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ LocDetl locDetl = new LocDetl();
+ locDetl.sync(mat);
+ locDetl.setLocNo(wrkMast.getLocNo());
+ locDetl.setAnfme(detlDto.getAnfme());
+ locDetl.setZpallet(zpallet); // 鎵樼洏鏉＄爜
+ locDetl.setSuppCode(detlDto.getContainerCode());// 鏂欑鐮�
+ locDetl.setBatch(detlDto.getBatch()); // 鎵瑰彿
+ locDetl.setThreeCode(detlDto.getCsocode());
+ locDetl.setDeadTime(detlDto.getIsoseq());
+ locDetl.setAppeTime(now);
+ locDetl.setAppeUser(9527L);
+ locDetl.setModiTime(now);
+ locDetl.setModiUser(9527L);
+
+ locDetlService.insert(locDetl);
+ }
+
+
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
locMast.setLocSts("F");
@@ -176,8 +238,6 @@
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast1.getLocNo()));
- } else {
- throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
}
break;
@@ -273,6 +333,7 @@
if (!locMastService.updateById(sourceLoc)) {
exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
+ locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
}
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
locMast.setLocSts(locSts);
--
Gitblit v1.9.1