From 11d13cfe30f79facfd6bda9058a5b0ccb860eb1c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 28 四月 2025 17:51:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 80 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 21 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 60bf3cd..dfd82ab 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2,9 +2,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.R;
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.TaskCreateInParam;
import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
@@ -24,13 +26,10 @@
private LocMastService locMastService;
@Override
- public HashMap<String, Object> taskCreate(TaskCreateParam param) {
- HashMap<String,Object> map=new HashMap<>();
+ public R taskCreate(TaskCreateParam param) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�");
- return map;
+ return R.error(param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�");
}
Date now = new Date();
@@ -41,14 +40,6 @@
taskWrk.setWrkNo(workNo1);
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());//鏉＄爜
@@ -56,7 +47,7 @@
if (param.getIoType() == 1) {
taskWrk.setWrkSts(1);
if (!Cools.isEmpty(param.getTargetPoint())) {
- taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣
+ taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
taskWrk.setOriginTargetPoint(param.getTargetPoint());
}
@@ -67,27 +58,74 @@
taskWrk.setTargetPoint(param.getTargetPoint());
}
taskWrk.setTargetPoint(param.getTargetPoint());
+
+ locMast.setLocSts("R");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+
} else if (param.getIoType() == 3) {
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
taskWrk.setTargetPoint(param.getTargetPoint());
}
- }
+ locMast.setLocSts("R");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+ }
if (!Cools.isEmpty(param.getMemo())) {
taskWrk.setMemo(param.getMemo());//澶囨敞
}
if (!taskWrkService.insert(taskWrk)) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�");
- return map;
+ return R.error(param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
}
- map.put("Code","1");
- map.put("Msg","ok");
- return map;
+ return R.ok();
}
+ @Override
+ public R taskCreateIn(TaskCreateInParam param) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
+ if (taskWrk != null) {
+ return R.error(param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�");
+ }
+
+ Date now = new Date();
+ taskWrk = new TaskWrk();
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getTargetPoint()));
+ if (locMast == null) {
+ return R.error(param.getTaskNo() + "搴撲綅涓嶅瓨鍦紒");
+ }
+
+ if (!locMast.getLocSts().equals("O")) {
+ return R.error(param.getTaskNo() + "搴撲綅涓嶅浜庣┖搴撲綅锛�");
+ }
+
+ locMast.setLocSts("S");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
+ taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
+ taskWrk.setBarcode(param.getBarcode());//鏉＄爜
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setWrkSts(1);
+ taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
+ taskWrk.setOriginTargetPoint(param.getTargetPoint());
+ if (!Cools.isEmpty(param.getMemo())) {
+ taskWrk.setMemo(param.getMemo());//澶囨敞
+ }
+
+ if (!taskWrkService.insert(taskWrk)) {
+ return R.error(param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.9.1