Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r14762 -r14825 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14762) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14825) @@ -987,7 +987,7 @@ //删除装配记录 if (task.getId() != null && task.getUnPackAmount() != null && task.getUnPackAmount() + amount == 0) { - packingManager.delete(task); + packingManager.delete(task,"保存回收记录"); setIDCardTousseInstanceBeforeRecycleStatus(idCardTousseInstance); continue; } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r14792 -r14825 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14792) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14825) @@ -18,7 +18,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import java.util.stream.Collectors; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -92,7 +91,6 @@ import com.forgon.tools.GB2WB; import com.forgon.tools.MathTools; import com.forgon.tools.SqlBuilder; -import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; @@ -286,7 +284,7 @@ } if(updateSuccess){ for (PackingTask packingTask : delTask) { - packingManager.delete(packingTask); + packingManager.delete(packingTask,"修改申请单"); } application.setCommittedStatus(false); application.setReaded(InvoicePlan.UNREAD); @@ -449,7 +447,7 @@ - item.getAmount()); packingManager.saveOrUpdate(task); } else { - packingManager.delete(task); + packingManager.delete(task,"删除回收申请单"); } } } @@ -563,7 +561,7 @@ + needAddAmount); } else if (task.getUnPackAmount() + needAddAmount == 0) { - packingManager.delete(task); + packingManager.delete(task,"保存或更新回收申请单"); } else { throw new RecyclingRecordException(task .getTousseDefinition().getName() Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r14726 -r14825 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 14726) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 14825) @@ -703,7 +703,7 @@ //删除对应的装配任务。由于invoicePlanManager.terminateInvoicePlan方法没有删除外来器械对应的装配任务，所以此处再处理一下 PackingTask task = packingManager.getForeignToussePackingTask(foreignTousseApplication.getId()); if(task != null && task.getUnPackAmount() > 0){ - packingManager.delete(task); + packingManager.delete(task,"提前归还"); } } } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTaskTests.java =================================================================== diff -u -r14491 -r14825 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTaskTests.java (.../PackingTaskTests.java) (revision 14491) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTaskTests.java (.../PackingTaskTests.java) (revision 14825) @@ -188,7 +188,7 @@ PackingTask task = packingManager.getUnfinishedTask(record.getId(), "019000001", td_Test开胸包.getId(), PackingTask.TASK_RECYCLINGRECORD); AssertJUnit.assertTrue(task != null); - packingManager.delete(task); + packingManager.delete(task,PackingTask.DELETE_CAUSE_TEST); JSONArray jsonArray2 = new JSONArray(); addRecyclingItem(jsonArray2, "019000001", "0", "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "", @@ -205,7 +205,7 @@ "019000001", td_Test开胸包.getId(), PackingTask.TASK_RECYCLINGRECORD); AssertJUnit.assertTrue(task2 != null); AssertJUnit.assertEquals(3, task2.getAmount().intValue()); - packingManager.delete(task2); + packingManager.delete(task2,PackingTask.DELETE_CAUSE_TEST); objectDao.flush(); ////////////////////////////编辑回收记录,减少回收数量(如果数量为负数的话,保存回收记录方法判断task为空且数量小于0时会当做该任务已装配完处理) @@ -260,7 +260,7 @@ PackingTask.TASK_APPLICATION); AssertJUnit.assertTrue(task != null); AssertJUnit.assertEquals(10, task.getAmount().intValue()); - packingManager.delete(task); + packingManager.delete(task,PackingTask.DELETE_CAUSE_TEST); List items = application.getApplicationItems(); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java =================================================================== diff -u -r14698 -r14825 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 14698) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 14825) @@ -34,7 +34,7 @@ public void saveOrUpdate(PackingTask task); - public void delete(PackingTask task); + public void delete(PackingTask task,String cause); public void saveOrUpdate(PackingRecord packingRecord); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java =================================================================== diff -u -r14559 -r14825 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java (.../PackingTask.java) (revision 14559) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java (.../PackingTask.java) (revision 14825) @@ -2,6 +2,7 @@ import java.util.Date; import java.util.List; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -10,8 +11,10 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.persistence.Transient; + import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; + import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem; import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError; @@ -46,6 +49,10 @@ public final static String STATUS_AWAIT_PACKING = "待装配"; public final static String STATUS_AWAIT_VERIFYING = "待确认";// 丢失确认 public final static String STATUS_PACKED = "已装配";// 丢失确认 + + public final static String DELETE_CAUSE_AUTO = "装配完成自动删除"; + public final static String DELETE_CAUSE_MANUAL = "手动删除"; + public final static String DELETE_CAUSE_TEST = "测试用例删除"; private TousseDefinition tousseDefinition; Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java =================================================================== diff -u -r14559 -r14825 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 14559) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 14825) @@ -801,7 +801,7 @@ for (String id : str) { PackingTask packingTask = packingManager .getPackingTaskById(id); - packingManager.delete(packingTask); + packingManager.delete(packingTask,PackingTask.DELETE_CAUSE_MANUAL); } message = "{success:true}"; } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r14698 -r14825 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14698) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14825) @@ -304,14 +304,15 @@ } @Override - public void delete(PackingTask task) { + public void delete(PackingTask task,String cause) { if (task != null) { + String tousseName = ""; if(task.getTousseDefinition() != null){ tousseName = task.getTousseDefinition().getName(); } String description = "删除装配任务[id:" + task.getId() + ",名称:" + tousseName - + ",数量:" + task.getAmount() + "]"; + + ",数量:" + task.getAmount() +",原因:"+cause+ "]"; appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_PACKING, Log.TYPE_DELETE, description); @@ -3775,7 +3776,7 @@ leftAmount -= unPackAmount; //待补充数量 if(waitSupplementTousseAmount == null || waitSupplementTousseAmount == 0){ - delete(packingTask); + delete(packingTask,PackingTask.DELETE_CAUSE_AUTO); if(StringUtils.isNotBlank(packingTask.getBasketBarcode())){ map.put(packingTask.getBasketBarcode(), packingTask.getBasketBarcode()); } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java =================================================================== diff -u -r14491 -r14825 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java (.../DeleteRecyclingRecordItemTests.java) (revision 14491) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java (.../DeleteRecyclingRecordItemTests.java) (revision 14825) @@ -287,7 +287,7 @@ PackingTask task = packingManager.getUnfinishedTask( recyclingRecord.getId(), "019000001", td.getId(), PackingTask.TASK_RECYCLINGRECORD); - packingManager.delete(task); + packingManager.delete(task,PackingTask.DELETE_CAUSE_TEST); objectDao.flush(); List baskets = recyclingRecord.getClassifyBaskets();