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/stockcheck/domain/CheckStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java index dcaa0e8..072e5ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java @@ -1,5 +1,8 @@ package com.ruoyi.check.stockcheck.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -7,10 +10,13 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 盘库单据主信息对象 check_stockin - * + * * @author ruoyi * @date 2025-05-29 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class CheckStockin extends BaseEntity { private static final long serialVersionUID = 1L; @@ -41,6 +47,7 @@ public class CheckStockin extends BaseEntity /** 仓库ID */ @Excel(name = "仓库ID") private String warehouseId; + private String warehouseName; /** 完成日期 */ @Excel(name = " 完成日期") @@ -90,195 +97,7 @@ public class CheckStockin extends BaseEntity @Excel(name = "备用字段5") private String spare5; - public void setStockGuid(String stockGuid) - { - this.stockGuid = stockGuid; - } - public String getStockGuid() - { - return stockGuid; - } - - public void setStockCheckId(String stockCheckId) - { - this.stockCheckId = stockCheckId; - } - - public String getStockCheckId() - { - return stockCheckId; - } - - public void setCheckType(String checkType) - { - this.checkType = checkType; - } - - public String getCheckType() - { - return checkType; - } - - public void setCreateDate(String createDate) - { - this.createDate = createDate; - } - - public String getCreateDate() - { - return createDate; - } - - public void setCreateManId(String createManId) - { - this.createManId = createManId; - } - - public String getCreateManId() - { - return createManId; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getStatus() - { - return status; - } - - public void setWarehouseId(String warehouseId) - { - this.warehouseId = warehouseId; - } - - public String getWarehouseId() - { - return warehouseId; - } - - public void setFinishDate(String finishDate) - { - this.finishDate = finishDate; - } - - public String getFinishDate() - { - return finishDate; - } - - public void setErpBill(String erpBill) - { - this.erpBill = erpBill; - } - - public String getErpBill() - { - return erpBill; - } - - public void setStockSource(String stockSource) - { - this.stockSource = stockSource; - } - - public String getStockSource() - { - return stockSource; - } - - public void setDepartmentNo(String departmentNo) - { - this.departmentNo = departmentNo; - } - - public String getDepartmentNo() - { - return departmentNo; - } - - public void setCustomerNo(String customerNo) - { - this.customerNo = customerNo; - } - - public String getCustomerNo() - { - return customerNo; - } - - public void setClassNo(String classNo) - { - this.classNo = classNo; - } - - public String getClassNo() - { - return classNo; - } - - public void setSupplierNo(String supplierNo) - { - this.supplierNo = supplierNo; - } - - public String getSupplierNo() - { - return supplierNo; - } - - public void setSpare1(String spare1) - { - this.spare1 = spare1; - } - - public String getSpare1() - { - return spare1; - } - - public void setSpare2(String spare2) - { - this.spare2 = spare2; - } - - public String getSpare2() - { - return spare2; - } - - public void setSpare3(String spare3) - { - this.spare3 = spare3; - } - - public String getSpare3() - { - return spare3; - } - - public void setSpare4(String spare4) - { - this.spare4 = spare4; - } - - public String getSpare4() - { - return spare4; - } - - public void setSpare5(String spare5) - { - this.spare5 = spare5; - } - - public String getSpare5() - { - return spare5; - } @Override public String toString() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java index 5f8236f..f9e0096 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java @@ -6,6 +6,7 @@ import java.util.Date; import java.util.List; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import com.ruoyi.bas.BasProduct.domain.BasProduct; import com.ruoyi.bas.BasProduct.service.IBasProductService; @@ -14,6 +15,7 @@ import com.ruoyi.check.stockcheck.domain.CheckStockVo; import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail; import com.ruoyi.check.stockcheckdetail.service.ICheckStockinDetailService; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.uuid.UUID; import com.ruoyi.in.stockin.domain.InStockin; import com.ruoyi.in.stockindetail.domain.InStockinDetail; @@ -127,6 +129,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService } private void insertCheckStockinHistory(CheckStockin checkStockin) { + checkStockin = selectCheckStockinByStockGuid(checkStockin.getStockGuid()); //插入历史单据 checkStockinMapper.insertCheckStockinHistory(checkStockin); checkStockinDetailService.insertCheckStockinDetailHistory(checkStockin); @@ -163,12 +166,12 @@ public class CheckStockinServiceImpl implements ICheckStockinService public String saveBill(CheckStockVo checkStockVo) { CheckStockin checkStockin = checkStockVo.getCheckStockin(); List detailList = checkStockVo.getDetailList(); - String stockCheckId = basJobIdService.getJobId("CKD"); + String stockCheckId = basJobIdService.getJobId("PDD"); checkStockin.setStockCheckId(stockCheckId); checkStockin.setStockGuid(IdUtil.simpleUUID()); checkStockin.setCreateDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - String username = SecurityContextHolder.getContext().getAuthentication().getName(); - checkStockin.setCreateManId(username); + checkStockin.setCreateManId(SecurityUtils.getUsername()); + checkStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId())); checkStockin.setStatus("1"); checkStockin.setStockSource("0"); checkStockin.setCheckType(checkStockin.getCheckType()); 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/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java index e779c05..65a543c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java @@ -45,11 +45,7 @@ public class CheckStockinDetailServiceImpl implements ICheckStockinDetailService @Override public List selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) { - List checkStockinDetails = checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail); - for (CheckStockinDetail stockinDetail : checkStockinDetails) { - stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); - } - return checkStockinDetails; + return checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java index b7b39bc..9596338 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java @@ -97,10 +97,6 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF @Override public List selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) { - List checkStockinDetails = checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail); - for (CheckStockinDetail stockinDetail : checkStockinDetails) { - stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); - } - return checkStockinDetails; + return checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java index ebeccb9..0142f01 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java @@ -116,6 +116,7 @@ public class InStockinServiceImpl implements IInStockinService * @param inStockin */ private void insertInStockinHistory(InStockin inStockin) { + inStockin = selectInStockinByStockinGuid(inStockin.getStockinGuid()); //插入历史单据 inStockinMapper.insertInStockinHistory(inStockin); iInStockinDetailService.insertInStockinDetailHistory(inStockin); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java index 248e913..fdacc26 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java @@ -46,11 +46,10 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService @Override public List selectInStockinDetailList(InStockinDetail inStockinDetail) { - List inStockinDetails = inStockinDetailMapper.selectInStockinDetailList(inStockinDetail); - for (InStockinDetail res : inStockinDetails) { + /*for (InStockinDetail res : inStockinDetails) { res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class)); - } - return inStockinDetails; + }*/ + return inStockinDetailMapper.selectInStockinDetailList(inStockinDetail); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java index c196f9e..da82b7b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java @@ -97,11 +97,8 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS @Override public List selectInStockinDetailList(InStockinDetail inStockinDetail) { - List inStockinDetails = inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail); - for (InStockinDetail res : inStockinDetails) { - res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class)); - } - return inStockinDetails; + + return inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail); } } 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..588e4fd 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..128b96e 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/out/productAndStock/domain/ViewProductAndStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java index 28bb073..c93a929 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 可出库的库存物资信息对象 view_product_and_stock - * + * * @author ruoyi * @date 2025-05-21 */ @@ -38,63 +38,72 @@ public class ViewProductAndStock extends BaseEntity /** 仓库 */ @Excel(name = "仓库") private String warehouseId; + private String warehouseName; - public void setOnlyIdentity(Long onlyIdentity) + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public void setOnlyIdentity(Long onlyIdentity) { this.onlyIdentity = onlyIdentity; } - public Long getOnlyIdentity() + public Long getOnlyIdentity() { return onlyIdentity; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setProductName(String productName) + public void setProductName(String productName) { this.productName = productName; } - public String getProductName() + public String getProductName() { return productName; } - public void setQuantity(String quantity) + public void setQuantity(String quantity) { this.quantity = quantity; } - public String getQuantity() + public String getQuantity() { return quantity; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } 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-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java index 9071e4f..4e3dfa7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java @@ -48,11 +48,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer @Override public List selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) { - List receiveStockinDetails = receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail); - for (ReceiveStockinDetail stockinDetail : receiveStockinDetails) { - stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); - } - return receiveStockinDetails; + return receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java index 45a0230..6b6de0f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java @@ -98,10 +98,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet @Override public List selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) { - List receiveStockinDetails = receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail); - for (ReceiveStockinDetail res : receiveStockinDetails) { - res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class)); - } - return receiveStockinDetails; + + return receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java index 8ab497f..be94b54 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 库存冻结记录对象 bas_stock_freeze_record - * + * * @author ruoyi * @date 2025-05-28 */ @@ -25,6 +25,7 @@ public class BasStockFreezeRecord extends BaseEntity /** 货位编码 */ @Excel(name = "货位编码") private String cargoSpaceId; + private String cargoSpaceName; /** 托盘条码 */ @Excel(name = "托盘条码") @@ -61,6 +62,7 @@ public class BasStockFreezeRecord extends BaseEntity /** 仓库 */ @Excel(name = "仓库") private String warehouseId; + private String warehouseName; /** 库存字表id */ @Excel(name = "库存字表id") @@ -82,172 +84,188 @@ public class BasStockFreezeRecord extends BaseEntity @Excel(name = "物料guid") private String productGuid; - public void setWhGuid(String whGuid) + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public String getCargoSpaceName() { + return cargoSpaceName; + } + + public void setCargoSpaceName(String cargoSpaceName) { + this.cargoSpaceName = cargoSpaceName; + } + + public void setWhGuid(String whGuid) { this.whGuid = whGuid; } - public String getWhGuid() + public String getWhGuid() { return whGuid; } - public void setStockId(String stockId) + public void setStockId(String stockId) { this.stockId = stockId; } - public String getStockId() + public String getStockId() { return stockId; } - public void setCargoSpaceId(String cargoSpaceId) + public void setCargoSpaceId(String cargoSpaceId) { this.cargoSpaceId = cargoSpaceId; } - public String getCargoSpaceId() + public String getCargoSpaceId() { return cargoSpaceId; } - public void setTrayCode(String trayCode) + public void setTrayCode(String trayCode) { this.trayCode = trayCode; } - public String getTrayCode() + public String getTrayCode() { return trayCode; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setProductName(String productName) + public void setProductName(String productName) { this.productName = productName; } - public String getProductName() + public String getProductName() { return productName; } - public void setPrintDate(String printDate) + public void setPrintDate(String printDate) { this.printDate = printDate; } - public String getPrintDate() + public String getPrintDate() { return printDate; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setOldStatus(String oldStatus) + public void setOldStatus(String oldStatus) { this.oldStatus = oldStatus; } - public String getOldStatus() + public String getOldStatus() { return oldStatus; } - public void setCurrStatus(String currStatus) + public void setCurrStatus(String currStatus) { this.currStatus = currStatus; } - public String getCurrStatus() + public String getCurrStatus() { return currStatus; } - public void setMethod(String method) + public void setMethod(String method) { this.method = method; } - public String getMethod() + public String getMethod() { return method; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setStockDetailId(String stockDetailId) + public void setStockDetailId(String stockDetailId) { this.stockDetailId = stockDetailId; } - public String getStockDetailId() + public String getStockDetailId() { return stockDetailId; } - public void setOperatingTarget(String operatingTarget) + public void setOperatingTarget(String operatingTarget) { this.operatingTarget = operatingTarget; } - public String getOperatingTarget() + public String getOperatingTarget() { return operatingTarget; } - public void setBarCodeOldQuantity(String barCodeOldQuantity) + public void setBarCodeOldQuantity(String barCodeOldQuantity) { this.barCodeOldQuantity = barCodeOldQuantity; } - public String getBarCodeOldQuantity() + public String getBarCodeOldQuantity() { return barCodeOldQuantity; } - public void setBarCodeQuantity(String barCodeQuantity) + public void setBarCodeQuantity(String barCodeQuantity) { this.barCodeQuantity = barCodeQuantity; } - public String getBarCodeQuantity() + public String getBarCodeQuantity() { return barCodeQuantity; } - public void setProductGuid(String productGuid) + public void setProductGuid(String productGuid) { this.productGuid = productGuid; } - public String getProductGuid() + public String getProductGuid() { return productGuid; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java index cd7999c..47fe408 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 库存操作记录对象 bas_stock_maintain_record - * + * * @author ruoyi * @date 2025-05-26 */ @@ -25,6 +25,7 @@ public class BasStockMaintainRecord extends BaseEntity /** 货位编码 */ @Excel(name = "货位编码") private String cargoSpaceId; + private String cargoSpaceName; /** 托盘条码 */ @Excel(name = "托盘条码") @@ -61,6 +62,7 @@ public class BasStockMaintainRecord extends BaseEntity /** 仓库 */ @Excel(name = "仓库") private String warehouseId; + private String warehouseName; /** 库存字表id */ @Excel(name = "库存字表id") @@ -82,172 +84,188 @@ public class BasStockMaintainRecord extends BaseEntity @Excel(name = "物料guid") private String productGuid; - public void setWhGuid(String whGuid) + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public String getCargoSpaceName() { + return cargoSpaceName; + } + + public void setCargoSpaceName(String cargoSpaceName) { + this.cargoSpaceName = cargoSpaceName; + } + + public void setWhGuid(String whGuid) { this.whGuid = whGuid; } - public String getWhGuid() + public String getWhGuid() { return whGuid; } - public void setStockId(String stockId) + public void setStockId(String stockId) { this.stockId = stockId; } - public String getStockId() + public String getStockId() { return stockId; } - public void setCargoSpaceId(String cargoSpaceId) + public void setCargoSpaceId(String cargoSpaceId) { this.cargoSpaceId = cargoSpaceId; } - public String getCargoSpaceId() + public String getCargoSpaceId() { return cargoSpaceId; } - public void setTrayCode(String trayCode) + public void setTrayCode(String trayCode) { this.trayCode = trayCode; } - public String getTrayCode() + public String getTrayCode() { return trayCode; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setProductName(String productName) + public void setProductName(String productName) { this.productName = productName; } - public String getProductName() + public String getProductName() { return productName; } - public void setPrintDate(String printDate) + public void setPrintDate(String printDate) { this.printDate = printDate; } - public String getPrintDate() + public String getPrintDate() { return printDate; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setOldQuantity(String oldQuantity) + public void setOldQuantity(String oldQuantity) { this.oldQuantity = oldQuantity; } - public String getOldQuantity() + public String getOldQuantity() { return oldQuantity; } - public void setQuantity(String quantity) + public void setQuantity(String quantity) { this.quantity = quantity; } - public String getQuantity() + public String getQuantity() { return quantity; } - public void setMethod(String method) + public void setMethod(String method) { this.method = method; } - public String getMethod() + public String getMethod() { return method; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setStockDetailId(String stockDetailId) + public void setStockDetailId(String stockDetailId) { this.stockDetailId = stockDetailId; } - public String getStockDetailId() + public String getStockDetailId() { return stockDetailId; } - public void setOperatingTarget(String operatingTarget) + public void setOperatingTarget(String operatingTarget) { this.operatingTarget = operatingTarget; } - public String getOperatingTarget() + public String getOperatingTarget() { return operatingTarget; } - public void setBarCodeOldQuantity(String barCodeOldQuantity) + public void setBarCodeOldQuantity(String barCodeOldQuantity) { this.barCodeOldQuantity = barCodeOldQuantity; } - public String getBarCodeOldQuantity() + public String getBarCodeOldQuantity() { return barCodeOldQuantity; } - public void setBarCodeQuantity(String barCodeQuantity) + public void setBarCodeQuantity(String barCodeQuantity) { this.barCodeQuantity = barCodeQuantity; } - public String getBarCodeQuantity() + public String getBarCodeQuantity() { return barCodeQuantity; } - public void setProductGuid(String productGuid) + public void setProductGuid(String productGuid) { this.productGuid = productGuid; } - public String getProductGuid() + public String getProductGuid() { return productGuid; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java index 40874b7..fc7f45a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java @@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 库存信息Controller - * + * * @author ruoyi * @date 2025-05-24 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java index c809cfb..9ff8be9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java @@ -1,5 +1,6 @@ package com.ruoyi.stock.stock.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; /** * 库存信息对象 bas_stock - * + * * @author ruoyi * @date 2025-05-24 */ @@ -22,6 +23,7 @@ public class BasStock extends BaseEntity /** 货位id */ @Excel(name = "货位id") private String cargoSpaceId; + private String cargoSpaceName; /** 库存状态 */ @Excel(name = "库存状态") @@ -80,8 +82,10 @@ public class BasStock extends BaseEntity private String inClassId; /** 仓库 */ - @Excel(name = "仓库") + @Excel(name = "仓库Id") private String warehouseId; + @Excel(name = "仓库") + private String warehouseName; /** 垛型ID */ @Excel(name = "垛型ID") @@ -111,242 +115,286 @@ public class BasStock extends BaseEntity @Excel(name = "备用字段6") private String spare6; - public void setStockId(String stockId) + private ExtraField extraField; + private String productName; + private String cargoSpaceStatus; + + public String getCargoSpaceName() { + return cargoSpaceName; + } + + public void setCargoSpaceName(String cargoSpaceName) { + this.cargoSpaceName = cargoSpaceName; + } + + public String getCargoSpaceStatus() { + return cargoSpaceStatus; + } + + public void setCargoSpaceStatus(String cargoSpaceStatus) { + this.cargoSpaceStatus = cargoSpaceStatus; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public ExtraField getExtraField() { + return extraField; + } + + public void setExtraField(ExtraField extraField) { + this.extraField = extraField; + } + + public void setStockId(String stockId) { this.stockId = stockId; } - public String getStockId() + public String getStockId() { return stockId; } - public void setCargoSpaceId(String cargoSpaceId) + public void setCargoSpaceId(String cargoSpaceId) { this.cargoSpaceId = cargoSpaceId; } - public String getCargoSpaceId() + public String getCargoSpaceId() { return cargoSpaceId; } - public void setStockStatus(String stockStatus) + public void setStockStatus(String stockStatus) { this.stockStatus = stockStatus; } - public String getStockStatus() + public String getStockStatus() { return stockStatus; } - public void setProductStatus(String productStatus) + public void setProductStatus(String productStatus) { this.productStatus = productStatus; } - public String getProductStatus() + public String getProductStatus() { return productStatus; } - 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 setBackDate(String backDate) + public void setBackDate(String backDate) { this.backDate = backDate; } - public String getBackDate() + public String getBackDate() { return backDate; } - public void setProductGuid(String productGuid) + public void setProductGuid(String productGuid) { this.productGuid = productGuid; } - public String getProductGuid() + public String getProductGuid() { return productGuid; } - public void setQuantity(String quantity) + public void setQuantity(String quantity) { this.quantity = quantity; } - public String getQuantity() + public String getQuantity() { return quantity; } - public void setJobId(String jobId) + public void setJobId(String jobId) { this.jobId = jobId; } - public String getJobId() + public String getJobId() { return jobId; } - public void setTrayCode(String trayCode) + public void setTrayCode(String trayCode) { this.trayCode = trayCode; } - public String getTrayCode() + public String getTrayCode() { return trayCode; } - public void setOutQuantity(String outQuantity) + public void setOutQuantity(String outQuantity) { this.outQuantity = outQuantity; } - public String getOutQuantity() + public String getOutQuantity() { return outQuantity; } - public void setStockinDetailId(String stockinDetailId) + public void setStockinDetailId(String stockinDetailId) { this.stockinDetailId = stockinDetailId; } - public String getStockinDetailId() + public String getStockinDetailId() { return stockinDetailId; } - public void setStockinId(String stockinId) + public void setStockinId(String stockinId) { this.stockinId = stockinId; } - public String getStockinId() + public String getStockinId() { return stockinId; } - public void setInType(String inType) + public void setInType(String inType) { this.inType = inType; } - public String getInType() + public String getInType() { return inType; } - public void setInClassId(String inClassId) + public void setInClassId(String inClassId) { this.inClassId = inClassId; } - public String getInClassId() + public String getInClassId() { return inClassId; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setStackingId(String stackingId) + public void setStackingId(String stackingId) { this.stackingId = stackingId; } - public String getStackingId() + public String getStackingId() { return stackingId; } - 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; } - public void setSpare5(String spare5) + public void setSpare5(String spare5) { this.spare5 = spare5; } - public String getSpare5() + public String getSpare5() { return spare5; } - public void setSpare6(String spare6) + public void setSpare6(String spare6) { this.spare6 = spare6; } - public String getSpare6() + public String getSpare6() { return spare6; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java index f448ecf..8048f50 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java @@ -1,19 +1,21 @@ package com.ruoyi.stock.stock.service; import java.util.List; + +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.stock.stock.domain.BasStock; /** * 库存信息Service接口 - * + * * @author ruoyi * @date 2025-05-24 */ -public interface IBasStockService +public interface IBasStockService { /** * 查询库存信息 - * + * * @param stockId 库存信息主键 * @return 库存信息 */ @@ -21,7 +23,7 @@ public interface IBasStockService /** * 查询库存信息列表 - * + * * @param basStock 库存信息 * @return 库存信息集合 */ @@ -29,7 +31,7 @@ public interface IBasStockService /** * 新增库存信息 - * + * * @param basStock 库存信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IBasStockService /** * 修改库存信息 - * + * * @param basStock 库存信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IBasStockService /** * 批量删除库存信息 - * + * * @param stockIds 需要删除的库存信息主键集合 * @return 结果 */ @@ -53,7 +55,7 @@ public interface IBasStockService /** * 删除库存信息信息 - * + * * @param stockId 库存信息主键 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java index 7fb60ce..e534ff1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java @@ -5,6 +5,12 @@ import java.util.List; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; +import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; +import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; +import com.ruoyi.bas.cargoSpace.service.impl.BasCargoSpaceServiceImpl; +import com.ruoyi.bas.warehouse.domain.BasWarehouse; +import com.ruoyi.bas.warehouse.service.IBasWarehouseService; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord; import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService; @@ -32,6 +38,8 @@ public class BasStockServiceImpl implements IBasStockService private IBasStockMaintainRecordService basStockMaintainRecordService; @Autowired private IBasStockFreezeRecordService basStockFreezeRecordService; + @Autowired + private IBasCargoSpaceService basCargoSpaceService; /** * 查询库存信息 @@ -70,21 +78,25 @@ public class BasStockServiceImpl implements IBasStockService return basStockMapper.insertBasStock(basStock); } - private void insertMaintainRecord(BasStock oldStock,BasStock basStock, String operate) { - BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord(); - basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID()); - basStockMaintainRecord.setStockId(basStock.getStockId()); - basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId()); - basStockMaintainRecord.setLotNo(basStock.getLotNo()); - basStockMaintainRecord.setTrayCode(basStock.getTrayCode()); - basStockMaintainRecord.setProductGuid(basStock.getProductGuid()); - basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); - basStockMaintainRecord.setCreateTime(new Date()); - basStockMaintainRecord.setOldQuantity(oldStock!=null?oldStock.getQuantity():"0"); - basStockMaintainRecord.setQuantity(basStock.getQuantity()); - basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId()); - basStockMaintainRecord.setMethod(operate); - basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord); + private void insertMaintainRecord(BasStock oldStock, BasStock basStock, String operate) { + if (!oldStock.getQuantity().equals(basStock.getQuantity())){ + BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord(); + basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID()); + basStockMaintainRecord.setStockId(basStock.getStockId()); + basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId()); + basStockMaintainRecord.setLotNo(basStock.getLotNo()); + basStockMaintainRecord.setTrayCode(basStock.getTrayCode()); + basStockMaintainRecord.setProductGuid(basStock.getProductGuid()); + basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); + basStockMaintainRecord.setCreateTime(new Date()); + basStockMaintainRecord.setOldQuantity(oldStock != null ? oldStock.getQuantity() : "0"); + basStockMaintainRecord.setQuantity(basStock.getQuantity()); + basStockMaintainRecord.setProductId(basStock.getExtraField().getProductId()); + basStockMaintainRecord.setProductName(basStock.getExtraField().getMaterialDesc()); + basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId()); + basStockMaintainRecord.setMethod(operate); + basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord); + } } /** @@ -98,25 +110,31 @@ public class BasStockServiceImpl implements IBasStockService { BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId()); insertMaintainRecord(oldBasStock,basStock,"2"); - insertFreezeRecord(oldBasStock,basStock); + BasCargoSpace oldBasCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(basStock.getCargoSpaceId()); + insertFreezeRecord(oldBasCargoSpace,basStock); return basStockMapper.updateBasStock(basStock); } - private void insertFreezeRecord(BasStock oldBasStock, BasStock basStock) { - if (!oldBasStock.getStockStatus().equals(basStock.getStockStatus())){ + private void insertFreezeRecord(BasCargoSpace oldBasCargoSpace, BasStock basStock) { + if (!oldBasCargoSpace.getLocked().equals(basStock.getCargoSpaceStatus())){ BasStockFreezeRecord basStockFreezeRecord = new BasStockFreezeRecord(); basStockFreezeRecord.setWhGuid(IdUtil.fastSimpleUUID()); - basStockFreezeRecord.setStockId(basStock.getStockId()); basStockFreezeRecord.setCargoSpaceId(basStock.getCargoSpaceId()); - basStockFreezeRecord.setLotNo(basStock.getLotNo()); basStockFreezeRecord.setTrayCode(basStock.getTrayCode()); - basStockFreezeRecord.setProductGuid(basStock.getProductGuid()); basStockFreezeRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); basStockFreezeRecord.setCreateTime(new Date()); - basStockFreezeRecord.setOldStatus(oldBasStock.getStockStatus()); - basStockFreezeRecord.setCurrStatus(basStock.getStockStatus()); + basStockFreezeRecord.setOldStatus(oldBasCargoSpace.getLocked()); + basStockFreezeRecord.setCurrStatus(basStock.getCargoSpaceStatus()); basStockFreezeRecord.setWarehouseId(basStock.getWarehouseId()); - basStockFreezeRecord.setMethod("0"); + if ("N".equals(basStock.getCargoSpaceStatus())){ + basStockFreezeRecord.setMethod("解锁"); + }else { + basStockFreezeRecord.setMethod("锁定"); + } + BasCargoSpace basCargoSpace = new BasCargoSpace(); + basCargoSpace.setCargoSpaceId(basStock.getCargoSpaceId()); + basCargoSpace.setLocked(basStock.getCargoSpaceStatus()); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); basStockFreezeRecordService.insertBasStockFreezeRecord(basStockFreezeRecord); } } @@ -156,4 +174,6 @@ public class BasStockServiceImpl implements IBasStockService public void insertBasStockList(List list) { basStockMapper.insertBasStockList(list); } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java b/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java index ace9f50..c01d532 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java @@ -2,6 +2,8 @@ package com.ruoyi.work.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.annotation.Anonymous; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 出库未完成任务Controller - * + * * @author gw * @date 2025-06-04 */ @@ -37,7 +39,7 @@ public class ViewNoDoneOutWorkController extends BaseController /** * 查询已完成入库任务列表 */ - @PreAuthorize("@ss.hasPermi('work:list1')") + @Anonymous @GetMapping("/list1") public TableDataInfo list1(ViewNoDoneOutWork viewNoDoneOutWork) { @@ -49,7 +51,7 @@ public class ViewNoDoneOutWorkController extends BaseController /** * 查询已完成出库任务列表 */ - @PreAuthorize("@ss.hasPermi('work:list2')") + @Anonymous @GetMapping("/list2") public TableDataInfo list2(ViewNoDoneOutWork viewNoDoneOutWork) { @@ -61,7 +63,7 @@ public class ViewNoDoneOutWorkController extends BaseController /** * 查询未完成入库任务列表 */ - @PreAuthorize("@ss.hasPermi('work:list3')") + @Anonymous @GetMapping("/list3") public TableDataInfo list3(ViewNoDoneOutWork viewNoDoneOutWork) { @@ -73,7 +75,7 @@ public class ViewNoDoneOutWorkController extends BaseController /** * 查询未完成出库任务列表 */ - @PreAuthorize("@ss.hasPermi('work:list4')") + @Anonymous @GetMapping("/list4") public TableDataInfo list4(ViewNoDoneOutWork viewNoDoneOutWork) { diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml index 7c45664..fbfb2a2 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml @@ -67,10 +67,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail_finish + select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id, + csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x, + csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec, + csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from check_stockin_detail_finish csd + left join bas_product bp on csd.product_id = bp.product_id @@ -119,34 +136,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultMap="CheckStockinDetailResult"> - and stock_check_guid = #{stockCheckGuid} - and stock_check_id = #{stockCheckId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and scan_num = #{scanNum} - and scan_num_x = #{scanNumX} - and scan_num_j = #{scanNumJ} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} + and csd.stock_check_guid = #{stockCheckGuid} + and csd.stock_check_id = #{stockCheckId} + and csd.lot_no = #{lotNo} + and csd.product_guid = #{productGuid} + and csd.product_id = #{productId} + and csd.quantity = #{quantity} + and csd.quantity_x = #{quantityX} + and csd.quantity_j = #{quantityJ} + and csd.price = #{price} + and csd.cargo_no = #{cargoNo} + and csd.assign_num = #{assignNum} + and csd.assign_num_x = #{assignNumX} + and csd.assign_num_j = #{assignNumJ} + and csd.print_date = #{printDate} + and csd.stock_status = #{stockStatus} + and csd.supplier_id = #{supplierId} + and csd.customer_id = #{customerId} + and csd.unit = #{unit} + and csd.spec = #{spec} + and csd.scan_num = #{scanNum} + and csd.scan_num_x = #{scanNumX} + and csd.scan_num_j = #{scanNumJ} + and csd.spare1 = #{spare1} + and csd.spare2 = #{spare2} + and csd.spare3 = #{spare3} + and csd.spare4 = #{spare4} + and csd.spare5 = #{spare5} + and csd.spare6 = #{spare6} diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml index 1c9d3b4..f62a1c0 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml @@ -35,43 +35,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail + select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id, + csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x, + csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec, + csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from check_stockin_detail csd + left join bas_product bp on csd.product_id = bp.product_id diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml index d2c6eff..734d948 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml @@ -45,9 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin_finish + select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, csf.warehouse_id,warehouse_name, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 + from check_stockin_finish csf + left join bas_warehouse bw on bw.warehouse_id= csf.warehouse_id select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish @@ -89,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and create_date = #{createDate} and create_man_id = #{createManId} and status = #{status} - and warehouse_id = #{warehouseId} + and csf.warehouse_id = #{warehouseId} and finish_date = #{finishDate} and erp_bill = #{erpBill} and stock_source = #{stockSource} diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml index 623f79e..ef79447 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml @@ -24,10 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin + select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, cs.warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 , + bw.warehouse_name + from check_stockin cs + left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id - and stockin_guid = #{stockinGuid} - and stockin_id = #{stockinId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} - and scan_num = #{scanNum} - and scan_num_x = #{scanNumX} - and scan_num_j = #{scanNumJ} + and isd.stockin_guid = #{stockinGuid} + and isd.stockin_id = #{stockinId} + and isd.lot_no = #{lotNo} + and isd.product_guid = #{productGuid} + and isd.product_id = #{productId} + and isd.quantity = #{quantity} + and isd.quantity_x = #{quantityX} + and isd.quantity_j = #{quantityJ} + and isd.price = #{price} + and isd.cargo_no = #{cargoNo} + and isd.assign_num = #{assignNum} + and isd.assign_num_x = #{assignNumX} + and isd.assign_num_j = #{assignNumJ} + and isd.print_date = #{printDate} + and isd.stock_status = #{stockStatus} + and isd.supplier_id = #{supplierId} + and isd.customer_id = #{customerId} + and isd.unit = #{unit} + and isd.spec = #{spec} + and isd.spare1 = #{spare1} + and isd.spare2 = #{spare2} + and isd.spare3 = #{spare3} + and isd.spare4 = #{spare4} + and isd.spare5 = #{spare5} + and isd.spare6 = #{spare6} + and isd.scan_num = #{scanNum} + and isd.scan_num_x = #{scanNumX} + and isd.scan_num_j = #{scanNumJ} @@ -114,34 +133,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultMap="InStockinDetailResult"> - and stockin_guid = #{stockinGuid} - and stockin_id = #{stockinId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} - and scan_num = #{scanNum} - and scan_num_x = #{scanNumX} - and scan_num_j = #{scanNumJ} + and isd.stockin_guid = #{stockinGuid} + and isd.stockin_id = #{stockinId} + and isd.lot_no = #{lotNo} + and isd.product_guid = #{productGuid} + and isd.product_id = #{productId} + and isd.quantity = #{quantity} + and isd.quantity_x = #{quantityX} + and isd.quantity_j = #{quantityJ} + and isd.price = #{price} + and isd.cargo_no = #{cargoNo} + and isd.assign_num = #{assignNum} + and isd.assign_num_x = #{assignNumX} + and isd.assign_num_j = #{assignNumJ} + and isd.print_date = #{printDate} + and isd.stock_status = #{stockStatus} + and isd.supplier_id = #{supplierId} + and isd.customer_id = #{customerId} + and isd.unit = #{unit} + and isd.spec = #{spec} + and isd.spare1 = #{spare1} + and isd.spare2 = #{spare2} + and isd.spare3 = #{spare3} + and isd.spare4 = #{spare4} + and isd.spare5 = #{spare5} + and isd.spare6 = #{spare6} + and isd.scan_num = #{scanNum} + and isd.scan_num_x = #{scanNumX} + and isd.scan_num_j = #{scanNumJ} diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml index 8da7d75..b9180fa 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml @@ -35,14 +35,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stockin_detail_id, stockin_guid, stockin_id, lot_no, isd.product_guid, - isd.product_id, quantity, quantity_x, quantity_j, isd.price, isd.cargo_no, isd.remark, - assign_num, assign_num_x, assign_num_j, print_date, stock_status, - supplier_id, customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, - isd.spare5, isd.spare6, scan_num, scan_num_x, scan_num_j + select + isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid, + isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark, + isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status, + isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, + isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j, + bp.product_name, bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume from in_stockin_detail isd left join bas_product bp on bp.product_id = isd.product_id @@ -50,34 +63,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml index a1c2c71..3383327 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml @@ -3,8 +3,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + @@ -31,41 +31,81 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select job_detail_id, job_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, product_id, stock_status, in_quantity, stock_quantity, out_quantity, layer_quantity, out_layer_quantity, give_num, stockin_id, stacking_id, exit_id, print_date, customer_id, supplier_id, spare1, spare2, spare3, spare4 from mydo_job_detail_finish - + select mjd.job_detail_id, + mjd.job_id, + mjd.stock_id, + mjd.lot_no, + mjd.in_date, + mjd.in_or_out_id, + mjd.in_or_out_d_id, + mjd.product_guid, + mjd.product_id, + mjd.stock_status, + mjd.in_quantity, + mjd.stock_quantity, + mjd.out_quantity, + mjd.layer_quantity, + mjd.out_layer_quantity, + mjd.give_num, + mjd.stockin_id, + mjd.stacking_id, + mjd.exit_id, + mjd.print_date, + mjd.customer_id, + mjd.supplier_id, + mjd.spare1, + mjd.spare2, + mjd.spare3, + mjd.spare4, + bp.product_name, bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + + from mydo_job_detail_finish mjd + left join bas_product bp on mjd.product_id = bp.product_id + @@ -73,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where job_id = #{jobId} - + - and job_detail_id = #{jobDetailId} - and job_id = #{jobId} - and stock_id = #{stockId} - and lot_no = #{lotNo} - and in_date = #{inDate} - and in_or_out_id = #{inOrOutId} - and in_or_out_d_id = #{inOrOutDId} - and product_guid = #{productGuid} - and product_id = #{productId} - and stock_status = #{stockStatus} - and in_quantity = #{inQuantity} - and stock_quantity = #{stockQuantity} - and out_quantity = #{outQuantity} - and layer_quantity = #{layerQuantity} - and out_layer_quantity = #{outLayerQuantity} - and give_num = #{giveNum} - and stockin_id = #{stockinId} - and stacking_id = #{stackingId} - and exit_id = #{exitId} - and print_date = #{printDate} - and customer_id = #{customerId} - and supplier_id = #{supplierId} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} + and mjd.job_detail_id = #{jobDetailId} + and mjd.job_id = #{jobId} + and mjd.stock_id = #{stockId} + and mjd.lot_no = #{lotNo} + and mjd.in_date = #{inDate} + and mjd.in_or_out_id = #{inOrOutId} + and mjd.in_or_out_d_id = #{inOrOutDId} + and mjd.product_guid = #{productGuid} + and mjd.product_id = #{productId} + and mjd.stock_status = #{stockStatus} + and mjd.in_quantity = #{inQuantity} + and mjd.stock_quantity = #{stockQuantity} + and mjd.out_quantity = #{outQuantity} + and mjd.layer_quantity = #{layerQuantity} + and mjd.out_layer_quantity = #{outLayerQuantity} + and mjd.give_num = #{giveNum} + and mjd.stockin_id = #{stockinId} + and mjd.stacking_id = #{stackingId} + and mjd.exit_id = #{exitId} + and mjd.print_date = #{printDate} + and mjd.customer_id = #{customerId} + and mjd.supplier_id = #{supplierId} + and mjd.spare1 = #{spare1} + and mjd.spare2 = #{spare2} + and mjd.spare3 = #{spare3} + and mjd.spare4 = #{spare4} + - + and only_identity = #{onlyIdentity} and product_id = #{productId} and lot_no like concat('%', #{lotNo}, '%') @@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and warehouse_id = #{warehouseId} - + - and stockin_guid = #{stockinGuid} - and stockin_id = #{stockinId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} + and rsd.stockin_guid = #{stockinGuid} + and rsd.stockin_id = #{stockinId} + and rsd.lot_no = #{lotNo} + and rsd.product_guid = #{productGuid} + and rsd.product_id = #{productId} + and rsd.quantity = #{quantity} + and rsd.quantity_x = #{quantityX} + and rsd.quantity_j = #{quantityJ} + and rsd.price = #{price} + and rsd.cargo_no = #{cargoNo} + and rsd.assign_num = #{assignNum} + and rsd.assign_num_x = #{assignNumX} + and rsd.assign_num_j = #{assignNumJ} + and rsd.print_date = #{printDate} + and rsd.stock_status = #{stockStatus} + and rsd.supplier_id = #{supplierId} + and rsd.customer_id = #{customerId} + and rsd.unit = #{unit} + and rsd.spec = #{spec} + and rsd.spare1 = #{spare1} + and rsd.spare2 = #{spare2} + and rsd.spare3 = #{spare3} + and rsd.spare4 = #{spare4} + and rsd.spare5 = #{spare5} + and rsd.spare6 = #{spare6} diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml index fdf6e91..7dd1219 100644 --- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml @@ -32,41 +32,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6 from receive_stockin_detail + select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id, + rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num, + rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id, + rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from receive_stockin_detail rsd + left join bas_product bp on rsd.product_id = bp.product_id - + and stock_id = #{stockId} - and cargo_space_id = #{cargoSpaceId} - and tray_code = #{trayCode} + and bsfr.cargo_space_id = #{cargoSpaceId} + and bsfr.tray_code = #{trayCode} and product_id = #{productId} and product_name like concat('%', #{productName}, '%') and print_date = #{printDate} @@ -42,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and old_status = #{oldStatus} and curr_status = #{currStatus} and method = #{method} - and warehouse_id = #{warehouseId} + and bsfr.warehouse_id = #{warehouseId} and stock_detail_id = #{stockDetailId} and operating_target = #{operatingTarget} and bar_code_old_quantity = #{barCodeOldQuantity} @@ -50,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and product_guid = #{productGuid} - + - + and stock_id = #{stockId} - and cargo_space_id = #{cargoSpaceId} - and tray_code = #{trayCode} + and bsmr.cargo_space_id = #{cargoSpaceId} + and bsmr.tray_code = #{trayCode} and product_id = #{productId} and product_name like concat('%', #{productName}, '%') and print_date = #{printDate} @@ -42,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and old_quantity = #{oldQuantity} and quantity = #{quantity} and method = #{method} - and warehouse_id = #{warehouseId} + and bsmr.warehouse_id = #{warehouseId} and stock_detail_id = #{stockDetailId} and operating_target = #{operatingTarget} and bar_code_old_quantity = #{barCodeOldQuantity} @@ -50,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and product_guid = #{productGuid} - + - and stock_id = #{stockId} - and cargo_space_id = #{cargoSpaceId} - and stock_status = #{stockStatus} - and product_status = #{productStatus} - and lot_no = #{lotNo} - and in_date = #{inDate} - and back_date = #{backDate} - and product_guid = #{productGuid} - and quantity = #{quantity} - and job_id = #{jobId} - and tray_code = #{trayCode} - and out_quantity = #{outQuantity} - and stockin_detail_id = #{stockinDetailId} - and stockin_id = #{stockinId} - and in_type = #{inType} - and in_class_id = #{inClassId} - and warehouse_id = #{warehouseId} - and stacking_id = #{stackingId} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} + and bs.stock_id = #{stockId} + and bs.cargo_space_id = #{cargoSpaceId} + and bs.stock_status = #{stockStatus} + and bs.product_status = #{productStatus} + and bs.lot_no = #{lotNo} + and bs.in_date = #{inDate} + and bs.back_date = #{backDate} + and bs.product_guid = #{productGuid} + and bp.product_name = #{productName} + and bs.quantity = #{quantity} + and bs.job_id = #{jobId} + and bs.tray_code = #{trayCode} + and bs.out_quantity = #{outQuantity} + and bs.stockin_detail_id = #{stockinDetailId} + and bs.stockin_id = #{stockinId} + and bs.in_type = #{inType} + and bs.in_class_id = #{inClassId} + and bs.warehouse_id = #{warehouseId} + and bs.stacking_id = #{stackingId} + and bs.spare1 = #{spare1} + and bs.spare2 = #{spare2} + and bs.spare3 = #{spare3} + and bs.spare4 = #{spare4} + and bs.spare5 = #{spare5} + and bs.spare6 = #{spare6} diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 88a3a09..026a771 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: { @@ -342,7 +354,8 @@ export default { selectMaterialRequired: 'Please select material', materialExistWarning: 'Selected material already exists, please reselect', quantityExceedError: 'Quantity cannot exceed stock quantity', - saveSuccess: 'Document {msg} saved successfully' + saveSuccess: 'Document {msg} saved successfully', + lotNo:'lotNo', }, //***************盘点单据管理*************** checkStockCheck: { @@ -551,6 +564,7 @@ export default { stockManagement: { stockId: 'Stock ID', cargoSpaceId: 'Cargo Space ID', + cargoSpaceName: 'Cargo Space Name', stockStatus: 'Stock Status', productStatus: 'Product Status', lotNo: 'Lot No', @@ -599,12 +613,23 @@ export default { addSuccess: 'Added successfully', editSuccess: 'Modified successfully', deleteSuccess: 'Deleted successfully', - confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?' + confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?', + productId:'物料编码', + materialDesc:'物料描述', + englishDesc:'英文描述', + netWeight:'净重', + length:'长', + width:'宽', + height:'高', + volume:'体积', + cargoSpaceStatus:'货位状态' + }, // *************库存操作记录*************** stockRecord: { stockId: 'Stock ID', cargoSpaceId: 'Cargo Space ID', + cargoSpaceName: '货位名称', trayCode: 'Tray Code', productId: 'Product ID', productName: 'Product Name', @@ -662,7 +687,8 @@ export default { editSuccess: 'Modified successfully', deleteSuccess: 'Deleted successfully', confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?', - fileName: 'record_{time}' + fileName: 'record_{time}', + createTime: '创建时间', }, // **************库存冻结记录************** stockFreeze: { @@ -722,7 +748,8 @@ export default { addSuccess: 'Added successfully', editSuccess: 'Modified successfully', deleteSuccess: 'Deleted successfully', - deleteConfirm: 'Are you sure to delete the selected stock freeze records?' + deleteConfirm: 'Are you sure to delete the selected stock freeze records?', + createTime: '创建时间', }, menu: { //收货单据新增 @@ -766,6 +793,25 @@ export default { NoticeManagement: 'NoticeManagement', //日志管理 LogManagement: 'LogManagement', + //操作日志 + LogManagement_OperationLog: 'OperationLog', + //登录日志 + LogManagement_LoginLog: 'LoginLog', + + //********************系统监控******************** + SystemMonitor: 'SystemMonitor', + // 在线用户 + SystemMonitor_Online: 'Online', + // 定时任务 + SystemMonitor_ScheduledTask: 'ScheduledTask', + // 数据监控 + SystemMonitor_DataMonitor: 'DataMonitor', + //服务监控 + SystemMonitor_ServiceMonitor: 'ServiceMonitor', + //缓存监控 + SystemMonitor_CacheMonitor: 'CacheMonitor', + //缓存列表 + SystemMonitor_CacheList: 'CacheList', // ****************盘点管理****************** inventoryManagement: 'inventoryManagement', @@ -1538,6 +1584,274 @@ export default { }, + // ***************系统管理：日志管理-操作日志************* + // ***************views/monitor/operlog************* + systemManagement_LogManagement_Operation:{ + //--------------数据表标题-------------- + operId: 'OperId', + title: 'Title', + businessType: 'BusinessType', + operName: 'OperName', + operIp: 'OperIp', + operLocation: 'OperLocation', + status: 'Status', + operTime: 'OperTime', + costTime: 'CostTime', + unitMillisecond: 'ms', + operation: 'Operation', + details: 'Details', + + //--------------当前页面交互框操作提示-------------- + placeholderOpenIp: 'Enter openId', + placeholderTitle: 'Enter title', + placeholderBusinessType: 'Select businessType', + placeholderOperName: 'Select operName', + placeholderStatus: 'Select status', + placeholderOperTime: 'OperationTime', + placeholderDateStart: 'DateStart', + placeholderDateEnd: 'DateEnd', + + //--------------二级窗口-------------- + //--------------标题-------------- + logDetails: 'logDetails', + + //--------------交互框标签-------------- + noticeContent:"Content", + loginInfo: 'Login Info', + requestInfo: 'Request Info', + requestUrl: 'Request Url', + requestMethod: 'Request Method', + method:'Method', + requestParam: 'Request Params', + responseParam: 'Response Param', + statusNormal: 'Success', + statusFail: 'Fail', + errorMsg:'Error Message', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnImport: 'Import', + btnExport: 'Export', + btnSubmit: 'Confirm', + btnCancel: 'Cancel', + btnClear: 'ClearAll', + btnDetails: 'Details', + + //--------------提示文本-------------- + + //---handleClean--- + textDeleteConfirm: 'Confirm that all operation log data entries are cleared?"', + + //--------------操作提示-------------- + addSuccessInfo: 'Add success', + editSuccessInfo: 'Edit success', + deleteSuccessInfo: 'Delete success', + clearSuccessInfo: 'Clear success', + + //--------------其他-------------- + lblWidthSearch: '80px', + lblWidthDialog: '150px', + + }, + + // ***************系统管理：日志管理-登录日志************* + // ***************views/monitor/logininfor************* + systemManagement_LogManagement_Login:{ + //--------------数据表标题-------------- + infoId: 'InfoId', + userName: 'UserName', + ipAddress: 'IPAddress', + loginLocation: 'LoginLocation', + operLocation: 'OperLocation', + browser: 'Browser', + os: 'OperationSystem', + status: 'Status', + loginTime: 'LoginTime', + message: 'Message', + + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: 'Enter IPAddress', + placeholderUserName: 'Enter UserName', + placeholderStatus: 'Select Status', + placeholderLoginTime: 'LoginTime', + placeholderDateStart: 'DateStart', + placeholderDateEnd: 'DateEnd', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnImport: 'Import', + btnExport: 'Export', + btnSubmit: 'Confirm', + btnCancel: 'Cancel', + btnClear: 'ClearAll', + btnDetails: 'Details', + btnUnlocked: 'Unlock', + + //--------------提示文本-------------- + + //---函数：handleDelete--- + textDeleteConfirm1: 'Are you sure you want to delete the data item with the infoId of "', + textDeleteConfirm2: '"?', + + //---函数：handleUnlock--- + textUnlockConfirm1: 'Are you sure you want to unlock the data item with the infoId of "', + textUnlockConfirm2: '"?', + + //---handleClean--- + textCleanConfirm: 'Are you sure to clear all login log data items?', + + //--------------操作提示-------------- + addSuccessInfo: 'Add success', + editSuccessInfo: 'Edit success', + deleteSuccessInfo: 'Delete success', + clearSuccessInfo: 'Clear success', + unlockSuccessInfo: 'Unlock success', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + + }, + + // ***************系统监控：在线用户************* + monitor_Online:{ + //--------------数据表标题-------------- + num: 'Id', + tokenId: 'TokenId', + userName: 'UserName', + deptName: 'DeptName', + ipAddress: 'Host IP', + loginLocation: 'LoginLocation', + browser: 'Browser', + os: 'Operating System', + loginTime: 'LoginTime', + message: 'Message', + + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: 'Enter Host IP', + placeholderUserName: 'Enter UserName', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnForceLogout: 'Force Logout', + + //--------------提示文本-------------- + //---函数：handleForceLogout--- + textForceLogoutConfirm1: 'Is the user with the username "', + textForceLogoutConfirm2: '"forcefully logged out?', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + }, + + // ***************系统监控：定时任务************* + Monitor_ScheduledTask:{ + //--------------数据表标题-------------- + jobId: 'JobId', + jobName: 'JobName', + jobGroup: 'JobGroup', + invokeTarget: 'InvokeTarget', + cronExpression: 'CronExpression', + status: 'Status', + operation: 'Operation', + + //--------------当前页面交互框操作提示-------------- + placeholderJobName: 'Enter JobName', + placeholderJobGroup: 'Select JobGroup', + + //---------------二级窗口操作提示------------------ + placeholderInvokeTarget: 'Enter InvokeTarget', + placeholderCronExpression: 'Enter CronExpression', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnImport: 'Import', + btnExport: 'Export', + btnSubmit: 'Confirm', + btnCancel: 'Cancel', + btnMore: 'More', + btnLog: 'Log', + btnGenerateExpression: 'GenerateExpression', + + //---------------更多-------------- + btnExceOnce: 'Execute Once', + btnJobDetails: 'Job Details', + btnJobLog: 'Job Log', + + //--------------提示文本-------------- + //---二级窗口标题--- + titleAddJob: 'Add Job', + titleEditJob: 'Edit Job', + + //---标签--- + nextValidTime:'Next Valid Time', + execStrategy:'Execution Strategy', + allowParallel:'Allow Parallel', + createTime:'CreateTime', + + //---二级窗口--- + textInvokeMethod: 'Invoke Method', + textInvokeMethodTip1: "Bean call example:ryTask.ryParams('ry')", + textInvokeMethodTip2: "Class call example:com.ruoyi.quartz.task.RyTask.ryParams('ry')", + textInvokeMethodTip3: "Parameter: string, boolean, long integer, floating point, integer", + + textJobStatusNormal: 'Normal', + textJobStatusPause: 'Pause', + + textDefaultStrategy: 'Default', + textExecStrategyTip1: 'Immediately', + textExecStrategyTip2: 'Once', + textExecStrategyTip3: 'Never', + + textIsParallelTip1: 'Enable', + textIsParallelTip2: 'Disable', + + //---函数：handleDelete--- + textEnable: 'Enable', + textDisable: 'Disable', + textChangeConfirm1: 'Are you sure you want to enable "', + textChangeConfirm2: '" job?', + textSuccess: 'Success', + + //---函数：handleRun--- + textExecConfirm1: 'Are you sure you want to perform a scheduling task numbered "', + textExecConfirm2: '" immediately?', + + //---函数：handleDelete--- + textDeleteConfirm1: 'Sure you want to delete the data item with timed task number "', + textDeleteConfirm2: '"?', + + //--------------操作提示-------------- + addSuccessInfo: 'Add success', + editSuccessInfo: 'Edit success', + deleteSuccessInfo: 'Delete success', + clearSuccessInfo: 'Clear success', + unlockSuccessInfo: 'Unlock success', + execSuccessInfo: 'Exec success', + + //--------------校验提示-------------- + checkJobNameIsNull: 'JobName cannot be null', + checkInvokeTargetIsNull: 'InvokeTarget cannot be null', + checkCronExpressionIsNull: 'CronExpression cannot be null', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + }, // ***************出库作业流水查询************* diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 74dbace..ec55dfd 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: { @@ -345,7 +358,8 @@ export default { selectMaterialRequired: '请选择物资', materialExistWarning: '所选物资已存在，请重新选择', quantityExceedError: '数量不能大于库存数量', - saveSuccess: '单据{msg}保存成功' + saveSuccess: '单据{msg}保存成功', + lotNo:'批次号', }, //***************盘点单据管理*************** checkStockCheck: { @@ -362,7 +376,7 @@ export default { invalidate: '单据作废', review: '单据审核', confirm: '单据确认', - warehouseId: '仓库ID', + warehouseId: '仓库', stockSource: '单据来源', departmentNo: '部门编码', createManId: '创建人', @@ -554,6 +568,7 @@ export default { stockManagement: { stockId: '库存id', cargoSpaceId: '货位id', + cargoSpaceName: '货位名称', stockStatus: '库存状态', productStatus: '物料状态', lotNo: '批次号', @@ -564,11 +579,12 @@ export default { jobId: '作业ID', trayCode: '托盘条码', outQuantity: '出库数量', - stockinDetailId: '入库子单id', + stockinDetailId: '入库子单', stockinId: '入库主单', inType: '入库类型', inClassId: '入库班组ID', warehouseId: '仓库', + warehouseName: 'WarehouseName', stackingId: '垛型ID', operation: '操作', add: '新增', @@ -591,7 +607,7 @@ export default { inputJobId: '请输入作业ID', inputTrayCode: '请输入托盘条码', inputOutQuantity: '请输入出库数量', - inputStockinDetailId: '请输入入库子单id', + inputStockinDetailId: '请输入入库子单', inputStockinId: '请输入入库主单', inputInClassId: '请输入入库班组ID', inputWarehouseId: '请输入仓库', @@ -602,12 +618,25 @@ export default { addSuccess: '新增成功', editSuccess: '修改成功', deleteSuccess: '删除成功', - confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？' + confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？', + materialDesc:'物料描述', + materialInDesc:'物料描述', + englishDesc:'英文描述', + netWeight:'净重', + length:'长', + width:'宽', + height:'高', + volume:'体积', + productId:'物料编码', + cargoSpaceStatus: '货位状态' + + }, // *************库存操作记录*************** stockRecord: { stockId: '库存编码', cargoSpaceId: '货位编码', + cargoSpaceName: '货位名称', trayCode: '托盘条码', productId: '物品编码', productName: '物品名称', @@ -665,7 +694,8 @@ export default { editSuccess: '修改成功', deleteSuccess: '删除成功', confirmDelete: '您确定要删除ID为' + '{whGuids}' + '的操作记录吗？', - fileName: '记录{time}' + fileName: '记录{time}', + createTime: '创建时间', }, // **************库存冻结记录************** stockFreeze: { @@ -725,7 +755,11 @@ export default { addSuccess: '新增成功', editSuccess: '修改成功', deleteSuccess: '删除成功', - deleteConfirm: '是否确认删除所选库存冻结记录？' + deleteConfirm: '是否确认删除所选库存冻结记录？', + createTime: '创建时间', + oldStatus: '原状态', + currStatus: '新状态', + cargoSpaceName: '货位名称', }, menu: { @@ -750,25 +784,47 @@ export default { outboundTaskManagement: '出库作业管理', //********************系统管理******************** - SystemManagement: '系统管理', - //用户管理 - UserManagement: '用户管理', - //角色管理 - RoleManagement: '角色管理', - //菜单管理 - MenuManagement: '菜单管理', - //部门管理 - DepartmentManagement: '部门管理', - //岗位管理 - PostManagement: '岗位管理', - //字典管理 - DictionaryManagement: '字典管理', - //参数管理 - ConfigManagement: '参数管理', - //通知公告 - NoticeManagement: '通知公告', - //日志管理 - LogManagement: '日志管理', + SystemManagement: '系统管理', + //用户管理 + UserManagement: '用户管理', + //角色管理 + RoleManagement: '角色管理', + //菜单管理 + MenuManagement: '菜单管理', + //部门管理 + DepartmentManagement: '部门管理', + //岗位管理 + PostManagement: '岗位管理', + //字典管理 + DictionaryManagement: '字典管理', + //参数管理 + ConfigManagement: '参数管理', + //通知公告 + NoticeManagement: '通知公告', + //日志管理 + LogManagement: '日志管理', + //操作日志 + LogManagement_OperationLog: '操作日志', + //登录日志 + LogManagement_LoginLog: '操作日志', + + //********************系统监控******************** + SystemMonitor: '系统监控', + // 在线用户 + SystemMonitor_Online: '在线用户', + // 定时任务 + SystemMonitor_ScheduledTask: '定时任务', + // 数据监控 + SystemMonitor_DataMonitor: '数据监控', + //服务监控 + SystemMonitor_ServiceMonitor: '服务监控', + //缓存监控 + SystemMonitor_CacheMonitor: '缓存监控', + //缓存列表 + SystemMonitor_CacheList: '缓存列表', + + + // ****************盘点管理****************** inventoryManagement: '盘点管理', @@ -1500,6 +1556,14 @@ export default { createTime: '创建时间', operation: '人工操作', + //--------------当前页面交互框操作提示-------------- + placeholderNoticeTitle: '请输入公告标题', + placeholderCreateBy: '请输入操作人员', + placeholderNoticeType: '选择公告类型', + placeholderCreateTime: '创建时间', + placeholderDateStart: '开始时间', + placeholderDateEnd: '结束时间', + //--------------二级窗口-------------- //--------------标题-------------- addNoticeItem: '新增公告', @@ -1508,17 +1572,9 @@ export default { //--------------交互框标签-------------- noticeContent:"公告内容", - //--------------当前页面交互框操作提示-------------- - placeholderNoticeTitle: '请输入公告标题', - placeholderCreateBy: '请输入操作人员', - placeholderNoticeType: '选择公告类型', - placeholderCreateTime: '创建时间', - placeholderDateStart: '开始时间', - placeholderDateEnd: '结束时间', - - //--------------二级窗口操作提示-------------- - placeholderRemark: '请输入内容', - placeholderNoticeContent: '请输入内容', + //--------------二级窗口操作提示-------------- + placeholderRemark: '请输入内容', + placeholderNoticeContent: '请输入内容', //--------------交互按钮-------------- btnSearch: '搜索', @@ -1555,6 +1611,298 @@ export default { }, + // ***************系统管理：日志管理-操作日志************* + // ***************views/monitor/operlog************* + systemManagement_LogManagement_Operation:{ + //--------------数据表标题-------------- + operId: '日志编号', + title: '系统模块', + businessType: '操作类型', + operName: '操作人员', + operIp: '操作地址', + operLocation: '操作地点', + status: '操作状态', + operTime: '操作日期', + costTime: '消耗时间', + unitMillisecond: '毫秒', + operation: '消耗时间', + details: '明细', + + //--------------当前页面交互框操作提示-------------- + placeholderOpenIp: '请输入日志编号', + placeholderTitle: '请输入系统模块', + placeholderBusinessType: '请选择公告类型', + placeholderOperName: '请选择操作人员', + placeholderStatus: '请选择操作状态', + placeholderOperTime: '操作日期', + placeholderDateStart: '开始时间', + placeholderDateEnd: '结束时间', + + //--------------二级窗口-------------- + //--------------标题-------------- + logDetails: '日志明细', + + //--------------交互框标签-------------- + noticeContent:"公告内容", + loginInfo: '登录信息', + requestInfo: '请求信息', + requestUrl: '请求地址', + requestMethod: '请求方式', + method:'方法', + requestParam: '请求参数', + responseParam: '响应参数', + statusNormal: '响应正常', + statusFail: '响应失败', + errorMsg:'异常信息', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnAdd: '新增', + btnEdit: '修改', + btnDelete: '删除', + btnImport: '导入', + btnExport: '导出', + btnSubmit: '确定', + btnCancel: '取消', + btnClear: '清空', + btnDetails: '明细', + + //--------------提示文本-------------- + + //---handleClean--- + textDeleteConfirm: '是否确认清空所有操作日志数据项？"', + + //--------------操作提示-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', + clearSuccessInfo: '清空成功', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + + }, + + // ***************系统管理：日志管理-登录日志************* + // ***************views/monitor/logininfor************* + systemManagement_LogManagement_Login:{ + //--------------数据表标题-------------- + infoId: '访问编号', + userName: '用户名称', + ipAddress: '登录地址', + loginLocation: '登录地点', + operLocation: '操作地点', + browser: '浏览器', + os: '操作系统', + status: '登录状态', + loginTime: '登录日期', + message: '操作信息', + + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: '请输入登录地址', + placeholderUserName: '请输入用户名称', + placeholderStatus: '请选择登录状态', + placeholderLoginTime: '登录时间', + placeholderDateStart: '开始时间', + placeholderDateEnd: '结束时间', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnAdd: '新增', + btnEdit: '修改', + btnDelete: '删除', + btnImport: '导入', + btnExport: '导出', + btnSubmit: '确定', + btnCancel: '取消', + btnClear: '清空', + btnDetails: '明细', + btnUnlocked: '解锁', + + //--------------提示文本-------------- + //---函数：handleDelete--- + textDeleteConfirm1: '是否确认删除访问编号为"', + textDeleteConfirm2: '"的数据项？', + + //---函数：handleUnlock--- + textUnlockConfirm1: '是否确认解锁访问编号为"', + textUnlockConfirm2: '"的数据项？', + + //---函数：handleClean--- + textCleanConfirm: '是否确认清空所有登录日志数据项？', + + //--------------操作提示-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', + clearSuccessInfo: '清空成功', + unlockSuccessInfo: '解锁成功', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + + }, + + // ***************系统监控：在线用户************* + monitor_Online:{ + //--------------数据表标题-------------- + num: '序号', + tokenId: '会话编号', + userName: '登录名称', + deptName: '部门名称', + ipAddress: '主机', + loginLocation: '登录地点', + browser: '浏览器', + os: '操作系统', + loginTime: '登录日期', + message: '操作信息', + + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: '请输入登录地址', + placeholderUserName: '请输入用户名称', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnForceLogout: '强制退出', + + //--------------提示文本-------------- + //---函数：handleForceLogout--- + textForceLogoutConfirm1: '是否强制退出用户名为"', + textForceLogoutConfirm2: '"的用户？', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + }, + + // ***************系统监控：定时任务************* + Monitor_ScheduledTask:{ + //--------------数据表标题-------------- + jobId: '任务编号', + jobName: '任务名称', + jobGroup: '任务组名', + invokeTarget: '调用目标字符串', + cronExpression: 'cron执行表达式', + status: '状态', + operation: '操作', + + //--------------当前页面交互框操作提示-------------- + placeholderJobName: '请输入任务名称', + placeholderJobGroup: '请选择任务组名', + + //---------------二级窗口操作提示------------------ + placeholderInvokeTarget: '请输入调用目标字符串', + placeholderCronExpression: '请输入Cron执行表达式', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnAdd: '新增', + btnEdit: '修改', + btnDelete: '删除', + btnImport: '导入', + btnExport: '导出', + btnSubmit: '确定', + btnCancel: '取消', + btnMore: '更多', + btnLog: '日志', + btnGenerateExpression: '生成表达式', + + btnExceOnce: '执行一次', + btnJobDetails: '任务详情', + btnJobLog: '调度日志', + + //--------------提示文本-------------- + //---二级窗口标题--- + titleAddJob: '添加任务', + titleEditJob: '修改任务', + + //---标签--- + nextValidTime:'下次执行时间', + execStrategy:'执行策略', + allowParallel:'是否并发', + createTime:'创建时间', + + //---二级窗口--- + textInvokeMethod: '调用方法', + textInvokeMethodTip1: "Bean调用示例：ryTask.ryParams('ry')", + textInvokeMethodTip2: "Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')", + textInvokeMethodTip3: "参数说明：支持字符串，布尔类型，长整型，浮点型，整型", + + textJobStatusNormal: '正常', + textJobStatusPause: '暂停', + + textDefaultStrategy: '默认策略', + textExecStrategyTip1: '立即执行', + textExecStrategyTip2: '执行一次', + textExecStrategyTip3: '放弃执行', + + textIsParallelTip1: '允许', + textIsParallelTip2: '禁止', + + //---函数：handleStatusChange--- + textEnable: '启用', + textDisable: '停用', + textChangeConfirm1: '确认要"', + textChangeConfirm2: '"任务吗？', + textSuccess: '成功', + + //---函数：handleRun--- + textExecConfirm1: '确认要立即执行一次"', + textExecConfirm2: '"任务吗？', + + //---函数：handleDelete--- + textDeleteConfirm1: '是否确认删除定时任务编号为"', + textDeleteConfirm2: '"的数据项？', + + //--------------操作提示-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', + clearSuccessInfo: '清空成功', + unlockSuccessInfo: '解锁成功', + execSuccessInfo: '执行成功', + + //--------------校验提示-------------- + checkJobNameIsNull: '任务名称不能为空', + checkInvokeTargetIsNull: '调用目标字符串不能为空', + checkCronExpressionIsNull: 'cron执行表达式不能为空', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + }, + + // ***************系统监控：服务监控*************** + Monitor_Service:{ + Property: '属性', + Value: '值', + RAM: '内存', + + cores: '核心数', + userUsageRate: '用户使用率', + systemUsageRate: '系统使用率', + idleRate: '当先空闲率', + + swap: 'Swap', + os: 'OS', + host: 'Host', + name: 'Name', + version: 'Version', + arch: 'Arch', + time: 'Time', + ip: 'IP', + mac: 'MAC', + cpu_cores: 'CPU Cores', + + }, + + // ***************出库作业流水查询************* searchViewOutJobFlow: { 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..c7782ba 100644 --- a/ruoyi-ui/src/views/check/create/index.vue +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -2,7 +2,7 @@
- + - + {{ $t('checkCreate.reset') }} - {{ $t('checkCreate.saveDocument') }} + {{ $t('checkCreate.saveDocument') }}
- {{ $t('checkCreate.selectMaterial') }} + {{ $t('checkCreate.selectMaterial') }} {{ $t('checkCreate.recreateDocument') }}
@@ -54,6 +54,7 @@ + @@ -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..e3b6dc8 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')}} @@ -201,7 +202,7 @@ - + @@ -227,8 +228,8 @@ - - + + 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 + + // 批次号 // 入库时间 --> + + + + + + - - -