Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java =================================================================== diff -u -r13522 -r13636 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java (.../GodownEntryAction.java) (revision 13522) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java (.../GodownEntryAction.java) (revision 13636) @@ -164,6 +164,7 @@ // 保存入库单,里面的item一定都是新建标识号对象,并且需要更新批次属性。 entry = godownEntry; buildGodownEntryParamsForSave(entry); + entry.setTime(new Date()); entry.setSubType(GodownEntry.SUBTYPE_MANUAL_OUT); godownEntryManager.saveGodownOutEntry_TRANS_REQUIRED(entry, returnMsg); } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js =================================================================== diff -u -r13635 -r13636 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js (.../godownOutView.js) (revision 13635) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js (.../godownOutView.js) (revision 13636) @@ -511,7 +511,7 @@ fieldLabel : '退库时间', id : 'time', name : 'time', - format : 'Y-m-d', + format : 'Y-m-d H:i', altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', value : new Date(), allowBlank : false, @@ -864,7 +864,7 @@ params : {id : id}, success : function(form, action) { var time = action.result.data.time.time; - top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(time), 'Y-m-d')); + top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(time), 'Y-m-d H:i')); setWareHouseInfo(action.result.data.warehouseID,action.result.data.warehouseName); top.Ext.getCmp("wareHouse1").setValue(action.result.data.warehouseID); for(var i = 0 ;i < action.result.data.itemsList.length ;i++){