From cdc3c47f2e61fd20c1a71b2cd1eeb9a58c570b70 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 14 二月 2023 13:23:07 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b6c260c..a94b6b1 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -219,8 +219,8 @@
                     }
                 }
             }
-            // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� todo:luxiaotao
-            if (!locMastService.checkEmptyCount(locMast)) {
+            // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+            if (!locMastService.checkEmptyCount(locMast, 10)) {
                 locMast = null;
             }
         }
@@ -235,10 +235,10 @@
                 times = 0;
             }
             // 璐х墿妫�绱綆搴撲綅浠撳け璐ワ紝鍏煎楂樺簱浣嶄粨鍚庣户缁墽琛�
-            if (locTypeDto.getLocType1() == 1) {
-                locTypeDto.setLocType1((short) 2);
-                return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
-            }
+//            if (locTypeDto.getLocType1() == 1) {
+//                locTypeDto.setLocType1((short) 2);
+//                return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
+//            }
             log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
             throw new CoolException("娌℃湁绌哄簱浣�");
         }

--
Gitblit v1.9.1