From e4e8132629c4d8d9ea3ac585b3f22793be000fa5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 17:09:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 9185303..496d6bb 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -469,13 +469,19 @@
             throw new CoolException("搴撲綅涓嶅瓨鍦�");
         }
         for (LocDetlAdjustParam.LocDetlAdjust adjust : param.getList()) {
+            if (Cools.isEmpty(adjust.getMatnr())) {
+                throw new CoolException(BaseRes.PARAM);
+            }
             LocDetl sqlParam = new LocDetl();
             sqlParam.setLocNo(locMast.getLocNo());
-            sqlParam.setMatnr(adjust.getMatNo());
+            sqlParam.setMatnr(adjust.getMatnr());
             LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
             // 淇濆瓨鏂板簱瀛樻槑缁�
             if (Cools.isEmpty(one)) {
-                MatCode matCode = matCodeService.selectById(adjust.getMatNo());
+                if (adjust.getCount() == 0){
+                    continue;
+                }
+                MatCode matCode = matCodeService.selectById(adjust.getMatnr());
                 LocDetl locDetl = new LocDetl();
                 locDetl.setLocNo(locMast.getLocNo());
                 locDetl.setMatnr(matCode.getMatNo());
@@ -483,6 +489,12 @@
                 locDetl.setAnfme(adjust.getCount()); // 鏁伴噺
                 locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
                 // todo:luxiaoao
+                locDetl.setLgnum("寰呭畾"); // 浠撳簱鍙�
+                locDetl.setTbnum(0); // 杞偍璇锋眰缂栧彿
+                locDetl.setTbpos(0); // 琛岄」鐩�
+                locDetl.setZmatid("寰呭畾"); // 鐗╂枡鏍囩ID
+                locDetl.setZpallet("寰呭畾"); // 鎵樼洏鏉$爜
+
                 locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
                 locDetl.setModiTime(new Date());
                 locDetl.setAppeUser(userId);
@@ -500,10 +512,13 @@
                             throw new CoolException("娓呴櫎搴撳瓨鏄庣粏澶辫触");
                         }
                     } else {
-                        one.setAnfme(adjust.getCount());
-                        one.setModiTime(new Date());
-                        one.setModiUser(userId);
-                        if (!locDetlService.updateById(one)) {
+                        LocDetl sqlParam1 = new LocDetl();
+                        sqlParam1.setAnfme(adjust.getCount());
+                        sqlParam1.setModiTime(new Date());
+                        sqlParam1.setModiUser(userId);
+                        if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
+                                .eq("loc_no", locMast.getLocNo())
+                                .eq("matnr", adjust.getMatnr()))) {
                             throw new CoolException("淇敼搴撳瓨鏄庣粏澶辫触");
                         }
                     }

--
Gitblit v1.9.1