From 230b5f1b455ce5d89ada908fcf79ca8d18eb0e1d Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 25 十一月 2025 18:33:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 142 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 139 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d51ef62..adeadee 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,10 +1,12 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
@@ -16,6 +18,8 @@
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +66,10 @@
private BasAgvMastService basAgvMastService;
@Autowired
private LocOwnerService locOwnerService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private LocMastServiceImpl locMastService;
@Override
@Transactional
@@ -89,7 +97,7 @@
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
- locOwner.getOwnerUuid(), // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛缂栧彿
locOwner.getOwner(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
@@ -258,7 +266,7 @@
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
- locOwner.getOwnerUuid(), // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛缂栧彿
locOwner.getOwner(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
@@ -661,7 +669,7 @@
try{
BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
new EntityWrapper<BasArmMastSign>()
- .eq("matnr", param.getSku())
+ .eq("matnr", param.getMatnr())
.eq("order_no", param.getOrderNo())
.eq("create_time", param.getBindingTags())
);
@@ -777,5 +785,133 @@
return true;
}
+ @Override
+ @Transactional
+ public boolean taskAgvCreate(TaskAgvCreateParam param) {
+ // 鍙傛暟妫�鏌�
+ if (param == null) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+ // 鍒涘缓瀵硅薄锛堟瀯閫犲嚱鏁颁腑宸茬敓鎴� timestamp锛�
+ BasAgvMast basAgvMast = new BasAgvMast();
+ // 鐢熸垚 WMS 浠诲姟鍙凤紙濡傛棤澶栭儴浼犲叆锛屽彲浠ヤ娇鐢ㄩ洩鑺盜D 鎴栬嚜澧烇級
+ basAgvMast.setTaskNo(commonService.getWorkNo(0));
+ // 璧嬪�煎弬鏁�
+ basAgvMast.setSourceStaNo(param.getSourceStaNo());
+ basAgvMast.setStaNo(param.getStaNo());
+ basAgvMast.setSourceLocNo(param.getSourceLocNo());
+ basAgvMast.setLocNo(param.getLocNo());
+ // 榛樿鍊�
+ basAgvMast.setPriority(1L); // 榛樿浼樺厛绾�
+ basAgvMast.setStatus(0); // 鍒濆鐘舵��
+ basAgvMast.setAppeTime(new Date()); // 娣诲姞鏃堕棿
+ basAgvMast.setModiTime(new Date()); // 淇敼鏃堕棿
+ basAgvMast.setIoType(param.getIoType());// 浠诲姟绫诲瀷
+ basAgvMast.setFloorNo(param.getFloorNo()); //妤煎眰
+
+ // 鎻掑叆鏁版嵁搴�
+ basAgvMastService.insert(basAgvMast);
+
+ return true;
+ }
+
+ @Override
+ @Transactional
+ public List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param) {
+ List<AgvLocListDetlParam> result = new ArrayList<>();
+
+ if (Cools.isEmpty(param.getLocNo())) {
+ EntityWrapper<LocMast> locMastEntityWrapper = new EntityWrapper<>();
+ locMastEntityWrapper.setSqlSelect("TOP 5 loc_no as locNo,loc_sts as locSts")
+ .where("loc_sts in ('F','D','S','R') and whs_type = '5'");
+ List<LocMast> locMasts = locMastService.selectList(locMastEntityWrapper);
+
+ for (LocMast locMast : locMasts) {
+ result.add(buildAgvLocListDetlParam(locMast.getLocNo(), locMast.getLocSts$()));
+ }
+ } else {
+ LocMast locMast = locMastService.selectOne(
+ new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo())
+ );
+ result.add(buildAgvLocListDetlParam(param.getLocNo(), locMast.getLocSts$()));
+ }
+
+ return result;
+ }
+
+ private AgvLocListDetlParam buildAgvLocListDetlParam(String locNo, String locSts) {
+ List<LocDetl> detlList = locDetlService.selectList(
+ new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+ );
+
+ AgvLocListDetlParam dto = new AgvLocListDetlParam();
+ dto.setLocNo(locNo);
+ dto.setLocSys(locSts);
+ dto.setAgvDetlList(detlList);
+ return dto;
+ }
+
+
+ @Override
+ @Transactional
+ public boolean bindCtnrAndBin(bindCtnrAndBinParam param) {
+ // 鍙傛暟妫�鏌�
+ if (param == null) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+ AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
+ BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+ BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
+ BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", param.getStaNo()));
+ agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
+ agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
+ agvBindCtnrAndBinParam.setCtnrTyp("1");
+ agvBindCtnrAndBinParam.setPositionCode(
+ basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null
+ ? basAgvLocNoSou.getAgvLocNo()
+ : ""
+ );
+ agvBindCtnrAndBinParam.setStgBinCode(
+ basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null
+ ? basAgvLocNoEnd.getAgvLocNo()
+ : ""
+ );
+ agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
+ try {
+ String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV鎺ュ彛鍦板潃
+ String mesPath = "bindCtnrAndBin"; // 鎺ュ彛璺緞
+ String response = "";
+ boolean success = false;
+
+ try {
+ log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛璇锋眰鍙傛暟: {}", JSON.toJSONString(agvBindCtnrAndBinParam));
+
+ response = new HttpHandler.Builder()
+ .setUri(URL)
+ .setPath(mesPath)
+ .setJson(JSON.toJSONString(agvBindCtnrAndBinParam))
+ .build()
+ .doPost();
+
+ log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛鍝嶅簲: {}", response);
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if (jsonObject.getInteger("code") != null && jsonObject.getInteger("code").equals(0)) {
+ success = true;
+ } else {
+ log.error("AGV缁戝畾瀹瑰櫒澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response);
+ throw new CoolException("AGV缁戝畾瀹瑰櫒澶辫触: " + jsonObject.getString("msg"));
+ }
+ } catch (Exception e) {
+ log.error("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response, e);
+ throw new CoolException("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父: " + e.getMessage());
+ }
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ return true;
+ }
+
+
}
--
Gitblit v1.9.1