From 9c98d630866b80627ae21ca539a8c3776baa7e73 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 09 十二月 2024 10:10:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 549553d..a85016a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -114,61 +114,61 @@
log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
return R.ok().add(dto);
}
-
- @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("");
+//
+// @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.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();
- }
+// 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 getLocNo464(@RequestBody SearchLocParam param) {
--
Gitblit v1.9.1