Merge remote-tracking branch 'origin/dev' into dev-ty1.2
This commit is contained in:
+1
-1
@@ -412,7 +412,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
b.warehouse_date
|
b.warehouse_date
|
||||||
from execution_in_material_detail a
|
from execution_in_material_detail a
|
||||||
left join execution_stock_in_order b on a.in_order_number = b.in_order_number
|
left join execution_stock_in_order b on a.in_order_number = b.in_order_number
|
||||||
left join material_base_info c on a.material_base_info_id = c.material_base_info_id
|
left join NGWL_TEST_WMS.material_base_info c on a.material_base_info_id = c.material_base_info_id
|
||||||
<where>
|
<where>
|
||||||
<if test="organizationId != null ">
|
<if test="organizationId != null ">
|
||||||
and a.organization_id = #{organizationId}
|
and a.organization_id = #{organizationId}
|
||||||
|
|||||||
Reference in New Issue
Block a user