From 17dfda3a88e556fa9416f4597153495110aa2aa8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 30 一月 2023 16:55:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 ea1afea..2964fb0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -67,6 +67,8 @@
private AdjDetlService adjDetlService;
@Autowired
private CheckRecordService checkRecordService;
+ @Autowired
+ private LocDetlService locDetlService;
@Override
@Transactional
@@ -75,9 +77,13 @@
throw new CoolException(BaseRes.PARAM);
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+// eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+// throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+// }
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ eq("zpallet", param.getBarcode())) > 0) {
+ throw new CoolException(param.getBarcode() + "缁勬墭鏁版嵁宸插瓨鍦�");
}
// todo: 涓嶄笅绾块噸鏂板叆搴�
@@ -97,7 +103,13 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr());
+
+// if (Cools.isEmpty(detlDto.getBatch())){
+// String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
+// detlDto.setBatch(batch);
+// }
+
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -126,6 +138,7 @@
waitPakin.setModiTime(now);
waitPakin.setMemo(detlDto.getMemo());
waitPakin.setFrozen(param.getFrozen()); // 鏄惁鍐荤粨
+ waitPakin.setManu(detlDto.getCstmr());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -212,8 +225,14 @@
WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
.eq("wrk_no", wrkMast.getWrkNo())
.eq("matnr",wrkDetl.getMatnr())
- .eq("batch",wrkDetl.getBatch())
+// .eq("batch",Cools.isEmpty(wrkDetl.getBatch())?"":wrkDetl.getBatch())
);
+// LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+// .eq("loc_no", wrkMast.getLocNo())
+// .eq("matnr",wrkDetl.getMatnr())
+// .eq("batch",wrkDetl.getBatch())
+// );
+
adjDetl.setMatnr(wrkDetl.getMatnr());
adjDetl.setBatch(wrkDetl.getBatch());
adjDetl.setAdjQty(wrkDetl.getAnfme());
--
Gitblit v1.9.1