From e70242e539c786b612698711d20ee9a1c367911d Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 26 十二月 2022 21:48:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 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 209a99c..4a11986 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
@@ -192,9 +194,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,9 +205,9 @@
         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){
@@ -214,6 +216,12 @@
                     .eq("matnr",wrkDetl.getMatnr())
                     .eq("batch",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