Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManagerImpl.java =================================================================== diff -u -r19803 -r19869 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManagerImpl.java (.../ClassifyBasketRecyclingSequenceManagerImpl.java) (revision 19803) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManagerImpl.java (.../ClassifyBasketRecyclingSequenceManagerImpl.java) (revision 19869) @@ -1,11 +1,11 @@ package com.forgon.disinfectsystem.packing.service; -import com.forgon.disinfectsystem.entity.recyclingrecord.ClassifyBasketRecyclingSequence; +import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingBasketSequence; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.BasePoManagerImpl; public class ClassifyBasketRecyclingSequenceManagerImpl - extends BasePoManagerImpl + extends BasePoManagerImpl implements ClassifyBasketRecyclingSequenceManager { @Override @@ -19,9 +19,9 @@ return; } - ClassifyBasketRecyclingSequence cbro = getForUpdate(recyclingRecordId,classifyBasketId,tousseDefinitionId);; + RecyclingBasketSequence cbro = getForUpdate(recyclingRecordId,classifyBasketId,tousseDefinitionId);; if(cbro == null){ - cbro = new ClassifyBasketRecyclingSequence(); + cbro = new RecyclingBasketSequence(); cbro.setClassifyBasketId(classifyBasketId); cbro.setRecyclingRecordId(recyclingRecordId); cbro.setTousseDefinitionId(tousseDefinitionId); @@ -31,7 +31,7 @@ } @Override - public ClassifyBasketRecyclingSequence get(Long recyclingRecordId, + public RecyclingBasketSequence get(Long recyclingRecordId, Long classifyBasketId, Long tousseDefinitionId) { if(!DatabaseUtil.isPoIdValid(recyclingRecordId) || !DatabaseUtil.isPoIdValid(classifyBasketId) || !DatabaseUtil.isPoIdValid(tousseDefinitionId)){ @@ -43,7 +43,7 @@ } @Override - public ClassifyBasketRecyclingSequence getForUpdate(Long recyclingRecordId, + public RecyclingBasketSequence getForUpdate(Long recyclingRecordId, Long classifyBasketId, Long tousseDefinitionId) { if(!DatabaseUtil.isPoIdValid(recyclingRecordId) || !DatabaseUtil.isPoIdValid(classifyBasketId) || !DatabaseUtil.isPoIdValid(tousseDefinitionId)){ @@ -55,7 +55,7 @@ } @Override - public ClassifyBasketRecyclingSequence get(Long recyclingRecordId,Long classifyBasketId) { + public RecyclingBasketSequence get(Long recyclingRecordId,Long classifyBasketId) { if(!DatabaseUtil.isPoIdValid(recyclingRecordId) || !DatabaseUtil.isPoIdValid(classifyBasketId)){ return null; } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r19862 -r19869 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19862) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19869) @@ -93,7 +93,7 @@ import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance; import com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem; import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError; -import com.forgon.disinfectsystem.entity.recyclingrecord.ClassifyBasketRecyclingSequence; +import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingBasketSequence; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection; @@ -3133,7 +3133,7 @@ Long materialDefinitionId = rs.getLong(4); ForeignTousseSplitVo packageObj = map.get(classifyBasketId); if(packageObj == null){ - ClassifyBasketRecyclingSequence sequence = classifyBasketRecyclingSequenceManager.get(task.getSourceId(), classifyBasketId, tousseDefinition.getId()); + RecyclingBasketSequence sequence = classifyBasketRecyclingSequenceManager.get(task.getSourceId(), classifyBasketId, tousseDefinition.getId()); packageObj = new ForeignTousseSplitVo(); Integer seq = sequence != null&&sequence.getSequence() != null?sequence.getSequence():0; packageObj.setSplitIndex(seq != null&&seq > 0?seq:i); Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java =================================================================== diff -u -r19803 -r19869 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java (.../RecyclingRecordTableManager.java) (revision 19803) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java (.../RecyclingRecordTableManager.java) (revision 19869) @@ -32,7 +32,7 @@ import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail; -import com.forgon.disinfectsystem.entity.recyclingrecord.ClassifyBasketRecyclingSequence; +import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingBasketSequence; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingItem; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; @@ -217,7 +217,7 @@ } } for (ClassifyBasket basket : recyclingRecord.getClassifyBaskets()) { - ClassifyBasketRecyclingSequence seq = classifyBasketRecyclingSequenceManager.get(recyclingRecord.getId(), basket.getId()); + RecyclingBasketSequence seq = classifyBasketRecyclingSequenceManager.get(recyclingRecord.getId(), basket.getId()); if(seq != null){ basket.setSequence(seq.getSequence()); } Fisheye: Tag 19869 refers to a dead (removed) revision in file `ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/ClassifyBasketRecyclingSequence.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketsRecyclingSequenceTests.java =================================================================== diff -u -r19804 -r19869 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketsRecyclingSequenceTests.java (.../ClassifyBasketsRecyclingSequenceTests.java) (revision 19804) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketsRecyclingSequenceTests.java (.../ClassifyBasketsRecyclingSequenceTests.java) (revision 19869) @@ -31,7 +31,7 @@ import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; import com.forgon.disinfectsystem.entity.packing.PackingTask; -import com.forgon.disinfectsystem.entity.recyclingrecord.ClassifyBasketRecyclingSequence; +import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingBasketSequence; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.packing.service.ClassifyBasketRecyclingSequenceManager; @@ -107,7 +107,7 @@ params.put("tousseJson", ja); recyclingRecordManager.save(recyclingRecord, params); - List list = classifyBasketRecyclingSequenceManager.getByHql("recyclingRecordId=" + recyclingRecord.getId()); + List list = classifyBasketRecyclingSequenceManager.getByHql("recyclingRecordId=" + recyclingRecord.getId()); assertEquals(list.size(),3); List sequences = list.stream().map(p->p.getSequence()).collect(Collectors.toList()); assertTrue(MathTools.continuous(sequences)); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/ClassifyBasketRecyclingSequence.java =================================================================== diff -u -r19799 -r19869 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/ClassifyBasketRecyclingSequence.java (.../ClassifyBasketRecyclingSequence.java) (revision 19799) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/ClassifyBasketRecyclingSequence.java (.../RecyclingBasketSequence.java) (revision 19869) @@ -17,7 +17,7 @@ */ @Entity @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) -public class ClassifyBasketRecyclingSequence { +public class RecyclingBasketSequence { private Long id; /** * 回收记录的id Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManager.java =================================================================== diff -u -r19803 -r19869 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManager.java (.../ClassifyBasketRecyclingSequenceManager.java) (revision 19803) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManager.java (.../ClassifyBasketRecyclingSequenceManager.java) (revision 19869) @@ -1,9 +1,9 @@ package com.forgon.disinfectsystem.packing.service; -import com.forgon.disinfectsystem.entity.recyclingrecord.ClassifyBasketRecyclingSequence; +import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingBasketSequence; import com.forgon.tools.hibernate.BasePoManager; -public interface ClassifyBasketRecyclingSequenceManager extends BasePoManager { +public interface ClassifyBasketRecyclingSequenceManager extends BasePoManager { /** * 保存或者更新记录。以recyclingRecordId和classifyBasketId、tousseDefinitionId查询记录,如果已经存在，则更新order，如果不存在,则插入新记录 * @param recyclingRecordId @@ -19,20 +19,20 @@ * @param tousseDefinitionId * @return */ - public ClassifyBasketRecyclingSequence get(Long recyclingRecordId,Long classifyBasketId,Long tousseDefinitionId); + public RecyclingBasketSequence get(Long recyclingRecordId,Long classifyBasketId,Long tousseDefinitionId); /** * 获取对象并锁定 * @param recyclingRecordId * @param classifyBasketId * @param tousseDefinitionId * @return */ - public ClassifyBasketRecyclingSequence getForUpdate(Long recyclingRecordId,Long classifyBasketId,Long tousseDefinitionId); + public RecyclingBasketSequence getForUpdate(Long recyclingRecordId,Long classifyBasketId,Long tousseDefinitionId); /** * 获取回收记录中的篮筐序号。在重新打开回收记录时，需要获取保存的篮筐序号。业务上，一个篮筐只能装一个外来器械包。目前一个回收记录,一个篮筐，只会装一个外来器械 * @param recyclingRecordId * @param classifyBasketId * @return */ - public ClassifyBasketRecyclingSequence get(Long recyclingRecordId,Long classifyBasketId); + public RecyclingBasketSequence get(Long recyclingRecordId,Long classifyBasketId); }