Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r26947 -r26978 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 26947) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 26978) @@ -3423,6 +3423,10 @@ double[] prices = null; if(foreignTousseSplitPriceType == TousseDefinition.FOREIGNTOUSSE_SPLIT_PRICE_TYPE_AVG){ prices = ForgonNumberUtils.splitPrice(tousseDefinition.getPrice(), count); + }else if(foreignTousseSplitPriceType == TousseDefinition.FOREIGNTOUSSE_SPLIT_PRICE_TYPE_TD){ + prices = new double[2]; + prices[0] = tousseDefinition.getPrice(); + prices[1] = tousseDefinition.getPrice(); } List result = new ArrayList(); Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r26899 -r26978 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 26899) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 26978) @@ -1227,7 +1227,7 @@ splitNumber : (splitNumber ? splitNumber : defaultSplitNumber), amount : 1, includeImplant : '', - price : 0.00, + price : foreignToussePrice, type : 'tousse', usedAmountOfIncludeImplant : 0, implantAmountOfUseRecord : 0, Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r26506 -r26978 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 26506) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 26978) @@ -37,6 +37,11 @@ else{ out.println(""); } + Double foreignToussePrice = sysParamsObj.getForeignToussePrice(); + if(foreignToussePrice == null || foreignToussePrice.isNaN()){ + foreignToussePrice = 0.0; + } + pageContext.setAttribute("foreignToussePrice", foreignToussePrice); if(currentOrgUnitName != null && currentOrgUnitCode != null){ request.setAttribute("depart",currentOrgUnitName); request.setAttribute("departCoding",currentOrgUnitCode); @@ -228,7 +233,7 @@ var tousseTypeDisinfect = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>;<%=TousseDefinition.PACKAGE_TYPE_STERILIZATION%>';//消毒物品和灭菌物品 var endCause = ${endCause}; var tousseType_diposableGoods = '一次性物品'; - +var foreignToussePrice = '<%=pageContext.getAttribute("foreignToussePrice")%>'; //包大小定义 var PACKAGE_SIZE_HUGE = '<%=TousseDefinition.PACKAGE_SIZE_HUGE%>'; var PACKAGE_SIZE_BIG = '<%=TousseDefinition.PACKAGE_SIZE_BIG%>';