From 962c3a2d98cb40347d1ea0540c80a63972d1ea5b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 16 六月 2025 17:03:25 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java | 130 +++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
index 59ee1da..ee48c9c 100644
--- a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
@@ -3,15 +3,18 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.TaskWrkReport;
-import com.zy.asrs.entity.wms.StorageEscalationParam;
+import com.zy.asrs.entity.param.StorageEscalationParam;
import com.zy.asrs.entity.wms.WmsResult;
import com.zy.asrs.service.*;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.Synchro;
-import com.zy.core.properties.SlaveProperties;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -19,24 +22,22 @@
import java.io.IOException;
import java.util.Date;
-@Service
+@Slf4j
+@Service("toWmsService")
public class ToWmsServiceImpl implements ToWmsService {
-
@Autowired
private TaskWrkService taskWrkService;
- @Autowired
- private SlaveProperties slaveProperties;
+
+
@Autowired
private TaskWrkReportService taskWrkReportService;
- @Autowired
- private StaDescService staDescService;
+
@Autowired
private CommonService commonService;
+
@Autowired
private LocMastService locMastService;
- @Autowired
- private BasDevpService basDevpService;
@Autowired
@@ -53,7 +54,7 @@
/**
* 浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
*/
- @Value("${wms.taskExecCallback}")
+ @Value("${wms.TaskExecCallback}")
private String taskExecCallback;
/**
* 浠诲姟瀹屾垚缁撴潫鏃讹紝WCS鍥炶皟WMS
@@ -61,17 +62,17 @@
@Value("${wms.taskStatusFeedbackPath}")
private String taskStatusFeedbackPath;
- @Value("${wms.code}")
- private String code;
+// @Value("${wms.code}")
+// private String code;
- @Value("${wms.successCode}")
- private String successCode;
-
- @Value("${wms.msg}")
- private String msg;
-
- @Value("${wms.data}")
- private String data;
+// @Value("${wms.successCode}")
+// private String successCode;
+//
+// @Value("${wms.msg}")
+// private String msg;
+//
+// @Value("${wms.data}")
+// private String data;
@Override
public void addReportLog(TaskWrk taskWrk) {
@@ -82,30 +83,75 @@
}
@Override
- public WmsResult getLocNoFromWms(StorageEscalationParam wmsParam) {
- String response = "";
- Boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath(inboundTaskApplyPath)
- .setJson(JSON.toJSONString(wmsParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get(code)) && jsonObject.get(code).equals(successCode)) {
- WmsResult result = JSON.parseObject(jsonObject.get(data).toString(), WmsResult.class);
- return result;
- }
- } catch (IOException e) {
-
- } finally {
- addApiLog("鍏ュ簱浠诲姟璇锋眰鑾峰彇搴撲綅", wmsUrl + inboundTaskApplyPath, JSON.toJSONString(wmsParam), response, success);
- }
- return null;
+ public TaskWrk getLocNoFromWms(StorageEscalationParam wmsParam) {
+// String response = "";
+// Boolean success = false;
+// try {
+// response = new HttpHandler.Builder()
+// .setUri(wmsUrl)
+// .setPath(inboundTaskApplyPath)
+// .setJson(JSON.toJSONString(wmsParam))
+// .build()
+// .doPost();
+// if (!Cools.isEmpty(response)) {
+// JSONObject jsonObject = JSON.parseObject(response);
+// if (!Cools.isEmpty(jsonObject.get(code)) && jsonObject.get(code).equals(successCode)) {
+// //鏈変簺涓夋柟wms绯荤粺涓嶈兘鍙婃椂杩斿洖搴撲綅鍙凤紝杩欐椂鍊欏氨闇�瑕�
+// //ZWmsResult result = JSON.parseObject(jsonObject.get(data).toString(), WmsResult.class);
+// TaskWrk taskWrk = null;
+// int i = 1;
+// while (i < 10) {
+// taskWrk = taskWrkService.selectByBarcode(wmsParam.getBarcode());
+// if (taskWrk != null) {
+// break;
+// }
+// try {
+// i++;
+// Thread.sleep(500L);
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
+// }
+// return taskWrk;
+// }
+// }
+// } catch (IOException e) {
+// e.printStackTrace();
+// log.info("璇锋眰wms鎶ラ敊锛寋}", e.getMessage());
+// } finally {
+// addApiLog("鍏ュ簱浠诲姟璇锋眰鑾峰彇搴撲綅", wmsUrl + inboundTaskApplyPath, JSON.toJSONString(wmsParam), response, success);
+// }
+ return null;
}
+ private TaskWrk createInTask(WmsResult result, String barcode, Integer startPoint) {
+ //String locNo = Utils.Fusion(result.getRow(), result.getFloor(), result.getColumn());
+ String locNo = result.getLocNo();
+ Date now = new Date();
+ TaskWrk taskWrk = new TaskWrk();
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(result.getTaskNo());//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//浠诲姟鐘舵�侊細娲惧彂
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(1);//浠诲姟绫诲瀷
+ taskWrk.setIoPri(13);//浼樺厛绾�
+ taskWrk.setBarcode(barcode);//鏉＄爜
+ LocMast locMast = locMastService.selectByLocNo(locNo);
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setTargetPoint(locNo);
+ taskWrk.setStartPoint(startPoint + "");
+ taskWrk.setCrnNo(result.getCrnNo());
+ if (taskWrk.getIoType() == 1) {
+ taskWrk.setWrkSts(2);
+ if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
+ taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
+ }
+ }
+ return taskWrk;
+ }
+
private void addApiLog(String nameSpace, String url, String param, String response, Boolean success) {
apiLogService.save(nameSpace, url, null, "127.0.0.1", param, response, success);
}
--
Gitblit v1.9.1