From 74fd6eb7fb0322078f7946f51073f20e90231df1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 01 四月 2025 11:54:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6f13a62..1d2bc1f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -137,7 +137,7 @@
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
}
- if (Cools.isEmpty(batch)) { //绠卞彿
+ if (Cools.isEmpty(batch)) { //鎵规
batch = "";
}
if (Cools.isEmpty(grade)) { //澶囩敤
@@ -182,8 +182,10 @@
nearRow = locNecessaryParameters[3];
if (crnNo>5 || crnNo<3){
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
- int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
+ int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100).ne("source_sta_no",100).and().ne("source_sta_no",148));
if (locMasts.size()-crnCountO<=2){
+ log.error(crnNo+"鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ nearRow = 0;
times++;
continue;
}
@@ -194,7 +196,8 @@
}
}
if (nearRow == 0) {
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満,鏃犲彲鐢ㄧ┖搴撲綅");
}
boolean signRule1 = false;
--
Gitblit v1.9.1