From 3759a40aad8191f82f4a2eac54c9045dcf6a0fb3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 09:46:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 2085ded..b96ecfe 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -437,6 +437,16 @@
}
return R.error("鍏ュ簱璺姴涓嶅瓨鍦�");
}
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("TARGET_POINT", param.getTargetPoint()));
+ if(!Cools.isEmpty(taskWrk)){
+ 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()));
}else if(param.getIoType() == 2){
@@ -453,6 +463,16 @@
// log.error("e2:"+e2.getMessage());
}
return R.error("鍑哄簱璺姴涓嶅瓨鍦�");
+ }
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("START_POINT", param.getStartPoint()));
+ if(!Cools.isEmpty(taskWrk)){
+ 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){
@@ -499,6 +519,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("鍙傛暟涓虹┖锛�");
@@ -506,14 +527,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);
}
--
Gitblit v1.9.1