From 808d32829a61f6f1de0b989b2c818327d3bf74ef Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 09:20:56 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7af2501..408172d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,13 +8,18 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CarryParam;
-import com.zy.asrs.entity.param.TaskOverParam;
-import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.TaskCreateParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.BasCrnErrorServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
+import com.zy.core.CrnThread;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.CrnSlave;
+import com.zy.core.model.RgvSlave;
+import com.zy.core.model.protocol.CrnProtocol;
+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;
@@ -30,6 +35,8 @@
@RequestMapping("/open")
public class OpenController extends BaseController {
+ @Autowired
+ private SlaveProperties slaveProperties;
@Autowired
private OpenService openService;
@Autowired
@@ -57,6 +64,9 @@
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+ @Autowired
+ private BasCrnErrorServiceImpl basCrnErrorService;
+
//agv浠诲姟瀹屾垚
@PostMapping("/toAgvTaskOver")
@AppAuth(memo = "agv浠诲姟瀹屾垚鎺ュ彛")
@@ -314,13 +324,16 @@
//浠诲姟涓嬪彂鎺ュ彛
@PostMapping("/outboundTaskSend")
+// @PostMapping("/taskCreate")
+// @AppAuth(memo = "浠诲姟涓嬪彂鎺ュ彛")
@Transactional
public R outboundTaskSend(@RequestHeader String appkey,
- @RequestBody List<CarryParam> params,
+ @RequestBody List<CarryParam> params,//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴�
HttpServletRequest request) {
- //auth(appkey, params, request);
- List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
+ auth(appkey, params, request);
+// List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (CarryParam param:params){
+ param.updateIoTyoe(param.getIoType());//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� ====杞崲涓�====> 1锛氬叆搴擄紝2锛氬嚭搴擄紝3锛氱Щ搴�
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
@@ -351,7 +364,18 @@
R r = null;
- if(param.getIoType() == 2){
+ if(param.getIoType() == 1){
+ //鍏ュ簱浠诲姟鍒涘缓
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("type_no",1)
+ .eq("crn_no",locMast.getCrnNo())
+ .eq("stn_no",param.getStartPoint()));
+ if(Cools.isEmpty(staDesc)){
+ return R.error("鍏ュ簱璺姴涓嶅瓨鍦�");
+ }
+ r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
+
+ }else if(param.getIoType() == 2){
//鍑哄簱浠诲姟鍒涘缓
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("type_no",2)
@@ -362,6 +386,13 @@
}
r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
}else if (param.getIoType() == 3){
+ LocMast locMast2 = locMastService.selectByLocNo(param.getTargetPoint());
+ if(Cools.isEmpty(locMast2)){
+ return R.error("鐩爣搴撲綅鏃犳硶鎵惧埌");
+ }
+ if (!locMast2.getCrnNo().equals(locMast.getCrnNo())){
+ return R.error("璧峰搴撲綅涓庣洰鏍囧簱浣嶄笉鍐嶅悓涓�宸烽亾");
+ }
//绉诲簱浠诲姟鍒涘缓
r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
}
@@ -383,9 +414,10 @@
//浠诲姟鍙栨秷鎺ュ彛
@PostMapping("/taskCancel")
public R taskCancel(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
+ @RequestBody WMSAndAGVInterfaceParam param,//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� 1锛氬彇娑� 2 瀹屾垚
HttpServletRequest request) {
auth(appkey, param, request);
+// param.updateTaskStatus(param.getTaskStatus());
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -446,10 +478,35 @@
for (BasDevp basDevp:basDevps){
list.add(basDevp);
}
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
- for (BasCrnp basCrnp:basCrnps){
- list.add(basCrnp);
+ List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>();
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) { continue; }
+ BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
+ if (basCrnp == null) {
+ log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
+ continue;
+ }
+ BasCrnpWmsParam basCrnpWmsParam = new BasCrnpWmsParam();
+ basCrnpWmsParam.sync(basCrnp);
+
+ basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
+ basCrnpWmsParamList.add(basCrnpWmsParam);
+
+ BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
+ basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
+
+ list.add(basCrnpWmsParam);
}
+ for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
+
+ }
+// List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+// for (BasCrnp basCrnp:basCrnps){
+// list.add(basCrnp);
+// }
return R.ok(list);
}
--
Gitblit v1.9.1