From dbfbc8f19dc5751b6dec442aff24463f1084a3d9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期日, 21 九月 2025 15:54:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java | 46 ++++++++++++++--------------------------------
1 files changed, 14 insertions(+), 32 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..81b5825 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,29 +32,18 @@
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("taskType", wrkMast.getIoType() == 11 ? 3 : 2);
+ map.put("startPoint", wrkMast.getSourceLocNo());
+ map.put("targetPoint", wrkMast.getLocNo());
+ map.put("barcode", wrkMast.getBarcode());
String response ="";
- Boolean bool =false;
+ boolean bool =false;
try {
- log.info("wms娲惧彂浠诲姟缁檞cs鍑哄簱={}", map);
+ log.info("wms娲惧彂浠诲姟缁檞cs鍑哄簱={}", JSON.toJSONString(map));
response = new HttpHandler.Builder()
// .setHeaders(headParam)
.setUri(addrs)
@@ -72,15 +52,17 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.get("Code").equals("1")){
+ 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("wcs娲惧彂浠诲姟缁橰CS鍑哄簱澶辫触{},杩斿洖鍊�={}", wrkMast, response);
+ log.error("wms娲惧彂浠诲姟缁檞cs鍑哄簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
} finally {
- apiLogService.save("wcs娲惧彂浠诲姟缁橰CS鍑哄簱"
+ apiLogService.save("wms娲惧彂浠诲姟缁檞cs鍑哄簱"
, addrs + outboundTaskSend
, null
, "127.0.0.1"
@@ -89,7 +71,7 @@
, bool
);
}
- return SUCCESS;
+ return SUCCESS;
}
}
--
Gitblit v1.9.1