From b0752dae29c4eadb96480d4c884c5badb9a66fb5 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 03 三月 2026 15:48:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index d922141..0fa9b07 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -103,6 +103,7 @@
@Resource
private BasAgvWrkDetlService basAgvWrkDetlService;
+ private OpenService openService;
@Override
@Transactional
@@ -990,7 +991,8 @@
@Override
@Transactional
public void completeWrkMast(String workNo, Long userId) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sheet_no",workNo));
+ Integer ioType = 0;
if (Cools.isEmpty(wrkMast)){
throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
}
@@ -1000,9 +1002,15 @@
// 鍏ュ簱 + 搴撲綅杞Щ
if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
wrkMast.setWrkSts(4L);
+ if(wrkMast.getIoType() == 11){
+ ioType = 2;
+ }else{
+ ioType = 3;
+ }
// 鍑哄簱
} else if (wrkMast.getWrkSts() > 10) {
wrkMast.setWrkSts(14L);
+ ioType = 1;
}
Date now = new Date();
wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
@@ -1241,7 +1249,7 @@
@Transactional
public void cancelWrkMast(String workNo, Long userId) {
Date now = new Date();
- WrkMast wrkMast = wrkMastService.selectById(workNo);
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sheet_no",workNo));
if (Cools.isEmpty(wrkMast)){
throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
}
--
Gitblit v1.9.1