From ca76cf86a1a73e5663614eccd41a8ae4e82196eb Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 27 十月 2025 13:01:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 20 ++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
2 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6752f1f..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){
@@ -454,6 +464,16 @@
}
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){
LocMast locMast2 = locMastService.selectByLocNo(param.getTargetPoint());
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 035451e..c1e8ee8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -815,7 +815,7 @@
}
}
} catch (Exception e){
- log.error("鍫嗗灈鏈�5鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣澶辫触");
+ log.error("鍫嗗灈鏈�10鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣澶辫触");
}
}
}
--
Gitblit v1.9.1