From 3614fc3249b3de228000234d384e07b97c0079ec Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 11 十月 2023 16:48:03 +0800
Subject: [PATCH] 单据自动完结
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 b29f993..066d20a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -217,8 +217,8 @@
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
- //LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
- // if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
+ LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(), null);
+ if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
}
}
if (!locDetlDtos.isEmpty()) {
@@ -304,6 +304,14 @@
StaDesc staDesc = staDescService.queryCrnStn(ioType, outCrnNo, staNo.getDevNo());
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+
+ Integer stnNo = staDesc.getStnNo();//鐩爣绔�
+ Integer sourceStaNo = staDesc.getCrnStn();//婧愮珯
+ if (stnNo == 325 || stnNo == 331 || stnNo == 333 || stnNo == 339) {
+ stnNo = staDesc.getCrnStn();
+ sourceStaNo = staDesc.getStnNo();
+ }
+
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -314,8 +322,8 @@
wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13
wrkMast.setOutMost(outMost?1:0);;
wrkMast.setCrnNo(outMost?outCrnNo:locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
+ wrkMast.setStaNo(stnNo); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -382,6 +390,14 @@
StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, outCrnNo, staNo.getDevNo());
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+
+ Integer stnNo = staDesc.getStnNo();//鐩爣绔�
+ Integer sourceStaNo = staDesc.getCrnStn();//婧愮珯
+ if (stnNo == 325 || stnNo == 331 || stnNo == 333 || stnNo == 339) {
+ stnNo = staDesc.getCrnStn();
+ sourceStaNo = staDesc.getStnNo();
+ }
+
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -392,8 +408,8 @@
wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13
wrkMast.setOutMost(outMost?1:0);;
wrkMast.setCrnNo(outMost?outCrnNo:locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
+ wrkMast.setStaNo(stnNo); // 鐩爣绔�
wrkMast.setSourceLocNo(taskDto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
--
Gitblit v1.9.1