From 078850a49800c715eedb9da3df405331300c4339 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 30 一月 2023 11:53:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 6df1451..595dc84 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: 涓嶄笅绾块噸鏂板叆搴�
@@ -98,6 +104,12 @@
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo());
+
+// 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;
@@ -192,9 +204,9 @@
throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鏃犳湁鏁堝伐浣滄。");
}else if (wrkMast.getIoType()!=107){
throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鎵�灞炲伐浣滄。闈炵洏鐐逛换鍔�");
- }/*else if (barcode.getWrkSts()!=17){
+ }else if (wrkMast.getWrkSts()!=17.0){
throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鎵�灞炲伐浣滄。宸ヤ綔鐘舵�佷笉鏄嚭搴撳畬鎴�");
- }*/else { }
+ }else { }
List<WrkDetl> wrkDetls = param.getWrkDetls();
String recordRecordLog="鎵樼洏鐮�"+param.getBarcode()+"鐩樼偣璁板綍锛�";
@@ -212,8 +224,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