refactor(wms): 移除物料大类和物料信息相关控制器中的权限注解;恢复物料信息查询逻辑,添加审批日期区间查询功能;wms_instock_order和wms_instock_detail添加字段

- 移除物料大类和物料信息相关控制器中的权限注解
- 恢复物料信息查询逻辑,添加审批日期区间查询功能
- wms_instock_order表添加入库方式(PDA入库、AGV入库、质检后PDA入库、质检后AGV入库)字段,wms_instock_detail表添加质检标识(0未质检 1已质检)、分包数量(int)字段。
- 在入库明细实体和 VO 中添加分包数量和是否质检字段
- 在入库订单实体和 VO 中添加入库方式字段
- 优化采购订单相关代码结构
master
zangch@mesnac.com 7 days ago
parent e0bfd8ea44
commit 65fe7d83f2

@ -1,6 +1,5 @@
package org.dromara.wms.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -41,7 +40,7 @@ public class BaseMaterialCategoryController extends BaseController {
/**
*
*/
@SaCheckPermission("mes:baseMaterialCategory:list")
//@SaCheckPermission("mes:baseMaterialCategory:list")
@GetMapping("/list")
public TableDataInfo<BaseMaterialCategoryVo> list(BaseMaterialCategoryBo bo, PageQuery pageQuery) {
return baseMaterialCategoryService.queryPageList(bo, pageQuery);
@ -50,7 +49,7 @@ public class BaseMaterialCategoryController extends BaseController {
/**
*
*/
@SaCheckPermission("mes:baseMaterialCategory:export")
//@SaCheckPermission("mes:baseMaterialCategory:export")
@Log(title = "物料大类信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(BaseMaterialCategoryBo bo, HttpServletResponse response) {
@ -63,7 +62,7 @@ public class BaseMaterialCategoryController extends BaseController {
*
* @param materialCategoryId
*/
@SaCheckPermission("mes:baseMaterialCategory:query")
//@SaCheckPermission("mes:baseMaterialCategory:query")
@GetMapping("/{materialCategoryId}")
public R<BaseMaterialCategoryVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long materialCategoryId) {
@ -73,7 +72,7 @@ public class BaseMaterialCategoryController extends BaseController {
/**
*
*/
@SaCheckPermission("mes:baseMaterialCategory:add")
//@SaCheckPermission("mes:baseMaterialCategory:add")
@Log(title = "物料大类信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -84,7 +83,7 @@ public class BaseMaterialCategoryController extends BaseController {
/**
*
*/
@SaCheckPermission("mes:baseMaterialCategory:edit")
//@SaCheckPermission("mes:baseMaterialCategory:edit")
@Log(title = "物料大类信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -97,7 +96,7 @@ public class BaseMaterialCategoryController extends BaseController {
*
* @param materialCategoryIds
*/
@SaCheckPermission("mes:baseMaterialCategory:remove")
//@SaCheckPermission("mes:baseMaterialCategory:remove")
@Log(title = "物料大类信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{materialCategoryIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

@ -42,7 +42,7 @@ public class BaseMaterialInfoController extends BaseController {
/**
*
*/
@SaCheckPermission("mes:baseMaterialInfo:list")
//@SaCheckPermission("mes:baseMaterialInfo:list")
@GetMapping("/list")
public TableDataInfo<BaseMaterialInfoVo> list(BaseMaterialInfoBo bo, PageQuery pageQuery) {
return baseMaterialInfoService.queryPageList(bo, pageQuery);
@ -51,7 +51,7 @@ public class BaseMaterialInfoController extends BaseController {
/**
*
*/
@SaCheckPermission("mes:baseMaterialInfo:export")
//@SaCheckPermission("mes:baseMaterialInfo:export")
@Log(title = "物料信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(BaseMaterialInfoBo bo, HttpServletResponse response) {
@ -64,7 +64,7 @@ public class BaseMaterialInfoController extends BaseController {
*
* @param materialId
*/
@SaCheckPermission("mes:baseMaterialInfo:query")
//@SaCheckPermission("mes:baseMaterialInfo:query")
@GetMapping("/{materialId}")
public R<BaseMaterialInfoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long materialId) {
@ -74,7 +74,7 @@ public class BaseMaterialInfoController extends BaseController {
/**
*
*/
@SaCheckPermission("mes:baseMaterialInfo:add")
//@SaCheckPermission("mes:baseMaterialInfo:add")
@Log(title = "物料信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -85,7 +85,7 @@ public class BaseMaterialInfoController extends BaseController {
/**
*
*/
@SaCheckPermission("mes:baseMaterialInfo:edit")
//@SaCheckPermission("mes:baseMaterialInfo:edit")
@Log(title = "物料信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -98,7 +98,7 @@ public class BaseMaterialInfoController extends BaseController {
*
* @param materialIds
*/
@SaCheckPermission("mes:baseMaterialInfo:remove")
//@SaCheckPermission("mes:baseMaterialInfo:remove")
@Log(title = "物料信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{materialIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

@ -1,27 +1,26 @@
package org.dromara.wms.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.wms.domain.WmsPurchaseOrder;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wms.domain.vo.WmsPurchaseOrderVo;
import org.dromara.wms.domain.bo.WmsPurchaseOrderBo;
import org.dromara.wms.service.IWmsPurchaseOrderService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wms.domain.WmsPurchaseOrder;
import org.dromara.wms.domain.bo.WmsPurchaseOrderBo;
import org.dromara.wms.domain.vo.WmsPurchaseOrderVo;
import org.dromara.wms.service.IWmsPurchaseOrderService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
@ -115,4 +114,5 @@ public class WmsPurchaseOrderController extends BaseController {
List<WmsPurchaseOrderVo> list = wmsPurchaseOrderService.queryList(bo);
return R.ok(list);
}
}

@ -1,9 +1,7 @@
package org.dromara.wms.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.math.BigDecimal;
@ -122,6 +120,17 @@ public class WmsInstockDetail{
*/
private BigDecimal printedNum;
/**
*
*/
private BigDecimal apportionQty;
/**
*
*/
private String isInspection;
/**
*

@ -1,13 +1,12 @@
package org.dromara.wms.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
import java.util.Date;
/**
* wms_instock_order
@ -75,6 +74,12 @@ public class WmsInstockOrder{
private Long warehouseId;
/**
* 0PDA1AGV2PDA3AGV
*/
private String instockMethond;
@TableField(fill = FieldFill.INSERT)
private String createBy;

@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.wms.domain.WmsInstockDetail;
import java.math.BigDecimal;
@ -110,6 +109,18 @@ public class WmsInstockDetailBo{
* id
*/
private String tenantId;
/**
*
*/
private BigDecimal apportionQty;
/**
*
*/
private String isInspection;
/**
*
*/

@ -1,17 +1,18 @@
package org.dromara.wms.domain.bo;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.wms.domain.WmsInstockOrder;
import java.util.Date;
/**
* wms_instock_order
*
@ -82,10 +83,15 @@ public class WmsInstockOrderBo extends BaseEntity {
*/
@NotNull(message = "仓库ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long warehouseId;
/**
* id
*/
private String tenantId;
/**
* 0PDA1AGV2PDA3AGV
*/
private String instockMethond;
}

@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.wms.domain.WmsInstockDetail;
@ -141,6 +139,17 @@ public class WmsInstockDetailVo implements Serializable {
*/
private String tenantId;
/**
*
*/
private BigDecimal apportionQty;
/**
*
*/
private String isInspection;
/**
*
*/

@ -1,16 +1,10 @@
package org.dromara.wms.domain.vo;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wms.domain.WmsInstockOrder;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.wms.domain.WmsInstockOrder;
import java.io.Serial;
import java.io.Serializable;
@ -91,11 +85,18 @@ public class WmsInstockOrderVo implements Serializable {
*/
@ExcelProperty(value = "仓库ID")
private Long warehouseId;
/**
* id
*/
private String tenantId;
/**
* 0PDA1AGV2PDA3AGV
*/
private String instockMethond;
private String warehouseCode;//字段映射
/**

@ -1,21 +1,18 @@
package org.dromara.wms.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wms.domain.WmsPurchaseOrder;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wms.domain.WmsPurchaseOrder;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* wms_purchase_order
*

@ -95,6 +95,10 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService {
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, BaseMaterialInfo::getMaterialCategoryId)
// lqw.between(params.get("beginApproveDate") != null && params.get("endApproveDate") != null,
// BaseMaterialInfo::getApproveDate ,params.get("beginApproveDate"), params.get("endApproveDate"));
.between(params.get("beginApproveDate") != null && params.get("endApproveDate") != null,
BaseMaterialInfo::getApproveDate ,params.get("beginApproveDate"), params.get("endApproveDate"))
.eq(bo.getMaterialId() != null, BaseMaterialInfo::getMaterialId, bo.getMaterialId())
.eq(StringUtils.isNotBlank(bo.getErpId()), BaseMaterialInfo::getErpId, bo.getErpId())

@ -96,6 +96,8 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsInstockDetail::getMaterialCategoryId)
.eq(StringUtils.isNotBlank(bo.getIsInspection()), WmsInstockDetail::getIsInspection, bo.getIsInspection())
.eq(bo.getInstockQty() != null, WmsInstockDetail::getInstockQty, bo.getInstockQty())
.eq(bo.getInstockDetailId() != null, WmsInstockDetail::getInstockDetailId, bo.getInstockDetailId())
.eq(bo.getInstockId() != null, WmsInstockDetail::getInstockId, bo.getInstockId())

@ -1,28 +1,24 @@
package org.dromara.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.checkerframework.checker.units.qual.A;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialCategory;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsConfiguration;
import org.dromara.wms.domain.WmsInstockOrder;
import org.dromara.wms.domain.bo.WmsConfigurationBo;
import org.dromara.wms.domain.bo.WmsInstockOrderBo;
import org.dromara.wms.domain.vo.WmsInstockOrderVo;
import org.dromara.wms.mapper.WmsInstockOrderMapper;
import org.dromara.wms.service.IWmsConfigurationService;
import org.dromara.wms.service.IWmsInstockDetailService;
import org.dromara.wms.service.IWmsInstockOrderService;
import org.springframework.beans.factory.annotation.Autowired;
@ -30,12 +26,11 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
/**
* Service
@ -114,6 +109,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
.select(WmsBaseWarehouse::getWarehouseCode)
.leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsInstockOrder::getWarehouseId)
.eq(StringUtils.isNotBlank(bo.getInstockMethond()), WmsInstockOrder::getInstockMethond, bo.getInstockMethond())
.eq(bo.getInstockId() != null, WmsInstockOrder::getInstockId, bo.getInstockId())
.eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockOrder::getInstockCode, bo.getInstockCode())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInstockOrder::getMaterialCategoryId, bo.getMaterialCategoryId())

@ -1,32 +1,31 @@
package org.dromara.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.*;
import org.dromara.wms.domain.vo.WmsInstockOrderVo;
import org.dromara.wms.mapper.WmsInstockOrderMapper;
import org.dromara.wms.service.IWmsPurchaseOrderDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.dromara.wms.domain.BaseMaterialCategory;
import org.dromara.wms.domain.BaseSupplierInfo;
import org.dromara.wms.domain.WmsPurchaseOrder;
import org.dromara.wms.domain.bo.WmsPurchaseOrderBo;
import org.dromara.wms.domain.vo.WmsPurchaseOrderVo;
import org.dromara.wms.mapper.BaseMaterialInfoMapper;
import org.dromara.wms.mapper.WmsPurchaseOrderMapper;
import org.dromara.wms.service.IWmsPurchaseOrderDetailService;
import org.dromara.wms.service.IWmsPurchaseOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.concurrent.atomic.AtomicInteger;
/**
@ -47,6 +46,8 @@ public class WmsPurchaseOrderServiceImpl implements IWmsPurchaseOrderService {
@Autowired
private IWmsPurchaseOrderDetailService wmsPurchaseOrderDetailService;
private final BaseMaterialInfoMapper baseMaterialInfoMapper;
/**
*
*

Loading…
Cancel
Save