Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java =================================================================== diff -u -r13921 -r13947 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java (.../ExpensiveDisposablegoods.java) (revision 13921) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java (.../ExpensiveDisposablegoods.java) (revision 13947) @@ -10,6 +10,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Transient; +import com.forgon.Constants; import com.forgon.directory.model.BarcodeDevice; import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.tools.db.DatabaseUtil; @@ -30,6 +31,8 @@ private String identification; // 标识号 private Date entryDate; // 入库时间 + + private Date printTime; // 打印时间 private Double price; // 价格 @@ -82,6 +85,22 @@ this.entryDate = entryDate; } + @Transient // 用于页面显示 + public String getPrintTimeStr() { + if(printTime == null){ + return ""; + } + return Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(printTime); + } + + public Date getPrintTime() { + return printTime; + } + + public void setPrintTime(Date printTime) { + this.printTime = printTime; + } + public Double getPrice() { return price; } Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java =================================================================== diff -u -r13908 -r13947 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 13908) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 13947) @@ -4,6 +4,7 @@ import java.io.PrintWriter; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -284,6 +285,9 @@ disposableGoodsBatchStock.getSupplierName()); jobj.put("expDate", disposableGoodsBatchStock.getExpDateStr()); + jobj.put("printTime", + expensiveDisposablegoods.getPrintTimeStr()); + } jobjs.add(jobj); } @@ -463,6 +467,7 @@ } String sql = String.format(" where %s ", SqlUtils.getNonStringFieldInCollectionsPredicate("po.id", diposableGoodsIdSet)); Map idsToDisposableGoodsMap = diposableGoodsManager.getIdsToDisposableGoodsMapBySql(sql); + diposableGoodsManager.updateExpensiveDisposablegoodsPrintTime(expensiveDisposablegoodsList); for (ExpensiveDisposablegoods expensiveDisposablegoods : expensiveDisposablegoodsList) { JSONObject jobj = new JSONObject(); Long disposableGoodsId = expensiveDisposablegoods.getDisposableGoodsID(); Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsView.js =================================================================== diff -u -r13945 -r13947 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsView.js (.../expensiveDisposableGoodsView.js) (revision 13945) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsView.js (.../expensiveDisposableGoodsView.js) (revision 13947) @@ -38,6 +38,7 @@ {name : 'price'}, {name : 'status'}, {name : 'expDate'}, + {name : 'printTime'}, {name : 'warehouseName'}, {name : 'supplierName'} ] @@ -381,11 +382,12 @@ autoScroll : true, cm : new top.Ext.grid.ColumnModel([selectModel, {header : "id",dataIndex : 'id',hidden : true}, - {header : "条码",width : 100,dataIndex : 'barcode',menuDisabled:true}, + {header : "条码",width : 90,dataIndex : 'barcode',menuDisabled:true}, {header : "批次",width : 100,dataIndex : 'batchNumber',menuDisabled:true}, {header : "价格",width : 50,dataIndex : 'price',menuDisabled:true}, {header : "状态",width : 60,dataIndex : 'status',menuDisabled:true}, {header : "失效期",width : 90,dataIndex : 'expDate',renderer:myDateFormat,menuDisabled:true}, + {header : "打印时间",width : 130,dataIndex : 'printTime',menuDisabled:true}, {id:'supplierName',header : "供应商",width : 200,dataIndex : 'supplierName',menuDisabled:true} ]), // autoExpandColumn : 'supplierName', Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r13855 -r13947 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 13855) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 13947) @@ -261,6 +261,15 @@ updateNameAndSpecification(oldName, oldSpecification, newName, newSpecification); } } + public void updateExpensiveDisposablegoodsPrintTime(List expensiveDisposablegoodsList){ + Date printTime = new Date(); + if(expensiveDisposablegoodsList != null){ + for (ExpensiveDisposablegoods expensiveDisposablegoods : expensiveDisposablegoodsList) { + expensiveDisposablegoods.setPrintTime(printTime); + objectDao.update(expensiveDisposablegoods); + } + } + } // 出库的最终方法,优先从批次里面出库,即使限定了价格。一个批次里面优先从指定的价格出库 // public void outStorage(DiposableGoods diposableGoods, String batchNumber, // boolean limitBatchNumber, double cost, boolean limitCost, Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java =================================================================== diff -u -r13632 -r13947 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 13632) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 13947) @@ -141,7 +141,7 @@ public void updateDisposableGoods_TRANS_REQUIRED( DisposableGoods diposableGoods); - + public void updateExpensiveDisposablegoodsPrintTime(List expensiveDisposablegoodsList); public DisposableGoodsStock createDisposableGoodsStock(Long warehouseID,String warehouseName,DisposableGoods disposableGoods);