From 8e19e67d1178e834a868f4a820d827ddf64c6e01 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 28 五月 2025 12:46:08 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/asrs/controller/OpenController.java | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9846b25..33e41cb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasCrnErrorServiceImpl;
+import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
@@ -70,6 +71,8 @@
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+ @Autowired
+ private TaskWrkLogServiceImpl taskWrkLogService;
//agv浠诲姟瀹屾垚
@PostMapping("/toAgvTaskOver")
@@ -92,7 +95,7 @@
}
//鍒涘缓浠诲姟
- @PostMapping("/taskCreate")
+ @PostMapping("/taskCreate2")
@AppAuth(memo = "WMS浠诲姟涓嬪彂")
@Transactional
public synchronized R taskCreate(@RequestHeader String appkey,
@@ -332,9 +335,9 @@
}
//浠诲姟涓嬪彂鎺ュ彛
- @PostMapping("/outboundTaskSend")
-// @PostMapping("/taskCreate")
-// @AppAuth(memo = "浠诲姟涓嬪彂鎺ュ彛")
+// @PostMapping("/outboundTaskSend")
+ @PostMapping("/taskCreate")
+ @AppAuth(memo = "浠诲姟涓嬪彂鎺ュ彛")
@Transactional
public R outboundTaskSend(@RequestHeader String appkey,
@RequestBody List<CarryParam> params,//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴�
@@ -343,7 +346,7 @@
// List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (CarryParam param:params){
param.updateIoTyoe(param.getIoType());//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� ====杞崲涓�====> 1锛氬叆搴擄紝2锛氬嚭搴擄紝3锛氱Щ搴�
-
+ param.updateLocNo();
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -366,7 +369,14 @@
// }
// }
- LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
+
+ String locNo=null;
+ if(param.getIoType()==1){
+ locNo=param.getTargetPoint();
+ }else{
+ locNo=param.getStartPoint();
+ }
+ LocMast locMast = locMastService.selectByLocNo(locNo);
if(Cools.isEmpty(locMast)){
return R.error("鍒濆搴撲綅鏃犳硶鎵惧埌");
}
@@ -382,7 +392,7 @@
if(Cools.isEmpty(staDesc)){
return R.error("鍏ュ簱璺姴涓嶅瓨鍦�");
}
- r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
+ r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getCrnStn()));
}else if(param.getIoType() == 2){
//鍑哄簱浠诲姟鍒涘缓
@@ -393,7 +403,7 @@
if(Cools.isEmpty(staDesc)){
return R.error("鍑哄簱璺姴涓嶅瓨鍦�");
}
- r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
+ r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getStnNo()));
}else if (param.getIoType() == 3){
LocMast locMast2 = locMastService.selectByLocNo(param.getTargetPoint());
if(Cools.isEmpty(locMast2)){
@@ -484,6 +494,7 @@
auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
List<Object> list = new ArrayList<>();
+ WcsStatusResponseModel wcsStatusResponseModel = new WcsStatusResponseModel();
for (BasDevp basDevp:basDevps){
BasDevpWmsParam basDevpWmsParam = new BasDevpWmsParam();
basDevpWmsParam.setDevNo(basDevp.getDevNo());
@@ -494,7 +505,8 @@
basDevpWmsParam.setOutEnable(basDevp.getOutEnable());
basDevpWmsParam.setDevErr(basDevp.getStaErr().longValue());
basDevpWmsParam.setDevErrM(basDevpWmsParam.getDevErr$());
- list.add(basDevpWmsParam);
+// list.add(basDevpWmsParam);
+ wcsStatusResponseModel.getChainList().add(basDevpWmsParam);
}
List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>();
for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -511,17 +523,23 @@
basCrnpWmsParam.sync(basCrnp);
basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
- basCrnpWmsParamList.add(basCrnpWmsParam);
+ basCrnpWmsParam.setCrnSts(crnProtocol.getStatus().intValue());
try{
- BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
+ BasCrnError basCrnError = basCrnErrorService.selectById(crnProtocol.getAlarm());
basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
} catch (Exception e){
basCrnpWmsParam.setCrnErrM("鏈煡寮傚父");
}
+ if (crnProtocol.getMode()!=3){
+ basCrnpWmsParam.setCrnErr(999L);
+ basCrnpWmsParam.setCrnErrM("闈炶嚜鍔紒锛侊紒");
+ }
+ basCrnpWmsParamList.add(basCrnpWmsParam);
- list.add(basCrnpWmsParam);
+// list.add(basCrnpWmsParam);
}
+ wcsStatusResponseModel.setPilingCarList(basCrnpWmsParamList);
for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
RgvProtocol rgvStatus = RgvStatusCache.getRgvStatus(rgvSlave.getId());
if (Cools.isEmpty(rgvStatus)){
@@ -533,20 +551,45 @@
basRgvWmsParam.setStatusType(rgvStatus.getStatusType().desc);
basRgvWmsParam.setSteNo(rgvSlave.getId());
basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
- try{
- BasRgvErr basRgvErr = basRgvErrService.selectById(rgvStatus.getAlarm().longValue());
-
- basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
- } catch (Exception e){
- basRgvWmsParam.setSteErrM("鏈煡寮傚父");
+ basRgvWmsParam.setSteErrM(rgvStatus.getAlarmM());
+// try{
+// BasRgvErr basRgvErr = basRgvErrService.selectById((long)rgvStatus.getAlarm$());
+//
+// basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
+// } catch (Exception e){
+// basRgvWmsParam.setSteErrM("鏈煡寮傚父");
+// }
+ if (rgvStatus.getMode()!=1){
+ basRgvWmsParam.setSteErr(999L);
+ basRgvWmsParam.setSteErrM("闈炶嚜鍔紒锛侊紒");
}
- list.add(basRgvWmsParam);
+// list.add(basRgvWmsParam);
+ wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);
+
}
// List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
// for (BasCrnp basCrnp:basCrnps){
// list.add(basCrnp);
// }
- return R.ok(list);
+ return R.ok(wcsStatusResponseModel);
+ }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/taskWrkLogs")
+ @Transactional
+ public R taskWrkLogs(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
+ return R.ok(taskWrkLogs);
+ }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/error")
+ @Transactional
+ public R errorRgv(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
+ return R.ok(taskWrkLogs);
}
--
Gitblit v1.9.1