Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java =================================================================== diff -u -r21818 -r24015 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java (.../ReturnGoodsRecordTableManager.java) (revision 21818) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java (.../ReturnGoodsRecordTableManager.java) (revision 24015) @@ -170,6 +170,8 @@ List list = objectDao.findBySql(Invoice.class.getSimpleName(), String.format(" where po.id=%s", invoice.getId())); obj.put("depart", invoice.getDepart()); obj.put("departCoding", invoice.getDepartCoding()); + obj.put("settleAccountsDepart", invoice.getSettleAccountsDepart()); + obj.put("settleAccountsDepartCoding", invoice.getSettleAccountsDepartCoding()); // WareHouse defaultWareHouse = wareHouseManager.getDefaultWareHouseByUnitCode(invoicePlan.getDepartCoding()); Long warehouseId = invoice.getSourceWarehouseId(); String warehouseName = invoice.getSourceWarehouseName(); Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js =================================================================== diff -u -r18491 -r24015 --- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js (.../returnTousseByInvoice.js) (revision 18491) +++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js (.../returnTousseByInvoice.js) (revision 24015) @@ -1001,8 +1001,8 @@ ReturnGoodsRecordTableManager.getInvoiceInfo(invoiceId,function(batchesStr){ var invoicePlanInfo = top.Ext4.JSON.decode(batchesStr); - top.Ext.getCmp('depart').setValue(invoicePlanInfo.depart); - top.Ext.getCmp('departCoding').setValue(invoicePlanInfo.departCoding); + top.Ext.getCmp('depart').setValue(invoicePlanInfo.settleAccountsDepart); + top.Ext.getCmp('departCoding').setValue(invoicePlanInfo.settleAccountsDepartCoding); }); DWREngine.setAsync(true);