Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r24921 -r25303 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 24921) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 25303) @@ -1774,6 +1774,27 @@ }] },{ columnWidth : colWidth, + layout : 'form', + items:[{ + xtype : 'combo', + fieldLabel : '发货数量模式', + id : 'invoiceAmountMode', + name : 'invoiceAmountMode', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore( { + fields : [ 'value'], + data : [['0'],['1'],['2'],['3'],['4']] + }), + editable : false, + forceSelection : true, + mode : 'local', + allowBlank : true, + triggerAction : 'all', + anchor : '100%' + }] + },{ + columnWidth : colWidth, layout : 'form', id:"unitField", labelWidth : fontSize == 12 ? 90 : 100, Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r25230 -r25303 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 25230) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 25303) @@ -2712,6 +2712,7 @@ td.setAllowModifyPackageType(ancestorTD.getAllowModifyPackageType());// 是否允许修改包装类型 td.setSterilingMethod(ancestorTD.getSterilingMethod());// 默认的灭菌程序 td.setTaskGroup(ancestorTD.getTaskGroup()); + td.setInvoiceAmountMode(ancestorTD.getInvoiceAmountMode()); //是否打印科室属性设置 td.setIsPrintOrg(ancestorTD.getIsPrintOrg()); td.setPrintOrgSource(ancestorTD.getPrintOrgSource()); Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r24973 -r25303 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 24973) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 25303) @@ -2834,6 +2834,7 @@ item.setIsInvoice(td.getIsInvoice()); } item.setExpressInvoice(td.getExpressInvoice()); + item.setInvoiceAmountMode(td.getInvoiceAmountMode()); item.setDiposable("否"); item.setIsCleanedEntirely(td.getIsCleanedEntirely()); item.setIsApplyEntireTousse(td.getIsApplyEntireTousse()); @@ -3156,6 +3157,7 @@ appItem.setIsRecycling(td.getIsRecycling()); appItem.setRecyclingAmount(null); appItem.setExpressInvoice(td.getExpressInvoice()); + appItem.setInvoiceAmountMode(td.getInvoiceAmountMode()); appItem.setIsCleanedEntirely(td.getIsCleanedEntirely()); appItem.setIsApplyEntireTousse(td.getIsApplyEntireTousse()); boolean isIDCard = tousseDefinitionManager.isThereIDCard(td);