linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mes stock in and out type

Browse Source
plp
chenshuichuan 2 years ago
parent b08f32db4a
commit eaa34df5df
9 changed files with 82 additions and 7 deletions
Show Stats Download Patch File Download Diff File

24
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java
Unescape Escape View File

@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProduc
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInSaveReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.StockInTypeEnum;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInDO;
@ -25,6 +26,7 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -34,6 +36,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -118,6 +121,14 @@ public class ErpStockInController {
@Operation(summary = "获得其它入库单分页")
@PreAuthorize("@ss.hasPermission('erp:stock-in:query')")
public CommonResult<PageResult<ErpStockInRespVO>> getStockInPage(@Valid ErpStockInPageReqVO pageReqVO) {
if(StringUtils.isEmpty(pageReqVO.getInType())){
List<String> list = new ArrayList<>();
list.add(StockInTypeEnum.产品入库.getValue());
list.add(StockInTypeEnum.其他入库.getValue());
list.add(StockInTypeEnum.原料入库.getValue());
list.add(StockInTypeEnum.关键件入库.getValue());
pageReqVO.setInTypeList(list);
}
PageResult<ErpStockInDO> pageResult = stockInService.getStockInPage(pageReqVO);
return success(buildStockInVOPageResult(pageResult));
}
@ -162,4 +173,17 @@ public class ErpStockInController {
});
}
@PostMapping("/createMesStockIn")
@Operation(summary = "创建其它入库单")
public CommonResult<Long> createMesStockIn(@Valid @RequestBody ErpStockInSaveReqVO createReqVO) {
createReqVO.setInType(StockInTypeEnum.生产入库.getValue());
return success(stockInService.createStockIn(createReqVO));
}
@GetMapping("/pageMesStockIn")
@Operation(summary = "获得其它入库单分页")
public CommonResult<PageResult<ErpStockInRespVO>> pageMesStockIn(@Valid ErpStockInPageReqVO pageReqVO) {
pageReqVO.setInType(StockInTypeEnum.生产入库.getValue());
PageResult<ErpStockInDO> pageResult = stockInService.getStockInPage(pageReqVO);
return success(buildStockInVOPageResult(pageResult));
}
}

18
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockOutController.java
Unescape Escape View File

@ -26,7 +26,7 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -120,10 +120,14 @@ public class ErpStockOutController {
@Operation(summary = "获得其它出库单分页")
//@PreAuthorize("@ss.hasPermission('erp:stock-out:query')")
public CommonResult<PageResult<ErpStockOutRespVO>> getStockOutPage(@Valid ErpStockOutPageReqVO pageReqVO) {
List<String> list = new ArrayList<>();
list.add(StockOutTypeEnum.产品出库.getValue());
list.add(StockOutTypeEnum.关键件出库.getValue());
list.add(StockOutTypeEnum.其他出库.getValue());
if(StringUtils.isEmpty(pageReqVO.getOutType())){
List<String> list = new ArrayList<>();
list.add(StockOutTypeEnum.产品出库.getValue());
list.add(StockOutTypeEnum.关键件出库.getValue());
list.add(StockOutTypeEnum.其他出库.getValue());
list.add(StockOutTypeEnum.原料出库.getValue());
pageReqVO.setOutTypeList(list);
}
PageResult<ErpStockOutDO> pageResult = stockOutService.getStockOutPage(pageReqVO);
return success(buildStockOutVOPageResult(pageResult));
}
@ -171,14 +175,14 @@ public class ErpStockOutController {
@Operation(summary = "创建生产领料出库单")
//@PreAuthorize("@ss.hasPermission('erp:stock-out:create')")
public CommonResult<Long> createMesStockout(@Valid @RequestBody ErpStockOutSaveReqVO createReqVO) {
createReqVO.setOutType(StockOutTypeEnum.原料出库.getValue());
createReqVO.setOutType(StockOutTypeEnum.领料出库.getValue());
return success(stockOutService.createStockOut(createReqVO));
}
@GetMapping("/pageMesStockOut")
@Operation(summary = "获得生产领料出库单分页")
//@PreAuthorize("@ss.hasPermission('erp:stock-out:query')")
public CommonResult<PageResult<ErpStockOutRespVO>> getMesStockOutPage(@Valid ErpStockOutPageReqVO pageReqVO) {
pageReqVO.setOutType(StockOutTypeEnum.原料出库.getValue());
pageReqVO.setOutType(StockOutTypeEnum.领料出库.getValue());
PageResult<ErpStockOutDO> pageResult = stockOutService.getStockOutPage(pageReqVO);
return success(buildStockOutVOPageResult(pageResult));
}

6
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInPageReqVO.java
Unescape Escape View File

@ -10,6 +10,7 @@ import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -33,6 +34,11 @@ public class ErpStockInPageReqVO extends PageParam {
@InEnum(ErpAuditStatus.class)
private Integer status;
@Schema(description = "入库类型", example = "随便")
private String inType;
@Schema(description = "入库类型", example = "随便")
private List<String> inTypeList;
@Schema(description = "备注", example = "随便")
private String remark;

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInRespVO.java
Unescape Escape View File

@ -53,6 +53,10 @@ public class ErpStockInRespVO {
@ExcelProperty("备注")
private String remark;
@Schema(description = "入库类型", example = "随便")
@ExcelProperty("入库类型")
private String inType;
@Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc")
private String fileUrl;

3
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInSaveReqVO.java
Unescape Escape View File

@ -24,6 +24,9 @@ public class ErpStockInSaveReqVO {
@NotNull(message = "入库时间不能为空")
private LocalDateTime inTime;
@Schema(description = "入库类型", example = "随便")
private String inType;
@Schema(description = "备注", example = "随便")
private String remark;

27
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/StockInTypeEnum.java
Unescape Escape View File

@ -0,0 +1,27 @@
package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum StockInTypeEnum {
其他入库("其他入库"),
关键件入库("关键件入库"),
原料入库("原料入库"),
产品入库("产品入库"),
生产入库("生产入库");
private final String value;
// 一个可选的方法，用于根据整数值获取对应的枚举实例
public static StockInTypeEnum fromValue(String value) {
for (StockInTypeEnum status : StockInTypeEnum.values()) {
if (status.getValue().equals(value)) {
return status;
}
}
throw new IllegalArgumentException("Unknown value: " + value);
}
}

1
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/out/StockOutTypeEnum.java
Unescape Escape View File

@ -10,6 +10,7 @@ public enum StockOutTypeEnum {
其他出库("其他出库"),
关键件出库("关键件出库"),
原料出库("原料出库"),
领料出库("领料出库"),
产品出库("产品出库");
private final String value;

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockInDO.java
Unescape Escape View File

@ -62,6 +62,10 @@ public class ErpStockInDO extends BaseDO {
* 备注
*/
private String remark;
/**
* 入库类型 ，1生产入库，2 其他入库
*/
private String inType;
/**
* 附件 URL
*/

2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockInMapper.java
Unescape Escape View File

@ -23,6 +23,8 @@ public interface ErpStockInMapper extends BaseMapperX<ErpStockInDO> {
.eqIfPresent(ErpStockInDO::getSupplierId, reqVO.getSupplierId())
.betweenIfPresent(ErpStockInDO::getInTime, reqVO.getInTime())
.eqIfPresent(ErpStockInDO::getStatus, reqVO.getStatus())
.eqIfPresent(ErpStockInDO::getInType, reqVO.getInType())
.inIfPresent(ErpStockInDO::getInType, reqVO.getInTypeList())
.likeIfPresent(ErpStockInDO::getRemark, reqVO.getRemark())
.eqIfPresent(ErpStockInDO::getCreator, reqVO.getCreator())
.orderByDesc(ErpStockInDO::getId);

Write Preview
Loading…
Cancel
Save