From 78067a1c03707766f3d6561c22e165af68ad36b9 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 18 十二月 2025 14:38:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java | 122 ++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java b/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
index 113b152..039dda2 100644
--- a/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
@@ -7,6 +7,8 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.model.StartupDto;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,64 +23,88 @@
@Transactional
public class OutWorkHandler extends AbstractHandler<String> {
- @Autowired
- private ApiLogService apiLogService;
@Value("${wcs.address.URL}")
private String addrs;
- @Value("${wcs.address.outboundTaskSend}")
- private String outboundTaskSend;
+ @Value("${wcs.address.createOutTask}")
+ private String outTask;
+ @Value("${wcs.address.createLocMoveTask}")
+ private String locMoveTask;
+
+ @Autowired
+ private ApiLogService apiLogService;
@Autowired
private WrkMastService wrkMastService;
-
public synchronized ReturnT<String> start(WrkMast wrkMast) {
- HashMap<String, Object> map = new HashMap<>();
- map.put("taskNo", wrkMast.getWrkNo());
- map.put("taskPriority", 10);
- map.put("barcode", wrkMast.getBarcode());
+ StartupDto startupDto = new StartupDto();
+ startupDto.setTaskNo(wrkMast.getWrkNo());
+ startupDto.setStaNo(wrkMast.getStaNo());
+ startupDto.setLocNo(Utils.locToLocNo(wrkMast.getSourceLocNo()));
+ startupDto.setTaskPri(wrkMast.getIoPri());
if (wrkMast.getIoType() == 11) {
- map.put("taskType", 3);
- map.put("startPoint", wrkMast.getSourceLocNo());
- map.put("targetPoint", wrkMast.getLocNo());
- }else {
- map.put("taskType", 2);
- map.put("startPoint", wrkMast.getSourceLocNo());
- map.put("targetPoint", wrkMast.getSourceStaNo() + "-" + wrkMast.getStaNo());
- }
-
- String response ="";
- boolean bool =false;
- try {
- log.info("wms娲惧彂浠诲姟缁檞cs鍑哄簱={}", JSON.toJSONString(map));
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(addrs)
- .setPath(outboundTaskSend)
- .setJson(JSON.toJSONString(map))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.getInteger("code") == 200){
- wrkMast.setWrkSts(12L);
- wrkMastService.updateById(wrkMast);
- bool = true;
- }else {
- log.error("wms娲惧彂浠诲姟缁檞cs鍑哄簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
+ String response = "";
+ boolean bool = false;
+ try {
+ log.info("wms娲惧彂浠诲姟缁檞cs绉诲簱={}", JSON.toJSONString(startupDto));
+ response = new HttpHandler.Builder()
+ .setUri(addrs)
+ .setPath(locMoveTask)
+ .setJson(JSON.toJSONString(startupDto))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code") == 200) {
+ wrkMast.setWrkSts(12L);
+ wrkMastService.updateById(wrkMast);
+ bool = true;
+ } else {
+ log.error("wms娲惧彂浠诲姟缁檞cs绉诲簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
+ }
+ } catch (Exception e) {
+ log.error("wms娲惧彂浠诲姟缁檞cs绉诲簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
+ } finally {
+ apiLogService.save("wms娲惧彂浠诲姟缁檞cs绉诲簱"
+ , addrs + locMoveTask
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(startupDto)
+ , response
+ , bool
+ );
}
- } catch (Exception e) {
- log.error("wms娲惧彂浠诲姟缁檞cs鍑哄簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
- } finally {
- apiLogService.save("wms娲惧彂浠诲姟缁檞cs鍑哄簱"
- , addrs + outboundTaskSend
- , null
- , "127.0.0.1"
- , JSON.toJSONString(map)
- , response
- , bool
- );
+ } else {
+ String response ="";
+ boolean bool =false;
+ try {
+ log.info("wms娲惧彂浠诲姟缁檞cs鍑哄簱={}", JSON.toJSONString(startupDto));
+ response = new HttpHandler.Builder()
+ .setUri(addrs)
+ .setPath(outTask)
+ .setJson(JSON.toJSONString(startupDto))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if(jsonObject.getInteger("code") == 200){
+ wrkMast.setWrkSts(12L);
+ wrkMastService.updateById(wrkMast);
+ bool = true;
+ }else {
+ log.error("wms娲惧彂浠诲姟缁檞cs鍑哄簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
+ }
+ } catch (Exception e) {
+ log.error("wms娲惧彂浠诲姟缁檞cs鍑哄簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
+ } finally {
+ apiLogService.save("wms娲惧彂浠诲姟缁檞cs鍑哄簱"
+ , addrs + outTask
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(startupDto)
+ , response
+ , bool
+ );
+ }
}
return SUCCESS;
-
}
}
--
Gitblit v1.9.1