From 19c13db8d30d1c2aeb9250ed218c110e1290d05f Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 08 二月 2022 16:37:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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 a8c9883..998769d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -652,6 +652,7 @@
             LocDetl sqlParam = new LocDetl();
             sqlParam.setLocNo(locMast.getLocNo());
             sqlParam.setMatNo(adjust.getMatNo());
+            sqlParam.setSupplier(adjust.getSupplier());
             LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
             // 淇濆瓨鏂板簱瀛樻槑缁�
             if (Cools.isEmpty(one)) {
@@ -663,6 +664,15 @@
                 locDetl.setLocNo(locMast.getLocNo());
                 locDetl.setQty(adjust.getCount()); // 鏁伴噺
                 VersionUtils.setLocDetl(locDetl, matCode); // 鐗堟湰鎺у埗
+
+                if (Cools.isEmpty(adjust.getSupplier())){
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+                    locDetl.setSupplier(sdf.format(new Date()));
+                }else {
+                    locDetl.setSupplier(adjust.getSupplier());
+                }
+
+
                 locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
                 locDetl.setModiTime(new Date());
                 locDetl.setAppeUser(userId);
@@ -690,11 +700,13 @@
                     } else {
                         LocDetl sqlParam1 = new LocDetl();
                         sqlParam1.setQty(adjust.getCount());
+                        sqlParam1.setSupplier(adjust.getSupplier());
                         sqlParam1.setModiTime(new Date());
                         sqlParam1.setModiUser(userId);
                         if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
                                 .eq("loc_no", locMast.getLocNo())
-                                .eq("mat_no", adjust.getMatNo()))) {
+                                .eq("mat_no", adjust.getMatNo())
+                                .eq("supplier",adjust.getSupplier()))) {
                             throw new CoolException("淇敼搴撳瓨鏄庣粏澶辫触");
                         }
                     }

--
Gitblit v1.9.1