[清退] 添加了缺少单据保存 以及加了一个状态

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -192,17 +192,22 @@ public enum LogType {
     SEND_BACK_26(100016,SEND_BACK.id, SEND_BACK_1214.id,END.id , "清退装备任务，上传了回执单据"),
     SEND_BACK_27(100017,SEND_BACK.id, SEND_BACK_1202.id,SEND_BACK_1213.id , "省直属单位清退装备选择完成，等待签字单据上传"),
     SEND_BACK_28(100018,SEND_BACK.id, SEND_BACK_1213.id,END.id , "上传了直属单位清退签字单据"),
+    SEND_BACK_29(100019,SEND_BACK.id, SEND_BACK_1209.id,SEND_BACK_1215.id , "单据未上传,继续等待单据上传"),
+    SEND_BACK_30(100020,SEND_BACK.id, SEND_BACK_1215.id,END.id , "接收单据已上传,清退装备配送完成"),
 
 
     LOSS_1(9000,LOSS.id,ORIGIN_STATUS.id,LOSS1300.id,"发起装备丢失上报"),
-    LOSS_2(9001,LOSS.id,LOSS1300.id,LOSS1300.id,"确认了装备丢失"),
+    LOSS_2(9001,LOSS.id,LOSS1300.id,LOSS1301.id,"确认了装备丢失"),
     LOSS_3(9002,LOSS.id,LOSS1300.id,END.id,"确认了装备丢失报告,报告任务结束"),
     LOSS_4(9003,LOSS.id,ORIGIN_STATUS.id,END.id,"省装备丢失报告发起记录"),
+    LOSS_5(9004,LOSS.id,ORIGIN_STATUS.id,LOSS1301.id,"发起丢失装备上报"),
+
 
     RETRIEVE_1(9010,RETRIEVE.id,ORIGIN_STATUS.id,RETRIEVE1400.id,"发起装备找回上报"),
-    RETRIEVE_2(9011,RETRIEVE.id,RETRIEVE1400.id,RETRIEVE1400.id,"确认了装备找回上报"),
+    RETRIEVE_2(9011,RETRIEVE.id,RETRIEVE1400.id,RETRIEVE1401.id,"确认了装备找回上报"),
     RETRIEVE_3(9012,RETRIEVE.id,RETRIEVE1400.id,END.id,"确认了装备找回上报,找回任务结束"),
-    RETRIEVE_4(9013,LOSS.id,ORIGIN_STATUS.id,END.id,"省装备找回报告发起记录"),
+    RETRIEVE_4(9013,RETRIEVE.id,ORIGIN_STATUS.id,END.id,"省装备找回报告发起记录"),
+    RETRIEVE_5(9014,RETRIEVE.id,ORIGIN_STATUS.id,RETRIEVE1401.id,"发起丢失装备上报"),
 
 
     WORK_H1(79, WORK_HANDOVER.id, ORIGIN_STATUS.id, WORKHANDOVER1011.id, "工作交接任务生成完成,等待上传交接单"),

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -85,8 +85,7 @@ public enum StatusEnum {
     SEND_BACK_1212(1212, "清退统计任务待办结"),
     SEND_BACK_1213(1213,"省直属清退任务待上传单据"),
     SEND_BACK_1214(1214,"清退出库等待上传回执单"),
-
-
+    SEND_BACK_1215(1215,"清退出库接收方单据待补充"),
 
 
 
@@ -125,7 +124,7 @@ public enum StatusEnum {
     TRAIN1008(1008, "成绩录入"),
 
     TRAIN1009(1009, "成绩确认"),
-    //
+
     TRAIN1010(1010, "待培训"),
 
     WORKHANDOVER1011(1011, "待上传签字单"),

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/StorageDeviceRepel.java

@@ -20,12 +20,19 @@ import java.util.List;
 @NoArgsConstructor
 @ApiModel("入库参数对象以及省本级、直属单位清退提交对象")
 public class StorageDeviceRepel {
+    /**
+     * 接收方单据
+     */
     private List<FileRet> fileRets;
 
-    private List<FileRet> inFiles;
-
+    /**
+     * 装备id集合
+     */
     private List<Integer> deviceIds;
 
+    /**
+     * 回执单据
+     */
     private List<FileRet> outFiles;
 
     private Integer userId;

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelBusinessService.java

@@ -66,7 +66,6 @@ public interface RepelBusinessService {
      */
     DeviceRepelDetail sendBackOutCheck(Integer taskId, Integer userId, OrderOutData orderOutData);
 
-
     /**
      * 上级清退装备入库
      * todo
@@ -74,6 +73,7 @@ public interface RepelBusinessService {
     void storageDeviceRepel(Integer taskId, StorageDeviceRepel storageDeviceRepel);
 
 
+
     /**
      * 本级装备待清退提交
      */

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -472,25 +472,36 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
 
     @Override
     public void storageDeviceRepel(Integer taskId, StorageDeviceRepel storageDeviceRepel) {
+        //判断是否上传单据
+        //是 直接入库 任务完结
+        //否 状态改为入库待补充文件
+        //修改统计表中的数据信息 状态
+
+
        List<RepelDeviceUnit> list=new ArrayList<>();
        TaskBto taskBto= taskService.get(taskId);
-       List<StatusEnum> enumList=new ArrayList<>();
-       enumList.add(StatusEnum.SEND_BACK_1209);
-       enumList.add(StatusEnum.SEND_BACK_1213);
-       TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1209);
-
-       DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
-       deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
-       deviceRepelDetail.setInFile(FilesUtil.stringFileToList(storageDeviceRepel.getInFiles()));
-       taskService.moveToEnd(taskBto);
-       deviceRepelDetail.setRepelStatus(2);
+       DeviceRepelDetail deviceRepelDetail = deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
+       //判断是否为入库单据待补充 还是直接入库。
+       if (storageDeviceRepel.getFileRets()!=null&&storageDeviceRepel.getFileRets().size()!=0) {
+           List<StatusEnum> enumList=new ArrayList<>();
+           enumList.add(StatusEnum.SEND_BACK_1209);
+           enumList.add(StatusEnum.SEND_BACK_1213);
+           enumList.add(StatusEnum.SEND_BACK_1215);
+           TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),enumList);
+           deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
+           taskService.moveToEnd(taskBto);
+       }else {
+           //判断当前状态是否为SEND_BACK_1209 清退装备等待入库
+           TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1209);
+           taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1215,0);
+        }
+        deviceRepelDetail.setRepelStatus(2);
        //判断是否为 市提交 是则为在库
         //否则为待清退
-       Integer inStock;
 //       if (unitsService.findById(deviceRepelDetail.getReceiveUnitId()).getLevel()==2){
 //          inStock=DeviceLifeStatus.IN_LIBRARY.id;
 //       }else {
-           inStock=DeviceLifeStatus.REPEL.id;
+       Integer inStock=DeviceLifeStatus.REPEL.id;
 //       }
        List<DeviceLibrary> libraries=  findInvoleDevice(deviceRepelDetail.getDeviceIds());
        libraries.forEach(
@@ -514,9 +525,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
         isEnd(taskBto,deviceRepelDetail.getRepelId());
         devLogAdd(findInvoleDevice(deviceRepelDetail.getDeviceIds()),deviceRepelDetail.getReceiveUnit()+"接收"+deviceRepelDetail.getSendUnit()+"装备清退装备，任务完成",storageDeviceRepel.getUserId());
-        //完结当前任务
-        //把任务状态修改为 清退提交装备已完成
-        //修改统计表中的数据信息 状态
+
     }
 
     @Override