From d96ec5757e91204bc348757226299400012da2e0 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 04 十月 2023 20:29:05 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d7f2974..ca975c4 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -111,7 +111,7 @@
dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins);
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/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