From e0ce49ec06c62ff404e97c79669feb24d7a1fa49 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 05 九月 2025 14:27:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 73 +++++++++++++-----------------------
1 files changed, 26 insertions(+), 47 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 f2d45cb..6ff4755 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -9,6 +9,7 @@
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CarryParam;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.TaskCreateParam;
@@ -66,69 +67,47 @@
@Override
- public HashMap<String, Object> taskCreate(TaskCreateParam param) {
- HashMap<String,Object> map=new HashMap<>();
+ public HashMap<String, Object> taskCreate(CarryParam param) {
+ HashMap<String, Object> map = new HashMap<>();
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�");
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�");
return map;
}
Date now = new Date();
taskWrk = new TaskWrk();
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getStartPoint()));
- int workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getOriginStartPoint()));
+// int workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
- taskWrk.setWrkNo(workNo1);
+ taskWrk.setWrkNo(Integer.valueOf(param.getTaskNo()));
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
- try {
- if (param.getIoType() > 1) {
- if (Utils.locNoRowBoolean(locMast.getRow1())) {
- param.setTaskPriority(11);
- }
- }
- } catch (Exception e) {
- }
- taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
- taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
- taskWrk.setBarcode(param.getBarcode());//鏉＄爜
+ taskWrk.setIoType(param.getStereoscopicTaskType());//浠诲姟绫诲瀷
+ taskWrk.setIoPri(param.getPriority());//浼樺厛绾�
+ taskWrk.setBarcode(param.getBoxNo());//鏉＄爜
taskWrk.setCrnNo(locMast.getCrnNo());
- if (param.getIoType() == 1) {
- taskWrk.setWrkSts(1);
- if (!Cools.isEmpty(param.getTargetPoint())) {
- taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣
- taskWrk.setOriginTargetPoint(param.getTargetPoint());
- }
-
- } else if (param.getIoType() == 2) {
+ if (param.getStereoscopicTaskType() == 2) {
taskWrk.setWrkSts(11);
- if (!Cools.isEmpty(param.getStartPoint())) {
- taskWrk.setStartPoint(param.getStartPoint());//璧风偣
- taskWrk.setTargetPoint(param.getTargetPoint());
- }
- taskWrk.setTargetPoint(param.getTargetPoint());
- } else if (param.getIoType() == 3) {
- taskWrk.setWrkSts(11);
- if (!Cools.isEmpty(param.getStartPoint())) {
- taskWrk.setStartPoint(param.getStartPoint());//璧风偣
- taskWrk.setTargetPoint(param.getTargetPoint());
- }
- }
-
-
- if (!Cools.isEmpty(param.getMemo())) {
- taskWrk.setMemo(param.getMemo());//澶囨敞
+ taskWrk.setStartPoint(param.getStartPoint());//婧愮珯鐐�
+ taskWrk.setTargetPoint(param.getTerminalNo());//鐩爣绔�
+ taskWrk.setOriginStartPoint(param.getOriginStartPoint());//婧愬簱浣�
+ } else if (param.getStereoscopicTaskType() == 3) {
+// taskWrk.setWrkSts(11);
+// if (!Cools.isEmpty(param.getStartPoint())) {
+// taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+// taskWrk.setTargetPoint(param.getTargetPoint());
+// }
}
if (!taskWrkService.insert(taskWrk)) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�");
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
return map;
}
- map.put("Code","1");
- map.put("Msg","ok");
+ map.put("Code", "1");
+ map.put("Msg", "ok");
return map;
}
@@ -182,7 +161,7 @@
WMSAndAGVInterfaceParam data = JSONObject.parseObject(jsonObject.get("data").toString(), WMSAndAGVInterfaceParam.class);
String msg = null;
try {
- taskCreate(new TaskCreateParam(data));
+// taskCreate(new TaskCreateParam(data));
} catch (Exception e) {
msg = e.getMessage();
}
--
Gitblit v1.9.1