From 7be83adcdc6ee45fce42d14d7da2be33b1bcc216 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 18 五月 2023 09:23:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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..5334814 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -573,8 +573,8 @@
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.getSettingTimes())){
+// throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
}else if (Cools.isEmpty(param.getRequestTime())){
throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
}
@@ -604,7 +604,7 @@
matNew.setTagId(tag.getId());
matNew.setMatnr(param.getPackName());
matNew.setMaktx(param.getPackName());
- matNew.setDeadWarn(mat.getDeadWarn());
+ matNew.setDeadWarn(480);//8灏忔椂 480鍒嗛挓
matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
matNew.setCreateTime(new Date());
matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
@@ -612,6 +612,7 @@
if (!matService.insert(matNew)){
throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ鑷姩鐢熸垚澶辫触");
}
+ mat=matNew;
// throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
WaitPakin waitPakin = new WaitPakin();
@@ -627,7 +628,7 @@
waitPakin.setAppeTime(new Date());
waitPakin.setModiUser(null);
waitPakin.setModiTime(new Date());
- waitPakin.setDeadWarn(param.getSettingTimes());
+ waitPakin.setDeadWarn(mat.getDeadWarn());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -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