更新

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -656,15 +656,25 @@ public class AllotBillController {
     public ResponseEntity applySignConfirm(@PathVariable("taskId") int taskId,@PathVariable("status") int status) {
         //推动任务
         TaskBto taskBto = taskService.get(taskId);
+        AllotBill allotBill = allotBillService.getOne(taskBto.getBillId());
         if (status==1){
             taskService.moveToSpecial(taskBto,StatusEnum.WAIT_SIGN);
-            AllotBill allotBill = allotBillService.getOne(taskBto.getBillId());
-            allotBill.setSendUserbId(userUtils.getCurrentUserId());
-            allotBill.setAgent(userUtils.getCurrentName());
+            if (allotBill.getAllotStatus()==0) {
+                allotBill.setSendUserbId(userUtils.getCurrentUserId());
+                allotBill.setAgent(userUtils.getCurrentName());
+            }
+            else {
+                allotBill.setReceiveUserbId(userUtils.getCurrentUserId());
+            }
             allotBillService.update(allotBill);
         }
         else {
-            taskService.moveToSpecial(taskBto,StatusEnum.ALLOT_DRAFT,taskBto.getCreateUserId());
+            if (allotBill.getAllotStatus()==0) {
+                taskService.moveToSpecial(taskBto, StatusEnum.ALLOT_DRAFT, taskBto.getCreateUserId());
+            }
+            else {
+                taskService.moveToSpecial(taskBto, StatusEnum.ALLOTING, allotBill.getReceiveUseraId());
+            }
         }
         myWebSocket.sendMessage1();
         return ResponseEntity.ok("申请成功");

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java

@@ -457,15 +457,25 @@ public class BackController {
     public ResponseEntity applySignConfirm(@PathVariable("taskId") int taskId,@PathVariable("status") int status) {
         //推动任务
         TaskBto taskBto = taskService.get(taskId);
+        AllotBackBill allotBill = allotBackBillService.getOne(taskBto.getBillId());
         if (status==1){
             taskService.moveToSpecial(taskBto,StatusEnum.BACK_WAIT_SIGN);
-            AllotBackBill allotBill = allotBackBillService.getOne(taskBto.getBillId());
-            allotBill.setSendUserbId(userUtils.getCurrentUserId());
-            allotBill.setAgent(userUtils.getCurrentUserName());
+            if (allotBill.getBackStatus()==0) {
+                allotBill.setSendUserbId(userUtils.getCurrentUserId());
+                allotBill.setAgent(userUtils.getCurrentName());
+            }
+            else {
+                allotBill.setReceiveUserbId(userUtils.getCurrentUserId());
+            }
             allotBackBillService.update(allotBill);
         }
         else {
-            taskService.moveToSpecial(taskBto,StatusEnum.BACK_DRAFT,taskBto.getCreateUserId());
+            if (allotBill.getBackStatus()==0) {
+                taskService.moveToSpecial(taskBto, StatusEnum.BACK_DRAFT, taskBto.getCreateUserId());
+            }
+            else {
+                taskService.moveToSpecial(taskBto, StatusEnum.ALLOT_BACKING, allotBill.getReceiveUseraId());
+            }
         }
         myWebSocket.sendMessage1();
         return ResponseEntity.ok("申请成功");

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotReceiveVo.java

@@ -63,7 +63,7 @@ public class AllotReceiveVo {
     private Map<Integer,String> map = new HashMap<>();
 
     @NotNull(message = "status不能为空")
-    @ApiModelProperty(value = "是否缺失单据（0：否，1：是）")
+    @ApiModelProperty(value = "是否二方都盖章了（0：否，1：是）")
     private Integer status = 0;
 
     @ApiModelProperty(value = "接收方配发单")

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

@@ -282,6 +282,17 @@ public enum LogType {
     ALLOT_17(110,ALLOT.id, SIGN_WAIT_CONFIRM.id, ALLOT_DRAFT.id, "拒绝电子签章申请"),
     ALLOT_18(111,ALLOT.id, SIGN_WAIT_CONFIRM.id, WAIT_SIGN.id, "同意电子签章申请"),
     ALLOT_19(112,ALLOT.id, WAIT_SIGN.id, ALLOTING.id, "盖电子签章并出库"),
+    ALLOT_BACK_8(113, ALLOT_BACK.id, ORIGIN_STATUS.id, BACK_SIGN_WAIT_CONFIRM.id, "申请电子签章"),
+    ALLOT_BACK_9(114,ALLOT_BACK.id, BACK_DRAFT.id, BACK_SIGN_WAIT_CONFIRM.id, "申请电子签章"),
+    ALLOT_BACK_10(115,ALLOT_BACK.id, BACK_SIGN_WAIT_CONFIRM.id, BACK_DRAFT.id, "拒绝电子签章申请"),
+    ALLOT_BACK_11(116,ALLOT_BACK.id, BACK_SIGN_WAIT_CONFIRM.id, BACK_WAIT_SIGN.id, "同意电子签章申请"),
+    ALLOT_BACK_12(117,ALLOT_BACK.id, BACK_WAIT_SIGN.id, ALLOT_BACKING.id, "盖电子签章并出库"),
+    ALLOT_BACK_13(118,ALLOT_BACK.id, BACK_WAIT_SIGN.id, END.id, "盖电子签章并入库"),
+    ALLOT_BACK_14(119,ALLOT_BACK.id, BACK_WAIT_SIGN.id, WAIT_UPLOAD_ALLOT_BACK_FILE.id, "盖电子签章并入库"),
+    ALLOT_20(120,ALLOT.id, WAIT_SIGN.id, END.id, "盖电子签章并入库"),
+    ALLOT_21(121,ALLOT.id, WAIT_SIGN.id, WAIT_UPLOAD_ALLOT_RECEIVE_FILE.id, "盖电子签章并入库"),
+    ALLOT_22(122,ALLOT.id, SIGN_WAIT_CONFIRM.id, ALLOTING.id, "拒绝电子签章申请"),
+    ALLOT_BACK_15(123,ALLOT_BACK.id, BACK_SIGN_WAIT_CONFIRM.id, ALLOT_BACKING.id, "拒绝电子签章申请"),
     ;
 
     public Integer id;

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -225,6 +225,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         PackingLibrary packingLibrary = getOne(id);
         packingLibrary.setPackingStatus(3);
         packingLibrary.setExitTime(Timestamp.from(new Date().toInstant()));
+        packingLibrary.setShowOrder(9999);
         update(packingLibrary);
         //添加列装日志
         PackingLog packingLog = new PackingLog();