[业务状态] 添加了业务状态

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

@@ -64,9 +64,6 @@ public enum LogType {
 
     APPLY_3(23,APPLY.id, DEVICE_APPLY_CONFIRM.id, ARCHIVE.id, "装备申请批复驳回"),
 
-    DESTROY_1(24,DESTROY.id, ORIGIN_STATUS.id, WAIT_UPLOAD_BILL_FILE.id, "发起销毁"),
-
-    DESTROY_3(26,DESTROY.id, DESTROY_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "销毁出库审核失败"),
 
     MATCHING_1(27,ADD_MATCHING_DEVICE.id, ORIGIN_STATUS.id, END.id, "发起新增配套设备"),
 
@@ -78,13 +75,11 @@ public enum LogType {
 
     REPAIR_SEND_2(31,REPAIR.id, REPAIR_SEND_CONFIRM.id, WAIT_RECEIVE.id, "审核成功并出库"),
 
-    DESTROY_2(25,DESTROY.id, DESTROY_BUSINESS_NEED_CONFIRM.id, WAIT_UPLOAD_BILL_FILE.id, "销毁出库审核成功"),
 
     REPAIR_SEND_3(32,REPAIR.id, REPAIR_SEND_CONFIRM.id, ARCHIVE.id, "维修出库审核失败"),
 
     REPAIR_SEND_4(33,REPAIR.id, WAIT_RECEIVE.id, END.id, "接收维修装备并发起入库"),
 
-    DESTROY_4(100,DESTROY.id, WAIT_UPLOAD_BILL_FILE.id, END.id, "上传销毁单"),
 
     REPAIR_SEND_5(34,REPAIR.id, WAIT_RECEIVE.id, WAIT_UPLOAD_FILE.id, "接收维修装备并发起入库(缺少单据)"),
 
@@ -183,11 +178,6 @@ public enum LogType {
     SEND_BACK_14(10004,SEND_BACK.id, SEND_BACK_1209.id,END.id , "单位接收完成"),
     SEND_BACK_15(10005,SEND_BACK.id, SEND_BACK_1207.id,SEND_BACK_1206.id , "上级审核不通过"),
     SEND_BACK_16(10006,SEND_BACK.id, SEND_BACK_1206.id,SEND_BACK_1208.id , "全部清退任务，不需要审核，等待清退装备出库"),
-
-    //退役
-    SEND_BACK_17(10007,DECOMMISSIONING.id, ORIGIN_STATUS.id,SEND_BACK_1210.id , "发起退役任务，等待中办签字单据"),
-    SEND_BACK_18(10008,DECOMMISSIONING.id, SEND_BACK_1210.id,END.id , "上传中办签字单据，任务结束"),
-
     SEND_BACK_19(10009,SEND_BACK.id, ORIGIN_STATUS.id,SEND_BACK_1211.id , "市发起清退任务，待省级单位审核"),
     SEND_BACK_20(100010,SEND_BACK.id, SEND_BACK_1211.id,END.id , "省对单位审核不通过，任务结束"),
     SEND_BACK_21(100011,SEND_BACK.id, SEND_BACK_1211.id,SEND_BACK_1204.id , "省对单位审核通过，等待下级单位提交"),
@@ -199,9 +189,36 @@ public enum LogType {
     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 , "接收单据已上传,清退装备配送完成"),
+
+    //退役
+    DECOMMISSIONING_1(100201,DECOMMISSIONING.id, ORIGIN_STATUS.id,SEND_BACK_1210.id , "发起退役任务，等待中办签字单据"),
+    DECOMMISSIONING_2(100202,DECOMMISSIONING.id, SEND_BACK_1210.id,END.id , "上传中办签字单据，任务结束"),
+    DECOMMISSIONING_3(100203,DECOMMISSIONING.id, ORIGIN_STATUS.id,DECOMMISSIONING_1250.id , "发起了退役任务的草稿"),
+    DECOMMISSIONING_4(100204,DECOMMISSIONING.id, DECOMMISSIONING_1250.id,SEND_BACK_1210.id , "上传中办签字单据，任务结束"),
+    DECOMMISSIONING_5(100205,DECOMMISSIONING.id, SEND_BACK_1210.id,END.id , "上传中办签字单据，任务结束"),
+    DECOMMISSIONING_6(100206,DECOMMISSIONING.id, ORIGIN_STATUS.id,DECOMMISSIONING_1251.id , "发起退役任务，等待待用签章审核"),
+    DECOMMISSIONING_7(100207,DECOMMISSIONING.id, DECOMMISSIONING_1251.id,DECOMMISSIONING_1250.id , "调用电子签章审核,拒绝"),
+    DECOMMISSIONING_8(100208,DECOMMISSIONING.id, DECOMMISSIONING_1251.id,DECOMMISSIONING_1252.id , "调用电子签章审核,通过"),
+    DECOMMISSIONING_9(100209,DECOMMISSIONING.id, DECOMMISSIONING_1252.id,END.id , "上传中办签字单据，任务结束"),
+//    DECOMMISSIONING_2(100202,DECOMMISSIONING.id, SEND_BACK_1210.id,END.id , "上传中办签字单据，任务结束"),
+//    DECOMMISSIONING_2(100202,DECOMMISSIONING.id, SEND_BACK_1210.id,END.id , "上传中办签字单据，任务结束"),
+
+
     //重新入库
     AGAINSTORAGE_01(100021,AGAINSTORAGE.id, ORIGIN_STATUS.id,END.id , "发起了装备生命状态转换"),
 
+    SCRAP_1(100101,SCRAP.id, ORIGIN_STATUS.id, SCRAP_2222.id, "发起装备报废"),
+    SCRAP_2(100102,SCRAP.id, SCRAP_2222.id, END.id, "上传报废单据,任务结束"),
+    SCRAP_3(100103,SCRAP.id, ORIGIN_STATUS.id, SCRAP_2223.id, "发起了报废任务的草稿"),
+    SCRAP_4(100104,SCRAP.id, SCRAP_2223.id, SCRAP_2222.id, "报废草稿任务，发布生成"),
+    SCRAP_5(100105,SCRAP.id, SCRAP_2222.id, END.id, "上传报废单据,任务结束"),
+    SCRAP_6(100106,SCRAP.id, ORIGIN_STATUS.id, SCRAP_2224.id, "发起报废任务，等待待用签章审核"),
+    SCRAP_7(100107,SCRAP.id, SCRAP_2224.id, SCRAP_2223.id, "调用电子签章审核,拒绝"),
+    SCRAP_8(100108,SCRAP.id, SCRAP_2224.id, SCRAP_2225.id, "调用电子签章审核,通过"),
+    SCRAP_9(100109,SCRAP.id, SCRAP_2225.id, END.id, "上传报废单据,任务结束"),
+//    SCRAP_2(100101,SCRAP.id, SCRAP_2222.id, END.id, "上传报废单据,任务结束"),
+//    SCRAP_2(100101,SCRAP.id, SCRAP_2222.id, END.id, "上传报废单据,任务结束"),
+
 
     LOSS_1(9000,LOSS.id,ORIGIN_STATUS.id,LOSS1300.id,"发起装备丢失上报"),
     LOSS_2(9001,LOSS.id,LOSS1300.id,LOSS1301.id,"确认了装备丢失"),
@@ -230,8 +247,7 @@ public enum LogType {
     REPAIR_SEND_10(87, REPAIR.id, ORIGIN_STATUS.id, WAIT_UPLOAD_FILE.id, "向(%receiveUnit)发起装备维修"),
     REPAIR_BACK_7(88, REPAIR_BACK.id, ORIGIN_STATUS.id, END.id, "维修退回装备接收并发起入库"),
     STORAGE_4(89, STORAGE.id, WAIT_STORAGE.id, ARCHIVE.id, "删除入库草稿"),
-    SCRAP_1(90,SCRAP.id, ORIGIN_STATUS.id, WAIT_UPLOAD_SCRAP_FILE.id, "发起装备报废"),
-    SCRAP_2(91,SCRAP.id, WAIT_UPLOAD_SCRAP_FILE.id, END.id, "上传报废单据"),
+//
     SELF_CHECK_5(92,SELF_CHECK.id, ORIGIN_STATUS.id, END.id, "终端自查"),
     SELF_CHECK_6(93,SELF_CHECK.id, WAIT_SELF_CHECK.id, END.id, "周期自查"),
     APPLY_4(94,APPLY.id, ORIGIN_STATUS.id, WAIT_APPLY_FILE.id, "发起申请"),