diff --git a/lxapp/app/products/mes/st/is/issue_bill_other_forinsert.jsp b/lxapp/app/products/mes/st/is/issue_bill_other_forinsert.jsp index e21b372..102110a 100644 --- a/lxapp/app/products/mes/st/is/issue_bill_other_forinsert.jsp +++ b/lxapp/app/products/mes/st/is/issue_bill_other_forinsert.jsp @@ -18,7 +18,6 @@ Combo_box_stor(); Combo_box_work_group(); //检测单类型下拉框 -// Combo_box5("issuebill_type", "ST_INV_TYPE_IS", false); debugger; }); //班组下拉框 @@ -226,7 +225,7 @@ var jres = $.str2json(result); if (jres.code == "1") { //操作成功 alert(jres.desc); - $.notify("rc_qc_edit");//触发用户添加成功消息 + $.notify("st_is_bill_other_edit");//触发用户添加成功消息 _close(); } else { alert(jres.desc); diff --git a/lxapp/app/products/mes/st/is/issue_bill_other_forinsert_mater_choice.jsp b/lxapp/app/products/mes/st/is/issue_bill_other_forinsert_mater_choice.jsp index 541753d..f7ccc61 100644 --- a/lxapp/app/products/mes/st/is/issue_bill_other_forinsert_mater_choice.jsp +++ b/lxapp/app/products/mes/st/is/issue_bill_other_forinsert_mater_choice.jsp @@ -22,7 +22,7 @@ //查询类型 //工厂下拉框 function Combo_box_factory() { - var form= $.getFieldValue({formid:'edit_form'}); + var form= $.getFieldValue({formid:'search_form'}); $.combobox({ id:'factory_uuid', url : 'wdk?action=wdk.pub&method=call_service&ajaxparam='+ new Date().getTime(), @@ -43,7 +43,7 @@ required:false, editable:false, multiple:false, - initvalue:'', + initvalue:'1060', idField:'id', textField:'text', tipPosition:'bottom', @@ -95,7 +95,7 @@ } function getGridQueryParam() { //获取form对象值 - var FieldValues = $.getFieldValue({formid:'edit_form'}); + var FieldValues = $.getFieldValue({formid:'search_form'}); //组织参数 var dataParam = { _SRVNAME:'server.store.issueBillOther' @@ -146,38 +146,31 @@
-
-
-
- -
-
-
- -
- +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
-
- -
- +
+
+ 查询 +
-
-
- -
- -
-
-
-
- 查询 -
-
-
+
diff --git a/lxapp/app/products/mes/st/is/issue_bill_other_forupdate.jsp b/lxapp/app/products/mes/st/is/issue_bill_other_forupdate.jsp index 73c4896..d99d7fc 100644 --- a/lxapp/app/products/mes/st/is/issue_bill_other_forupdate.jsp +++ b/lxapp/app/products/mes/st/is/issue_bill_other_forupdate.jsp @@ -205,8 +205,6 @@ return; } } - debugger; -// staffFieldValues.carrier_no=allrows[0].carrier_no; //打开旋转 $.wait_open(); dataParam = { @@ -298,7 +296,6 @@ } function getGridQueryParam() { //获取form对象值 -// var FieldValues = $.getFieldValue({formid:'search_form'}); //组织参数 var dataParam = { _SRVNAME:'server.store.issueBillOther' diff --git a/lxapp/app/products/mes/st/is/issue_bill_other_query.jsp b/lxapp/app/products/mes/st/is/issue_bill_other_query.jsp index 56b981c..f79f2b1 100644 --- a/lxapp/app/products/mes/st/is/issue_bill_other_query.jsp +++ b/lxapp/app/products/mes/st/is/issue_bill_other_query.jsp @@ -19,6 +19,8 @@ Combo_box_status("status"); //初始化日期控件 initDate(); + //注册用户添加成功的监听 + $.addListener("st_is_bill_other_edit","query"); }); //初始化日期控件 diff --git a/lxapp/src/wql/mes/st/is/ST_IS_ISSUE_OTHER_01.wql b/lxapp/src/wql/mes/st/is/ST_IS_ISSUE_OTHER_01.wql index 5d1915d..ca34100 100644 --- a/lxapp/src/wql/mes/st/is/ST_IS_ISSUE_OTHER_01.wql +++ b/lxapp/src/wql/mes/st/is/ST_IS_ISSUE_OTHER_01.wql @@ -282,7 +282,7 @@ IF 输入.flag = "3" issuebilldtl.sect_name end ), - unit.unit_name AS num_base_unit_name, + unit.unit_name AS base_unit_name, issuebilldtl.issued_qty, issuebilldtl.noissued_qty, issuebilldtl.create_deliver_qty, @@ -291,7 +291,6 @@ IF 输入.flag = "3" issuebilldtl.nodelivered_qty, issuebilldtl.STATUS, issuebilldtl.remark, - mdme.net_weight , bill.lgort , bill.id AS sap_proc_id, bill.is_checked, @@ -306,9 +305,7 @@ IF 输入.flag = "3" LEFT JOIN ST_BS_WorkGroup gro ON gro.group_uuid = issuebilldtl.group_uuid AND gro.is_active = '1' LEFT JOIN MD_CS_Factory factory ON factory.factory_uuid = issuebilldtl.factory_uuid - LEFT JOIN ST_BS_WMSMaterial mater ON mater.wmsmaterial_uuid = issuebilldtl.wmsmaterial_uuid LEFT JOIN MD_PB_MeasureUnit unit ON unit.measure_unit_uuid = issuebilldtl.num_base_unit_uuid - LEFT JOIN MD_ME_MaterialBase mdme ON mdme.material_uuid = mater.material_uuid left join IF_SAP_IssueBillProc bill on bill.issuebill_uuid = issuebilldtl.issuebill_uuid AND bill.arbpl = gro.group_code AND bill.MATNR = issuebilldtl.material_code @@ -494,71 +491,50 @@ ENDIF IF 输入.flag = "12" PAGEQUERY SELECT DISTINCT - mater.wmsmaterial_uuid as id, + mater.wmsmaterial_uuid AS id, mater.wmsmaterial_uuid, mater.material_uuid, mater.material_code, mater.material_name, mater.factory_uuid, - materialbase.net_weight, - ISNULL(a.canuse_num,0) AS canuse_num, - factory.factory_code, + ISNULL( a.canuse_num, 0 ) AS canuse_num, factory.factory_name, - measureunit.unit_name AS material_unit_name, - classStandard.class_name AS baseclassify, - materialbase.photo AS photo, - materialbase.is_seal_up, - materialbase.material_spec, - materialbase.material_unit_uuid AS unit_uuid, - measureunit.unit_name AS unit_name, - measureunit.conv_coefficient AS coefficient, - measureunit.measure_unit_uuid as num_base_unit_uuid, - measureunit.unit_name AS num_base_unit_name, + measureunit.unit_name AS base_unit_name, materialbase.base_unit_uuid, - measureunit2.unit_name AS base_unit_name, - measureunit2.conv_coefficient AS base_coefficient, - materialbase.asst_unit_uuid, - measureunit3.unit_name AS asst_unit_name, - measureunit3.conv_coefficient AS asst_coefficient, - materialbase.weight_unit_uuid, - measureunit4.unit_name AS weight_unit_name, - measureunit4.conv_coefficient AS weight_coefficient, - materialbase.material_prop_scode, - dic.sysdic_name AS material_prop_scode_name, - materialbase.gross_weight, - materialbase.cubage, materialbase.sect_type AS sect_type, materialbase.sect_uuid AS sect_uuid, materialbase.sect_code AS sect_code, - sect_name = ( - case when - materialbase.sect_type = '01' then '1002' - else - materialbase.sect_name - end - ), - sdi.sysdic_name AS sect_type_name - FROM ST_BS_WMSMaterial mater - LEFT JOIN MD_ME_MaterialBase materialbase ON materialbase.material_uuid=mater.material_uuid - LEFT JOIN ST_BS_SectAttr sect on (sect.sect_uuid=materialbase.sect_uuid and materialbase.sect_type = '03') or (materialbase.sect_type <> '03' and sect.sect_type=materialbase.sect_type) - LEFT JOIN MD_CS_Factory factory ON factory.factory_uuid=mater.factory_uuid - LEFT JOIN PF_PB_SysDicInfo dic ON dic.sysdic_code = materialbase.material_prop_scode and dic.sysdic_type='MD_MATERIAL_PROP' - LEFT JOIN MD_PB_BaseData_ClassInfo classInfo ON classInfo.base_data_uuid = materialbase.material_uuid - LEFT JOIN MD_PB_BaseData_ClassStandard classStandard ON classStandard.class_uuid = classInfo.class_uuid - AND classStandard.base_data_type = classInfo.base_data_type - LEFT JOIN MD_PB_MeasureUnit measureunit ON measureunit.measure_unit_uuid = materialbase.material_unit_uuid - LEFT JOIN MD_PB_MeasureUnit measureunit2 ON measureunit2.measure_unit_uuid = materialbase.base_unit_uuid - LEFT JOIN MD_PB_MeasureUnit measureunit3 ON measureunit3.measure_unit_uuid = materialbase.asst_unit_uuid - LEFT JOIN MD_PB_MeasureUnit measureunit4 ON measureunit4.measure_unit_uuid = materialbase.weight_unit_uuid + sect_name = ( CASE WHEN materialbase.sect_type = '01' THEN '1002' ELSE materialbase.sect_name END ), + sdi.sysdic_name AS sect_type_name + FROM + ST_BS_WMSMaterial mater + LEFT JOIN MD_ME_MaterialBase materialbase ON materialbase.material_uuid= mater.material_uuid + LEFT JOIN ST_BS_SectAttr sect ON ( sect.sect_uuid= materialbase.sect_uuid AND materialbase.sect_type = '03' ) + OR ( materialbase.sect_type <> '03' AND sect.sect_type= materialbase.sect_type ) + LEFT JOIN MD_CS_Factory factory ON factory.factory_uuid= mater.factory_uuid + LEFT JOIN MD_PB_MeasureUnit measureunit ON measureunit.measure_unit_uuid = materialbase.base_unit_uuid LEFT JOIN PF_PB_SysDicInfo sdi ON sdi.sysdic_code = materialbase.sect_type AND sdi.sysdic_type = 'ST_SECT_TYPE' - LEFT JOIN (SELECT sum(ISNULL(ivt.canuse_num,0)) AS canuse_num,ivt.material_code,ivt.factory_uuid FROM ST_IVT_StructIvt ivt where ivt.stor_uuid = 输入.stor_uuid group by ivt.material_code,ivt.factory_uuid)a ON a.material_code = mater.material_code and a.factory_uuid = mater.factory_uuid - WHERE 1=1 - and materialbase.sysisdelete != '1' + inner JOIN ( + SELECT SUM + ( ISNULL( ivt.canuse_num, 0 ) ) AS canuse_num, + ivt.material_code, + ivt.factory_uuid + FROM + ST_IVT_StructIvt ivt + WHERE + ivt.stor_uuid = 输入.stor_uuid + GROUP BY + ivt.material_code, + ivt.factory_uuid + ) a ON ( a.material_code = mater.material_code AND a.factory_uuid = mater.factory_uuid ) + WHERE + 1 = 1 + AND materialbase.sysisdelete <> '1' OPTION 输入.factory_uuid <> "" mater.factory_uuid = 输入.factory_uuid ENDOPTION - OPTION 输入.searchBar <> "" - mater.material_code LIKE 输入.searchBar + OPTION 输入.material_code <> "" + mater.material_code = 输入.material_code ENDOPTION ENDSELECT ENDPAGEQUERY diff --git a/lxservice/com/noblelift/imp/products/mes/service/ifs/sap/SapToWmsServiceImpl.java b/lxservice/com/noblelift/imp/products/mes/service/ifs/sap/SapToWmsServiceImpl.java index 49fc9ac..ffc2dd6 100644 --- a/lxservice/com/noblelift/imp/products/mes/service/ifs/sap/SapToWmsServiceImpl.java +++ b/lxservice/com/noblelift/imp/products/mes/service/ifs/sap/SapToWmsServiceImpl.java @@ -873,6 +873,10 @@ public class SapToWmsServiceImpl implements SapToWmsService { material_name = material_name.replace("\"","’"); material_name = material_name.replace("'","’"); + + if (uString.isNotBlank(jo.getString("english_name"))) { + material_name = "(旧"+jo.getString("english_name")+")"+material_name; + } jo.put("material_name", material_name); JSONObject unit = WQLObject.getWQLObject("MD_PB_MeasureUnit") diff --git a/lxservice/com/noblelift/imp/products/mes/service/ifs/sch/CarrierMaterJob.java b/lxservice/com/noblelift/imp/products/mes/service/ifs/sch/CarrierMaterJob.java index 4cbcfdb..f151b96 100644 --- a/lxservice/com/noblelift/imp/products/mes/service/ifs/sch/CarrierMaterJob.java +++ b/lxservice/com/noblelift/imp/products/mes/service/ifs/sch/CarrierMaterJob.java @@ -23,10 +23,15 @@ public class CarrierMaterJob extends BaseJob{ for(int i=0;i'0' and stack_time<'"+beforeDate+"'"); - + //任务指令定期清理 WQLObject.getWQLObject("IF_WCS_InstructPoint").delete("create_time<'"+beforeDate+"'"); + //物料规格型号表定期清理 + WQLObject.getWQLObject("IF_SAP_MaterSpec").delete("1=1"); + + //删除wdk_scheduler_log + WQLObject.getWQLObject("wdk_scheduler_log").delete("1=1"); } @Override diff --git a/lxservice/com/noblelift/imp/products/mes/service/ifs/sch/SapMaterialShortagelistJob.java b/lxservice/com/noblelift/imp/products/mes/service/ifs/sch/SapMaterialShortagelistJob.java index fcfc36c..0c94a9a 100644 --- a/lxservice/com/noblelift/imp/products/mes/service/ifs/sch/SapMaterialShortagelistJob.java +++ b/lxservice/com/noblelift/imp/products/mes/service/ifs/sch/SapMaterialShortagelistJob.java @@ -3,9 +3,12 @@ package com.noblelift.imp.products.mes.service.ifs.sch; import org.quartz.JobExecutionContext; import org.wdk.core.env.context.ServiceContext; import org.wdk.core.spring.SpringContext; +import org.wdk.core.wql.core.bean.WQLObject; import org.wdk.module.scheduler.source.base.BaseJob; + import com.noblelift.imp.platform.core.util.WdkUtil; import com.noblelift.imp.products.mes.api.ifs.sap.SapToWmsService; + import net.sf.json.JSONObject; public class SapMaterialShortagelistJob extends BaseJob{ @@ -18,6 +21,9 @@ public class SapMaterialShortagelistJob extends BaseJob{ //班组欠料信息导入 sapToWmsService.getMaterialShortagelist(ctx); + //删除wdk_scheduler_log + WQLObject.getWQLObject("wdk_scheduler_log").delete("1=1"); + } @Override diff --git a/lxservice/com/noblelift/imp/products/mes/service/st/is/IssueBillOtherServiceImpl.java b/lxservice/com/noblelift/imp/products/mes/service/st/is/IssueBillOtherServiceImpl.java index 90c75fb..34c7c95 100644 --- a/lxservice/com/noblelift/imp/products/mes/service/st/is/IssueBillOtherServiceImpl.java +++ b/lxservice/com/noblelift/imp/products/mes/service/st/is/IssueBillOtherServiceImpl.java @@ -152,7 +152,7 @@ public class IssueBillOtherServiceImpl implements IssueBillOtherService { public ServiceResultBean pageQueryMaterByMater(ServiceContext context, String accountId, JSONObject form) { HashMap param = WDK.json2map(form); if (uString.isNotBlank(form.optString("searchBar"))) - param.put("searchBar", "%" + form.optString("searchBar") + "%"); + param.put("material_code", form.optString("searchBar")); JSONObject jres = WQL.getWO("ST_IS_ISSUE_OTHER_01").addParamMap(param).addParam("flag", "12").pageQuery(context, ""); ServiceResultBean srb = new ServiceResultBean(); srb.setSuccess();