From 9268cd77b4e864b901a8b0bf965f441f2e8c4fbd Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 04 一月 2026 08:06:14 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/common/web/WcsController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 703bad5..5ec89eb 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -51,6 +51,10 @@
private LocDetlService locDetlService;
@Autowired
private BasCrnpService basCrnpService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
@Value("${led.ip}")
private String ledIp;
@@ -157,7 +161,7 @@
StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
if (dto == null) {
- throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅--->" + barcode);
}
int workNo = dto.getWorkNo();
Date now = new Date();
@@ -237,7 +241,7 @@
throw new CoolException("鎷ｉ�夌洏鐐逛换鍔′笉瀛樺湪");
}
- if (wrkMastOut.getIoType() != 103 || wrkMastOut.getIoType() != 107) {
+ if (wrkMastOut.getIoType() != 103 && wrkMastOut.getIoType() != 107) {
throw new CoolException("浠诲姟绫诲瀷涓嶅睘浜庢嫞閫夈�佺洏鐐�");
}
@@ -277,12 +281,24 @@
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+ wrkMast.setIoTime(now);
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- wrkDetlService.updateWorkNo(wrkMastOut.getWrkNo(), workNo);
+ //淇濆瓨宸ヤ綔涓绘。
+ if (!wrkMastLogService.save(wrkMastOut.getWrkNo())){
+ throw new CoolException("淇濆瓨宸ヤ綔涓绘。澶辫触锛寃orkNo=" + wrkMastOut.getWrkNo());
+ }
+ //淇濆瓨宸ヤ綔鏄庣粏妗�
+ if (!wrkMastOut.getEmptyMk().equals("Y")) {
+ if (!wrkDetlLogService.save(wrkMastOut.getWrkNo())){
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触锛寃orkNo=" + wrkMastOut.getWrkNo());
+ }
+ }
+
+ wrkDetlService.updateWorkNo(wrkMastOut.getWrkNo(), workNo,now);
// 鍒犻櫎宸ヤ綔涓绘。
if (!wrkMastService.deleteById(wrkMastOut)) {
@@ -297,8 +313,8 @@
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")) {
- locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ if (locMast.getLocSts().equals("P")) {
+ locMast.setLocSts("Q"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
--
Gitblit v1.9.1