From a1e94379b115721b2e604070dc48063b8016f72f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 21 十月 2025 19:32:59 +0800
Subject: [PATCH] 侧面输送线出库码盘信息对接
---
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 58 +++++++++++++++++-----------------------------------------
1 files changed, 17 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index 1373172..3183814 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -1,7 +1,6 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -13,9 +12,9 @@
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.service.ToWmsService;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
-import com.zy.common.utils.HttpHandler;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
@@ -27,13 +26,11 @@
import com.zy.core.model.protocol.StaProtocol;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
@Slf4j
@@ -42,14 +39,17 @@
@Autowired
private CommonService commonService;
+
@Autowired
private StaDescService staDescService;
- @Value("${wms.url}")
- private String wmsUrl;
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
+
+
@Autowired
private ApiLogService apiLogService;
+
+
+ @Autowired
+ private ToWmsService toWmsService;
@Override
public TaskWrk selectByTaskNo(String taskNo) {
@@ -59,6 +59,11 @@
@Override
public TaskWrk selectByStartPoint(String taskNo) {
return this.baseMapper.selectByStartPoint(taskNo);
+ }
+
+ @Override
+ public TaskWrk selectByTargetPoint(String taskNo) {
+ return this.baseMapper.selectByTargetPoint(taskNo);
}
@Override
@@ -120,7 +125,7 @@
taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
taskWrk.setModiTime(new Date());
taskWrk.setModiUser(userId);
- updateById(taskWrk);
+ super.updateById(taskWrk);
CrnSlave.CrnStn crnStn = Utils.getCrnStnByStaNo(staDesc.getCrnStn(), true);
if (crnStn == null) {
@@ -143,36 +148,7 @@
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
} else {
- try {
- HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("taskNo", taskWrk.getTaskNo());
- headParam.put("status", taskWrk.getStatus());
- headParam.put("ioType", taskWrk.getIoType());
- headParam.put("barcode", taskWrk.getBarcode());
-// headParam.put("reportTime",new Date());
- String response;
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
-
- JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
- , wmsUrl + taskStatusFeedbackPath
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , true
- );
- } catch (Exception e) {
- log.error("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触", taskWrk);
-// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
- }
-
+ toWmsService.addReportLog(taskWrk);
}
}
@@ -191,7 +167,7 @@
taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
taskWrk.setModiTime(new Date());
taskWrk.setModiUser(userId);
- updateById(taskWrk);
+ super.updateById(taskWrk);
CrnSlave.CrnStn crnStn = Utils.getCrnStnByStaNo(staDesc.getCrnStn(), false);
if (crnStn == null) {
@@ -240,7 +216,7 @@
//taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
taskWrk.setModiTime(new Date());
taskWrk.setModiUser(userId);
- updateById(taskWrk);
+ super.updateById(taskWrk);
}
@Override
--
Gitblit v1.9.1