Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java =================================================================== diff -u -r12531 -r12643 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java (.../GodownEntryAction.java) (revision 12531) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java (.../GodownEntryAction.java) (revision 12643) @@ -298,7 +298,7 @@ // 保存入库单,里面的item一定都是新建标识号对象,并且需要更新批次属性。 entry = godownEntry; buildGodownEntryParamsForSave(entry); - + entry.setTime(new Date()); godownEntryManager.saveGodownEntry_TRANS_REQUIRED(entry, returnMsg); } saveResult = true; Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r12590 -r12643 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 12590) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 12643) @@ -1325,11 +1325,7 @@ private void addIdentificationCardToRecyclingError(String name, Integer tousseCount, TousseDefinition tousseDefinition, List recyclingErrorVos) { - List idCardDefinitions = tousseDefinition.getIDCardDefinitions(objectDao); - if (idCardDefinitions != null - && idCardDefinitions.size() > 0) { boolean isThereIDCard = tousseDefinitionManager.isThereIDCard(tousseDefinition); - if (isThereIDCard) { RecyclingErrorVo recyclingErrorVo = new RecyclingErrorVo(); recyclingErrorVo.setErrorCount(0); @@ -1340,7 +1336,6 @@ recyclingErrorVo.setTousseName(name); recyclingErrorVos.add(recyclingErrorVo); } - } } /** Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r12532 -r12643 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12532) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12643) @@ -358,7 +358,7 @@ fieldLabel : '入库时间', id : 'time', name : 'time', - format : 'Y-m-d', + format : 'Y-m-d H:i', value : new Date(), allowBlank : false, anchor : '95%' @@ -1263,7 +1263,7 @@ waitMsg : '正在加载数据，请稍候', params : {id : id}, success : function(form, action) { - top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(action.result.data.time.time), 'Y-m-d')); + top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(action.result.data.time.time), 'Y-m-d H:i')); for(var i = 0 ;i < action.result.data.itemsList.length ;i++){ var specification = action.result.data.itemsList[i].diposableGoods.specification; @@ -1323,7 +1323,7 @@ var columns = [ {header : "单号",width : 200,dataIndex : 'serialNumber', renderer : modifyRecord}, {header : "操作员",width : 200,dataIndex : 'operator'}, - {header : "入库时间",width : 200,dataIndex : 'time' , renderer : myDateFormat}, + {header : "入库时间",width : 200,dataIndex : 'time' , renderer : myDateFormatByMinute}, {header : "金额",width : 200,dataIndex : 'totalPrice'}, {header : "供应商",width : 200,dataIndex : 'supplierName'}, {id : 'operationRemark',header : "备注",width : 120,dataIndex : 'remark'} @@ -1415,7 +1415,7 @@ grid = new Ext.ux.ForgonPageGrid( { tbar : tbar, pageSize : 20, - defaultSortField : 'time', + defaultSortField : 'id', // title : '入库单列表', defaultSortDirection : 'DESC', isCheckboxSelectionModel : true, Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r12599 -r12643 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 12599) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 12643) @@ -110,7 +110,14 @@ var unread = '<%=InvoicePlan.UNREAD%>'; var awaitRecycling = '<%=InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE%>'; +var recycled = '<%=InvoicePlan.RECYCLINGSTATUS_RECYCLED%>'; +var partRecycle = '<%=InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE%>'; + var awaitDeliver = '<%=InvoicePlan.DELIVERSTATUS_AWAITDELIVER%>'; + +var end = '<%=InvoicePlan.STATUS_END%>'; +var partEnd = '<%=InvoicePlan.STATUS_PART_END%>'; + var unPrint = '<%=InvoicePlan.PRINT_STATUS_UNPRINT%>'; var isCssdUser = '<%=request.getAttribute("isCssdUser")%>'; Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r12641 -r12643 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 12641) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 12643) @@ -2349,22 +2349,38 @@ var deliverStatus = recyclingApplication.deliverStatus; var recyclingStatus = recyclingApplication.recyclingStatus; var committedStatus = recyclingApplication.committedStatus; + var endStatus = recyclingApplication.endStatus; var printed = recyclingApplication.printed; var isReaded = false; if(recyclingApplication.readed == 1){ isReaded = true; } var hiddenCommitButton = false; var hiddenSaveButton = false; - if((committedStatus && isReaded) || printed != unPrint){ - hiddenCommitButton = true; + + //供应室用户 + if(isCssdUser == 'true'){ + //已打印 + if(printed != unPrint){ + hiddenCommitButton = true; + //已提交、已回收已发货已终止 不能修改 + }else if(committedStatus && ((recyclingStatus == partRecycle || recyclingStatus == recycled) || + deliverStatus != awaitDeliver || (endStatus == end || endStatus == partEnd))){ + hiddenCommitButton = true; + } + //临床科室用户 + }else{ + //已提交已阅读、已打印不能修改 + if((committedStatus && isReaded) || printed != unPrint){ + hiddenCommitButton = true; + } } if(committedStatus){ hiddenSaveButton = true; } var hiddenReturnButton = true; - if (hiddenCommitButton && hiddenSaveButton + if (isCssdUser == 'true' && committedStatus && (recyclingStatus == awaitRecycling || recyclingStatus == "") && deliverStatus == awaitDeliver) { hiddenReturnButton = false; Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r12642 -r12643 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 12642) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 12643) @@ -1199,38 +1199,17 @@ } public boolean isThereIDCard(TousseDefinition tousseDefinition) { - boolean isThereIDCard = false; - if (tousseDefinition != null) { - if (tousseDefinition.getId() == null) { return false;// 数据异常,包定义不存在 } if (tousseDefinition.isIDCardDisabled()) { return false;// 标识牌已被禁用 + }else{ + return true; } - String queryString = "select count(*) from IDCardInstance i inner join IDCardDefinition d " - + "on i.idCardDefinitionID = d.id and d.deleted = 0 and d.tousseDefinitionID = " - + tousseDefinition.getId(); - - ResultSet rs = objectDao.executeSql(queryString); - - try { - if (rs != null && rs.next()) { - long count = rs.getLong(1); - if (count > 0) { - isThereIDCard = true; - } - } - - } catch (SQLException e) { - e.printStackTrace(); - } finally { - DatabaseUtil.closeResultSetAndStatement(rs); - } - } - return isThereIDCard; + return false; } // 搜索器械包（含消毒物品）和一次性物品