From cdf91538ba9d130afa33b12e55b18bd77d0b93d8 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 13 一月 2025 08:14:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 6ec2675..3bc9a83 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -356,14 +356,14 @@
if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
String sourcecLocNo = wrkMast.getSourceLocNo();
- // 鑾峰彇鍚庝袱浣嶇殑灞傛暟
+ // 鑾峰彇鍚庝袱浣嶇殑灞傛暟锛堥珮浣庡簱浣嶆暟鎹級
String layerStr = sourcecLocNo.substring(sourcecLocNo.length() - 2);
int layer = Integer.parseInt(layerStr);
// 鍒ゆ柇灞傛暟
Short locType1 = (short) ((layer == 1) ? 1 : 2);
LocTypeDto locTypeDto = new LocTypeDto();
locTypeDto.setLocType1(locType1);
- //娉ㄦ剰涓�涓澘鍙兘鏀惧悓涓�绉嶇墿鏂�
+ //娉ㄦ剰涓�涓澘鍙兘鏀惧悓涓�绉嶇墿鏂欙紙妫�绱㈡柊搴撲綅锛�
StartupDto dto = commonService.getLocNoRunPick(4, 1, 101, wrkDetls.get(0).getMatnr(), wrkDetls.get(0).getBatch(), null, 4, locTypeDto, 2);
Date now = new Date();
wrkMast.setIoTime(now);
@@ -402,12 +402,12 @@
//鏇存柊宸ヤ綔鏄庣粏骞舵竻绌烘簮搴撲綅
for (WrkDetl wrkDetl : wrkDetls){
LocDetl locDetl = locDetlService.selectItem(wrkMast.getSourceLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
- if (null != locDetl && wrkMast.getIoType() == 103) {
+ if (null != locDetl && wrkMast.getIoType() == 103) {//鎷ｆ枡
if (!wrkDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new CoolException("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
- }else if(wrkMast.getIoType() == 107){
+ }else if(wrkMast.getIoType() == 107){//鐩樼偣
if (!wrkDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new CoolException("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -427,6 +427,7 @@
}
}
wrkMastService.updateById(wrkMast);
+ //宸插叆搴撴湭纭鍘嗗彶妗ｆ洿鏂�
if(wrkMast.getWrkSts() == 14){
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
--
Gitblit v1.9.1