diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/MydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/MydoJobController.java rename to ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java index cad5c67..f82ce92 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/MydoJobController.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java new file mode 100644 index 0000000..ae48a46 --- /dev/null +++ b/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 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); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java index 116796b..90b21dd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java index 46b92a7..ce52e37 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java +++ b/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); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index cebb148..d188f43 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/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; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java index 0d7e150..6e542a1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java +++ b/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 diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index c4991ce..5cc6fb7 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and class_id = #{classId} and warehouse_id = #{warehouseId} and fault_flag = #{faultFlag} + and in_or_out >=20 diff --git a/ruoyi-ui/src/api/job/OutmydoJob.js b/ruoyi-ui/src/api/job/OutmydoJob.js new file mode 100644 index 0000000..0c68d1d --- /dev/null +++ b/ruoyi-ui/src/api/job/OutmydoJob.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + + +// 查询任务表列表 +export function listMydoJobOut(query) { + return request({ + url: '/job/outmydoJob/list', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue new file mode 100644 index 0000000..58cdc9c --- /dev/null +++ b/ruoyi-ui/src/views/job/outJobManagement.vue @@ -0,0 +1,533 @@ + + + + + diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue index cad9cf8..816ac57 100644 --- a/ruoyi-ui/src/views/out/outStockoutManage.vue +++ b/ruoyi-ui/src/views/out/outStockoutManage.vue @@ -53,6 +53,7 @@ icon="el-icon-check" size="mini" @click="handleAudit(2)" + v-hasPermi="['out:outStockout:changeStatus']" >单据审核 @@ -62,6 +63,7 @@ icon="el-icon-circle-check" size="mini" @click="handleAudit(4)" + v-hasPermi="['out:outStockout:changeStatus']" >单据确认 @@ -71,6 +73,7 @@ icon="el-icon-delete" size="mini" @click="handleAudit(5)" + v-hasPermi="['out:outStockout:changeStatus']" >单据作废