From 783e18db68ed1efcf14a0a2852dbf53ad4ae4c9f Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期四, 05 一月 2023 14:48:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 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 6df1451..b9b9617 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
@@ -98,6 +100,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 +200,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 +220,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