Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r15332 -r15390 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 15332) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 15390) @@ -64,6 +64,7 @@ import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.invoicemanager.LostMaterialItem; import com.forgon.disinfectsystem.entity.invoicemanager.TimeQuantum; +import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection; import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem; import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection; @@ -847,12 +848,21 @@ // ttRecord.setTakeover("小七"); // ttRecord.setTransitionTime(new Date()); // } + String sterilizationPosition = tousseInstance.getSterilizerPosition(); + if(StringUtils.isBlank(sterilizationPosition)){ + Long reviewBasket_id = tousseInstance.getReviewBasket_id(); + ReviewedBasket rb = (ReviewedBasket)objectDao.getByProperty(ReviewedBasket.class.getSimpleName(), "id", reviewBasket_id); + if(rb != null){ + sterilizationPosition = rb.getSterilizerPosition(); + } + } Map map = new HashMap(); map.put("success", true); map.put("tousseInstance", tousseInstance); map.put("invoice", invoice); map.put("washClassifyBaskets", basketJsons); map.put("tousseTransitionRecord", ttRecord); + map.put("sterilizationPosition", sterilizationPosition); if(sr != null){ map.put("sterilizationRecordID", sr.getId()); map.put("sterilizerRecordAmounts", sr.getSterilizerRecordAmount()); Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js =================================================================== diff -u -r15167 -r15390 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 15167) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 15390) @@ -314,6 +314,19 @@ layout : 'form', columnWidth : .5, cls:'edit-part2-labelwidth', + items : [{ + id : 'sterilizationPosition', + name : 'sterilizationPosition', + xtype : 'textfield', + fieldLabel : '灭菌位置', + anchor : '100%', + readOnly : true, + cls : 'fieldReadOnlyNoRemove' + }] + },{ + layout : 'form', + columnWidth : .5, + cls:'edit-part2-labelwidth', bodyStyle : 'padding:0px 0px 0px 50px', items : [{ xtype : 'button', @@ -811,6 +824,7 @@ top.Ext.getCmp('endDate').setValue(instance.sterileEndTime); top.Ext.getCmp('sterilizationRecordID').setValue(result.sterilizationRecordID); top.Ext.getCmp('sterilizerRecordAmounts').setValue(result.sterilizerRecordAmounts); + top.Ext.getCmp('sterilizationPosition').setValue(result.sterilizationPosition); if(instance.useRecord_id != null){ Ext.Ajax.request({