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 | 137 +++++++++++++++++++++++++--------------------
1 files changed, 76 insertions(+), 61 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 06dd5f1..039dda2 100644
--- a/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
@@ -2,16 +2,13 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.param.CarryParam;
import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.service.impl.LocMastServiceImpl;
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;
@@ -19,77 +16,95 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
@Slf4j
@Service
@Transactional
public class OutWorkHandler extends AbstractHandler<String> {
- @Autowired
- private LocMastService locMastService;
- @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) {
- //浼樺厛绾�
- LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
- int Priority = locMast.getLocAttribute() == null ? 0 : locMast.getLocAttribute();
+ StartupDto startupDto = new StartupDto();
+ startupDto.setTaskNo(wrkMast.getWrkNo());
+ startupDto.setStaNo(wrkMast.getStaNo());
+ startupDto.setLocNo(Utils.locToLocNo(wrkMast.getSourceLocNo()));
+ startupDto.setTaskPri(wrkMast.getIoPri());
- HashMap<String, Object> map = new HashMap<>();
- CarryParam carryParam = new CarryParam();
- carryParam.setBoxNo(wrkMast.getBarcode());//鎵樼洏鐮�
- carryParam.setTaskNo(wrkMast.getWrkNo()+"");//浠诲姟鍙�
- carryParam.setStereoscopicTaskType(2);//2.鍑哄簱
- carryParam.setPriority(10+Priority);//浼樺厛绾�
- carryParam.setOriginalRowNo(locMast.getRow1());//婧愬簱浣嶆帓
- carryParam.setOriginalColumnNo(locMast.getBay1());//婧愬簱浣嶅垪
- carryParam.setOriginalFloorNo(locMast.getLev1());//婧愬簱浣嶅眰
- carryParam.setStartPoint(wrkMast.getStaNo()+""+locMast.getLev1());//婧愮珯
- carryParam.setTerminalNo(wrkMast.getStaNo()+"");//鐩爣绔�
- List<CarryParam> carryParamList=new ArrayList<>();
- carryParamList.add(carryParam);
- map.put("TaskList",carryParamList);
-
- String response ="";
- Boolean bool =false;
- try {
- log.info("wms娲惧彂浠诲姟缁檞cs鍑哄簱={}", map);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(addrs)
- .setPath(outboundTaskSend)
- .setJson(JSON.toJSONString(map))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.get("Code").equals("1")){
- wrkMast.setWrkSts(12L);
- wrkMastService.updateById(wrkMast);
- bool = true;
+ if (wrkMast.getIoType() == 11) {
+ 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("wcs娲惧彂浠诲姟缁橰CS鍑哄簱澶辫触{},杩斿洖鍊�={}", wrkMast, response);
- } finally {
- apiLogService.save("wcs娲惧彂浠诲姟缁橰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;
-
+ return SUCCESS;
}
}
--
Gitblit v1.9.1