From 60f3e05910eb36f6e9f50ee0e103732c9142119e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 04 十月 2023 15:59:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 2 +-
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/resources/application.yml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 674434a..a9e5cee 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -103,7 +103,7 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
- vo.setLocType1(staProtocol.getLocType1().toString()); // 楂樹綆淇″彿
+ vo.setLocType1(staProtocol.getLocType1()==null?"-":staProtocol.getLocType1().toString()); // 楂樹綆淇″彿
}
return R.ok().add(list);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7ca377b..fc204ed 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,10 +8,10 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=tzskasrs
+ url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
username: sa
# password: Zoneyung@zy56$
- password: sa
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index eb8bad3..43806aa 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -188,7 +188,7 @@
<select id="selectPickStepByBarcode" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast
where io_type in (53,103)
- and wrk_sts in (2,3,34)
+ and wrk_sts in (2,3,34,29)
and barcode = #{barcode}
order by io_pri desc,wrk_sts desc
</select>
--
Gitblit v1.9.1