Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItemVO.java =================================================================== diff -u -r22179 -r22180 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItemVO.java (.../SterilizationTransitionItemVO.java) (revision 22179) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItemVO.java (.../SterilizationTransitionItemVO.java) (revision 22180) @@ -54,9 +54,9 @@ private String reviewer; /** - * 审核时间（定义成字符串格式） + * 装配时间（定义成字符串格式） */ - private String reviewTime; + private String operationTime; /** * 是否加急 @@ -136,12 +136,12 @@ this.reviewer = reviewer; } - public String getReviewTime() { - return reviewTime; + public String getOperationTime() { + return operationTime; } - public void setReviewTime(String reviewTime) { - this.reviewTime = reviewTime; + public void setOperationTime(String operationTime) { + this.operationTime = operationTime; } public String getIsUrgentTousse() { Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r22140 -r22180 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 22140) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 22180) @@ -2593,7 +2593,7 @@ || type == diposableGoodsApplicationForm || type == disinfectGoodsApplicationForm) && deliverStatus != statusArr[2] - && (recyclingStatus == recycled || (!recyclingStatus && deliverStatus == statusArr[1]))){ //发货状态!=已发货 &&(发货状态=已回收 || 发货状态=部分发货) + && (recyclingStatus == recycled || (!recyclingStatus && deliverStatus == statusArr[1]))){ //发货状态!=已发货 &&(回收状态=已回收 || 发货状态=部分发货) return ""; } }}, Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java =================================================================== diff -u -r22179 -r22180 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java (.../SterilizationTransitionManagerImpl.java) (revision 22179) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java (.../SterilizationTransitionManagerImpl.java) (revision 22180) @@ -79,7 +79,7 @@ item.setTousseInstanceBarcode(tousseInstanceBarcode); item.setTousseInstanceId(vo.getTousseInstanceId()); item.setTousseName(vo.getTousseName()); - item.setReviewTime(ForgonDateUtils.safelyParseDate(vo.getReviewTime())); + item.setOperationTime(ForgonDateUtils.safelyParseDate(vo.getOperationTime())); item.setIsUrgentTousse(vo.getIsUrgentTousse()); item.setSterilizationTransition(sterilizationTransition); newTousseInstanceIds.add(item.getTousseInstanceId()); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java =================================================================== diff -u -r22179 -r22180 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java (.../SterilizationTransitionItem.java) (revision 22179) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java (.../SterilizationTransitionItem.java) (revision 22180) @@ -72,9 +72,9 @@ private String reviewer; /** - * 审核时间 + * 装配时间 */ - private Date reviewTime; + private Date operationTime; /** * 是否加急 @@ -167,12 +167,12 @@ this.tousseName = tousseName; } - public Date getReviewTime() { - return reviewTime; + public Date getOperationTime() { + return operationTime; } - public void setReviewTime(Date reviewTime) { - this.reviewTime = reviewTime; + public void setOperationTime(Date operationTime) { + this.operationTime = operationTime; } public String getIsUrgentTousse() { Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java =================================================================== diff -u -r22179 -r22180 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java (.../SterilizationTransitionAction.java) (revision 22179) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java (.../SterilizationTransitionAction.java) (revision 22180) @@ -139,7 +139,7 @@ child.put("packer", item.getPacker()); child.put("reviewerCode", item.getReviewerCode()); child.put("reviewer", item.getReviewer()); - child.put("reviewTime", ForgonDateUtils.safelyFormatDate(item.getReviewTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + child.put("operationTime", ForgonDateUtils.safelyFormatDate(item.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); child.put("isUrgentTousse", item.getIsUrgentTousse()); child.put("leaf", true); tousseDefinitionNode.optJSONArray("children").add(child); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r22179 -r22180 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 22179) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 22180) @@ -3393,8 +3393,8 @@ instanceJSONObject.put("packerCode", tousseInstance.getOperatorCode()); //配包人编码 instanceJSONObject.put("reviewer", tousseInstance.getReviewer()); //审核人 instanceJSONObject.put("reviewerCode", tousseInstance.getReviewerCode()); //审核人编码 - String reviewTime = ForgonDateUtils.safelyFormatDate(tousseInstance.getReviewTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""); - instanceJSONObject.put("reviewTime", reviewTime); //审核时间 + String operationTime = ForgonDateUtils.safelyFormatDate(tousseInstance.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""); + instanceJSONObject.put("operationTime", operationTime); //装配时间 instanceJSONObject.put("isUrgentTousse", tousseInstance.getIsUrgentTousse());//是否加急 } return instanceJSONObject; Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js =================================================================== diff -u -r22179 -r22180 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js (.../sterilizationTransitionForm.js) (revision 22179) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js (.../sterilizationTransitionForm.js) (revision 22180) @@ -26,7 +26,7 @@ {name: 'packer'}, //配包人 {name: 'reviewerCode'}, //审核人条码 {name: 'reviewer'}, //审核人 - {name: 'reviewTime'}, //审核时间 + {name: 'operationTime'}, //装配时间 {name: 'isUrgentTousse'}, //是否加急 {name: 'amount'} //数量 ]}); @@ -114,7 +114,7 @@ },{ header: '审核人',dataIndex: 'reviewer', width: 60,menuDisabled: true,sortable: false },{ - header: '审核时间',dataIndex: 'reviewTime', width: 120,menuDisabled: true,sortable: false + header: '装配时间',dataIndex: 'operationTime', width: 120,menuDisabled: true,sortable: false },{ header: '加急',dataIndex: 'isUrgentTousse', width: 70,menuDisabled: true,sortable: false },{ @@ -213,7 +213,7 @@ if(result.success){ Ext4.getCmp('handover').setValue(result.data.fullName); Ext4.getCmp('handoverCode').setValue(result.data.name); - Ext4.getCmp('takeoverBarcode').focus(); + Ext4.getCmp('barcode').focus(); }else{ showResult('请扫描用户条码'); } @@ -364,7 +364,7 @@ packer: (leaf ? tousseInstance.packer : ''), reviewerCode: (leaf ? tousseInstance.reviewerCode : ''), reviewer: (leaf ? tousseInstance.reviewer : ''), - reviewTime: (leaf ? tousseInstance.reviewTime : ''), + operationTime: (leaf ? tousseInstance.operationTime : ''), isUrgentTousse: (leaf ? tousseInstance.isUrgentTousse : ''), amount: (leaf ? '' : 1), leaf: leaf, @@ -392,7 +392,7 @@ packer: node.get('packer'), reviewerCode: node.get('reviewerCode'), reviewer: node.get('reviewer'), - reviewTime: node.get('reviewTime'), + operationTime: node.get('operationTime'), isUrgentTousse: node.get('isUrgentTousse') }; items.push(item);