空安瓿新增已消耗处理类型

jmai-physic/src/main/java/com/jmai/physic/entity/PhysicStorageAmpoule.java

@@ -36,7 +36,7 @@ public class PhysicStorageAmpoule extends BaseVersionEntity {
     private Integer expendNum;
     private Integer expendNum;
     @ApiModelProperty(value = "回收处方数量")
     @ApiModelProperty(value = "回收处方数量")
     private Integer recycleReceiptNum;
     private Integer recycleReceiptNum;
-    @ApiModelProperty(value = "类型：1-接收，2-移至销毁")
+    @ApiModelProperty(value = "类型：1-接收，2-移至销毁、3-已销毁")
     private Integer type;
     private Integer type;
 
 
     @ApiModelProperty(value = "销毁状态：0-待销毁 1-已销毁")
     @ApiModelProperty(value = "销毁状态：0-待销毁 1-已销毁")

jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicDestroyCheckServiceImpl.java

@@ -197,8 +197,9 @@ public class PhysicDestroyCheckServiceImpl extends BaseServiceImpl<PhysicDestroy
                 ampoule.setAcceptDeptId(sysUser.getDeptId());
                 ampoule.setAcceptDeptId(sysUser.getDeptId());
                 ampoule.setExpendNum(detail.getDestroyNum());
                 ampoule.setExpendNum(detail.getDestroyNum());
                 ampoule.setRecycleReceiptNum(null);
                 ampoule.setRecycleReceiptNum(null);
-                ampoule.setType(2);
 
 
+                // 3-已销毁
+                ampoule.setType(3);
                 ampoule.setDestroyStatus(1);
                 ampoule.setDestroyStatus(1);
 
 
                 Integer batchNoSum = physicStorageAmpouleMapper.selectCurrentSumByBatchNo(detail.getPhysicName(), detail.getPhysicSpec(), detail.getFactoryName(), detail.getBatchNo());
                 Integer batchNoSum = physicStorageAmpouleMapper.selectCurrentSumByBatchNo(detail.getPhysicName(), detail.getPhysicSpec(), detail.getFactoryName(), detail.getBatchNo());