From 17485bf8af53591618ca052dfb76559b8e67ce51 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期六, 20 五月 2023 11:13:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 101 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4722c0b..2758674 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -573,64 +573,65 @@
throw new CoolException("缂哄皯鍙傛暟锛歱ackNo");
}else if (Cools.isEmpty(param.getPackName())){
throw new CoolException("缂哄皯鍙傛暟锛歱ackName");
- }else if (Cools.isEmpty(param.getSettingTimes())){
- throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
}else if (Cools.isEmpty(param.getRequestTime())){
- throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
+ throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");//姝ゅ弬鏁板～鍏ョ敓浜ф棩鏈熶竴鏍� 涓嶇敤鍙叧闂�
}
if (Cools.isEmpty(param.getPackNo())) {
throw new CoolException(BaseRes.PARAM);
}
- // 鍒ゆ柇鏄惁鏈夌浉鍚孭ack鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getPackNo() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
+// // 鍒ゆ柇鏄惁鏈夌浉鍚孭ack鐮佺殑鏁版嵁
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+// eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) {
+// throw new CoolException(param.getPackNo() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+// }
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));
- int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo()));
- if (countLoc > 0 || countWrk > 0) {
- throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo());
- }else if (countPakin>0){
- throw new CoolException("閲嶅鐢宠" + param.getPackNo());
- }
+// int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));
+// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));
+// int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo()));
+// if (countLoc > 0 || countWrk > 0) {
+// throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo());
+// }else if (countPakin>0){
+// throw new CoolException("閲嶅鐢宠" + param.getPackNo());
+// }
// 鐢熸垚鍏ュ簱閫氱煡妗�
- Mat mat = matService.selectByMatnr(param.getPackName());
+ Mat mat = matService.selectByMatnr(param.getPackNo());
+ Date now = new Date();
if (Cools.isEmpty(mat)) {
Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
Mat matNew = new Mat();
matNew.setTagId(tag.getId());
- matNew.setMatnr(param.getPackName());
+ matNew.setMatnr(param.getPackNo());
matNew.setMaktx(param.getPackName());
- matNew.setDeadWarn(mat.getDeadWarn());
+ mat.setManuDate(param.getRequestTime());
+ matNew.setDeadWarn(480);//8灏忔椂 480鍒嗛挓
matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
- matNew.setCreateTime(new Date());
+ matNew.setCreateTime(now);
matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
- matNew.setUpdateTime(new Date());
+ matNew.setUpdateTime(now);
if (!matService.insert(matNew)){
throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ鑷姩鐢熸垚澶辫触");
}
+// mat=matNew;
// throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- WaitPakin waitPakin = new WaitPakin();
-// waitPakin.sync(mat);
- waitPakin.setMatnr(param.getPackName());
- waitPakin.setMaktx(param.getPackName());
- waitPakin.setZpallet(param.getPackNo()); // Pack鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(1.0); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setManuDate(param.getRequestTime());
- waitPakin.setAppeUser(null);
- waitPakin.setAppeTime(new Date());
- waitPakin.setModiUser(null);
- waitPakin.setModiTime(new Date());
- waitPakin.setDeadWarn(param.getSettingTimes());
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
+// WaitPakin waitPakin = new WaitPakin();
+//// waitPakin.sync(mat);
+// waitPakin.setMatnr(param.getPackName());
+// waitPakin.setMaktx(param.getPackName());
+// waitPakin.setZpallet(param.getPackNo()); // Pack鐮�
+// waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+// waitPakin.setAnfme(1.0); // 鏁伴噺
+// waitPakin.setStatus("Y"); // 鐘舵��
+// waitPakin.setManuDate(param.getRequestTime());
+// waitPakin.setAppeUser(null);
+// waitPakin.setAppeTime(new Date());
+// waitPakin.setModiUser(null);
+// waitPakin.setModiTime(new Date());
+// waitPakin.setDeadWarn(mat.getDeadWarn());
+// if (!waitPakinService.insert(waitPakin)) {
+// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+// }
}
@Override
@Transactional
@@ -798,12 +799,12 @@
Date date = new Date();
locMast.setPackStatus(3);
locMast.setModiTime(date);
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(3);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(locMast.getBarcode());
+// combParam.setLocNo(locMast.getLocNo());
+// combParam.setPackSts(3);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
@@ -839,12 +840,12 @@
Date date = new Date();
locMast.setPackStatus(4);
locMast.setModiTime(date);
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(4);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(locMast.getBarcode());
+// combParam.setLocNo(locMast.getLocNo());
+// combParam.setPackSts(4);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
--
Gitblit v1.9.1