From 712dcbef9f4ae3f81e751bf8651d2e241f3f792c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 21 十月 2025 15:40:49 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 127 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 114 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5a20234..6752f1f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -6,11 +6,13 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
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 +72,8 @@
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+ @Autowired
+ private TaskWrkLogServiceImpl taskWrkLogService;
//agv浠诲姟瀹屾垚
@PostMapping("/toAgvTaskOver")
@@ -339,21 +343,53 @@
public R outboundTaskSend(@RequestHeader String appkey,
@RequestBody List<CarryParam> params,//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴�
HttpServletRequest request) {
+
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟", 1, "wms浠诲姟涓嬪彂,浠诲姟鏁�:"+params.size());
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
auth(appkey, params, request);
// 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)){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍙傛暟涓虹┖,param:"+JSON.toJSONString(param));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "浠诲姟鍙蜂负绌�,taskNo:"+JSON.toJSONString(param));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
return R.error("浠诲姟鍙蜂负绌猴紒");
} else if (Cools.isEmpty(param.getIoType())){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "浠诲姟绫诲瀷涓虹┖,ioType:"+JSON.toJSONString(param));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
return R.error("浠诲姟绫诲瀷涓虹┖锛�");
}
if (Cools.isEmpty(param.getStartPoint()) || Cools.isEmpty(param.getTargetPoint())){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍒濆鐩爣鎴栬�呯洰鏍囦綅涓虹┖,Point:"+JSON.toJSONString(param));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
return R.error("鍒濆鐩爣鎴栬�呯洰鏍囦綅涓虹┖");
}
+
+ param.updateIoTyoe(param.getIoType());//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� ====杞崲涓�====> 1锛氬叆搴擄紝2锛氬嚭搴擄紝3锛氱Щ搴�
+ param.updateLocNo();
// if (Cools.isEmpty(param.getContainerCode())){
// return R.error("瀹瑰櫒缂栫爜(鎵樼洏鐮�)涓虹┖锛�");
// }
@@ -375,6 +411,12 @@
}
LocMast locMast = locMastService.selectByLocNo(locNo);
if(Cools.isEmpty(locMast)){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍒濆搴撲綅鏃犳硶鎵惧埌,locNo:"+JSON.toJSONString(locNo));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
return R.error("鍒濆搴撲綅鏃犳硶鎵惧埌");
}
@@ -387,6 +429,12 @@
.eq("crn_no",locMast.getCrnNo())
.eq("stn_no",param.getStartPoint()));
if(Cools.isEmpty(staDesc)){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍏ュ簱璺姴涓嶅瓨鍦�,param:"+JSON.toJSONString(param));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
return R.error("鍏ュ簱璺姴涓嶅瓨鍦�");
}
r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getCrnStn()));
@@ -398,15 +446,33 @@
.eq("crn_no",locMast.getCrnNo())
.eq("stn_no",param.getTargetPoint()));
if(Cools.isEmpty(staDesc)){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍑哄簱璺姴涓嶅瓨鍦�,param:"+JSON.toJSONString(param));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
return R.error("鍑哄簱璺姴涓嶅瓨鍦�");
}
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)){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鐩爣搴撲綅鏃犳硶鎵惧埌,locNo:"+JSON.toJSONString(param.getTargetPoint()));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
return R.error("鐩爣搴撲綅鏃犳硶鎵惧埌");
}
if (!locMast2.getCrnNo().equals(locMast.getCrnNo())){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "璧峰搴撲綅涓庣洰鏍囧簱浣嶄笉鍐嶅悓涓�宸烽亾,param:"+JSON.toJSONString(param));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
return R.error("璧峰搴撲綅涓庣洰鏍囧簱浣嶄笉鍐嶅悓涓�宸烽亾");
}
//绉诲簱浠诲姟鍒涘缓
@@ -433,6 +499,7 @@
@RequestBody WMSAndAGVInterfaceParam param,//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� 1锛氬彇娑� 2 瀹屾垚
HttpServletRequest request) {
auth(appkey, param, request);
+ param.updateIoTyoe(param.getIoType());//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� ====杞崲涓�====> 1锛氬叆搴擄紝2锛氬嚭搴擄紝3锛氱Щ搴�
// param.updateTaskStatus(param.getTaskStatus());
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
@@ -440,14 +507,11 @@
return R.error("宸ヤ綔鍙蜂负绌猴紒");
} else if (Cools.isEmpty(param.getIoType())){
return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
- } else if (Cools.isEmpty(param.getBarcode())){
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒");
}
TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
.eq("task_no", param.getTaskNo())
- .eq("io_type",param.getIoType())
- .eq("barcode",param.getBarcode()));
+ .eq("io_type",param.getIoType()));
if (Cools.isEmpty(taskWrk)){
return R.error("鏈煡鍒板綋鍓嶄换鍔�---"+param);
}
@@ -520,12 +584,17 @@
basCrnpWmsParam.sync(basCrnp);
basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
+ 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);
@@ -543,12 +612,17 @@
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);
wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);
@@ -561,5 +635,32 @@
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);
+ }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/wrkNo/wmsTaskNo")
+ @Transactional
+ public R wrkNoWmsTaskNo(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
+ return R.ok(taskWrkLogs);
+ }
+
}
--
Gitblit v1.9.1