Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r26388 -r26453 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 26388) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 26453) @@ -24,7 +24,7 @@ "4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.7", "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4","4.9.5","4.9.6", "4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18","4.9.19","4.9.20","4.9.21","4.9.22","4.9.23","4.9.24", - "4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34"}; + "4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java =================================================================== diff -u -r26368 -r26453 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java (.../PackingTask.java) (revision 26368) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java (.../PackingTask.java) (revision 26453) @@ -517,6 +517,7 @@ this.discardTiBarcode = discardTiBarcode; } + @Column(length = 4000) public String getErrorRemark() { return errorRemark; } @@ -525,6 +526,7 @@ this.errorRemark = errorRemark; } + @Column(length = 4000) public String getDamageRemark() { return damageRemark; } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r26426 -r26453 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 26426) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 26453) @@ -581,6 +581,8 @@ String itemType = obj.getItemType(); String tousseBarcode = obj.getTousseBarcode(); String errorDamageQmKey = obj.getErrorDamageQmKey(); + String errorRemark = obj.getErrorRemark(); + String damageRemark = obj.getDamageRemark(); if(!DatabaseUtil.isPoIdValid(tousseDefinitionID)){ throw new RuntimeException("参数错误"); @@ -632,6 +634,8 @@ detail.setOperationTime(new Date()); detail.setMaterialDefinitionId(materialDefinitionId); detail.setType(itemType); + detail.setErrorRemark(errorRemark); + detail.setDamageRemark(damageRemark); detail.setTousseName(recyclingItem.getTousseName()); detail.setOperator(record.getOperator()); if(MaterialErrorDamageDetail.TYPE_DAMAGE.equals(itemType)){ Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/MaterialErrorDamageDetailVo.java =================================================================== diff -u -r18645 -r26453 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/MaterialErrorDamageDetailVo.java (.../MaterialErrorDamageDetailVo.java) (revision 18645) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/MaterialErrorDamageDetailVo.java (.../MaterialErrorDamageDetailVo.java) (revision 26453) @@ -24,6 +24,14 @@ private String itemType; private String tousseBarcode; private String errorDamageQmKey; + /** + * 丢失备注 + */ + private String errorRemark; + /** + * 报损备注 + */ + private String damageRemark; public Long getDetailId() { return detailId; } @@ -80,6 +88,19 @@ public void setErrorDamageQmKey(String errorDamageQmKey) { this.errorDamageQmKey = errorDamageQmKey; } + public String getErrorRemark() { + return errorRemark; + } + public void setErrorRemark(String errorRemark) { + this.errorRemark = errorRemark; + } + public String getDamageRemark() { + return damageRemark; + } + public void setDamageRemark(String damageRemark) { + this.damageRemark = damageRemark; + } + /** * 计算集合中丢失报损的数量总和 * @param items Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.34_4.9.35_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.34_4.9.35_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.34_4.9.35_oracle.sql (revision 26453) @@ -0,0 +1,5 @@ +execute immediate 'alter table RecyclingItem modify remark varchar2(4000)'; +execute immediate 'alter table RecyclingItem modify errorRemark varchar2(4000)'; +execute immediate 'alter table RecyclingItem modify damageRemark varchar2(4000)'; +execute immediate 'alter table PackingTask modify errorRemark varchar2(4000)'; +execute immediate 'alter table PackingTask modify damageRemark varchar2(4000)'; \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/MaterialErrorDamageDetail.java =================================================================== diff -u -r23492 -r26453 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/MaterialErrorDamageDetail.java (.../MaterialErrorDamageDetail.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/MaterialErrorDamageDetail.java (.../MaterialErrorDamageDetail.java) (revision 26453) @@ -6,6 +6,7 @@ import javax.persistence.Entity; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -234,6 +235,16 @@ */ private Boolean isUnionToussInstance; + /** + * 器械丢失备注 + */ + private String errorRemark; + + /** + * 器械报损备注 + */ + private String damageRemark; + @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { @@ -620,6 +631,24 @@ this.isUnionToussInstance = isUnionToussInstance; } + @Column(length = 4000) + public String getErrorRemark() { + return errorRemark; + } + + public void setErrorRemark(String errorRemark) { + this.errorRemark = errorRemark; + } + @Column(length = 4000) + public String getDamageRemark() { + return damageRemark; + } + + public void setDamageRemark(String damageRemark) { + this.damageRemark = damageRemark; + } + + } Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.34_4.9.35_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.34_4.9.35_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.34_4.9.35_sqlserver.sql (revision 26453) @@ -0,0 +1,5 @@ +alter table RecyclingItem alter column remark varchar(4000); +alter table RecyclingItem alter column errorRemark varchar(4000); +alter table RecyclingItem alter column damageRemark varchar(4000); +alter table PackingTask alter column errorRemark varchar(4000); +alter table PackingTask alter column damageRemark varchar(4000); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java =================================================================== diff -u -r25841 -r26453 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java (.../RecyclingItem.java) (revision 25841) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java (.../RecyclingItem.java) (revision 26453) @@ -6,6 +6,7 @@ import javax.persistence.Entity; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -359,6 +360,7 @@ return damages; } + @Column(length = 4000) public String getRemark() { return remark; } @@ -367,14 +369,16 @@ this.remark = remark; } + @Column(length = 4000) public String getErrorRemark() { return errorRemark; } public void setErrorRemark(String errorRemark) { this.errorRemark = errorRemark; } - + + @Column(length = 4000) public String getDamageRemark() { return damageRemark; } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java =================================================================== diff -u -r26164 -r26453 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java (.../MaterialErrorDamageDetailManagerImpl.java) (revision 26164) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java (.../MaterialErrorDamageDetailManagerImpl.java) (revision 26453) @@ -144,6 +144,7 @@ String departCoding = json.optString("departCoding"); String linkType = json.optString("linkType"); String damageOfPeople = json.optString("damageOfPeople"); + String remark = json.optString("remark"); if(StringUtils.isBlank(linkType)){ throw new RuntimeException("参数错误！"); } @@ -193,6 +194,7 @@ item.setWarehouseId(wareHouse.getId()); item.setWarehouseName(wareHouse.getName()); item.setType(MaterialErrorDamageDetail.TYPE_DAMAGE); + item.setDamageRemark(remark); objectDao.saveOrUpdate(item); } }