Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r40612 -r40614 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 40612) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 40614) @@ -1265,11 +1265,11 @@ //使用记录转换的消毒物品申请单,目前会调用合并的代码,需要按照申请单加急情况合并申请单 urgentSql += " and po.urgent = '" + recyclingApplication.getUrgent() + "' "; } - boolean enableGeneratingDisposableGoodsApplyAndReturnsUsingThirdPpartyData = - ConfigUtils.getSystemSetConfigByNameBool("enableGeneratingDisposableGoodsApplyAndReturnsUsingThirdPpartyData"); + boolean enableGeneratingDisposableGoodsApplyAndReturnUsingThirdPartyData = + ConfigUtils.getSystemSetConfigByNameBool("enableGeneratingDisposableGoodsApplyAndReturnUsingThirdPartyData"); //根据HIS系统提供的收费自动生成的申请单,不合并申请单GZFDZL-163 String dataSourceSql = ""; - if(enableGeneratingDisposableGoodsApplyAndReturnsUsingThirdPpartyData){ + if(enableGeneratingDisposableGoodsApplyAndReturnUsingThirdPartyData){ dataSourceSql = " and (po.dataSource is null or po.dataSource <> " + InvoicePlan.DATADOURCE_THIRD_PARTY_CHARGE_RECORD + ")"; } String sql = "where po.departCoding = '" Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js =================================================================== diff -u -r40612 -r40614 --- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js (.../config.js) (revision 40612) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js (.../config.js) (revision 40614) @@ -95,5 +95,5 @@ //启用发货管理的一次性物品树状结构模式 enableTheDisposableGoodsTreeModeForiInvoiceView:true, //启用第三方数据生成一次性物品申请单和退货单功能 - enableGeneratingDisposableGoodsApplyAndReturnsUsingThirdPpartyData:true + enableGeneratingDisposableGoodsApplyAndReturnUsingThirdPartyData:true } \ No newline at end of file