Merge remote-tracking branch 'origin/master'

1 month ago · 54faba0e0f
parent 226c432a5c bba11a3338
commit 54faba0e0f
1 changed files with 2 additions and 1 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
@ -899,7 +899,8 @@
            ods_procure_order_card
                LEFT JOIN ods_procure_order ON  ods_procure_order.ID = TRY_CAST(ods_procure_order_card.User_Defined4 AS INT)
        WHERE	ods_procure_order.user_defined5=#{userDefined5}
-          AND	ods_procure_order_card.User_Defined10='0'
+          AND (ods_procure_order_card.User_Defined10= '0'
+            OR ods_procure_order_card.User_Defined10= '2')
    </select>
    <select id="selectOdsProcureOrderCardByUserDefined1new" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
        SELECT