From d3583be62b733b5701f343ae13773d8a488f4c0a Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期四, 13 七月 2023 14:26:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 4ad0aca..c2afe90 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -171,6 +171,7 @@
List<String> groupOuterSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
for (String locNo : groupOuterSingleLoc) {
//姣忎釜搴撲綅鐨勫簱浣嶆槑缁�
+ if(locs.contains(locNo)) continue;
for (LocDetl detl : locDetlService.selectByLocNo(locNo)) {
if (!detl.getMatnr().equals(locDetl.getMatnr())) {
//涓嶆槸鐩稿悓鐗╂枡
@@ -446,6 +447,7 @@
@Override
@Transactional
public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
+ Integer basDevp = staNo.getDevNo();
Date now = new Date();
// 鍚堝苟鍚岀被椤�
Set<String> locNos = new HashSet<>();
@@ -623,13 +625,27 @@
//-----------------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 (locMast.getLocType2() == 1 && locDetls.size() > 1) {
+ // //鍗曞搧鍖哄煙鍑哄簱鐗╂枡澶т簬1绉嶏紝寮哄埗鍙樻垚101鍏ㄦ澘鍑哄簱
+ // ioType = 101;
+ // if (staNo.getDevNo()==300){
+ // staNo.setDevNo(200);
+ // }
+ //}
+ if (ioType == 101) {
if (staNo.getDevNo()==300){
- staNo.setDevNo(200);
+ if(locMast.getCrnNo() == 1) {
+ staNo.setDevNo(100);
+ } else {
+ staNo.setDevNo(200);
+ }
+
}
+ } else {
+ staNo.setDevNo(basDevp);
}
+
+
}
//-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜end-----------------------
@@ -1011,9 +1027,9 @@
@Override
@Transactional
public void locCheckOut(StockOutParam param, Long userId) {
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 107)) > 0) {
- throw new CoolException("鍙兘瀛樺湪涓�绗旂洏鐐逛换鍔�");
- }
+// if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 107)) > 0) {
+// throw new CoolException("鍙兘瀛樺湪涓�绗旂洏鐐逛换鍔�");
+// }
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
--
Gitblit v1.9.1