From 287170042ad762d32ca574a5ed692648ea8e002f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 14 四月 2025 08:56:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 14 +++++++++-----
1 files changed, 9 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 3dd45bf..721258a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -356,11 +356,11 @@
@PostMapping("/process/loc/v1")
@ResponseBody
@Transactional
- public synchronized void processLoc() {
+ public synchronized R processLoc() {
log.info("鏀跺埌WCS缃愯鍑哄簱鎺ュ彛璇锋眰");
Date now = new Date();
// 鏌ヨ搴撳瓨鐘舵�佷綅F 涓� 搴撳瓨鏄庣粏鍖呭惈璇ョ墿鏂欑殑搴撲綅
- LocMast tarLoc = locMastService.getLocFByMatnr("BC20009TY13701530");
+ LocMast tarLoc = locMastService.getLocFByMatnr("BZ10100ZZ00000010");
if (Cools.isEmpty(tarLoc)) {
throw new CoolException("娌℃湁鍙嚭搴撶殑搴撲綅");
}
@@ -426,6 +426,7 @@
} else {
throw new CoolException(tarLoc.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
+ return R.ok();
}
@PostMapping("/process/in/loc/v1")
@ResponseBody
@@ -467,7 +468,9 @@
wrkMast.setWrkSts(2L);
wrkMast.setSourceStaNo(2106);
wrkMast.setStaNo(staNo);
- wrkMast.setLocNo(wrkMast.getSourceLocNo());
+ wrkMast.setLocNo(wrkMast.getSourceLocNo(
+
+ ));
wrkMast.setSourceLocNo("");
wrkMast.setModiTime(now);
if (!wrkMastService.updateById(wrkMast)) {
@@ -475,14 +478,15 @@
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls) {
- Mat mat = matService.selectByMatnr("CP25009TY10000248");
+ Mat mat = matService.selectByMatnr("CP10103TY22014617");
WrkDetl wrkDetl1 = new WrkDetl();
wrkDetl1.sync(wrkDetl);
wrkDetl1.sync(mat);
+ wrkDetl1.setBatch(param.getBatch());
wrkDetl1.setIoTime(now);
wrkDetlService.insert(wrkDetl1);
}
- wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("matnr", "BC20009TY13701530").eq("wrk_no",wrkMast.getWrkNo()));
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("matnr", "BZ10100ZZ00000010").eq("wrk_no",wrkMast.getWrkNo()));
// 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗ｅ叧鑱斾娇鐢級
// wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
--
Gitblit v1.9.1