From d26899642291dbc0cb8b97f7fb175411b53a2895 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 14:56:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 132 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 insertions(+), 19 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 9ee699d..9adda8a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,54 +1,148 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.param.taskCreateParam;
-import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.TaskWrkService;
+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;
+import com.zy.common.service.CommonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.Date;
+import java.util.*;
@Service
public class OpenServiceImpl implements OpenService {
@Autowired
private TaskWrkService taskWrkService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private LocMastService locMastService;
@Override
- public void taskCreate(taskCreateParam param) {
+ public HashMap<String, Object> taskCreate(TaskCreateParam param) {
+ HashMap<String,Object> map=new HashMap<>();
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
- throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
- if (param.getIoType().equals(0)){
- throw new CoolException("鐢熸垚浠诲姟澶辫触锛屼换鍔＄被鍨嬩笉瀛樺湪锛�");
+ 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);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
+ 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());//鏉＄爜
- taskWrk.setWrkSts(11);
- if (!Cools.isEmpty(param.getStartPoint())) {
- taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ if (param.getIoType() == 1) {
+ taskWrk.setWrkSts(1);
+ if (!Cools.isEmpty(param.getTargetPoint())) {
+ taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
+ taskWrk.setOriginTargetPoint(param.getTargetPoint());
+ }
+
+ } else if (param.getIoType() == 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.getTargetPoint())) {
- taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
- }
+
+
if (!Cools.isEmpty(param.getMemo())) {
taskWrk.setMemo(param.getMemo());//澶囨敞
}
if (!taskWrkService.insert(taskWrk)) {
- throw new CoolException("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ map.put("Code","0");
+ map.put("Msg",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�");
+ return map;
}
+ map.put("Code","1");
+ map.put("Msg","ok");
+ return map;
+ }
+
+ @Override
+ public HashMap<String, Object> taskCreateIn(TaskCreateInParam 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() + "浠诲姟宸茬粡鐢熸垚锛�");
+ return map;
+ }
+
+ Date now = new Date();
+ taskWrk = new TaskWrk();
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getTargetPoint()));
+ if (locMast == null) {
+ map.put("Code","0");
+ map.put("Msg", param.getTaskNo() + "搴撲綅涓嶅瓨鍦紒");
+ return map;
+ }
+
+ if (!locMast.getLocSts().equals("O")) {
+ map.put("Code","0");
+ map.put("Msg", param.getTaskNo() + "搴撲綅涓嶅浜庣┖搴撲綅锛�");
+ return map;
+ }
+
+ 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)) {
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
+ return map;
+ }
+ map.put("Code","1");
+ map.put("Msg","ok");
+ return map;
}
}
--
Gitblit v1.9.1