From c45f2e980ff53c2e0d8a0a05480d347132a6cd3c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 29 八月 2025 16:06:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 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 17b0c6b..46e6205 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -340,17 +340,12 @@
// 鑾峰彇璺緞
List<StaDesc> staDescs = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
StaDesc staDesc = staDescs.get(0);
+ Integer crnStn = staDesc.getCrnStn();
if (locMast.getCrnNo() == 1) {
- int finalCrnStn = 1016;
if (locMast.getRow1() <= 3) {
- finalCrnStn = 1013;
- }
-
- for (StaDesc desc : staDescs) {
- if (desc.getCrnStn() == finalCrnStn) {
- staDesc = desc;
- break;
- }
+ crnStn = 1013;
+ }else {
+ crnStn = 1016;
}
}
@@ -378,7 +373,7 @@
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setSourceStaNo(crnStn); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -406,7 +401,9 @@
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(now);
Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
+ Double weight = MatUtils.calcWeight(detlDto.getLocDetl().getMatnr(), anfme);
wrkDetl.setAnfme(anfme); // 鏁伴噺
+ wrkDetl.setWeight(weight);
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
@@ -468,7 +465,16 @@
String orderNo = taskDto.getLocDtos().get(0).getOrderNo();
OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);
int ioType = orderPakout.getDocType() == 8 ? 107 : (taskDto.isAll() ? 101 : 103);
- StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
+ StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo(),locMast.getRow1());
+ Integer crnStn = staDesc.getCrnStn();
+ if (locMast.getCrnNo() == 1) {
+ if (locMast.getRow1() <= 3) {
+ crnStn = 1013;
+ }else {
+ crnStn = 1016;
+ }
+ }
+
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
@@ -479,7 +485,7 @@
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setSourceStaNo(crnStn); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(taskDto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -504,9 +510,11 @@
OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()
, locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());
if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null, locDto.getBrand()
- , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());
-
+ orderDetlPakout = orderDetlPakoutService.selectOne(new EntityWrapper<OrderDetlPakout>()
+ .eq("order_no", locDto.getOrderNo())
+ .eq("matnr", locDto.getMatnr())
+ .eq("standby1", locDto.getStandby1())
+ );
}
Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
@@ -538,6 +546,7 @@
wrkDetl.setStockNum(locDetl.getAnfme());//搴撳瓨
wrkDetl.setStockNum2(locDetl.getWeight());//杈呭簱瀛�
wrkDetl.setKpCstmrName(orderPakout.getKpCstmrName());
+ wrkDetl.setCstateid(locDetl.getCstateid());
//璁＄畻杈呮暟閲�
Double weight = MatUtils.calcWeight(wrkDetl.getMatnr(), wrkDetl.getAnfme());
@@ -665,6 +674,14 @@
if (Cools.isEmpty(sourceStaNo)) {
throw new CoolException("妫�绱㈡簮绔欏け璐�");
}
+ if (locMast.getCrnNo() == 1) {
+ if (locMast.getRow1() <= 3) {
+ sourceStaNo = 1013;
+ }else {
+ sourceStaNo = 1016;
+ }
+ }
+
Date now = new Date();
// 淇濆瓨宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -727,6 +744,14 @@
if (Cools.isEmpty(sourceStaNo)) {
throw new CoolException("妫�绱㈡簮绔欏け璐�");
}
+ if (locMast.getCrnNo() == 1) {
+ if (locMast.getRow1() <= 3) {
+ sourceStaNo = 1013;
+ }else {
+ sourceStaNo = 1016;
+ }
+ }
+
Date now = new Date();
// 淇濆瓨宸ヤ綔妗�
--
Gitblit v1.9.1