Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r22301 -r22315 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 22301) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 22315) @@ -69,7 +69,6 @@ import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.vo.SterilizationRecordPrintTousseItem; import com.forgon.disinfectsystem.stockmanage.cssdstock.service.TousseStockManager; import com.forgon.disinfectsystem.stockmanage.departmentstock.service.DepartmentStockManager; -import com.forgon.disinfectsystem.stockmanage.departmentstock.vo.TousseInstanceVo; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.disinfectsystem.vo.SimpleInfoVo; import com.forgon.disinfectsystem.vo.TousseSimpleVO; @@ -3452,4 +3451,18 @@ time+=day; // 相加得到新的毫秒数 return new Date(time); // 将毫秒数转换成日期 } + + @Override + public void set2Printed(Long id) { + SterilizationRecord record = getForUpdate(id); + JSONObject description = new JSONObject(); + description.put("操作", "修改打印状态"); + JSONUtil.addLogProperty(description, "灭菌记录id", id); + if(record != null){ + JSONUtil.modifyPropertyLog(description, "printStatus", record.getPrintStatus(), Constants.PRINT_STATUS_PRINTED); + record.setPrintStatus(Constants.PRINT_STATUS_PRINTED); + } + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILIZATION, Log.TYPE_UPDATE, description); + save(record); + } } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r22296 -r22315 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 22296) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 22315) @@ -339,4 +339,9 @@ */ public boolean updateTousseInsValidUntilDate( Collection sterilizationRecordIds); + /** + * 设置为已打印 + * @param id 灭菌记录id + */ + public void set2Printed(Long id); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r22310 -r22315 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 22310) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 22315) @@ -25,6 +25,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.forgon.Constants; import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; @@ -244,6 +245,11 @@ private Integer reviewedBasketAmount; private SterilizerGrossRecord sterilizerGrossRecord; + + /** + * 打印状态,未打印,已打印 + */ + private String printStatus = Constants.PRINT_STATUS_NONE; @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -681,4 +687,12 @@ this.biologicalObserveDate = biologicalObserveDate; } + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r22296 -r22315 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 22296) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 22315) @@ -149,21 +149,53 @@ url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!loadSterilizationRecordPrintData.do', params : {id : id}, success : function(response, options) { - hideMessageBox(false); var result = Ext.decode(response.responseText); - formTypeOfPrinted = "sterilizationRecordDetail"; - setPrinterByConfig(); - setGoodsInfos(result); - print2(result); - LODOP.PRINT(); - - grid.dwrReload(); + if(result.success){ + formTypeOfPrinted = "sterilizationRecordDetail"; + setPrinterByConfig(); + setGoodsInfos(result); + print2(result); + LODOP.PRINT(); + + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!updatePrintStatus.do', + params : {id : id}, + success : function(response, options) { + hideMessageBox(false); + grid.dwrReload(); + var result = Ext.decode(response.responseText); + if(result.success){ + showResult('打印并更新状态成功', null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); + }else{ + if(result.message){ + showResult(result.message, null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); + }else{ + showResult('更新打印状态失败', null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); + } + } + }, + failure : function(response, options) { + hideMessageBox(false); + showResult('更新打印状态失败', null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); + grid.dwrReload(); + } + }); + }else{ + hideMessageBox(false); + if(result.message){ + showResult(result.message, null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); + }else{ + showResult('打印失败', null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); + } + } }, failure : function(response, options) { hideMessageBox(false); var result = Ext.decode(response.responseText); if(result && result.message){ showResult(result.message, null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); + }else{ + showResult('访问服务器超时', null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); } } }); @@ -748,6 +780,7 @@ return null; } }}, + {header : "打印状态",width : 70,dataIndex : 'printStatus',hidden : !printConfig.sterilizationRecordDetail}, {header : "备注",width : 150,dataIndex : 'remark'}, {id : 'action',header : "操作",width : 70,dataIndex : 'status',renderer : actionFun} @@ -766,6 +799,7 @@ {type : 'string',dataIndex : 'sterilizer.name'}, {type : 'numeric',dataIndex : 'frequency'}, {type : 'string',dataIndex : 'biologicalMonitoringStatus'}, + {type : 'string',dataIndex : 'printStatus'}, {type : 'list',dataIndex : 'status',options : [statusBegin, statusEnd, statusFailure],phpMode : true }] }); @@ -786,6 +820,7 @@ {name : 'frequency'}, {name : 'sterilizerRecordAmount'}, {name : 'amount'}, + {name : 'printStatus'}, {name : 'biologicalMonitoringStatus'}, {name : 'remark'} ]; Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r22301 -r22315 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 22301) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 22315) @@ -17,7 +17,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import java.util.function.LongUnaryOperator; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; @@ -358,6 +357,18 @@ } } /** + * 将灭菌记录设置为已打印 + */ + public void updatePrintStatus(){ + try{ + Long recordId = StrutsParamUtils.getPraramLongValue("id", null); + sterilizationRecordManager.set2Printed(recordId); + StrutsResponseUtils.output(true); + }catch(Exception e){ + exceptionHandler.handleException(StrutsParamUtils.getResponse(), e); + } + } + /** * 灭菌完成确认或者灭菌卸载 */ public void completeSterilizationConfirm() {