From cfc0e582c5ec110ae4b2b3e1a5ad36d013876c66 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期六, 10 六月 2023 14:02:30 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocMastMapper.xml | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 15 +++++----------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 964c038..823a720 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -140,7 +140,7 @@
end = 21;
//203绔欏垎閰�2锛�3鍫嗗灈鏈�
- crnNos.add(2);
+// crnNos.add(2);
crnNos.add(3);
//鍒嗛厤8锛�14锛�15锛�21鎺�
@@ -217,7 +217,7 @@
if (!sign){
//----------------2023.06.02鍏煎浠ｇ爜锛屽悗鏈熷簱浣嶈鍒欑鍚堣姹傚悗鍙垹闄�------------------------
- //濡傛灉浠ヤ笂閮芥壘涓嶅埌搴撲綅锛屽垯寮哄埗鎼滅储1銆�2鍫嗗灈鏈虹┖搴撲綅杩涜鍏ュ簱锛屼繚闅�3鍙峰爢鍨涙満搴撲綅閮芥槸绗﹀悎瑕佹眰鐨�
+ //濡傛灉浠ヤ笂閮芥壘涓嶅埌搴撲綅锛屽垯寮哄埗鎼滅储2鍫嗗灈鏈虹┖搴撲綅杩涜鍏ュ簱锛屼繚闅�3鍙峰爢鍨涙満搴撲綅閮芥槸绗﹀悎瑕佹眰鐨�
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
wrapper.eq("loc_type1", locTypeDto.getLocType1());
wrapper.in("crn_no", "2");
@@ -229,14 +229,9 @@
//鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
continue;
}
- if(sourceStaNo==103 && mast.getRow1()>7)
- {
- continue;
- }
- if(sourceStaNo==203 && mast.getRow1()<8)
- {
- continue;
- }
+ if(sourceStaNo==103 && mast.getRow1()>14) continue;
+ if(sourceStaNo==103 && mast.getRow1()<8) continue;
+ if(sourceStaNo==203 && mast.getRow1()<15) continue;
//鎵惧埌搴撲綅锛岃繑鍥瀌to
locMast=mast;
sign = true;
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index e464b67..e71c79e 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -317,7 +317,7 @@
#{item}
</foreach>
and loc_sts = 'O'
- <if test="crnNo != null || crnNo != ''">
+ <if test="crnNo != null and crnNo != ''">
and crn_no = #{crnNo}
</if>
order by bay1,lev1,row1
--
Gitblit v1.9.1