Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java =================================================================== diff -u -r15334 -r15647 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java (.../GodownEntryItem.java) (revision 15334) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java (.../GodownEntryItem.java) (revision 15647) @@ -77,7 +77,11 @@ private String supplierName ;// 供应商 - private String sterileBatchNumber ;// 灭菌批次 + /** + * 灭菌批次(是否应该称灭菌日期更合适?) + * 看到健讯旧系统的单据有叫灭菌日期,接口文档里叫生产日期,没有看到灭菌批次 + */ + private String sterileBatchNumber ; private String manufacturer ;// 生产厂家 private String conclusion; private String producingArea;// 产地 Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java =================================================================== diff -u -r15603 -r15647 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 15603) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 15647) @@ -470,6 +470,15 @@ DisposableGoodsBatch disposableGoodsBatch = new DisposableGoodsBatch(); disposableGoodsBatch.setDiposableGoods(diposableGoods); disposableGoodsBatch.setBatchNumber(godownEntryItem.getBatchNumber()); + + //设置灭菌批次(灭菌日期/生产日期) + disposableGoodsBatch.setSterileBatchNumber(godownEntryItem.getSterileBatchNumber()); + //供货商 + disposableGoodsBatch.setSupplierName(godownEntryItem.getSupplierName()); + //生产厂家 + disposableGoodsBatch.setManufacturer(godownEntryItem.getManufacturer()); + //产地 + disposableGoodsBatch.setProducingArea(godownEntryItem.getProducingArea()); //设置为his系统的批次id disposableGoodsBatch.setBatchIdFromHisSync(godownEntryItem.getBatchIdFromHisSync()); diposableGoodsManager.saveOrUpdate(disposableGoodsBatch); Index: ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/InventoryDaoImpl.java =================================================================== diff -u -r15603 -r15647 --- ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/InventoryDaoImpl.java (.../InventoryDaoImpl.java) (revision 15603) +++ ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/InventoryDaoImpl.java (.../InventoryDaoImpl.java) (revision 15647) @@ -292,10 +292,17 @@ Object amount = transfersetJsonObject.opt("QUANTITY"); Object unitPrice = transfersetJsonObject.opt("PreferentialPrice"); + //生产日期(灭菌日期) + Object productDateTime = transfersetJsonObject.opt("ProductDateTime"); + + //生产厂家健迅的接口暂时没有传 + StorageEntryItem entryItem = new StorageEntryItem(); entryItem.setBatchNumber(batchNumber instanceof String ? (String)batchNumber : null); try { entryItem.setExpDate(expDate instanceof String ? new java.sql.Date(new SimpleDateFormat("yyyy-MM-dd").parse((String)expDate).getTime()) : null); + //生产日期对应灭菌批号 + entryItem.setSterileBatchNumber(expDate instanceof String ? (String)productDateTime : null); } catch (ParseException e) { // TODO Auto-generated catch block e.printStackTrace();