From 31d7788cf41d7a134326e790fb0cbbe5353ec4a3 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期三, 17 八月 2022 17:46:23 +0800
Subject: [PATCH] Revert "#"
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 38 ++++++++++++++++++--------------------
1 files changed, 18 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 a9d19e0..addbfdb 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -41,6 +41,10 @@
private ApiLogService apiLogService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
@Value("${mes.url}")
private String mesUrl;
@@ -56,14 +60,8 @@
try {
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
ReturnT<String> result = null;
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
- locMast.setFireStatus(0);
- locMast.setPackStatus(1);
- if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()))){
- throw new CoolException("娑堥槻鐘舵��/浜у搧鐘舵�佹洿鏂板け璐�");
- }
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if(wrkDetl != null){
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetl.getZpallet());
@@ -71,24 +69,25 @@
combParam.setLocno(wrkMast.getLocNo());
combParam.setPackSts(1);
combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(inpath,combParam);
+// result = postMesData(inpath,combParam);
+ // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
+ if (!waitPakinLogService.save(wrkMast.getBarcode())) {
+ exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎鍏ュ簱閫氱煡妗�
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
+ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
}
} else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
- locMast.setFireStatus(0);
- locMast.setPackStatus(0);
- if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()))){
- throw new CoolException("娑堥槻鐘舵��/浜у搧鐘舵�佹洿鏂板け璐�");
- }
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if(wrkDetl != null){
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetl.getZpallet());
combParam.setPackName(wrkDetl.getMatnr());
combParam.setLocno(wrkMast.getLocNo());
- combParam.setPackSts(null);
+ combParam.setPackSts(0);
combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(outPath,combParam);
+// result = postMesData(outPath,combParam);
}
}
if(null != result && !result.isSuccess()){
@@ -96,6 +95,7 @@
}
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
@@ -130,9 +130,7 @@
String response = "";
boolean success = false;
try {
- Map<String, Object> map = new HashMap<>();
- map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder().setHeaders(map)
+ response = new HttpHandler.Builder()
.setUri(mesUrl)
.setPath(mesPath)
.setJson(JSON.toJSONString(combParam))
--
Gitblit v1.9.1