Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r26651 -r26752 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 26651) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 26752) @@ -3435,13 +3435,21 @@ allIdentifications.addAll(identifications); } + //科室供应室配置(BJCYLYY-17 器械包设置自动扣除材料包括一次性物品，发货后不用单独收取科室一次性物品的费用) + SupplyRoomConfig supplyRoomConfig = + supplyRoomConfigManager.getSystemParamsObj(); // 获得浮动价格系数 BigDecimal floatPercent = null; - if(invoicePlan != null){ - floatPercent = invoicePlan.getDisposablePriceFluctuation(); - assertInvoicePlanDisposablePriceFluctuation(invoicePlan, floatPercent); + //(BJCYLYY-17 器械包设置自动扣除材料包括一次性物品，发货后不用单独收取科室一次性物品的费用) + if(StringUtils.equals(Constants.STR_YES, supplyRoomConfig.getInsideTousseMaterialOutCost())){ + if(invoicePlan != null){ + floatPercent = invoicePlan.getDisposablePriceFluctuation(); + assertInvoicePlanDisposablePriceFluctuation(invoicePlan, floatPercent); + }else{ + floatPercent = supplyRoomConfigManager.getDisposableGoodsFluctuation(); + } }else{ - floatPercent = supplyRoomConfigManager.getDisposableGoodsFluctuation(); + floatPercent = BigDecimal.valueOf(0); } int amountAwaitingSent = amount; Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.37_4.9.38.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.37_4.9.38.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.37_4.9.38.sql (revision 26752) @@ -0,0 +1 @@ +update SupplyRoomConfig set insideTousseMaterialOutCost='是' where supplyRoomType=0; \ No newline at end of file Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r26718 -r26752 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 26718) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 26752) @@ -24,7 +24,7 @@ "4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.7", "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4","4.9.5","4.9.6", "4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18","4.9.19","4.9.20","4.9.21","4.9.22","4.9.23","4.9.24", - "4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37"}; + "4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37","4.9.38"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java =================================================================== diff -u -r26613 -r26752 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 26613) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 26752) @@ -392,7 +392,14 @@ * 报损器械计算科室成本 */ private String damagedTousseAtCost = Constants.STR_NO; - + + /** + * 包内材料(即一次性物品)是否扣减科室成本(前提是该所发的器械包定义的自动扣包内材料也为是,否则也是不扣减) + * 如果为是,则库存数量与金额都计算;为否则只扣减库存数量,金额为0(前提是该所发的器械包定义的自动扣包内材料也为是,否则库存数量与金额都不调整) + * (BJCYLYY-17 器械包设置自动扣除材料包括一次性物品，发货后不用单独收取科室一次性物品的费用，也不要体现在报表和发货单上) + */ + private String insideTousseMaterialOutCost = Constants.STR_YES; + @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { @@ -1042,6 +1049,14 @@ this.damagedTousseAtCost = damagedTousseAtCost; } + public String getInsideTousseMaterialOutCost() { + return insideTousseMaterialOutCost; + } + + public void setInsideTousseMaterialOutCost(String insideTousseMaterialOutCost) { + this.insideTousseMaterialOutCost = insideTousseMaterialOutCost; + } + /** * 获取外来器械包处理科室及任务组json数组 * @return Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js =================================================================== diff -u -r26529 -r26752 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 26529) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 26752) @@ -508,38 +508,13 @@ header : "科室编码", id : 'departId', width : 20, - dataIndex : 'departId', - hidden :false + dataIndex : 'departId' },{ header : "科室名称", dataIndex : 'name', width : 220, menuDisabled : true },{ - header : "一次性物品价格浮动系数", - dataIndex : 'disposablePriceFluctuation', - width : 220, - menuDisabled : true, - hidden :true, - editor : new Ext.form.NumberField({ - allowBlank : true, - allowNegative : false, - minValue :0.0001, - decimalPrecision: 4, - style : 'text-align: left', - allowDecimals : true, - listeners : { - focus : function(thiz){ - thiz.selectText(); - } - } - }) - },{ - header : "拼音", - id : 'spell', - dataIndex : 'spell', - hidden :true - },{ id : 'deleteItem', header:'删除', width : 100, @@ -549,7 +524,7 @@ }, menuDisabled : true, dataIndex:'id' - } ]); + }]); var cmTousseOperation = new Ext.grid.ColumnModel( [ { id : 'id',