From 91eca979b480dff62809368a5c6563c9e0fcc851 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 08 六月 2025 08:29:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskMastScheduler.java | 61 ++++++++----------------------
1 files changed, 16 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskMastScheduler.java b/src/main/java/com/zy/asrs/task/TaskMastScheduler.java
index eb5210a..85c3b74 100644
--- a/src/main/java/com/zy/asrs/task/TaskMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskMastScheduler.java
@@ -61,74 +61,45 @@
public void execute() throws IOException {
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
HashMap<String, Object> headParam = new HashMap<>();
- String s="";//鏃ュ織鏍囪瘑
+ String s = "";//鏃ュ織鏍囪瘑
if (taskWrk.getWrkSts() == 6) {//鍏ュ簱瀹屾垚
headParam.put("Result", 1);
- s="鍏ュ簱瀹屾垚";
- taskWrk.setStatus(7);//鍏ュ簱浠诲姟杞巻鍙叉。6--銆�7
+ s = "鍏ュ簱瀹屾垚";
+ taskWrk.setWrkSts(7);//鍏ュ簱浠诲姟杞巻鍙叉。6--銆�7
} else if (taskWrk.getWrkSts() == 16) {//鍑哄簱瀹屾垚-寰呮惉绂�
headParam.put("Result", 1);
- s="鍑哄簱瀹屾垚-寰呮惉绂�";
+ s = "鍑哄簱瀹屾垚-寰呮惉绂�";
taskWrk.setWrkSts(17);//鍑哄簱浠诲姟16--銆�17
- } else if (taskWrk.getWrkSts().equals(30)) {//鍙栨秷
- s="鍙栨秷";
+ } else if (taskWrk.getStatus().equals(4)) {//鍙栨秷浠诲姟涓婃姤wms
+ s = "鍙栨秷";
+ taskWrk.setStatus(5);//鍙栨秷浠诲姟
headParam.put("Result", 2);
- taskWrk.setWrkSts(31);//鍙栨秷浠诲姟30--銆�31
+ } else if (taskWrk.getStatus().equals(6)) {//瀹岀粨浠诲姟涓婃姤wms
+ s = "鎵嬪姩瀹屾垚";
+ taskWrk.setStatus(7);//瀹岀粨
+ headParam.put("Result", 1);
}
String response = "";
Boolean bool = false;
try {
headParam.put("TaskNo", taskWrk.getTaskNo());
- log.info("wcs"+s+"浠诲姟涓婃姤wms={}", taskWrk);
+ log.info("wcs" + s + "浠诲姟涓婃姤wms={}", taskWrk);
response = new HttpHandler.Builder()
- // .setHeaders(headParam)
+ // .setHeaders(headPraam)
.setUri(wmsUrl)
.setPath(TaskExecCallback)
.setJson(JSON.toJSONString(headParam))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- Date date=new Date();
- if(jsonObject.get("ReturnStatus").equals(0)){
- if(taskWrk.getIoType().equals(1)){//鍏ュ簱
- LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());//鐩爣搴撲綅
- if(locMast != null){
- locMast.setLocSts("F");
- locMast.setBarcode(taskWrk.getBarcode());
- locMast.setModiTime(date);
- locMastService.updateById(locMast);
- }
- }else if(taskWrk.getIoType().equals(3)){//绉诲簱
- LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());//鐩爣搴撲綅
- if(locMast != null){
- locMast.setLocSts("F");
- locMast.setBarcode(taskWrk.getBarcode());
- locMast.setModiTime(date);
- locMastService.updateById(locMast);
- }
- LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getStartPoint());//鍘熷搴撲綅
- if(locMast2 != null){
- locMast2.setLocSts("O");
- locMast2.setBarcode("");
- locMast.setModiTime(date);
- locMastService.updateById(locMast2);
- }
- }else if(taskWrk.getIoType().equals(2)){//鍑哄簱
- LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getStartPoint());//鍘熷搴撲綅
- if(locMast2 != null){
- locMast2.setLocSts("O");
- locMast2.setBarcode("");
- locMast2.setModiTime(date);
- locMastService.updateById(locMast2);
- }
- }
+ if (jsonObject.get("ReturnStatus").equals("0")) {
taskWrkService.updateById(taskWrk);
bool = true;
}
} catch (Exception e) {
- log.error("wcs"+s+"浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk, response);
+ log.error("wcs" + s + "浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk, response);
} finally {
- apiLogService.save("wcs"+s+"浠诲姟涓婃姤wms"
+ apiLogService.save("wcs" + s + "浠诲姟涓婃姤wms"
, wmsUrl + TaskExecCallback
, null
, "127.0.0.1"
--
Gitblit v1.9.1