出库部分

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/job/mydoJob")
-public class MydoJobController extends BaseController
+public class InMydoJobController extends BaseController
 {
     @Autowired
     private IMydoJobService mydoJobService;

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java

@@ -0,0 +1,64 @@
+package com.ruoyi.job.mydojob.controller;
+
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.job.mydojob.domain.MydoJob;
+import com.ruoyi.job.mydojob.service.IMydoJobService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static com.ruoyi.common.utils.PageUtils.startPage;
+
+@RestController
+@RequestMapping("/job/outmydoJob")
+public class OutMydoJobController extends BaseController {
+
+    @Autowired
+    private IMydoJobService mydoJobService;
+
+    /**
+     * 查询任务表列表
+     */
+    @PreAuthorize("@ss.hasPermi('job:outmydoJob:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MydoJob mydoJob)
+    {
+        startPage();
+        mydoJob.setInOut("2");
+        List<MydoJob> list = mydoJobService.selectMydoJobList(mydoJob);
+        return getDataTable(list);
+    }
+
+    /**
+     * 手动完成
+     */
+    @PreAuthorize("@ss.hasPermi('job:outmydoJob:OuthandFinish')")
+    @Log(title = "出库手动完成", businessType = BusinessType.OTHER)
+    @RequestMapping("/OuthandFinish")
+    public AjaxResult manualCompleted(MydoJob mydoJob)
+    {
+        return mydoJobService.OuthandFinish(mydoJob);
+    }
+
+    /**
+     * 手动作废
+     */
+    @PreAuthorize("@ss.hasPermi('job:outmydoJob:OuthandInvalidation')")
+    @Log(title = "出库手动作废", businessType = BusinessType.OTHER)
+    @RequestMapping("/OuthandInvalidation")
+    public AjaxResult OuthandInvalidation(MydoJob mydoJob)
+    {
+        return mydoJobService.OuthandInvalidation(mydoJob);
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java

@@ -111,6 +111,16 @@ public class MydoJob extends BaseEntity
     @Excel(name = "重分标记")
     private String faultFlag;
 
+    private String inOut;
+
+    public String getInOut() {
+        return inOut;
+    }
+
+    public void setInOut(String inOut) {
+        this.inOut = inOut;
+    }
+
     public void setJobId(String jobId)
     {
         this.jobId = jobId;

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java

@@ -74,4 +74,13 @@ public interface IMydoJobService
      * @return
      */
     AjaxResult manualCompleted(MydoJob mydoJob);
+
+    /**
+     * 出库手动完成
+     */
+    AjaxResult OuthandFinish(MydoJob mydoJob);
+    /**
+     * 出库手动作废
+     */
+    AjaxResult OuthandInvalidation(MydoJob mydoJob);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -211,4 +211,13 @@ public class MydoJobServiceImpl implements IMydoJobService
         return stock;
     }
 
+    @Override
+    public AjaxResult OuthandFinish(MydoJob mydoJob) {
+        return null;
+    }
+
+    @Override
+    public AjaxResult OuthandInvalidation(MydoJob mydoJob) {
+        return null;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java

@@ -119,6 +119,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 出库单据状态改变
      */
+    @PreAuthorize("@ss.hasPermi('out:outStockout:changeStatus')")
     @Log(title = "出库主单状态改变", businessType = BusinessType.OTHER)
     @RequestMapping("/changeStatus")
     @ResponseBody