From a0569f17a5ab47b8da6a2af303feda7a8196cb90 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Mon, 9 Jun 2025 14:23:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=20=20?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CheckStockinController.java | 1 + .../CheckStockinDetailController.java | 2 +- .../controller/InMydoJobController.java | 4 +- .../controller/OutMydoJobController.java | 4 +- .../mydojobdetail/domain/MydoJobDetail.java | 115 ++++++++++-------- .../impl/MydoJobDetailServiceImpl.java | 13 +- .../impl/MydoJobDetailFinishServiceImpl.java | 28 +++-- .../controller/OutStockoutController.java | 1 + .../impl/ReceiveStockinServiceImpl.java | 2 + ruoyi-ui/src/lang/en.js | 14 ++- ruoyi-ui/src/lang/zh.js | 17 ++- ruoyi-ui/src/views/bas/BasProduct/index.vue | 12 +- ruoyi-ui/src/views/check/create/index.vue | 4 +- ruoyi-ui/src/views/check/job/in/index.vue | 4 +- ruoyi-ui/src/views/check/job/out/index.vue | 14 +-- ruoyi-ui/src/views/check/stockCheck/index.vue | 1 + ruoyi-ui/src/views/in/job/index.vue | 20 ++- ruoyi-ui/src/views/in/receive/add/index.vue | 6 +- ruoyi-ui/src/views/in/receive/index.vue | 8 +- ruoyi-ui/src/views/in/stockIn/index.vue | 3 + ruoyi-ui/src/views/out/addOutStockout.vue | 4 +- ruoyi-ui/src/views/out/outStockoutManage.vue | 2 + 22 files changed, 176 insertions(+), 103 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java index 7b066d7..39afa53 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java @@ -117,6 +117,7 @@ public class CheckStockinController extends BaseController */ @Log(title = "盘点主单保存", businessType = BusinessType.INSERT) @PostMapping("/saveBill") + @PreAuthorize("@ss.hasPermi('check:stockCheck:saveBill')") @ResponseBody public AjaxResult saveBill(@RequestBody CheckStockVo checkStockVo) { String stockOutId = checkStockinService.saveBill(checkStockVo); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java index aa31660..6f8843d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java @@ -43,7 +43,7 @@ public class CheckStockinDetailController extends BaseController /** * 查询盘库单据子信息列表 */ - @PreAuthorize("@ss.hasPermi('check:stockCheckDetail:list')") + @PreAuthorize("@ss.hasAnyPermi('check:stockCheckDetail:list,check:productAndStock:list')") @GetMapping("/list") public TableDataInfo list(CheckStockinDetail checkStockinDetail) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java index acc374c..ec907af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java @@ -115,7 +115,7 @@ public class InMydoJobController extends BaseController /** * 手动作废任务表 */ - @PreAuthorize("@ss.hasPermi('job:mydoJob:manualInvalidation')") + @PreAuthorize("@ss.hasAnyPermi('job:mydoJob:manualInvalidation,job:checkMydoJob:manualInvalidation')") @Log(title = "任务表", businessType = BusinessType.DELETE) @PostMapping("/manualInvalidation") public AjaxResult manualInvalidation(@RequestBody MydoJob mydoJob) @@ -126,7 +126,7 @@ public class InMydoJobController extends BaseController /** * 手动完成任务表 */ - @PreAuthorize("@ss.hasPermi('job:mydoJob:manualCompleted')") + @PreAuthorize("@ss.hasAnyPermi('job:mydoJob:manualCompleted,job:checkMydoJob:manualCompleted')") @Log(title = "任务表", businessType = BusinessType.OTHER) @PostMapping("/manualCompleted") public AjaxResult manualCompleted(@RequestBody MydoJob mydoJob) 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 index 66b139f..7267b20 100644 --- 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 @@ -51,7 +51,7 @@ public class OutMydoJobController extends BaseController { /** * 手动完成 */ - @PreAuthorize("@ss.hasPermi('job:outmydoJob:OuthandFinish')") + @PreAuthorize("@ss.hasAnyPermi('job:outmydoJob:OuthandFinish,job:checkMydoJob:OuthandFinish,')") @Log(title = "出库手动完成", businessType = BusinessType.OTHER) @RequestMapping("/OuthandFinish") public AjaxResult manualCompleted(@RequestParam("jobIds")String[] jobIds) @@ -62,7 +62,7 @@ public class OutMydoJobController extends BaseController { /** * 手动作废 */ - @PreAuthorize("@ss.hasPermi('job:outmydoJob:OuthandInvalidation')") + @PreAuthorize("@ss.hasAnyPermi('job:outmydoJob:OuthandInvalidation,job:checkMydoJob:OuthandInvalidation')") @Log(title = "出库手动作废", businessType = BusinessType.OTHER) @RequestMapping("/OuthandInvalidation") public AjaxResult OuthandInvalidation(@RequestParam("jobIds")String[] jobIds) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java index 1e69b95..50a0668 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java @@ -1,5 +1,6 @@ package com.ruoyi.job.mydojobdetail.domain; +import com.ruoyi.common.domain.ExtraField; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -7,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 子任务对象 mydo_job_detail - * + * * @author ruoyi * @date 2025-05-22 */ @@ -120,6 +121,16 @@ public class MydoJobDetail extends BaseEntity private String spare4; private String status; + //额外字段 + private ExtraField extraField; + + public ExtraField getExtraField() { + return extraField; + } + + public void setExtraField(ExtraField extraField) { + this.extraField = extraField; + } public String getStatus() { return status; @@ -134,257 +145,257 @@ public class MydoJobDetail extends BaseEntity this.jobDetailId = jobDetailId; } - public String getJobDetailId() + public String getJobDetailId() { return jobDetailId; } - public void setJobId(String jobId) + public void setJobId(String jobId) { this.jobId = jobId; } - public String getJobId() + public String getJobId() { return jobId; } - public void setStockId(String stockId) + public void setStockId(String stockId) { this.stockId = stockId; } - public String getStockId() + public String getStockId() { return stockId; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setInDate(String inDate) + public void setInDate(String inDate) { this.inDate = inDate; } - public String getInDate() + public String getInDate() { return inDate; } - public void setInOrOutId(String inOrOutId) + public void setInOrOutId(String inOrOutId) { this.inOrOutId = inOrOutId; } - public String getInOrOutId() + public String getInOrOutId() { return inOrOutId; } - public void setInOrOutDId(String inOrOutDId) + public void setInOrOutDId(String inOrOutDId) { this.inOrOutDId = inOrOutDId; } - public String getInOrOutDId() + public String getInOrOutDId() { return inOrOutDId; } - public void setProductGuid(String productGuid) + public void setProductGuid(String productGuid) { this.productGuid = productGuid; } - public String getProductGuid() + public String getProductGuid() { return productGuid; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setStockStatus(String stockStatus) + public void setStockStatus(String stockStatus) { this.stockStatus = stockStatus; } - public String getStockStatus() + public String getStockStatus() { return stockStatus; } - public void setInQuantity(String inQuantity) + public void setInQuantity(String inQuantity) { this.inQuantity = inQuantity; } - public String getInQuantity() + public String getInQuantity() { return inQuantity; } - public void setStockQuantity(String stockQuantity) + public void setStockQuantity(String stockQuantity) { this.stockQuantity = stockQuantity; } - public String getStockQuantity() + public String getStockQuantity() { return stockQuantity; } - public void setOutQuantity(String outQuantity) + public void setOutQuantity(String outQuantity) { this.outQuantity = outQuantity; } - public String getOutQuantity() + public String getOutQuantity() { return outQuantity; } - public void setLayerQuantity(String layerQuantity) + public void setLayerQuantity(String layerQuantity) { this.layerQuantity = layerQuantity; } - public String getLayerQuantity() + public String getLayerQuantity() { return layerQuantity; } - public void setOutLayerQuantity(String outLayerQuantity) + public void setOutLayerQuantity(String outLayerQuantity) { this.outLayerQuantity = outLayerQuantity; } - public String getOutLayerQuantity() + public String getOutLayerQuantity() { return outLayerQuantity; } - public void setGiveNum(String giveNum) + public void setGiveNum(String giveNum) { this.giveNum = giveNum; } - public String getGiveNum() + public String getGiveNum() { return giveNum; } - public void setStockinId(String stockinId) + public void setStockinId(String stockinId) { this.stockinId = stockinId; } - public String getStockinId() + public String getStockinId() { return stockinId; } - public void setStackingId(String stackingId) + public void setStackingId(String stackingId) { this.stackingId = stackingId; } - public String getStackingId() + public String getStackingId() { return stackingId; } - public void setExitId(String exitId) + public void setExitId(String exitId) { this.exitId = exitId; } - public String getExitId() + public String getExitId() { return exitId; } - public void setPrintDate(String printDate) + public void setPrintDate(String printDate) { this.printDate = printDate; } - public String getPrintDate() + public String getPrintDate() { return printDate; } - public void setCustomerId(String customerId) + public void setCustomerId(String customerId) { this.customerId = customerId; } - public String getCustomerId() + public String getCustomerId() { return customerId; } - public void setSupplierId(String supplierId) + public void setSupplierId(String supplierId) { this.supplierId = supplierId; } - public String getSupplierId() + public String getSupplierId() { return supplierId; } - public void setSpare1(String spare1) + public void setSpare1(String spare1) { this.spare1 = spare1; } - public String getSpare1() + public String getSpare1() { return spare1; } - public void setSpare2(String spare2) + public void setSpare2(String spare2) { this.spare2 = spare2; } - public String getSpare2() + public String getSpare2() { return spare2; } - public void setSpare3(String spare3) + public void setSpare3(String spare3) { this.spare3 = spare3; } - public String getSpare3() + public String getSpare3() { return spare3; } - public void setSpare4(String spare4) + public void setSpare4(String spare4) { this.spare4 = spare4; } - public String getSpare4() + public String getSpare4() { return spare4; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java index a5da976..bfe8514 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java @@ -1,6 +1,11 @@ package com.ruoyi.job.mydojobdetail.service.impl; import java.util.List; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.ruoyi.common.domain.ExtraField; +import com.ruoyi.in.stockindetail.domain.InStockinDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.job.mydojobdetail.mapper.MydoJobDetailMapper; @@ -40,7 +45,13 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService @Override public List selectMydoJobDetailList(MydoJobDetail mydoJobDetail) { - return mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail); + List mydoJobDetails = mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail); + for (MydoJobDetail jobDetail : mydoJobDetails) { + if (StrUtil.isNotEmpty(jobDetail.getSpare1())){ + jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class)); + } + } + return mydoJobDetails; } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java index c5807a9..c1cfe24 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java @@ -3,6 +3,9 @@ package com.ruoyi.job.mydojobdetailfinish.service.impl; import java.util.Collections; import java.util.List; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.ruoyi.common.domain.ExtraField; import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,19 +15,19 @@ import com.ruoyi.job.mydojobdetailfinish.service.IMydoJobDetailFinishService; /** * 历史子作业Service业务层处理 - * + * * @author ruoyi * @date 2025-05-23 */ @Service -public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishService +public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishService { @Autowired private MydoJobDetailFinishMapper mydoJobDetailFinishMapper; /** * 查询历史子作业 - * + * * @param jobDetailId 历史子作业主键 * @return 历史子作业 */ @@ -36,7 +39,7 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi /** * 查询历史子作业列表 - * + * * @param mydoJobDetailFinish 历史子作业 * @return 历史子作业 */ @@ -49,12 +52,19 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi @Override public List selectMydoJobDetailFinishListByJobDetail(MydoJobDetail mydoJobDetail) { String jobId = mydoJobDetail.getJobId(); - return mydoJobDetailFinishMapper.selectMydoJobDetailFinishListByJobId(jobId); + List mydoJobDetails = mydoJobDetailFinishMapper.selectMydoJobDetailFinishListByJobId(jobId); + + for (MydoJobDetail jobDetail : mydoJobDetails) { + if (StrUtil.isNotEmpty(jobDetail.getSpare1())){ + jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class)); + } + } + return mydoJobDetails; } /** * 新增历史子作业 - * + * * @param mydoJobDetailFinish 历史子作业 * @return 结果 */ @@ -66,7 +76,7 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi /** * 修改历史子作业 - * + * * @param mydoJobDetailFinish 历史子作业 * @return 结果 */ @@ -78,7 +88,7 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi /** * 批量删除历史子作业 - * + * * @param jobDetailIds 需要删除的历史子作业主键 * @return 结果 */ @@ -90,7 +100,7 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi /** * 删除历史子作业信息 - * + * * @param jobDetailId 历史子作业主键 * @return 结果 */ 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 6e542a1..9c0b695 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 @@ -110,6 +110,7 @@ public class OutStockoutController extends BaseController { */ @Log(title = "出库主单保存", businessType = BusinessType.OTHER) @PostMapping("/saveBill") + @PreAuthorize("@ss.hasPermi('out:outStockout:saveBill')") @ResponseBody public AjaxResult saveBill(@RequestBody OutStockoutVo outStockoutVo) { String stockOutId = outStockoutService.saveBill(outStockoutVo); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java index 7990126..68031b2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java @@ -179,6 +179,8 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService Optional first = list.stream().filter(x -> x.getProductId().equals(basProduct.getProductId())).findFirst(); first.ifPresent(receiveProductVo -> basProduct.setQuantity(receiveProductVo.getQuantity())); first.ifPresent(receiveProductVo -> basProduct.setLotNo(receiveProductVo.getLotNo())); + first.ifPresent(receiveProductVo -> basProduct.setSpare3(receiveProductVo.getCartonNo())); + first.ifPresent(receiveProductVo -> basProduct.setSpare4(receiveProductVo.getPackingMethod())); } return AjaxResult.success(result); } diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 0e20ed0..cda7ca9 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -114,6 +114,10 @@ export default { stockStatus: 'Document Status', operate: 'Operation', selecInType: 'Please select stockin type', + netWeight: '净重', + totalPrice: '确定', + totalNetWeight: '总净重', + grossWeight: '毛重', }, // ***************入库单据管理************* inStockin: { @@ -175,7 +179,15 @@ export default { selectStartTime: 'Please select Start Time', selectFinishTime: 'Please select Finish Time', inputEntranceId: 'Please input Entrance ID', - inputExitId: 'Please input Exit ID' + inputExitId: 'Please input Exit ID', + netWeight: '净重', + totalPrice: '确定', + totalNetWeight: '总净重', + grossWeight: '毛重', + materialDesc: '物料描述', + englishDesc: '英文描述', + cartonNo: '箱号', + packingMethod: '包装方式', }, // ***************出库单据管理************** outStockoutManage: { diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 74dbace..85dae12 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -117,7 +117,11 @@ export default { packingMethod: '包装方式', quantity: '计划数量', stockStatus: '单据状态', - operate: '操作' + operate: '操作', + netWeight: '净重', + totalPrice: '确定', + totalNetWeight: '总净重', + grossWeight: '毛重', }, // ***************入库单据管理************* inStockin: { @@ -179,7 +183,16 @@ export default { selectStartTime: '请选择开始时间', selectFinishTime: '请选择结束时间', inputEntranceId: '请输入入口ID', - inputExitId: '请输入出口ID' + inputExitId: '请输入出口ID', + + netWeight: '净重', + totalPrice: '确定', + totalNetWeight: '总净重', + grossWeight: '毛重', + materialDesc: '物料描述', + englishDesc: '英文描述', + cartonNo: '箱号', + packingMethod: '包装方式', }, // ***************新建出库单据************** addOutStockout: { diff --git a/ruoyi-ui/src/views/bas/BasProduct/index.vue b/ruoyi-ui/src/views/bas/BasProduct/index.vue index 284d04b..92bb04a 100644 --- a/ruoyi-ui/src/views/bas/BasProduct/index.vue +++ b/ruoyi-ui/src/views/bas/BasProduct/index.vue @@ -59,7 +59,7 @@ @keyup.enter.native="handleQuery" /> --> - + - - + + @@ -263,12 +263,12 @@ - + diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue index 1de94cf..9862efd 100644 --- a/ruoyi-ui/src/views/check/create/index.vue +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -31,12 +31,12 @@ {{ $t('checkCreate.reset') }} - {{ $t('checkCreate.saveDocument') }} + {{ $t('checkCreate.saveDocument') }}
- {{ $t('checkCreate.selectMaterial') }} + {{ $t('checkCreate.selectMaterial') }} {{ $t('checkCreate.recreateDocument') }}
diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue index be081ee..f496fa7 100644 --- a/ruoyi-ui/src/views/check/job/in/index.vue +++ b/ruoyi-ui/src/views/check/job/in/index.vue @@ -216,7 +216,7 @@ size="mini" :disabled="multiple" @click="handleManualVoid" - v-hasPermi="['check:job:in:void']" + v-hasPermi="['job:checkMydoJob:manualInvalidation']" >{{$t('checkJobIn.manualVoid')}} @@ -227,7 +227,7 @@ size="mini" :disabled="multiple" @click="handleManualFinish" - v-hasPermi="['check:job:in:finish']" + v-hasPermi="['job:checkMydoJob:manualCompleted']" >{{$t('checkJobIn.manualFinish')}} diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue index f238188..ccb8967 100644 --- a/ruoyi-ui/src/views/check/job/out/index.vue +++ b/ruoyi-ui/src/views/check/job/out/index.vue @@ -216,7 +216,7 @@ icon="el-icon-edit" size="mini" @click="handleCompletedManually({type: 'invalid'})" - v-hasPermi="['job:mydoJob:CompletedManually']" + v-hasPermi="['job:checkMydoJob:OuthandFinish']" >{{$t('checkJobOut.manualInvalid')}} @@ -226,7 +226,7 @@ icon="el-icon-edit" size="mini" @click="handleCompletedManually({type: 'completed'})" - v-hasPermi="['job:mydoJob:CompletedManually']" + v-hasPermi="['job:job:checkMydoJob:OuthandInvalidation']" >{{$t('checkJobOut.manualFinish')}} {{$t('checkJobOut.manualInvalid')}} @@ -338,14 +340,6 @@ - diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue index f3c5bdd..6b514d6 100644 --- a/ruoyi-ui/src/views/check/stockCheck/index.vue +++ b/ruoyi-ui/src/views/check/stockCheck/index.vue @@ -167,6 +167,7 @@ plain icon="el-icon-plus" size="mini" + :disabled="single" @click="handleReview" v-hasPermi="['check:stockCheck:edit']" >{{$t('checkStockCheck.review')}} diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index 4a3b70e..387e0c5 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -305,8 +305,8 @@ > - // 任务ID - // 库存ID + + // 批次号 // 入库时间