From af17595ea094b162d3b90279f140cbdb3da1c52b Mon Sep 17 00:00:00 2001
From: zwl <zwl123>
Date: 星期六, 07 十月 2023 15:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxlktasrs' into sxlktasrs

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

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 0423184..9aa21cb 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -105,6 +105,7 @@
         } else if (sourceStaNo > 299){
             whsType = 3;
         }
+
         // 鐩爣鍫嗗灈鏈哄彿
         int crnNo = whsType;
         if (!basCrnpService.checkSiteError(crnNo, true)){
@@ -246,6 +247,7 @@
             log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
             throw new CoolException("娌℃湁绌哄簱浣�");
         }
+
         String locNo = locMast.getLocNo();
 
         // 鐢熸垚宸ヤ綔鍙�

--
Gitblit v1.9.1