diff --git a/lxapp/app/products/mes/st/rc/receive_dtl3.jsp b/lxapp/app/products/mes/st/rc/receive_dtl3.jsp index 6cb693b..ebef7af 100644 --- a/lxapp/app/products/mes/st/rc/receive_dtl3.jsp +++ b/lxapp/app/products/mes/st/rc/receive_dtl3.jsp @@ -137,9 +137,17 @@
- +
- + +
+
+
+
+
+ +
+
diff --git a/lxapp/src/wql/mes/st/rc/ST_RC_RECEIVE_04.wql b/lxapp/src/wql/mes/st/rc/ST_RC_RECEIVE_04.wql index c5fd20e..abc5e29 100644 --- a/lxapp/src/wql/mes/st/rc/ST_RC_RECEIVE_04.wql +++ b/lxapp/src/wql/mes/st/rc/ST_RC_RECEIVE_04.wql @@ -36,6 +36,9 @@ //查询条件 输入.search_bar TYPEAS s_string + + //查询条件 + 输入.search_bar2 TYPEAS s_string //开始日期 输入.date_begin TYPEAS s_string @@ -258,6 +261,7 @@ mater.material_code, mater.material_name, mater.factory_uuid AS factory_uuid, + base.english_name, base.base_unit_uuid AS num_base_unit_uuid, unit.unit_name AS unit_name, base.sect_type AS sect_type, @@ -273,7 +277,7 @@ convert (varchar(100), GETDATE(), 112) AS pcsn FROM ST_BS_WMSMaterial mater - INNER JOIN MD_ME_MaterialBase base ON mater.material_uuid = base.material_uuid + INNER JOIN MD_ME_MaterialBase base ON (mater.material_uuid = base.material_uuid and base.sysisdelete='0') INNER JOIN MD_PB_MeasureUnit unit ON unit.measure_unit_uuid = base.base_unit_uuid INNER JOIN PF_PB_SysDicInfo sys ON sys.sysdic_code = base.sect_type AND sys.sysdic_type='ST_SECT_TYPE' INNER JOIN MD_CS_Factory factory ON factory.factory_uuid = mater.factory_uuid @@ -282,13 +286,16 @@ 1 = 1 AND base.sect_type in ('01','02','03') OPTION 输入.sect_types <> "" - base.sect_type in (输入.sect_types) + base.sect_type in (输入.sect_types) ENDOPTION OPTION 输入.search_bar <> "" - mater.material_code = 输入.search_bar + mater.material_code = 输入.search_bar + ENDOPTION + OPTION 输入.search_bar2 <> "" + base.english_name = 输入.search_bar2 ENDOPTION OPTION 输入.material_codes <> "" - mater.material_code in (输入.material_codes) + mater.material_code in (输入.material_codes) ENDOPTION ENDSELECT ENDPAGEQUERY