From c2e921780a0989a79c211f3b02b3a99c827d9fbe Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 30 一月 2023 08:52:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index bb23fdb..d17ece8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -489,6 +489,7 @@
LocMast sourceLocMast = locMastService.selectById(sourceLocNo);
if (sourceLocMast.getLocSts().equals("P")) {
sourceLocMast.setLocSts("O");
+ sourceLocMast.setBarcode("");
sourceLocMast.setModiTime(new Date());
if (!locMastService.updateById(sourceLocMast)) {
throw new CoolException(wrkMast.getWrkNo() + "淇敼婧愬簱浣嶇姸鎬� O.绌哄簱浣�");
@@ -1045,7 +1046,13 @@
} else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
if (null == waitWrkMast) {
// 鐢熸垚涓�绗旂Щ搴撲换鍔″伐浣滄。銆佹敼鍙樻祬搴撲綅鐨勬簮搴�/鐩爣搴� 搴撲綅鐘舵��
- moveLocForDeepLoc(slave, shallowLoc);
+ // 娌℃湁浣滀笟涓殑鍑哄簱浠诲姟鏃讹紝鎵嶈兘鐢熸垚绉诲簱浠诲姟
+ WrkMast one2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("crn_no",slave.getId())
+ .last(" and wrk_sts in (12,13,14,15,16)"));
+ if(one2==null) {
+ moveLocForDeepLoc(slave, shallowLoc);
+ }
flag = true;
break;
} else {
@@ -1488,8 +1495,11 @@
if(!Cools.isEmpty(deeplocs)){
for(String deepLocNo : deeplocs) {
LocMast deepLoc = locMastService.selectById(deepLocNo);
-// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(deepLocNo);
- if(deepLoc != null && !deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("O")){
+ WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(deepLocNo);
+ if(deepLoc != null && !deepLoc.getLocSts().equals("F")
+ && !deepLoc.getLocSts().equals("D")
+ && !deepLoc.getLocSts().equals("O")
+ && (waitWrkMast!=null && waitWrkMast.getWrkSts()<17)){
News.error("绉诲簱鍐嶅洖搴撴椂锛屾繁搴撲綅缁勬繁搴撲綅鐘舵�佷负浣滀笟涓� ===>> deepLoc={},loc_sts={}", deepLoc.getLocNo(), deepLoc.getLocSts());
flag = true;
break;
--
Gitblit v1.9.1