Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.60_4.9.61.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.60_4.9.61.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.60_4.9.61.sql (revision 30035) @@ -0,0 +1,4 @@ +update ReturnMaterialRecord set settleAccountsDepartCoding = (select orgUnitCoding from SupplyRoomConfig where supplyRoomType = 4 and orgUnitCoding = (select settleAccountsDepartCoding from SupplyRoomConfig where supplyRoomType = 3 and orgUnitCoding = ReturnMaterialRecord.departCoding and settleAccountsDepartCoding is not null and settleAccountsDepartCoding <> '')) where settleAccountsDepartCoding is null; +update ReturnMaterialRecord set settleAccountsDepart = (select orgUnitName from SupplyRoomConfig where supplyRoomType = 4 and orgUnitCoding = (select settleAccountsDepartCoding from SupplyRoomConfig where supplyRoomType = 3 and orgUnitCoding = ReturnMaterialRecord.departCoding and settleAccountsDepartCoding is not null and settleAccountsDepartCoding <> '')) where settleAccountsDepart is null; +update ReturnMaterialRecord set settleAccountsDepartCoding = departCoding, settleAccountsDepart = depart where settleAccountsDepartCoding is null and settleAccountsDepart is null; +update MaterialInvoice set settleAccountsDepartCoding = (select orgUnitCoding from SupplyRoomConfig where supplyRoomType = 4 and orgUnitName = MaterialInvoice.settleAccountsDepart) where settleAccountsDepartCoding is null; Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java =================================================================== diff -u -r18549 -r30035 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java (.../ReturnMaterialRecordTableManager.java) (revision 18549) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java (.../ReturnMaterialRecordTableManager.java) (revision 30035) @@ -111,6 +111,8 @@ json.put("returnOfPeople", rmr.getReturnOfPeople()); json.put("departCoding", rmr.getDepartCoding()); json.put("settlementPrice", rmr.getSettlementPrice()); + json.put("settleAccountsDepart", rmr.getSettleAccountsDepart()); + json.put("settleAccountsDepartCoding", rmr.getSettleAccountsDepartCoding()); JSONUtil.addSuccess(json, true); } }catch(Exception e){ Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoice.java =================================================================== diff -u -r23652 -r30035 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoice.java (.../MaterialInvoice.java) (revision 23652) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoice.java (.../MaterialInvoice.java) (revision 30035) @@ -45,6 +45,11 @@ private String wbCode;// 科室五笔 + /** + * 结算科室编码 + */ + private String settleAccountsDepartCoding; // 发往目的科室 + private String settleAccountsDepart;//结算科室 private String sender; // 发货员 @@ -266,4 +271,12 @@ this.printTime = printTime; } + public String getSettleAccountsDepartCoding() { + return settleAccountsDepartCoding; + } + + public void setSettleAccountsDepartCoding(String settleAccountsDepartCoding) { + this.settleAccountsDepartCoding = settleAccountsDepartCoding; + } + } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialRecord.java =================================================================== diff -u -r23492 -r30035 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialRecord.java (.../ReturnMaterialRecord.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialRecord.java (.../ReturnMaterialRecord.java) (revision 30035) @@ -46,6 +46,16 @@ private String departCoding;//退货人科室编码 + /** + * 退货人结算科室 + */ + private String settleAccountsDepart; + + /** + * 退货人结算科室编码 + */ + private String settleAccountsDepartCoding; + private Date returnTime;//退货时间 private String remark;//备注 @@ -131,6 +141,22 @@ this.departCoding = departCoding; } + public String getSettleAccountsDepart() { + return settleAccountsDepart; + } + + public void setSettleAccountsDepart(String settleAccountsDepart) { + this.settleAccountsDepart = settleAccountsDepart; + } + + public String getSettleAccountsDepartCoding() { + return settleAccountsDepartCoding; + } + + public void setSettleAccountsDepartCoding(String settleAccountsDepartCoding) { + this.settleAccountsDepartCoding = settleAccountsDepartCoding; + } + public Date getReturnTime() { return returnTime; } Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/MaterialInvoiceAction.java =================================================================== diff -u -r26361 -r30035 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/MaterialInvoiceAction.java (.../MaterialInvoiceAction.java) (revision 26361) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/MaterialInvoiceAction.java (.../MaterialInvoiceAction.java) (revision 30035) @@ -105,6 +105,8 @@ jsonData.put("depart", materialInvoice.getDepart()); jsonData.put("sendTime", materialInvoice.getSendTime()); jsonData.put("serialNumber", materialInvoice.getSerialNumber()); + jsonData.put("settleAccountsDepartCoding", materialInvoice.getSettleAccountsDepartCoding()); + jsonData.put("settleAccountsDepart", materialInvoice.getSettleAccountsDepart()); JSONArray mInvoiceItemListArray = new JSONArray(); //材料发货单明细 for (MaterialInvoiceItem mInvoiceItem : materialInvoiceItemList) { Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r29925 -r30035 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 29925) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 30035) @@ -25,7 +25,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.38","4.9.39","4.9.40","4.9.41","4.9.42","4.9.43","4.9.44", - "4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53","4.9.54","4.9.55","4.9.56","4.9.57","4.9.58","4.9.59","4.9.60"}; + "4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53","4.9.54","4.9.55","4.9.56","4.9.57","4.9.58","4.9.59","4.9.60","4.9.61"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] {