From ed9146112d95e2d89dc775eed7f36e6bad43efd6 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Fri, 29 Nov 2024 11:06:21 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=A0=87=E8=AF=86=E5=8D=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/wms/controller/WmsToWCSmissionController.java  | 2 +-
 .../src/main/resources/mapper/wms/OdsProcureOrderMapper.xml    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
index 171f75f9..d1e43ca4 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
@@ -273,7 +273,7 @@ public class WmsToWCSmissionController {
     public AjaxResult SweepMaterialCardSC(@RequestBody WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn) {
         WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn1 = odsProcureOrderService.SweepMaterialCardSC(wmsOdsMateStorageNewsSn);
         if(wmsOdsMateStorageNewsSn1==null){
-            return error("库存没有这个标识卡");
+            return error("仓库没有这个标识卡");
         }
         if (wmsOdsMateStorageNewsSn1.getUserDefined3().equals("0")){//userDefined3
             return error("未105过账");
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
index 3ea4e690..7e605d64 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
@@ -45,6 +45,8 @@
         <result property="waCode" column="waCode"/>
         <result property="factoryCode" column="factoryCode"/>
         <result property="SapTempInfor" column="Sap_Temp_Infor"/>
+        <result property="temNumber" column="tem_number"/>
+
     </resultMap>
 
     <sql id="selectOdsProcureOrderVo">
@@ -865,6 +867,7 @@
             ods_procure_order_card.Active,
             ods_procure_order_card.Enterprise_Id,
             ods_procure_order_card.Enterprise_Code,
+            ods_procure_order_card.tem_number,
             ods_procure_order.user_defined5	User_Defined5,
             COALESCE ( ods_procure_order_card.Operation_Number, 0 ) Operation_Number
         FROM