From c825d67d652cc9fe3f476bab4da9fa6d1b709da7 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期三, 02 十一月 2022 12:45:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 10 +++++-----
1 files changed, 5 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 209a99c..f7bfdc8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -192,9 +192,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()+"鐩樼偣璁板綍锛�";
@@ -203,16 +203,16 @@
adjDetl.setAppeUser(userId);
adjDetl.setModiTime(new Date());
adjDetl.setModiUser(userId);
- adjDetl.setLocNo(wrkMast.getLocNo());
+ adjDetl.setLocNo(wrkMast.getSourceLocNo());
CheckRecord checkRecord=new CheckRecord();
- checkRecord.setLocNo(wrkMast.getLocNo());
+ checkRecord.setLocNo(wrkMast.getSourceLocNo());
checkRecord.setBarcode(param.getBarcode());
checkRecord.setCreateTime(new Date());
for (WrkDetl wrkDetl:wrkDetls){
WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
.eq("wrk_no", wrkMast.getWrkNo())
.eq("matnr",wrkDetl.getMatnr())
- .eq("batch",wrkDetl.getBatch())
+// .eq("batch",wrkDetl.getBatch())
);
adjDetl.setMatnr(wrkDetl.getMatnr());
adjDetl.setBatch(wrkDetl.getBatch());
--
Gitblit v1.9.1