From aa2ef2ef37c7d95cfb1d3833a023328d05ea5060 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 15:06:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 24e4e2d..1e23c30 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -154,7 +154,7 @@
LocTypeDto locTypeDto = new LocTypeDto();
locTypeDto.setLocType1((short)1);
- StartupDto dto = commonService.getLocNo(1, 1, 145, matnr,null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, 1, param.getSouSta(), matnr,null,null, locTypeDto);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -226,8 +226,8 @@
}
Order order = orderService.selectByNo(param.getOrderNo());
- if (Cools.isEmpty(order)){
- throw new CoolException("鏈煡璇㈠埌姝よ鍗曪紝鍗曞彿锛�"+param.getOrderNo());
+ if (Cools.isEmpty(order) || order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈燂紝鍗曞彿锛�"+param.getOrderNo());
}
DocType docType = docTypeService.selectById(order.getDocType());
if (Cools.isEmpty(docType) || !docType.getDocName().equals("閫�璐у叆搴撳崟")){
@@ -252,6 +252,9 @@
if (!orderBoxNoList.contains(matList.getBatch())){
throw new CoolException("鍗曞彿锛�"+param.getOrderNo()+" 绠卞彿锛�"+matList.getBatch()+"涓嶅睘浜庢璁㈠崟鎴栬�呭凡缁忓叆搴�");
}else {
+// if (matList.getAnfme() > orderDetls.get(0).getAnfme()) {
+// throw new CoolException("绠卞彿锛�"+orderDetls.get(0).getBatch() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+// }
matListBoxNoList.add(matList.getBoxNo());
}
}
@@ -273,6 +276,7 @@
matnr = mat.getMatnr();
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
+ waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
waitPakin.setModel(orderDetl.getModel()); //鎵规
waitPakin.setSpecs(orderDetl.getSpecs()); //瑙勬牸
waitPakin.setBatch(orderDetl.getBatch()); //鏈ㄧ缂栫爜
@@ -328,6 +332,7 @@
waitPakins.forEach(waitPakin -> {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
+ wrkDetl.setOrderNo(order.getOrderNo());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
@@ -348,6 +353,11 @@
} else {
throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), orderDetls.get(0).getMatnr(), orderDetls.get(0).getBatch(), orderDetls.get(0).getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
+ orderService.updateSettle(order.getId(), 2L, userId);
}
@Override
@Transactional
--
Gitblit v1.9.1