From cce8b8793ca1466ca1330f3bd62e11ae6551261e Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 13:51:58 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 0060059..382854e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
@@ -65,9 +66,21 @@
public R taskCreate(TaskCreateParam param) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wmsErr", 1, "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦,taskWrk:"+JSON.toJSONString(taskWrk));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
}
if (param.getIoType().equals(0)){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wmsErr", 1, "鐢熸垚浠诲姟澶辫触锛屼换鍔＄被鍨嬩笉瀛樺湪锛�,iotype:"+JSON.toJSONString(param.getIoType()));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
throw new CoolException("鐢熸垚浠诲姟澶辫触锛屼换鍔＄被鍨嬩笉瀛樺湪锛�");
}
@@ -75,9 +88,11 @@
taskWrk = new TaskWrk();
int workNo1 = 0;//鑾峰彇鍏ュ簱宸ヤ綔鍙�
if (param.getIoType() .equals(1)){
- commonService.getWorkNo(WorkNoType.PAKOUT.type);
+ workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);
+ } else if (param.getIoType() .equals(2)){
+ workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);
} else {
- commonService.getWorkNo(WorkNoType.PAKIN.type);
+ workNo1 = commonService.getWorkNo(WorkNoType.PICK.type);
}
taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
taskWrk.setWrkNo(workNo1);
@@ -106,7 +121,9 @@
if (!Cools.isEmpty(param.getTargetPoint())) {
// taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣 杞崲涓�
taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
- taskWrk.setOriginTargetPoint(param.getStartPoint());
+ taskWrk.setStartPoint(param.getStartPoint());
+ taskWrk.setOriginStartPoint(param.getStartPointSta().toString());
+ taskWrk.setOriginTargetPoint(param.getTargetPointSta().toString());
}
} else if (param.getIoType() == 2) {
@@ -116,11 +133,15 @@
taskWrk.setTargetPoint(param.getTargetPoint());
}
taskWrk.setTargetPoint(param.getTargetPoint());
+ taskWrk.setOriginStartPoint(param.getStartPointSta().toString());
+ taskWrk.setOriginTargetPoint(param.getTargetPointSta().toString());
}else if (param.getIoType() == 3){
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
taskWrk.setTargetPoint(param.getTargetPoint());
+ taskWrk.setOriginStartPoint("0");
+ taskWrk.setOriginTargetPoint("0");
}
}
@@ -131,6 +152,12 @@
}
if (!taskWrkService.insert(taskWrk)) {
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("wmsErr", 1, "鍒涘缓浠诲姟澶辫触锛�,param:"+JSON.toJSONString(param));
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
return R.error("鍒涘缓浠诲姟澶辫触");
}
return R.ok();
@@ -179,7 +206,7 @@
,true
);
- if (jsonObject.getInteger("code").equals(200)) {
+ if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
//瑙ｆ瀽
List<WMSAndAGVInterfaceParam> params = new ArrayList<>();
params.add(param);
--
Gitblit v1.9.1