Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js =================================================================== diff -u -r33152 -r33646 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 33152) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 33646) @@ -227,5 +227,7 @@ enableReminderOfTheDifferenceBetweenApplicationAndRecyclingAmount:true, //启用发货扫描异常物品时弹出报警确认对话框 enableTheAlarmConfirmationDialogBoxPopsUpWhenTheShipmentScansAbnormalItems:true, - colorChangeRuleOfInvoicPlanToSendGoodsList : 2 + colorChangeRuleOfInvoicPlanToSendGoodsList : 2, + //打印回收清单的查询界面只显示基本字段 + onlyShowBasicFieldsInPackingPrintRecyclingDetails:true } \ No newline at end of file Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r33639 -r33646 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 33639) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 33646) @@ -1467,11 +1467,11 @@ fromTime = dateQueryAdapter.dateAdapter(fromTime); toTime = dateQueryAdapter.dateAdapter(toTime); - boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false); + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); String orgUnitCodingSql = ""; String taskGroups = ""; String tousseGroupIds = ""; - if(!disableGroupFilterInPackingPrintRecyclingDetails){ + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -1568,10 +1568,10 @@ toTime = dateQueryAdapter.dateAdapter(toTime); List departGroups = departmentGroupManager.getAll(); - boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false); + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); String tdSql = ""; String orgUnitCodingSql = ""; - if(!disableGroupFilterInPackingPrintRecyclingDetails){ + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -1694,10 +1694,10 @@ orOrgUnitNameSQL = " and po.depart not in ('" + goodsOption.getValue().replace(";", "','") + "')"; } } - boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false); + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); String tdSql = ""; String orgUnitCodingSql = ""; - if(!disableGroupFilterInPackingPrintRecyclingDetails){ + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -1851,8 +1851,8 @@ toTime = dateQueryAdapter.dateAdapter(toTime); String orgUnitCodingSql = ""; String tdSql = ""; - boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false); - if(!disableGroupFilterInPackingPrintRecyclingDetails){ + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -2066,8 +2066,8 @@ toTime = dateQueryAdapter.dateAdapter(toTime); String orgUnitCodingSql = ""; String tdSql = ""; - boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false); - if(!disableGroupFilterInPackingPrintRecyclingDetails){ + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -2209,8 +2209,8 @@ String tdSql = ""; String departCodeSqlSql = ""; String departCodingSql = ""; - boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false); - if(!disableGroupFilterInPackingPrintRecyclingDetails){ + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -2425,9 +2425,9 @@ StrutsResponseUtils.output(JSONUtil.buildJsonObject(false, "回收清单参数配置有误!缺失tables")); return; } - boolean disableGroupFilterInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("disableGroupFilterInPackingPrintRecyclingDetails", false); + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); String extraSql = ""; - if(!disableGroupFilterInPackingPrintRecyclingDetails){ + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js =================================================================== diff -u -r33639 -r33646 --- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 33639) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 33646) @@ -212,6 +212,8 @@ companyName:"dingxiang", //是否启用加急功能 enableUrgentFunction : true, + //打印回收清单的查询界面只显示基本字段 + onlyShowBasicFieldsInPackingPrintRecyclingDetails:true, //禁用装配打印回收明细分组 disableGroupFilterInPackingPrintRecyclingDetails:true } \ No newline at end of file