From 1af3b14449eb33792e606185c55643bca53efbb7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 07 六月 2023 16:50:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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 68ae5eb..fbd7760 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -177,6 +177,9 @@
}
double lastCount = locDetl.getCount() - useCount;//鍓╀綑鎵�闇�鏁伴噺
double realCount = 0;//瀹為檯鎻愪緵鏁伴噺
+ if (lastCount==0){
+ continue;
+ }
if (locDetl0.getAnfme() >= lastCount) {//瀹為檯鏁伴噺澶т簬鎵�闇�鏁伴噺锛屾寜鎵�闇�鏁伴噺鎻愪緵
realCount = lastCount;
} else {
@@ -471,13 +474,16 @@
if (!locDetl.getMatnr().equals(matnr)) {
flag = true;
break;
+ }else if (ioWorkType.equals(IoWorkType.CHECK_OUT)){
+ flag = true;
+ break;
}
}
if (flag) {
//褰撳墠宸烽亾瀛樺湪涓嶅悓瑙勬牸鐨勭墿鏂欙紝闇�瑕佽繘琛�101鍏ㄦ澘鍑哄簱
// 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(101, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1());
+ StaDesc staDesc = staDescService.queryCrnStn(101, locMast.getCrnNo(), locMast.getCrnNo()==1? 100:200 , locMast.getRow1());
if(staDesc == null){
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
}
@@ -495,7 +501,7 @@
wrkMast.setOutMost(0);
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setStaNo(locMast.getCrnNo()==1? 100:200); // 鐩爣绔�
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -580,23 +586,22 @@
assert ioType != null;
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
- Integer devNo = staNo.getDevNo();
- //-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜-----------------------6.3鏇存柊
- List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo());
- if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
- //鍗曞搧鍖哄煙鍑哄簱鐗╂枡澶т簬1绉嶏紝寮哄埗鍙樻垚101鍏ㄦ澘鍑哄簱
- ioType = 101;
- if (locMast.getCrnNo()==1){
- devNo = 100;
- }else {
- devNo = 200;
+ //-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜-----------------------
+ if (ioType!=107){
+ List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo());
+ if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
+ //鍗曞搧鍖哄煙鍑哄簱鐗╂枡澶т簬1绉嶏紝寮哄埗鍙樻垚101鍏ㄦ澘鍑哄簱
+ ioType = 101;
+ if (staNo.getDevNo()==300){
+ staNo.setDevNo(200);
+ }
}
}
//-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜end-----------------------
// 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), devNo, locMast.getRow1());
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1());
if(staDesc == null){
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
}
@@ -614,7 +619,7 @@
wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false) ? 1 : 0);
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(devNo); // 鐩爣绔�
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
--
Gitblit v1.9.1