Index: ssts-web/src/main/resources/config/zsly/mybatis/syncToHERP_Mapper.xml =================================================================== diff -u -r12331 -r13030 --- ssts-web/src/main/resources/config/zsly/mybatis/syncToHERP_Mapper.xml (.../syncToHERP_Mapper.xml) (revision 12331) +++ ssts-web/src/main/resources/config/zsly/mybatis/syncToHERP_Mapper.xml (.../syncToHERP_Mapper.xml) (revision 13030) @@ -5,7 +5,7 @@ - (year_month,iow_no,dept_code,make_date,maker,store_code,bus_type_code,comp_code,copy_code) + (year_month,iow_no,dept_code,make_date,maker,store_code,bus_type_code,comp_code,copy_code,write_time,send_date) @@ -22,6 +22,8 @@ , '2' , '1001' , '101' + , #{writeTime} + , #{sendDate} ) @@ -39,6 +41,8 @@ , '22' , '1001' , '101' + , #{writeTime} + , #{sendDate} ) @@ -56,6 +60,8 @@ , '14' , '1001' , '101' + , #{writeTime} + , #{sendDate} ) @@ -74,6 +80,8 @@ , '2' , '1001' , '101' + , #{writeTime} + , #{sendDate} ) Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/WriteBackEntry.java =================================================================== diff -u -r12582 -r13030 --- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/WriteBackEntry.java (.../WriteBackEntry.java) (revision 12582) +++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/WriteBackEntry.java (.../WriteBackEntry.java) (revision 13030) @@ -25,6 +25,10 @@ private String type = "2";//类型(回写中间表时,如果发货部门为手术室或麻醉科时,type值为14,否则默认为2) + private Date sendDate;//发货日期 + + private Date writeTime;//写入日期 + private Collection items = CollectionUtils.emptyCollection(); public Long getId() { @@ -106,4 +110,22 @@ public void setItems(Collection items) { this.items = items; } + + public Date getSendDate() { + return sendDate; + } + + public void setSendDate(Date sendDate) { + this.sendDate = sendDate; + } + + public Date getWriteTime() { + return writeTime; + } + + public void setWriteTime(Date writeTime) { + this.writeTime = writeTime; + } + + } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java =================================================================== diff -u -r12672 -r13030 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java (.../WriteBackInventoryManagerImpl.java) (revision 12672) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java (.../WriteBackInventoryManagerImpl.java) (revision 13030) @@ -102,6 +102,8 @@ entry.setOperator(invoice.getSender()); entry.setTime(invoice.getSendTime()); entry.setRemark(invoice.getRemark()); + entry.setWriteTime(new Date()); + entry.setSendDate(invoice.getSendTime()); entry.setDepart(invoice.getInvoicePlan() .getSettleAccountsDepart()); if("手术室".equals(invoice.getInvoicePlan().getDepart()) || "麻醉科".equals(invoice.getInvoicePlan().getDepart())){ @@ -205,7 +207,8 @@ entry.setRemark(returnGoodsRecord.getRemark()); entry.setDepart(returnGoodsRecord.getDepart()); entry.setDepartCoding(returnGoodsRecord.getDepartCoding()); - + entry.setWriteTime(new Date()); + entry.setSendDate(returnGoodsRecord.getReturnTime()); List items = new ArrayList(); if (writeBackDiposableGoods) { @@ -303,7 +306,8 @@ entry.setOperator(godownEntry.getOperator()); entry.setTime(godownEntry.getTime()); entry.setRemark(godownEntry.getRemark()); - + entry.setWriteTime(new Date()); + entry.setSendDate(godownEntry.getTime()); SupplyRoomConfig firstSupplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig(); entry.setDepart(firstSupplyRoomConfig.getOrgUnitName()); entry.setDepartCoding(firstSupplyRoomConfig.getOrgUnitCoding()); @@ -392,7 +396,8 @@ entry.setRemark(receiveRecord.getRemark()); entry.setDepart(orgUnitManager.getOrgUnitByCode(receiveRecord.getDepartCoding()).getName()); entry.setDepartCoding(receiveRecord.getDepartCoding()); - + entry.setWriteTime(new Date()); + entry.setSendDate(receiveRecord.getTime()); List items = new ArrayList(); for (ReceiveRecordItem receiveRecordItem : receiveRecord.getItems()) {