From ee405b2816b47cd7bd637fd19bef473db6c0bd9b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 六月 2020 09:49:11 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 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 0f5e587..0f62468 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -123,13 +123,13 @@
         BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
         // 鑾峰彇搴撲綅鏄庣粏
         List<LocDetlDto> locDetlDtos = new ArrayList<>();
-        for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
-            if (!Cools.isEmpty(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getCount())) {
+        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
+            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                 LocDetl sqlParam = new LocDetl();
-                sqlParam.setLocNo(locDetl.getLocNo());
-                sqlParam.setMatnr(locDetl.getMatnr());
+                sqlParam.setLocNo(paramLocDetl.getLocNo());
+                sqlParam.setMatnr(paramLocDetl.getMatnr());
                 LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
-                if (null != one) locDetlDtos.add(new LocDetlDto(one, locDetl.getCount()));
+                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
             }
         }
         if (!locDetlDtos.isEmpty()) {
@@ -199,6 +199,7 @@
             }
             // 鐢熸垚宸ヤ綔妗f槑缁�
             for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
+                // 鍑哄簱鏃讹紝鏁伴噺涓�0鐨勭洿鎺ュ拷鐣�
                 if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
                 WrkDetl wrkDetl = new WrkDetl();
                 wrkDetl.setWrkNo(workNo);
@@ -361,13 +362,13 @@
         BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
         // 鑾峰彇搴撲綅鏄庣粏
         List<LocDetlDto> locDetlDtos = new ArrayList<>();
-        for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
-            if (!Cools.isEmpty(locDetl.getLocNo(), locDetl.getMatnr())) {
+        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
+            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr())) {
                 LocDetl sqlParam = new LocDetl();
-                sqlParam.setLocNo(locDetl.getLocNo());
-                sqlParam.setMatnr(locDetl.getMatnr());
+                sqlParam.setLocNo(paramLocDetl.getLocNo());
+                sqlParam.setMatnr(paramLocDetl.getMatnr());
                 LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
-                if (null != one) locDetlDtos.add(new LocDetlDto(one, locDetl.getCount()));
+                if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getAnfme()));
             }
         }
         if (!locDetlDtos.isEmpty()) {
@@ -449,7 +450,7 @@
                 throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
             }
         } else {
-            throw new CoolException("棰勭害婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLoc.getLocType$());
+            throw new CoolException("婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLoc.getLocType$());
         }
         // 淇敼鐩爣搴撲綅鐘舵��
         if (loc.getLocType().equals("O")) {

--
Gitblit v1.9.1