From 8ad012e177451a736391e478c955949265af08b2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 14 一月 2025 10:56:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 246a478..8604944 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -2,11 +2,17 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.param.CancelTaskParam;
+import com.zy.asrs.domain.param.CompleteTaskParam;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.core.enums.WrkIoType;
+import com.zy.core.enums.WrkStsType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.Date;
@Slf4j
@Service
@@ -14,6 +20,8 @@
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
@Autowired
private WrkLastnoService wrkLastnoService;
@@ -32,7 +40,7 @@
int eNo = wrkLastno.getENo();
workNo = workNo>=eNo ? sNo : workNo+1;
while (true) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(workNo);
if (null != wrkMast) {
workNo = workNo>=eNo ? sNo : workNo+1;
} else {
@@ -48,7 +56,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectByWorkNo(workNo)!=null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -69,4 +77,38 @@
}
}
+ public boolean completeTask(CompleteTaskParam param) {
+ Integer wrkNo = param.getWrkNo();
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ if (null == wrkMast) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ if (wrkMast.getIoType() == WrkIoType.IN.id) {
+ wrkMast.setWrkSts(WrkStsType.COMPLETE_INBOUND.sts);
+ }else if (wrkMast.getIoType() == WrkIoType.OUT.id) {
+ wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
+ } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_MOVE.id) {
+ wrkMast.setWrkSts(WrkStsType.COMPLETE_MOVE.sts);
+ } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) {
+ wrkMast.setWrkSts(WrkStsType.COMPLETE_CHARGE.sts);
+ }
+
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ return true;
+ }
+
+ public boolean cancelTask(CancelTaskParam param) {
+ Integer wrkNo = param.getWrkNo();
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ if (null == wrkMast) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ wrkMastLogService.save(wrkNo);
+ wrkMastService.deleteById(wrkNo);
+ return true;
+ }
+
}
--
Gitblit v1.9.1