From 295ee7dd14f5d36e2fe442714ab0a80c480c8029 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 15 十二月 2025 15:31:32 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java | 99 ++++++++++++++++++++++---------------------------
1 files changed, 44 insertions(+), 55 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..d31e70b 100644
--- a/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
@@ -2,14 +2,9 @@
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.common.utils.HttpHandler;
@@ -19,17 +14,13 @@
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}")
@@ -41,55 +32,53 @@
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();
-
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);
+ map.put("taskNo", wrkMast.getWrkNo());
+ map.put("taskPriority", 10);
+ map.put("barcode", wrkMast.getBarcode());
+
+ 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鍑哄簱={}", 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;
- }
- } 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
- );
- }
- return SUCCESS;
+ 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);
+// }
+// } 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
+// );
+// }
+ return SUCCESS;
}
}
--
Gitblit v1.9.1