Merge remote-tracking branch 'origin/master'

10 months ago · a3bff82c1c
parent 7a9d2dd4ae 4e519ae69d
commit a3bff82c1c
1 changed files with 2 additions and 2 deletions
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
@ -75,9 +75,9 @@
            Active,
            Enterprise_Id,
            Enterprise_Code,
-            base_product_attached.pallet_num, COALESCE ( Operation_Number, 0 ) Operation_Number
+            COALESCE ( Operation_Number, 0 ) Operation_Number
        FROM
-            ods_procure_orde</sql>
+            ods_procure_order</sql>
    <select id="selectOdsProcureOrderList" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
        <include refid="selectOdsProcureOrderVo"/>