lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改权限 ，修改字段展示

Browse Source
This commit is contained in:
liuhanqing
2025-06-09 14:23:11 +08:00
parent 417e9a8dfa
commit a0569f17a5
22 changed files with 176 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java
View File

@@ -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);

2
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java
View File

@@ -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)
{

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

@@ -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)

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

@@ -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)

115
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java
View File

@@ -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;
}

13
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java
View File

@@ -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<MydoJobDetail> selectMydoJobDetailList(MydoJobDetail mydoJobDetail)
{
return mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail);
List<MydoJobDetail> mydoJobDetails = mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail);
for (MydoJobDetail jobDetail : mydoJobDetails) {
if (StrUtil.isNotEmpty(jobDetail.getSpare1())){
jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class));
}
}
return mydoJobDetails;
}
/**

28
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java
View File

@@ -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<MydoJobDetail> selectMydoJobDetailFinishListByJobDetail(MydoJobDetail mydoJobDetail) {
String jobId = mydoJobDetail.getJobId();
return mydoJobDetailFinishMapper.selectMydoJobDetailFinishListByJobId(jobId);
List<MydoJobDetail> 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 结果
*/

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

@@ -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);

2
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java
View File

@@ -179,6 +179,8 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
Optional<ReceiveProductVo> 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);
}