From 2aaba3dde3a1c91628488221ac18ea501bb42c33 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 17 Apr 2025 17:16:19 +0800
Subject: [PATCH] =?UTF-8?q?wms=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OdsProcureOutOrderServiceImpl.java   |   2 +-
 .../mapper/wms/OdsProcureOrderMapper.xml      | 106 +++++++++---------
 2 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java
index 1c6732237..063e4bb7f 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java
@@ -342,7 +342,7 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
                 order.setPlanNumber(amount);
                 order.setLocCode(wmsOdsMateStorageNewsSn.getWaCode());//库区
                 order.setID(IdUtils.fastSimpleUUID());
-                order.setUnit(wmsOdsMateStorageNewsSn.getUserDefined1());
+                order.setUnit("PC");
                 order.setFactoryCode(factoryCode);
                 order.setActive("1");
                 order.setCreateBy(createBy);
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 02138b6c4..4bda5db5d 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
@@ -86,7 +86,7 @@
             bpa.wa_code waCode
         FROM
             ods_procure_order opo
-            LEFT JOIN base_product_attached bpa on RIGHT ( opo.Material_Code, 11 ) = bpa.product_code
+                LEFT JOIN base_product_attached bpa on RIGHT ( opo.Material_Code, 11 ) = bpa.product_code
     </sql>
 
     <select id="selectOdsProcureOrderList" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
@@ -174,7 +174,7 @@
     </select>
     <select id="selectOdsProcureOrderByID" parameterType="String" resultMap="OdsProcureOrderResult">
         <include refid="selectOdsProcureOrderVo"/>
-        where ID = #{ID}
+        where opo.ID = #{ID}
     </select>
     <select id="selectWMSOdsProcureReturnOrderByID" parameterType="String" resultMap="OdsProcureOrderResult">
         SELECT	DISTINCT
@@ -216,8 +216,8 @@
     </select>
     <select id="selectOdsProcureOrderByIDAndSap" parameterType="String" resultMap="OdsProcureOrderResult">
         <include refid="selectOdsProcureOrderVo"/>
-        where ID = #{ID}
-        and       ( Sap_Temp_Status!='1'	OR	Sap_Temp_Status	is	NULL)
+        where opo.ID = #{ID}
+        and       ( opo.Sap_Temp_Status!='1'	OR	opo.Sap_Temp_Status	is	NULL)
     </select>
     <insert id="insertOdsProcureOrder" parameterType="OdsProcureOrder">
         insert into ods_procure_order
@@ -331,8 +331,8 @@
     </update>
 
     <delete id="deleteOdsProcureOrderByID" parameterType="String">
-		delete from ods_procure_order where ID = #{ID}
-	</delete>
+        delete from ods_procure_order where ID = #{ID}
+    </delete>
 
     <delete id="deleteOdsProcureOrderByIDs" parameterType="String">
         delete from ods_procure_order where ID in
@@ -341,15 +341,15 @@
         </foreach>
     </delete>
     <update id="updateRealityNuById" parameterType="OdsProcureOrder">
-		update ods_procure_order
-		SET Reality_Number = COALESCE(Reality_Number, 0) + #{planNumber},
-			Order_Status=#{orderStatus}
-		where  ID = #{ID}
+        update ods_procure_order
+        SET Reality_Number = COALESCE(Reality_Number, 0) + #{planNumber},
+            Order_Status=#{orderStatus}
+        where  ID = #{ID}
 
-	</update>
+    </update>
     <select id="selectBaseSupplier" resultType="java.lang.String">
-		SELECT	DISTINCT	zh_desc	FROM	base_supplier	WHERE	supplier_code= #{supplierCode}
-	</select>
+        SELECT	DISTINCT	zh_desc	FROM	base_supplier	WHERE	supplier_code= #{supplierCode}
+    </select>
     <select id="selectOdsProcureOrderAlreadyList"   parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
         <include refid="selectOdsProcureOrderVo"/>
         <![CDATA[  where   Procure_Code = #{procureCode}  and Active='1'   AND Order_Status <> 0 ]]>
@@ -419,7 +419,7 @@
             ods_procure_order_card
         where Procure_Code=#{procureCode}   and  User_Defined3= #{userDefined3}  and User_Defined8= #{userDefined8}  and User_Defined11= #{userDefined11}   and  User_Defined7= #{userDefined7}
           and   User_Defined4=#{ID}
-          ORDER BY  CAST(card_num AS INT)
+        ORDER BY  CAST(card_num AS INT)
     </select>
     <select id="getIdCardListTH"  parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
         SELECT
@@ -640,7 +640,7 @@
             card.User_Defined1
         FROM
             ods_procure_order_card card
-             WHERE
+        WHERE
             card.User_Defined1= #{userDefined1}
     </select>
     <select id="selectOdsProcureOrderCardTLTWO"      resultMap="OdsProcureOrderResult">
@@ -662,43 +662,43 @@
             card.Procure_Code= #{procureCode}
     </select>
     <select id="selectOdsProcureOrderList1" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
-            SELECT
-                o.Site_code,
-                o.ID,
-                o.Procure_Code,
-                o.Material_Code,
-                o.Material_Desc,
-                o.Plan_Date,
-                o.Plan_Number,
-                o.Unit,
-                COALESCE ( Reality_Number, 0 ) Reality_Number,
-                o.Order_Status,
-                o.User_Defined1,
-                o.User_Defined2,
-                o.User_Defined3,
-                o.User_Defined4,
-                o.User_Defined5,
-                o.User_Defined6,
-                o.User_Defined7,
-                o.User_Defined8,
-                o.User_Defined9,
-                o.User_Defined10,
-                o.User_Defined11,
-                o.Supplier_Code,
-                o.Supplier_Name,
-                o.Remark,
-                o.Create_By,
-                o.Create_Date,
-                o.Last_Update_By,
-                o.Last_Update_Date,
-                o.Active,
-                o.Enterprise_Id,
-                o.Sap_Temp_Infor,
-                o.Enterprise_Code,
-                base_product_attached.pallet_num, COALESCE ( Operation_Number, 0 ) Operation_Number
-            FROM
-                ods_procure_order as o LEFT JOIN base_product_attached
-                                                 on o.Material_Code = '0000000'+base_product_attached.product_code
+        SELECT
+        o.Site_code,
+        o.ID,
+        o.Procure_Code,
+        o.Material_Code,
+        o.Material_Desc,
+        o.Plan_Date,
+        o.Plan_Number,
+        o.Unit,
+        COALESCE ( Reality_Number, 0 ) Reality_Number,
+        o.Order_Status,
+        o.User_Defined1,
+        o.User_Defined2,
+        o.User_Defined3,
+        o.User_Defined4,
+        o.User_Defined5,
+        o.User_Defined6,
+        o.User_Defined7,
+        o.User_Defined8,
+        o.User_Defined9,
+        o.User_Defined10,
+        o.User_Defined11,
+        o.Supplier_Code,
+        o.Supplier_Name,
+        o.Remark,
+        o.Create_By,
+        o.Create_Date,
+        o.Last_Update_By,
+        o.Last_Update_Date,
+        o.Active,
+        o.Enterprise_Id,
+        o.Sap_Temp_Infor,
+        o.Enterprise_Code,
+        base_product_attached.pallet_num, COALESCE ( Operation_Number, 0 ) Operation_Number
+        FROM
+        ods_procure_order as o LEFT JOIN base_product_attached
+        on o.Material_Code = '0000000'+base_product_attached.product_code
         <where>
             <if test="siteCode != null  and siteCode != ''">and o.Site_code = #{siteCode}</if>
             <if test="ID != null  and ID != ''">and o.ID = #{ID}</if>
@@ -794,7 +794,7 @@
             ods_procure_order_card
                 LEFT JOIN ods_procure_order ON ods_procure_order_card.User_Defined4= ods_procure_order.ID
         WHERE
-                ods_procure_order_card.User_Defined1= #{userDefined6}
+            ods_procure_order_card.User_Defined1= #{userDefined6}
 
     </select>
     <select id="getIdCardByIdList"  parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">