Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r20037 -r20435 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 20037) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 20435) @@ -1580,9 +1580,29 @@ }] - }, - { + },{ columnWidth : .25, + layout : 'form', + items:[{ + xtype : 'combo', + fieldLabel : '快速发货', + id : 'expressInvoice', + name : 'expressInvoice', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore( { + fields : [ 'value'], + data : [['是'],['否']] + }), + editable : false, + forceSelection : true, + mode : 'local', + allowBlank : true, + triggerAction : 'all', + anchor : '100%' + }] + },{ + columnWidth : .25, layout : 'form', id:"unitField", labelWidth : fontSize == 12 ? 90 : 100, Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r20432 -r20435 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 20432) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 20435) @@ -380,6 +380,10 @@ */ private String expressRecycling; /** + * 是否快速发货 + */ + private String expressInvoice; + /** * 是否禁用标识牌 */ private String isDisableIDCard = STR_YES; @@ -993,7 +997,32 @@ public void setExpressRecycling(String expressRecycling) { this.expressRecycling = expressRecycling; } + /** + * 获取快速发货的值。不要直接调用,改为调用{@link TousseDefinition#expressInvoice()}方法判断是否快速发货 + * @return + */ + public String getExpressInvoice() { + return StringTools.defaultIfBlank(expressInvoice,Constants.STR_NO); + } + /** + * 设置是否快速发货。 + * @param expressInvoice 值为是或者否。非是即为否 + */ + public void setExpressInvoice(String expressInvoice) { + if(!Constants.STR_YES.equals(expressInvoice)){ + expressInvoice = Constants.STR_NO; + } + this.expressInvoice = expressInvoice; + } + /** + * 判断是否可以快速发货。值为是才是可以快速发货,其他值都不可以快速发货。非是即为否 + * @return true可以快速发货。false,不可以快速发货 + */ + public boolean expressInvoice(){ + return Constants.STR_YES.equals(getExpressInvoice()); + } + public String getPackageCode() { return packageCode; }