From d514c4c031247ba2903f2eca14ac266e3a36c994 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 16 四月 2026 17:00:45 +0800
Subject: [PATCH] #空库位阈值自动出空板
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 9 +++++++--
1 files changed, 7 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 731c99c..a437a9a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -949,10 +949,10 @@
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 鍏ュ簱 + 搴撲綅杞Щ
- if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType() == 11)) {
+ if (wrkMast.getWrkSts() < 4 ) {
wrkMast.setWrkSts(4L);
WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", wrkMast.getBarcode()).eq("wrk_sts",15L));
- if (!Cools.isEmpty(wrkMast)) {
+ if (!Cools.isEmpty(wrkMast) &&(wrkMast.getIoType()==1||wrkMast.getIoType()==11||wrkMast.getIoType()==10)) {
mast.setOveMk("Y");
wrkMast.setModiTime(new Date());
wrkMastService.updateById(mast);
@@ -1503,6 +1503,10 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto locNo = commonService.getLocNo1(locMast1.getCrnNo());
+ if(Cools.isEmpty(locNo)) {
+ return R.error("娌℃湁绌哄簱浣�");
+ }
+
Date now = new Date();
// 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
Integer staNo = staDesc.getCrnStn();
@@ -1517,6 +1521,7 @@
mast.setSourceLocNo(wrkMast.getLocNo());
mast.setLocNo(locNo.getLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
mast.setModiTime(now);
+ mast.setWrkCode(workNo);
mast.setModiUser(userId);
if (!wrkMastService.insert(mast)) {
return R.error("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
--
Gitblit v1.9.1