From 0afba31001bcc9cc05af2b9061aa32bf7bd83b0b Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 14:28:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 7c0e292..a85016a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -114,10 +114,64 @@
log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
return R.ok().add(dto);
}
-
- @PostMapping("/pakin/yx/loc/v33")
+//
+// @PostMapping("/pakin/yx/loc/v33")
+// @ResponseBody
+// public synchronized R getLocNo33(@RequestBody SearchLocParam param) {
+// if (Cools.isEmpty(param.getBarcode(), param.getSourceStaNo())) {
+// throw new CoolException(BaseRes.PARAM);
+// }
+// // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+// eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+// throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+// }
+//
+// if(param.getBarcode().length()!=8){
+// throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
+// }
+//
+// int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+// int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
+// if (countLoc > 0 || countWrk > 0 || countwait > 0) {
+// throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+// }
+// BasDevp basDevp = basDevpService.selectById(param.getSourceStaNo());
+// if (Cools.isEmpty(basDevp)){
+// throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓嶅瓨鍦�");
+// }
+// if (Cools.isEmpty(basDevp.getGrossWt())){
+// throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 "+param.getSourceStaNo()+"閲嶉噺淇℃伅涓嶅瓨鍦�");
+// }
+//
+// Date now = new Date();
+// // 鐢熸垚鍏ュ簱閫氱煡妗�
+// Mat mat = matService.selectByMatnr("6-6405H");
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException("6-6405H鍟嗗搧妗ｆ涓嶅瓨鍦�");
+// }
+// WaitPakin waitPakin = new WaitPakin();
+// waitPakin.sync(mat);
+// waitPakin.setBatch("");
+//// waitPakin.setWeight(basDevp.getGrossWt());
+// waitPakin.setWeight(basDevp.getGrossWt());
+// waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+// waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+// waitPakin.setAnfme(1.0); // 鏁伴噺
+// waitPakin.setStatus("Y"); // 鐘舵��
+// waitPakin.setAppeUser(7777L);
+// waitPakin.setAppeTime(now);
+// waitPakin.setModiUser(7777L);
+// waitPakin.setModiTime(now);
+// if (!waitPakinService.insert(waitPakin)) {
+// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+// }
+// return R.ok();
+// }
+ @PostMapping("/pakin/yx/loc/v464")
@ResponseBody
- public synchronized R getLocNo33(@RequestBody SearchLocParam param) {
+ public synchronized R getLocNo464(@RequestBody SearchLocParam param) {
if (Cools.isEmpty(param.getBarcode(), param.getSourceStaNo())) {
throw new CoolException(BaseRes.PARAM);
}
@@ -147,22 +201,22 @@
Date now = new Date();
// 鐢熸垚鍏ュ簱閫氱煡妗�
- Mat mat = matService.selectByMatnr("6-6405H");
+ Mat mat = matService.selectByMatnr("111111");
if (Cools.isEmpty(mat)) {
- throw new CoolException("6-6405H鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ throw new CoolException("111111鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setBatch("");
// waitPakin.setWeight(basDevp.getGrossWt());
- waitPakin.setWeight(basDevp.getGrossWt());
+ waitPakin.setWeight(450.0);
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(1.0); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAppeUser(7777L);
+ waitPakin.setAppeUser(8888L);
waitPakin.setAppeTime(now);
- waitPakin.setModiUser(7777L);
+ waitPakin.setModiUser(8888L);
waitPakin.setModiTime(now);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
--
Gitblit v1.9.1