From 142c37a834945545531c034a3c8806bf12032d74 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 04 十月 2023 15:59:23 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 2 +-
src/main/resources/application.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index c14495a..2e9058e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -112,7 +112,7 @@
dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats);
break;
case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, null);
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
break;
case 103:// 鎷ｆ枡鍏ュ簱
case 104:// 骞舵澘鍏ュ簱
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4ce90f7..d07e7e6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
- url: jdbc:sqlserver://localhost:1433;databasename=tzskasrs
+ url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 25df390..3f7a714 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -97,7 +97,7 @@
</select>
<select id="selectOfPick" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where wrk_no=#{wrkNo} and wrk_sts=17 and io_type = #{ioType}
+ select top 1 * from asr_wrk_mast where wrk_no=#{wrkNo} and wrk_sts=29 and io_type = #{ioType}
</select>
<select id="selectSameMatnrs" resultMap="BaseResultMap">
--
Gitblit v1.9.1