From 4c88c0606bb333ac1ad4c1ad536a848f7d27fdb7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 23 四月 2025 12:43:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 158 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 121 insertions(+), 37 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 bc0c5a4..cd5f403 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,48 +1,132 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.entity.param.WmsWrkCreateParam;
-import com.zy.asrs.service.OpenService;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+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;
+import com.zy.common.service.CommonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.*;
@Service
public class OpenServiceImpl implements OpenService {
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private LocMastService locMastService;
+
@Override
- public void wmsWrkCreate(WmsWrkCreateParam param) {
-// WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(param.getWmsWrkNo());
-// if (wmsWrk != null) {
-// throw new CoolException(param.getWmsWrkNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
-// }
-//
-// Date now = new Date();
-// wmsWrk = new WmsWrk();
-// wmsWrk.setWmsWrkNo(param.getWmsWrkNo());//WMS浠诲姟鍙�
-// wmsWrk.setWmsStatus(WmsWrkStatusType.RECEIVE.id);//WMS鐘舵�侊細鎺ユ敹
-// wmsWrk.setCreateTime(now);
-// wmsWrk.setAppeTime(now);
-// wmsWrk.setAppeUser(9527L);
-// wmsWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
-// wmsWrk.setIoPri(13D);//浼樺厛绾�
-// wmsWrk.setBarcode(param.getBarcode());//鏉＄爜
-// if (!Cools.isEmpty(param.getLocNo())) {
-// wmsWrk.setLocNo(param.getLocNo());//鐩爣搴撲綅
-// }
-// if (!Cools.isEmpty(param.getSourceLocNo())) {
-// wmsWrk.setSourceLocNo(param.getSourceLocNo());//婧愬簱浣�
-// }
-// if (!Cools.isEmpty(param.getStaNo())) {
-// wmsWrk.setStaNo(param.getStaNo());//鐩爣绔�
-// }
-// if (!Cools.isEmpty(param.getSourceStaNo())) {
-// wmsWrk.setSourceStaNo(param.getSourceStaNo());//婧愮珯
-// }
-// if (!Cools.isEmpty(param.getMemo())) {
-// wmsWrk.setMemo(param.getMemo());//澶囨敞
-// }
-//
-// if (!wmsWrkService.insert(wmsWrk)) {
-// throw new CoolException("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
+ public HashMap<String, Object> taskCreate(TaskCreateParam 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.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.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.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;
+ }
+
+ @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()));
+ 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