From b0951eba94a2e22db9783aed934874ce4736f008 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 18:32:31 +0800
Subject: [PATCH] #v2.0
---
src/main/java/com/zy/common/service/CommonService.java | 2 +-
src/main/resources/mapper/BasDevpMapper.xml | 4 ++--
src/main/resources/application.yml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bcc0107..8f9dec7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -162,7 +162,7 @@
}
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
int inQty = staNo.getInQty()==null?0:staNo.getInQty();
- if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) {
+ if (staNo.getAutoing().equals("Y") && inQty<2) {
// 鏌ユ壘搴撲綅
if (locMast == null) {
locMast = locMastService.queryFreeLocMast(curRow);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b3733e9..d27d9a4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,7 +16,7 @@
# password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=gdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index b00be22..4f6e131 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -51,7 +51,7 @@
left join asr_sta_desc asd on abd.dev_no = asd.stn_no
where 1=1
and asd.type_no = #{typeNo}
- and abd.in_enable = 'Y'
+ -- and abd.in_enable = 'Y'
group by abd.dev_no
</select>
@@ -62,7 +62,7 @@
left join asr_sta_desc asd on abd.dev_no = asd.stn_no
where 1=1
and asd.type_no = #{typeNo}
- and abd.out_enable = 'Y'
+ -- and abd.out_enable = 'Y'
group by abd.dev_no
</select>
--
Gitblit v1.9.1