From cdcfca91ded792ab73f786a81cdccde8475b3e0c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 07 十月 2023 16:03:51 +0800
Subject: [PATCH] #新增许可证
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index b93bd99..8af7632 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -64,13 +64,13 @@
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
if(wrkDetl != null){
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkDetl.getZpallet());
-// combParam.setPackName(wrkDetl.getMatnr());
- combParam.setLocNo(wrkMast.getLocNo());
- combParam.setPackSts(1);
- combParam.setRequestTime(DateUtils.convert(new Date()));
-// result = new PostMesDataUtils().postMesData(inpath,combParam);
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(wrkDetl.getMatnr());
+//// combParam.setPackName(wrkDetl.getMaktx());
+// combParam.setLocNo(wrkMast.getLocNo());
+// combParam.setPackSts(1);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// result = new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
WaitPakin pakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
if (pakin!=null){
@@ -84,19 +84,19 @@
}
}
} else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
- if(wrkDetl != null){
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkDetl.getZpallet());
-// combParam.setPackName(wrkDetl.getMatnr());
- combParam.setLocNo(wrkMast.getSourceLocNo());
-// combParam.setPackSts(0);
- combParam.setRequestTime(DateUtils.convert(new Date()));
-// result = new PostMesDataUtils().postMesData(outPath,combParam);
- }
+// if(wrkDetl != null){
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(wrkDetl.getMatnr());
+//// combParam.setPackName(wrkDetl.getMatnr());
+// combParam.setLocNo(wrkMast.getSourceLocNo());
+//// combParam.setPackSts(0);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// result = new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,outPath,combParam);
+// }
}
- if(null != result && !result.isSuccess()){
- return result;
- }
+// if(null != result && !result.isSuccess()){
+// return result;
+// }
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
@@ -115,7 +115,7 @@
// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
- if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+ if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet", wrkMast.getBarcode()))) {
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
} catch (Exception e) {
--
Gitblit v1.9.1