From f9129a94e2b579cbfc70086458f4b05096e26677 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 28 七月 2025 10:12:22 +0800
Subject: [PATCH] 修复工作明细历史搜索条件精确匹配，字段映射
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 6925ad8..c99303c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -340,7 +340,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setIoPri(staDesc.getStnNo() == 1064 ? 14D: 13D); // 绌烘《鍑哄簱鍒颁簩鍙风綈瑁呯嚎浼樺厛绾ф彁楂�
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -741,7 +741,7 @@
throw new CoolException(locDetl.getLocNo() + "," + locDetl.getMatnr() + "," + locDetl.getBatch() + "搴撳瓨鏄庣粏宸茶鍐荤粨!");
}
- if (!loc.getLocSts().equals("O") || (!sourceLoc.getLocSts().equals("F") && !sourceLoc.getLocSts().equals("D"))){
+ if (!loc.getLocSts().equals("O") || (!sourceLoc.getLocSts().equals("F") && !sourceLoc.getLocSts().equals("M") && !sourceLoc.getLocSts().equals("Z"))){
throw new CoolException("搴撲綅鐘舵�佸凡鏀瑰彉");
}
if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
@@ -763,7 +763,7 @@
wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
+ wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("M") ? "M" : sourceLoc.getLocSts().equals("Z") ? "Z" : "N"); // 绌烘澘
wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
wrkMast.setAppeUser(userId);
@@ -790,7 +790,7 @@
}
}
// 淇敼婧愬簱浣嶇姸鎬�
- if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
+ if (sourceLoc.getLocSts().equals("F") || sourceLoc.getLocSts().equals("M") || sourceLoc.getLocSts().equals("Z")) {
sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
sourceLoc.setModiUser(userId);
sourceLoc.setModiTime(now);
@@ -841,6 +841,9 @@
wrkMast.setWrkSts(14L);
}
workNoOther = wrkMast.getWorkNoOther();
+ } else if(wrkMast.getIoType() == 1 && wrkMast.getWrkSts() == 10) {
+ wrkMast.setWrkSts(2L);
+ wrkMast.setRgvFinishTime(new Date());
}
Date now = new Date();
wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
@@ -854,13 +857,15 @@
}
if(workNoOther != 0) {
WrkMast wrkMast1 = wrkMastService.selectById(workNoOther);
- wrkMast1.setWrkSts(wrkMast.getWrkSts());
- wrkMast1.setCrnStrTime(wrkMast.getCrnStrTime());
- wrkMast1.setCrnEndTime(now);
- wrkMast1.setModiTime(now);
- wrkMast1.setModiUser(userId);
- wrkMast1.setManuType("鎵嬪姩瀹屾垚");
- wrkMastService.updateById(wrkMast1);
+ if (wrkMast1 != null) {
+ wrkMast1.setWrkSts(wrkMast.getWrkSts());
+ wrkMast1.setCrnStrTime(wrkMast.getCrnStrTime());
+ wrkMast1.setCrnEndTime(now);
+ wrkMast1.setModiTime(now);
+ wrkMast1.setModiUser(userId);
+ wrkMast1.setManuType("鎵嬪姩瀹屾垚");
+ wrkMastService.updateById(wrkMast1);
+ }
}
}
--
Gitblit v1.9.1