From d6258da9eb0203cbc812689197eb3d347799a8d0 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期六, 03 六月 2023 10:28:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 e104b23..68ae5eb 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -580,17 +580,23 @@
assert ioType != null;
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
+ Integer devNo = staNo.getDevNo();
- //-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜-----------------------
+ //-----------------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鍑哄簱鍏煎浠ｇ爜end-----------------------
// 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1());
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), devNo, locMast.getRow1());
if(staDesc == null){
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
}
@@ -608,7 +614,7 @@
wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false) ? 1 : 0);
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setStaNo(devNo); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
--
Gitblit v1.9.1