BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 94247addc6a572698ab5e448086143a327dd5a4d

Authored by YunaiV
1 parent 573a79ca

✨ ERP：增加 ERP 盘点单的实现 100%

Inline Side-by-side
Showing 17 changed files with 952 additions and 22 deletions
yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
  View file @94247ad
... ... @@ -40,17 +40,25 @@ public interface ErrorCodeConstants {
40 40 ErrorCode STOCK_OUT_NO_EXISTS = new ErrorCode(1_030_402_004, "生成出库单失败，请重新提交");
41 41 ErrorCode STOCK_OUT_UPDATE_FAIL_APPROVE = new ErrorCode(1_030_402_005, "其它出库单({})已审核，无法修改");
42 42  
43   - // ========== ERP 其它出库单 1-030-403-000 ==========
  43 + // ========== ERP 库存调拨单 1-030-403-000 ==========
44 44 ErrorCode STOCK_MOVE_NOT_EXISTS = new ErrorCode(1_030_402_000, "库存调拨单不存在");
45 45 ErrorCode STOCK_MOVE_DELETE_FAIL_APPROVE = new ErrorCode(1_030_402_001, "库存调拨单({})已审核，无法删除");
46   - ErrorCode STOCK_MOVE_PROCESS_FAIL = new ErrorCode(1_030_402_002, "反审核失败，只有已审核的出库单才能反审核");
47   - ErrorCode STOCK_MOVE_APPROVE_FAIL = new ErrorCode(1_030_402_003, "审核失败，只有未审核的出库单才能审核");
  46 + ErrorCode STOCK_MOVE_PROCESS_FAIL = new ErrorCode(1_030_402_002, "反审核失败，只有已审核的调拨单才能反审核");
  47 + ErrorCode STOCK_MOVE_APPROVE_FAIL = new ErrorCode(1_030_402_003, "审核失败，只有未审核的调拨单才能审核");
48 48 ErrorCode STOCK_MOVE_NO_EXISTS = new ErrorCode(1_030_402_004, "生成调拨号失败，请重新提交");
49 49 ErrorCode STOCK_MOVE_UPDATE_FAIL_APPROVE = new ErrorCode(1_030_402_005, "库存调拨单({})已审核，无法修改");
50 50  
51   - // ========== ERP 产品库存 1-030-403-000 ==========
52   - ErrorCode STOCK_COUNT_NEGATIVE = new ErrorCode(1_030_403_000, "操作失败，产品({})所在仓库({})的库存：{}，小于变更数量：{}");
53   - ErrorCode STOCK_COUNT_NEGATIVE2 = new ErrorCode(1_030_403_000, "操作失败，产品({})所在仓库({})的库存不足");
  51 + // ========== ERP 库存盘点单 1-030-403-000 ==========
  52 + ErrorCode STOCK_CHECK_NOT_EXISTS = new ErrorCode(1_030_403_000, "库存盘点单不存在");
  53 + ErrorCode STOCK_CHECK_DELETE_FAIL_APPROVE = new ErrorCode(1_030_403_001, "库存盘点单({})已审核，无法删除");
  54 + ErrorCode STOCK_CHECK_PROCESS_FAIL = new ErrorCode(1_030_403_002, "反审核失败，只有已审核的盘点单才能反审核");
  55 + ErrorCode STOCK_CHECK_APPROVE_FAIL = new ErrorCode(1_030_403_003, "审核失败，只有未审核的盘点单才能审核");
  56 + ErrorCode STOCK_CHECK_NO_EXISTS = new ErrorCode(1_030_403_004, "生成盘点号失败，请重新提交");
  57 + ErrorCode STOCK_CHECK_UPDATE_FAIL_APPROVE = new ErrorCode(1_030_403_005, "库存盘点单({})已审核，无法修改");
  58 +
  59 + // ========== ERP 产品库存 1-030-404-000 ==========
  60 + ErrorCode STOCK_COUNT_NEGATIVE = new ErrorCode(1_030_404_000, "操作失败，产品({})所在仓库({})的库存：{}，小于变更数量：{}");
  61 + ErrorCode STOCK_COUNT_NEGATIVE2 = new ErrorCode(1_030_404_001, "操作失败，产品({})所在仓库({})的库存不足");
54 62  
55 63 // ========== ERP 产品 1-030-500-000 ==========
56 64 ErrorCode PRODUCT_NOT_EXISTS = new ErrorCode(1_030_500_000, "产品不存在");
... ...
yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/stock/ErpStockRecordBizTypeEnum.java
  View file @94247ad
... ... @@ -25,6 +25,11 @@ public enum ErpStockRecordBizTypeEnum implements IntArrayValuable {
25 25 MOVE_IN_CANCEL(31, "调拨入库（作废）"),
26 26 MOVE_OUT(32, "调拨出库"),
27 27 MOVE_OUT_CANCEL(33, "调拨出库（作废）"),
  28 +
  29 + CHECK_MORE_IN(40, "盘盈入库"),
  30 + CHECK_MORE_IN_CANCEL(41, "盘盈入库（作废）"),
  31 + CHECK_LESS_OUT(42, "盘亏出库"),
  32 + CHECK_LESS_OUT_CANCEL(43, "盘亏出库（作废）"),
28 33 ;
29 34  
30 35 public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ErpStockRecordBizTypeEnum::getType).toArray();
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCheckController.java 0 → 100644
  View file @94247ad
  1 +package cn.iocoder.yudao.module.erp.controller.admin.stock;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  6 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  7 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
  8 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  9 +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
  10 +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
  11 +import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO;
  12 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckPageReqVO;
  13 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckRespVO;
  14 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckSaveReqVO;
  15 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckDO;
  16 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckItemDO;
  17 +import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
  18 +import cn.iocoder.yudao.module.erp.service.stock.ErpStockCheckService;
  19 +import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
  20 +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
  21 +import io.swagger.v3.oas.annotations.Operation;
  22 +import io.swagger.v3.oas.annotations.Parameter;
  23 +import io.swagger.v3.oas.annotations.tags.Tag;
  24 +import jakarta.annotation.Resource;
  25 +import jakarta.servlet.http.HttpServletResponse;
  26 +import jakarta.validation.Valid;
  27 +import org.springframework.security.access.prepost.PreAuthorize;
  28 +import org.springframework.validation.annotation.Validated;
  29 +import org.springframework.web.bind.annotation.*;
  30 +
  31 +import java.io.IOException;
  32 +import java.util.List;
  33 +import java.util.Map;
  34 +
  35 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  36 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
  37 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  38 +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
  39 +
  40 +@Tag(name = "管理后台 - ERP 库存调拨单")
  41 +@RestController
  42 +@RequestMapping("/erp/stock-check")
  43 +@Validated
  44 +public class ErpStockCheckController {
  45 +
  46 + @Resource
  47 + private ErpStockCheckService stockCheckService;
  48 + @Resource
  49 + private ErpProductService productService;
  50 +
  51 + @Resource
  52 + private AdminUserApi adminUserApi;
  53 +
  54 + @PostMapping("/create")
  55 + @Operation(summary = "创建库存调拨单")
  56 + @PreAuthorize("@ss.hasPermission('erp:stock-check:create')")
  57 + public CommonResult<Long> createStockCheck(@Valid @RequestBody ErpStockCheckSaveReqVO createReqVO) {
  58 + return success(stockCheckService.createStockCheck(createReqVO));
  59 + }
  60 +
  61 + @PutMapping("/update")
  62 + @Operation(summary = "更新库存调拨单")
  63 + @PreAuthorize("@ss.hasPermission('erp:stock-check:update')")
  64 + public CommonResult<Boolean> updateStockCheck(@Valid @RequestBody ErpStockCheckSaveReqVO updateReqVO) {
  65 + stockCheckService.updateStockCheck(updateReqVO);
  66 + return success(true);
  67 + }
  68 +
  69 + @PutMapping("/update-status")
  70 + @Operation(summary = "更新库存调拨单的状态")
  71 + @PreAuthorize("@ss.hasPermission('erp:stock-check:update-status')")
  72 + public CommonResult<Boolean> updateStockCheckStatus(@RequestParam("id") Long id,
  73 + @RequestParam("status") Integer status) {
  74 + stockCheckService.updateStockCheckStatus(id, status);
  75 + return success(true);
  76 + }
  77 +
  78 + @DeleteMapping("/delete")
  79 + @Operation(summary = "删除库存调拨单")
  80 + @Parameter(name = "ids", description = "编号数组", required = true)
  81 + @PreAuthorize("@ss.hasPermission('erp:stock-check:delete')")
  82 + public CommonResult<Boolean> deleteStockCheck(@RequestParam("ids") List<Long> ids) {
  83 + stockCheckService.deleteStockCheck(ids);
  84 + return success(true);
  85 + }
  86 +
  87 + @GetMapping("/get")
  88 + @Operation(summary = "获得库存调拨单")
  89 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  90 + @PreAuthorize("@ss.hasPermission('erp:stock-check:query')")
  91 + public CommonResult<ErpStockCheckRespVO> getStockCheck(@RequestParam("id") Long id) {
  92 + ErpStockCheckDO stockCheck = stockCheckService.getStockCheck(id);
  93 + if (stockCheck == null) {
  94 + return success(null);
  95 + }
  96 + List<ErpStockCheckItemDO> stockCheckItemList = stockCheckService.getStockCheckItemListByCheckId(id);
  97 + Map<Long, ErpProductRespVO> productMap = productService.getProductVOMap(
  98 + convertSet(stockCheckItemList, ErpStockCheckItemDO::getProductId));
  99 + return success(BeanUtils.toBean(stockCheck, ErpStockCheckRespVO.class, stockCheckVO ->
  100 + stockCheckVO.setItems(BeanUtils.toBean(stockCheckItemList, ErpStockCheckRespVO.Item.class, item ->
  101 + MapUtils.findAndThen(productMap, item.getProductId(), product -> item.setProductName(product.getName())
  102 + .setProductBarCode(product.getBarCode()).setProductUnitName(product.getUnitName()))))));
  103 + }
  104 +
  105 + @GetMapping("/page")
  106 + @Operation(summary = "获得库存调拨单分页")
  107 + @PreAuthorize("@ss.hasPermission('erp:stock-check:query')")
  108 + public CommonResult<PageResult<ErpStockCheckRespVO>> getStockCheckPage(@Valid ErpStockCheckPageReqVO pageReqVO) {
  109 + PageResult<ErpStockCheckDO> pageResult = stockCheckService.getStockCheckPage(pageReqVO);
  110 + return success(buildStockCheckVOPageResult(pageResult));
  111 + }
  112 +
  113 + @GetMapping("/export-excel")
  114 + @Operation(summary = "导出库存调拨单 Excel")
  115 + @PreAuthorize("@ss.hasPermission('erp:stock-check:export')")
  116 + @OperateLog(type = EXPORT)
  117 + public void exportStockCheckExcel(@Valid ErpStockCheckPageReqVO pageReqVO,
  118 + HttpServletResponse response) throws IOException {
  119 + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
  120 + List<ErpStockCheckRespVO> list = buildStockCheckVOPageResult(stockCheckService.getStockCheckPage(pageReqVO)).getList();
  121 + // 导出 Excel
  122 + ExcelUtils.write(response, "库存调拨单.xls", "数据", ErpStockCheckRespVO.class, list);
  123 + }
  124 +
  125 + private PageResult<ErpStockCheckRespVO> buildStockCheckVOPageResult(PageResult<ErpStockCheckDO> pageResult) {
  126 + if (CollUtil.isEmpty(pageResult.getList())) {
  127 + return PageResult.empty(pageResult.getTotal());
  128 + }
  129 + // 1.1 出库项
  130 + List<ErpStockCheckItemDO> stockCheckItemList = stockCheckService.getStockCheckItemListByCheckIds(
  131 + convertSet(pageResult.getList(), ErpStockCheckDO::getId));
  132 + Map<Long, List<ErpStockCheckItemDO>> stockCheckItemMap = convertMultiMap(stockCheckItemList, ErpStockCheckItemDO::getCheckId);
  133 + // 1.2 商品信息
  134 + Map<Long, ErpProductRespVO> productMap = productService.getProductVOMap(
  135 + convertSet(stockCheckItemList, ErpStockCheckItemDO::getProductId));
  136 + // 1.3 管理员信息
  137 + Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
  138 + convertSet(pageResult.getList(), erpStockRecordDO -> Long.parseLong(erpStockRecordDO.getCreator())));
  139 + // 2. 开始拼接
  140 + return BeanUtils.toBean(pageResult, ErpStockCheckRespVO.class, stockCheck -> {
  141 + stockCheck.setItems(BeanUtils.toBean(stockCheckItemMap.get(stockCheck.getId()), ErpStockCheckRespVO.Item.class,
  142 + item -> MapUtils.findAndThen(productMap, item.getProductId(), product -> item.setProductName(product.getName())
  143 + .setProductBarCode(product.getBarCode()).setProductUnitName(product.getUnitName()))));
  144 + stockCheck.setProductNames(CollUtil.join(stockCheck.getItems(), "，", ErpStockCheckRespVO.Item::getProductName));
  145 + MapUtils.findAndThen(userMap, Long.parseLong(stockCheck.getCreator()), user -> stockCheck.setCreatorName(user.getNickname()));
  146 + });
  147 + }
  148 +
  149 +}
0 150 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockMoveController.java
  View file @94247ad
... ... @@ -16,7 +16,6 @@ import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockDO;
16 16 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockMoveDO;
17 17 import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockMoveItemDO;
18 18 import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
19   -import cn.iocoder.yudao.module.erp.service.sale.ErpCustomerService;
20 19 import cn.iocoder.yudao.module.erp.service.stock.ErpStockMoveService;
21 20 import cn.iocoder.yudao.module.erp.service.stock.ErpStockService;
22 21 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
... ... @@ -53,8 +52,6 @@ public class ErpStockMoveController {
53 52 private ErpStockService stockService;
54 53 @Resource
55 54 private ErpProductService productService;
56   - @Resource
57   - private ErpCustomerService customerService;
58 55  
59 56 @Resource
60 57 private AdminUserApi adminUserApi;
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/check/ErpStockCheckPageReqVO.java 0 → 100644
  View file @94247ad
  1 +package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import cn.iocoder.yudao.framework.common.validation.InEnum;
  5 +import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
  6 +import io.swagger.v3.oas.annotations.media.Schema;
  7 +import lombok.Data;
  8 +import lombok.EqualsAndHashCode;
  9 +import lombok.ToString;
  10 +import org.springframework.format.annotation.DateTimeFormat;
  11 +
  12 +import java.time.LocalDateTime;
  13 +
  14 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  15 +
  16 +@Schema(description = "管理后台 - ERP 库存盘点单分页 Request VO")
  17 +@Data
  18 +@EqualsAndHashCode(callSuper = true)
  19 +@ToString(callSuper = true)
  20 +public class ErpStockCheckPageReqVO extends PageParam {
  21 +
  22 + @Schema(description = "盘点单号", example = "S123")
  23 + private String no;
  24 +
  25 + @Schema(description = "仓库编号", example = "3113")
  26 + private Long warehouseId;
  27 +
  28 + @Schema(description = "盘点时间")
  29 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  30 + private LocalDateTime[] checkTime;
  31 +
  32 + @Schema(description = "状态", example = "10")
  33 + @InEnum(ErpAuditStatus.class)
  34 + private Integer status;
  35 +
  36 + @Schema(description = "备注", example = "随便")
  37 + private String remark;
  38 +
  39 + @Schema(description = "创建者")
  40 + private String creator;
  41 +
  42 + @Schema(description = "产品编号", example = "1")
  43 + private Long productId;
  44 +
  45 +}
0 46 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/check/ErpStockCheckRespVO.java 0 → 100644
  View file @94247ad
  1 +package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check;
  2 +
  3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
  5 +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
  6 +import com.alibaba.excel.annotation.ExcelProperty;
  7 +import io.swagger.v3.oas.annotations.media.Schema;
  8 +import jakarta.validation.constraints.NotNull;
  9 +import lombok.Data;
  10 +
  11 +import java.math.BigDecimal;
  12 +import java.time.LocalDateTime;
  13 +import java.util.List;
  14 +
  15 +import static cn.iocoder.yudao.module.erp.enums.DictTypeConstants.AUDIT_STATUS;
  16 +
  17 +@Schema(description = "管理后台 - ERP 库存盘点单 Response VO")
  18 +@Data
  19 +@ExcelIgnoreUnannotated
  20 +public class ErpStockCheckRespVO {
  21 +
  22 + @Schema(description = "盘点编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11756")
  23 + @ExcelProperty("盘点编号")
  24 + private Long id;
  25 +
  26 + @Schema(description = "盘点单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "S123")
  27 + @ExcelProperty("盘点单号")
  28 + private String no;
  29 +
  30 + @Schema(description = "盘点时间", requiredMode = Schema.RequiredMode.REQUIRED)
  31 + @ExcelProperty("盘点时间")
  32 + private LocalDateTime checkTime;
  33 +
  34 + @Schema(description = "合计数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "15663")
  35 + @ExcelProperty("合计数量")
  36 + private BigDecimal totalCount;
  37 +
  38 + @Schema(description = "合计金额，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "24906")
  39 + @ExcelProperty("合计金额")
  40 + private BigDecimal totalPrice;
  41 +
  42 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  43 + @ExcelProperty(value = "状态", converter = DictConvert.class)
  44 + @DictFormat(AUDIT_STATUS)
  45 + private Integer status;
  46 +
  47 + @Schema(description = "备注", example = "随便")
  48 + @ExcelProperty("备注")
  49 + private String remark;
  50 +
  51 + @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc")
  52 + private String fileUrl;
  53 +
  54 + @Schema(description = "审核人", example = "芋道")
  55 + private String creator;
  56 + @Schema(description = "审核人名称", example = "芋道")
  57 + private String creatorName;
  58 +
  59 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  60 + @ExcelProperty("创建时间")
  61 + private LocalDateTime createTime;
  62 +
  63 + @Schema(description = "盘点项列表", requiredMode = Schema.RequiredMode.REQUIRED)
  64 + private List<Item> items;
  65 +
  66 + @Schema(description = "产品信息", requiredMode = Schema.RequiredMode.REQUIRED)
  67 + @ExcelProperty("产品信息")
  68 + private String productNames;
  69 +
  70 + @Data
  71 + public static class Item {
  72 +
  73 + @Schema(description = "盘点项编号", example = "11756")
  74 + private Long id;
  75 +
  76 + @Schema(description = "仓库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
  77 + private Long warehouseId;
  78 +
  79 + @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
  80 + private Long productId;
  81 +
  82 + @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
  83 + private BigDecimal productPrice;
  84 +
  85 + @Schema(description = "账面数量（当前库存）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
  86 + @NotNull(message = "账面数量不能为空")
  87 + private BigDecimal stockCount;
  88 +
  89 + @Schema(description = "实际数量（实际库存）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
  90 + @NotNull(message = "实际数量不能为空")
  91 + private BigDecimal actualCount;
  92 +
  93 + @Schema(description = "盈亏数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
  94 + @NotNull(message = "盈亏数量不能为空")
  95 + private BigDecimal count;
  96 +
  97 + @Schema(description = "备注", example = "随便")
  98 + private String remark;
  99 +
  100 + // ========== 关联字段 ==========
  101 +
  102 + @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "巧克力")
  103 + private String productName;
  104 + @Schema(description = "产品条码", requiredMode = Schema.RequiredMode.REQUIRED, example = "A9985")
  105 + private String productBarCode;
  106 + @Schema(description = "产品单位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "盒")
  107 + private String productUnitName;
  108 +
  109 + }
  110 +
  111 +}
0 112 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/check/ErpStockCheckSaveReqVO.java 0 → 100644
  View file @94247ad
  1 +package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import jakarta.validation.Valid;
  5 +import jakarta.validation.constraints.NotEmpty;
  6 +import jakarta.validation.constraints.NotNull;
  7 +import lombok.Data;
  8 +
  9 +import java.math.BigDecimal;
  10 +import java.time.LocalDateTime;
  11 +import java.util.List;
  12 +
  13 +@Schema(description = "管理后台 - ERP 其它出库单新增/修改 Request VO")
  14 +@Data
  15 +public class ErpStockCheckSaveReqVO {
  16 +
  17 + @Schema(description = "出库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11756")
  18 + private Long id;
  19 +
  20 + @Schema(description = "出库时间", requiredMode = Schema.RequiredMode.REQUIRED)
  21 + @NotNull(message = "出库时间不能为空")
  22 + private LocalDateTime checkTime;
  23 +
  24 + @Schema(description = "备注", example = "随便")
  25 + private String remark;
  26 +
  27 + @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc")
  28 + private String fileUrl;
  29 +
  30 + @Schema(description = "出库项列表", requiredMode = Schema.RequiredMode.REQUIRED)
  31 + @NotEmpty(message = "出库项列表不能为空")
  32 + @Valid
  33 + private List<Item> items;
  34 +
  35 + @Data
  36 + public static class Item {
  37 +
  38 + @Schema(description = "出库项编号", example = "11756")
  39 + private Long id;
  40 +
  41 + @Schema(description = "仓库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
  42 + @NotNull(message = "仓库编号不能为空")
  43 + private Long warehouseId;
  44 +
  45 + @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
  46 + @NotNull(message = "产品编号不能为空")
  47 + private Long productId;
  48 +
  49 + @Schema(description = "产品单价", example = "100.00")
  50 + private BigDecimal productPrice;
  51 +
  52 + @Schema(description = "账面数量（当前库存）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
  53 + @NotNull(message = "账面数量不能为空")
  54 + private BigDecimal stockCount;
  55 +
  56 + @Schema(description = "实际数量（实际库存）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
  57 + @NotNull(message = "实际数量不能为空")
  58 + private BigDecimal actualCount;
  59 +
  60 + @Schema(description = "盈亏数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
  61 + @NotNull(message = "盈亏数量不能为空")
  62 + private BigDecimal count;
  63 +
  64 + @Schema(description = "备注", example = "随便")
  65 + private String remark;
  66 +
  67 + }
  68 +
  69 +}
0 70 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockCheckDO.java 0 → 100644
  View file @94247ad
  1 +package cn.iocoder.yudao.module.erp.dal.dataobject.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import com.baomidou.mybatisplus.annotation.KeySequence;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import lombok.*;
  8 +
  9 +import java.math.BigDecimal;
  10 +import java.time.LocalDateTime;
  11 +
  12 +/**
  13 + * ERP 库存盘点单 DO
  14 + *
  15 + * @author 芋道源码
  16 + */
  17 +@TableName("erp_stock_check")
  18 +@KeySequence("erp_stock_check_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  19 +@Data
  20 +@EqualsAndHashCode(callSuper = true)
  21 +@ToString(callSuper = true)
  22 +@Builder
  23 +@NoArgsConstructor
  24 +@AllArgsConstructor
  25 +public class ErpStockCheckDO extends BaseDO {
  26 +
  27 + /**
  28 + * 盘点编号
  29 + */
  30 + @TableId
  31 + private Long id;
  32 + /**
  33 + * 盘点单号
  34 + */
  35 + private String no;
  36 + /**
  37 + * 盘点时间
  38 + */
  39 + private LocalDateTime checkTime;
  40 + /**
  41 + * 合计数量
  42 + */
  43 + private BigDecimal totalCount;
  44 + /**
  45 + * 合计金额，单位：元
  46 + */
  47 + private BigDecimal totalPrice;
  48 + /**
  49 + * 状态
  50 + *
  51 + * 枚举 {@link cn.iocoder.yudao.module.erp.enums.ErpAuditStatus}
  52 + */
  53 + private Integer status;
  54 + /**
  55 + * 备注
  56 + */
  57 + private String remark;
  58 + /**
  59 + * 附件 URL
  60 + */
  61 + private String fileUrl;
  62 +
  63 +}
0 64 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockCheckItemDO.java 0 → 100644
  View file @94247ad
  1 +package cn.iocoder.yudao.module.erp.dal.dataobject.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.*;
  9 +
  10 +import java.math.BigDecimal;
  11 +
  12 +/**
  13 + * ERP 库存盘点单项 DO
  14 + *
  15 + * @author 芋道源码
  16 + */
  17 +@TableName("erp_stock_check_item")
  18 +@KeySequence("erp_stock_check_item_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  19 +@Data
  20 +@EqualsAndHashCode(callSuper = true)
  21 +@ToString(callSuper = true)
  22 +@Builder
  23 +@NoArgsConstructor
  24 +@AllArgsConstructor
  25 +public class ErpStockCheckItemDO extends BaseDO {
  26 +
  27 + /**
  28 + * 盘点项编号
  29 + */
  30 + @TableId
  31 + private Long id;
  32 + /**
  33 + * 盘点编号
  34 + *
  35 + * 关联 {@link ErpStockCheckDO#getId()}
  36 + */
  37 + private Long checkId;
  38 + /**
  39 + * 仓库编号
  40 + *
  41 + * 关联 {@link ErpWarehouseDO#getId()}
  42 + */
  43 + private Long warehouseId;
  44 + /**
  45 + * 产品编号
  46 + *
  47 + * 关联 {@link ErpProductDO#getId()}
  48 + */
  49 + private Long productId;
  50 + /**
  51 + * 产品单位编号
  52 + *
  53 + * 冗余 {@link ErpProductDO#getUnitId()}
  54 + */
  55 + private Long productUnitId;
  56 + /**
  57 + * 产品单价
  58 + */
  59 + private BigDecimal productPrice;
  60 + /**
  61 + * 账面数量（当前库存）
  62 + */
  63 + private BigDecimal stockCount;
  64 + /**
  65 + * 实际数量（实际库存）
  66 + */
  67 + private BigDecimal actualCount;
  68 + /**
  69 + * 盈亏数量
  70 + *
  71 + * count = stockCount - actualCount
  72 + */
  73 + private BigDecimal count;
  74 + /**
  75 + * 合计金额，单位：元
  76 + */
  77 + private BigDecimal totalPrice;
  78 + /**
  79 + * 备注
  80 + */
  81 + private String remark;
  82 +
  83 +}
0 84 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockCheckItemMapper.java 0 → 100644
  View file @94247ad
  1 +package cn.iocoder.yudao.module.erp.dal.mysql.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  4 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckItemDO;
  5 +import org.apache.ibatis.annotations.Mapper;
  6 +
  7 +import java.util.Collection;
  8 +import java.util.List;
  9 +
  10 +/**
  11 + * ERP 库存盘点单项 Mapper
  12 + *
  13 + * @author 芋道源码
  14 + */
  15 +@Mapper
  16 +public interface ErpStockCheckItemMapper extends BaseMapperX<ErpStockCheckItemDO> {
  17 +
  18 + default List<ErpStockCheckItemDO> selectListByCheckId(Long checkId) {
  19 + return selectList(ErpStockCheckItemDO::getCheckId, checkId);
  20 + }
  21 +
  22 + default List<ErpStockCheckItemDO> selectListByCheckIds(Collection<Long> checkIds) {
  23 + return selectList(ErpStockCheckItemDO::getCheckId, checkIds);
  24 + }
  25 +
  26 + default int deleteByCheckId(Long checkId) {
  27 + return delete(ErpStockCheckItemDO::getCheckId, checkId);
  28 + }
  29 +
  30 +}
0 31 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockCheckMapper.java 0 → 100644
  View file @94247ad
  1 +package cn.iocoder.yudao.module.erp.dal.mysql.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
  6 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckPageReqVO;
  7 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckDO;
  8 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckItemDO;
  9 +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
  10 +import org.apache.ibatis.annotations.Mapper;
  11 +
  12 +/**
  13 + * ERP 库存调拨单 Mapper
  14 + *
  15 + * @author 芋道源码
  16 + */
  17 +@Mapper
  18 +public interface ErpStockCheckMapper extends BaseMapperX<ErpStockCheckDO> {
  19 +
  20 + default PageResult<ErpStockCheckDO> selectPage(ErpStockCheckPageReqVO reqVO) {
  21 + MPJLambdaWrapperX<ErpStockCheckDO> query = new MPJLambdaWrapperX<ErpStockCheckDO>()
  22 + .eqIfPresent(ErpStockCheckDO::getNo, reqVO.getNo())
  23 + .betweenIfPresent(ErpStockCheckDO::getCheckTime, reqVO.getCheckTime())
  24 + .eqIfPresent(ErpStockCheckDO::getStatus, reqVO.getStatus())
  25 + .likeIfPresent(ErpStockCheckDO::getRemark, reqVO.getRemark())
  26 + .eqIfPresent(ErpStockCheckDO::getCreator, reqVO.getCreator())
  27 + .orderByDesc(ErpStockCheckDO::getId);
  28 + if (reqVO.getWarehouseId() != null || reqVO.getProductId() != null) {
  29 + query.leftJoin(ErpStockCheckItemDO.class, ErpStockCheckItemDO::getCheckId, ErpStockCheckDO::getId)
  30 + .eq(reqVO.getWarehouseId() != null, ErpStockCheckItemDO::getWarehouseId, reqVO.getWarehouseId())
  31 + .eq(reqVO.getProductId() != null, ErpStockCheckItemDO::getProductId, reqVO.getProductId())
  32 + .groupBy(ErpStockCheckDO::getId); // 避免 1 对多查询，产生相同的 1
  33 + }
  34 + return selectJoinPage(reqVO, ErpStockCheckDO.class, query);
  35 + }
  36 +
  37 + default int updateByIdAndStatus(Long id, Integer status, ErpStockCheckDO updateObj) {
  38 + return update(updateObj, new LambdaUpdateWrapper<ErpStockCheckDO>()
  39 + .eq(ErpStockCheckDO::getId, id).eq(ErpStockCheckDO::getStatus, status));
  40 + }
  41 +
  42 + default ErpStockCheckDO selectByNo(String no) {
  43 + return selectOne(ErpStockCheckDO::getNo, no);
  44 + }
  45 +
  46 +}
0 47 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java
  View file @94247ad
... ... @@ -33,6 +33,11 @@ public class ErpNoRedisDAO {
33 33 */
34 34 public static final String STOCK_MOVE_NO_PREFIX = "QCDB";
35 35  
  36 + /**
  37 + * 库存盘点 {@link cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckDO}
  38 + */
  39 + public static final String STOCK_CHECK_NO_PREFIX = "QCPD";
  40 +
36 41 @Resource
37 42 private StringRedisTemplate stringRedisTemplate;
38 43  
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java 0 → 100644
  View file @94247ad
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckPageReqVO;
  5 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckSaveReqVO;
  6 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckDO;
  7 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckItemDO;
  8 +import jakarta.validation.Valid;
  9 +
  10 +import java.util.Collection;
  11 +import java.util.List;
  12 +
  13 +/**
  14 + * ERP 库存盘点单 Service 接口
  15 + *
  16 + * @author 芋道源码
  17 + */
  18 +public interface ErpStockCheckService {
  19 +
  20 + /**
  21 + * 创建库存盘点单
  22 + *
  23 + * @param createReqVO 创建信息
  24 + * @return 编号
  25 + */
  26 + Long createStockCheck(@Valid ErpStockCheckSaveReqVO createReqVO);
  27 +
  28 + /**
  29 + * 更新库存盘点单
  30 + *
  31 + * @param updateReqVO 更新信息
  32 + */
  33 + void updateStockCheck(@Valid ErpStockCheckSaveReqVO updateReqVO);
  34 +
  35 + /**
  36 + * 更新库存盘点单的状态
  37 + *
  38 + * @param id 编号
  39 + * @param status 状态
  40 + */
  41 + void updateStockCheckStatus(Long id, Integer status);
  42 +
  43 + /**
  44 + * 删除库存盘点单
  45 + *
  46 + * @param ids 编号数组
  47 + */
  48 + void deleteStockCheck(List<Long> ids);
  49 +
  50 + /**
  51 + * 获得库存盘点单
  52 + *
  53 + * @param id 编号
  54 + * @return 库存盘点单
  55 + */
  56 + ErpStockCheckDO getStockCheck(Long id);
  57 +
  58 + /**
  59 + * 获得库存盘点单分页
  60 + *
  61 + * @param pageReqVO 分页查询
  62 + * @return 库存盘点单分页
  63 + */
  64 + PageResult<ErpStockCheckDO> getStockCheckPage(ErpStockCheckPageReqVO pageReqVO);
  65 +
  66 + // ==================== 盘点项 ====================
  67 +
  68 + /**
  69 + * 获得库存盘点单项列表
  70 + *
  71 + * @param checkId 盘点编号
  72 + * @return 库存盘点单项列表
  73 + */
  74 + List<ErpStockCheckItemDO> getStockCheckItemListByCheckId(Long checkId);
  75 +
  76 + /**
  77 + * 获得库存盘点单项 List
  78 + *
  79 + * @param checkIds 盘点编号数组
  80 + * @return 库存盘点单项 List
  81 + */
  82 + List<ErpStockCheckItemDO> getStockCheckItemListByCheckIds(Collection<Long> checkIds);
  83 +
  84 +}
0 85 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java 0 → 100644
  View file @94247ad
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
  6 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  7 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckPageReqVO;
  8 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckSaveReqVO;
  9 +import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
  10 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckDO;
  11 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckItemDO;
  12 +import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockCheckItemMapper;
  13 +import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockCheckMapper;
  14 +import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
  15 +import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
  16 +import cn.iocoder.yudao.module.erp.enums.stock.ErpStockRecordBizTypeEnum;
  17 +import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
  18 +import cn.iocoder.yudao.module.erp.service.stock.bo.ErpStockRecordCreateReqBO;
  19 +import jakarta.annotation.Resource;
  20 +import org.springframework.stereotype.Service;
  21 +import org.springframework.transaction.annotation.Transactional;
  22 +import org.springframework.validation.annotation.Validated;
  23 +
  24 +import java.math.BigDecimal;
  25 +import java.util.Collection;
  26 +import java.util.Collections;
  27 +import java.util.List;
  28 +import java.util.Map;
  29 +
  30 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  31 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
  32 +import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
  33 +
  34 +// TODO 芋艿：记录操作日志
  35 +
  36 +/**
  37 + * ERP 库存盘点单 Service 实现类
  38 + *
  39 + * @author 芋道源码
  40 + */
  41 +@Service
  42 +@Validated
  43 +public class ErpStockCheckServiceImpl implements ErpStockCheckService {
  44 +
  45 + @Resource
  46 + private ErpStockCheckMapper stockCheckMapper;
  47 + @Resource
  48 + private ErpStockCheckItemMapper stockCheckItemMapper;
  49 +
  50 + @Resource
  51 + private ErpNoRedisDAO noRedisDAO;
  52 +
  53 + @Resource
  54 + private ErpProductService productService;
  55 + @Resource
  56 + private ErpWarehouseService warehouseService;
  57 + @Resource
  58 + private ErpStockRecordService stockRecordService;
  59 +
  60 + @Override
  61 + @Transactional(rollbackFor = Exception.class)
  62 + public Long createStockCheck(ErpStockCheckSaveReqVO createReqVO) {
  63 + // 1.1 校验盘点项的有效性
  64 + List<ErpStockCheckItemDO> stockCheckItems = validateStockCheckItems(createReqVO.getItems());
  65 + // 1.2 生成盘点单号，并校验唯一性
  66 + String no = noRedisDAO.generate(ErpNoRedisDAO.STOCK_CHECK_NO_PREFIX);
  67 + if (stockCheckMapper.selectByNo(no) != null) {
  68 + throw exception(STOCK_CHECK_NO_EXISTS);
  69 + }
  70 +
  71 + // 2.1 插入盘点单
  72 + ErpStockCheckDO stockCheck = BeanUtils.toBean(createReqVO, ErpStockCheckDO.class, in -> in
  73 + .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
  74 + .setTotalCount(getSumValue(stockCheckItems, ErpStockCheckItemDO::getCount, BigDecimal::add))
  75 + .setTotalPrice(getSumValue(stockCheckItems, ErpStockCheckItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO)));
  76 + stockCheckMapper.insert(stockCheck);
  77 + // 2.2 插入盘点单项
  78 + stockCheckItems.forEach(o -> o.setCheckId(stockCheck.getId()));
  79 + stockCheckItemMapper.insertBatch(stockCheckItems);
  80 + return stockCheck.getId();
  81 + }
  82 +
  83 + @Override
  84 + @Transactional(rollbackFor = Exception.class)
  85 + public void updateStockCheck(ErpStockCheckSaveReqVO updateReqVO) {
  86 + // 1.1 校验存在
  87 + ErpStockCheckDO stockCheck = validateStockCheckExists(updateReqVO.getId());
  88 + if (ErpAuditStatus.APPROVE.getStatus().equals(stockCheck.getStatus())) {
  89 + throw exception(STOCK_CHECK_UPDATE_FAIL_APPROVE, stockCheck.getNo());
  90 + }
  91 + // 1.2 校验盘点项的有效性
  92 + List<ErpStockCheckItemDO> stockCheckItems = validateStockCheckItems(updateReqVO.getItems());
  93 +
  94 + // 2.1 更新盘点单
  95 + ErpStockCheckDO updateObj = BeanUtils.toBean(updateReqVO, ErpStockCheckDO.class, in -> in
  96 + .setTotalCount(getSumValue(stockCheckItems, ErpStockCheckItemDO::getCount, BigDecimal::add))
  97 + .setTotalPrice(getSumValue(stockCheckItems, ErpStockCheckItemDO::getTotalPrice, BigDecimal::add)));
  98 + stockCheckMapper.updateById(updateObj);
  99 + // 2.2 更新盘点单项
  100 + updateStockCheckItemList(updateReqVO.getId(), stockCheckItems);
  101 + }
  102 +
  103 + @Override
  104 + @Transactional(rollbackFor = Exception.class)
  105 + public void updateStockCheckStatus(Long id, Integer status) {
  106 + boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
  107 + // 1.1 校验存在
  108 + ErpStockCheckDO stockCheck = validateStockCheckExists(id);
  109 + // 1.2 校验状态
  110 + if (stockCheck.getStatus().equals(status)) {
  111 + throw exception(approve ? STOCK_CHECK_APPROVE_FAIL : STOCK_CHECK_PROCESS_FAIL);
  112 + }
  113 +
  114 + // 2. 更新状态
  115 + int updateCount = stockCheckMapper.updateByIdAndStatus(id, stockCheck.getStatus(),
  116 + new ErpStockCheckDO().setStatus(status));
  117 + if (updateCount == 0) {
  118 + throw exception(approve ? STOCK_CHECK_APPROVE_FAIL : STOCK_CHECK_PROCESS_FAIL);
  119 + }
  120 +
  121 + // 3. 变更库存
  122 + List<ErpStockCheckItemDO> stockCheckItems = stockCheckItemMapper.selectListByCheckId(id);
  123 + stockCheckItems.forEach(stockCheckItem -> {
  124 + // 没有盈亏，不用出入库
  125 + if (stockCheckItem.getCount().compareTo(BigDecimal.ZERO) == 0) {
  126 + return;
  127 + }
  128 + // 10；12；-2（）
  129 + BigDecimal count = approve ? stockCheckItem.getCount(): stockCheckItem.getCount().negate();
  130 + Integer bizType;
  131 + if (approve) {
  132 + bizType = count.compareTo(BigDecimal.ZERO) > 0 ? ErpStockRecordBizTypeEnum.CHECK_MORE_IN.getType()
  133 + : ErpStockRecordBizTypeEnum.CHECK_LESS_OUT.getType();
  134 + } else {
  135 + bizType = count.compareTo(BigDecimal.ZERO) > 0 ? ErpStockRecordBizTypeEnum.CHECK_MORE_IN_CANCEL.getType()
  136 + : ErpStockRecordBizTypeEnum.CHECK_LESS_OUT_CANCEL.getType();
  137 + }
  138 + stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
  139 + stockCheckItem.getProductId(), stockCheckItem.getWarehouseId(), count,
  140 + bizType, stockCheckItem.getCheckId(), stockCheckItem.getId(), stockCheck.getNo()));
  141 + });
  142 + }
  143 +
  144 + private List<ErpStockCheckItemDO> validateStockCheckItems(List<ErpStockCheckSaveReqVO.Item> list) {
  145 + // 1.1 校验产品存在
  146 + List<ErpProductDO> productList = productService.validProductList(
  147 + convertSet(list, ErpStockCheckSaveReqVO.Item::getProductId));
  148 + Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
  149 + // 1.2 校验仓库存在
  150 + warehouseService.validWarehouseList(convertSet(list, ErpStockCheckSaveReqVO.Item::getWarehouseId));
  151 + // 2. 转化为 ErpStockCheckItemDO 列表
  152 + return convertList(list, o -> BeanUtils.toBean(o, ErpStockCheckItemDO.class, item -> item
  153 + .setProductUnitId(productMap.get(item.getProductId()).getUnitId())
  154 + .setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()))));
  155 + }
  156 +
  157 + private void updateStockCheckItemList(Long id, List<ErpStockCheckItemDO> newList) {
  158 + // 第一步，对比新老数据，获得添加、修改、删除的列表
  159 + List<ErpStockCheckItemDO> oldList = stockCheckItemMapper.selectListByCheckId(id);
  160 + List<List<ErpStockCheckItemDO>> diffList = diffList(oldList, newList, // id 不同，就认为是不同的记录
  161 + (oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
  162 +
  163 + // 第二步，批量添加、修改、删除
  164 + if (CollUtil.isNotEmpty(diffList.get(0))) {
  165 + diffList.get(0).forEach(o -> o.setCheckId(id));
  166 + stockCheckItemMapper.insertBatch(diffList.get(0));
  167 + }
  168 + if (CollUtil.isNotEmpty(diffList.get(1))) {
  169 + stockCheckItemMapper.updateBatch(diffList.get(1));
  170 + }
  171 + if (CollUtil.isNotEmpty(diffList.get(2))) {
  172 + stockCheckItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpStockCheckItemDO::getId));
  173 + }
  174 + }
  175 +
  176 + @Override
  177 + @Transactional(rollbackFor = Exception.class)
  178 + public void deleteStockCheck(List<Long> ids) {
  179 + // 1. 校验不处于已审批
  180 + List<ErpStockCheckDO> stockChecks = stockCheckMapper.selectBatchIds(ids);
  181 + if (CollUtil.isEmpty(stockChecks)) {
  182 + return;
  183 + }
  184 + stockChecks.forEach(stockCheck -> {
  185 + if (ErpAuditStatus.APPROVE.getStatus().equals(stockCheck.getStatus())) {
  186 + throw exception(STOCK_CHECK_DELETE_FAIL_APPROVE, stockCheck.getNo());
  187 + }
  188 + });
  189 +
  190 + // 2. 遍历删除，并记录操作日志
  191 + stockChecks.forEach(stockCheck -> {
  192 + // 2.1 删除盘点单
  193 + stockCheckMapper.deleteById(stockCheck.getId());
  194 + // 2.2 删除盘点单项
  195 + stockCheckItemMapper.deleteByCheckId(stockCheck.getId());
  196 + });
  197 + }
  198 +
  199 + private ErpStockCheckDO validateStockCheckExists(Long id) {
  200 + ErpStockCheckDO stockCheck = stockCheckMapper.selectById(id);
  201 + if (stockCheck == null) {
  202 + throw exception(STOCK_CHECK_NOT_EXISTS);
  203 + }
  204 + return stockCheck;
  205 + }
  206 +
  207 + @Override
  208 + public ErpStockCheckDO getStockCheck(Long id) {
  209 + return stockCheckMapper.selectById(id);
  210 + }
  211 +
  212 + @Override
  213 + public PageResult<ErpStockCheckDO> getStockCheckPage(ErpStockCheckPageReqVO pageReqVO) {
  214 + return stockCheckMapper.selectPage(pageReqVO);
  215 + }
  216 +
  217 + // ==================== 盘点项 ====================
  218 +
  219 + @Override
  220 + public List<ErpStockCheckItemDO> getStockCheckItemListByCheckId(Long checkId) {
  221 + return stockCheckItemMapper.selectListByCheckId(checkId);
  222 + }
  223 +
  224 + @Override
  225 + public List<ErpStockCheckItemDO> getStockCheckItemListByCheckIds(Collection<Long> checkIds) {
  226 + if (CollUtil.isEmpty(checkIds)) {
  227 + return Collections.emptyList();
  228 + }
  229 + return stockCheckItemMapper.selectListByCheckIds(checkIds);
  230 + }
  231 +
  232 +}
0 233 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java
  View file @94247ad
... ... @@ -138,10 +138,12 @@ public class ErpStockInServiceImpl implements ErpStockInService {
138 138  
139 139 private List<ErpStockInItemDO> validateStockInItems(List<ErpStockInSaveReqVO.Item> list) {
140 140 // 1.1 校验产品存在
141   - List<ErpProductDO> productList = productService.validProductList(convertSet(list, ErpStockInSaveReqVO.Item::getProductId));
  141 + List<ErpProductDO> productList = productService.validProductList(
  142 + convertSet(list, ErpStockInSaveReqVO.Item::getProductId));
142 143 Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
143 144 // 1.2 校验仓库存在
144   - warehouseService.validWarehouseList(convertSet(list, ErpStockInSaveReqVO.Item::getWarehouseId));
  145 + warehouseService.validWarehouseList(convertSet(
  146 + list, ErpStockInSaveReqVO.Item::getWarehouseId));
145 147 // 2. 转化为 ErpStockInItemDO 列表
146 148 return convertList(list, o -> BeanUtils.toBean(o, ErpStockInItemDO.class, item -> item
147 149 .setProductUnitId(productMap.get(item.getProductId()).getUnitId())
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockMoveServiceImpl.java
  View file @94247ad
... ... @@ -214,16 +214,16 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService {
214 214 // ==================== 出库项 ====================
215 215  
216 216 @Override
217   - public List<ErpStockMoveItemDO> getStockMoveItemListByMoveId(Long inId) {
218   - return stockMoveItemMapper.selectListByMoveId(inId);
  217 + public List<ErpStockMoveItemDO> getStockMoveItemListByMoveId(Long moveId) {
  218 + return stockMoveItemMapper.selectListByMoveId(moveId);
219 219 }
220 220  
221 221 @Override
222   - public List<ErpStockMoveItemDO> getStockMoveItemListByMoveIds(Collection<Long> inIds) {
223   - if (CollUtil.isEmpty(inIds)) {
  222 + public List<ErpStockMoveItemDO> getStockMoveItemListByMoveIds(Collection<Long> moveIds) {
  223 + if (CollUtil.isEmpty(moveIds)) {
224 224 return Collections.emptyList();
225 225 }
226   - return stockMoveItemMapper.selectListByMoveIds(inIds);
  226 + return stockMoveItemMapper.selectListByMoveIds(moveIds);
227 227 }
228 228  
229 229 }
230 230 \ No newline at end of file
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java
  View file @94247ad
... ... @@ -139,7 +139,8 @@ public class ErpStockOutServiceImpl implements ErpStockOutService {
139 139  
140 140 private List<ErpStockOutItemDO> validateStockOutItems(List<ErpStockOutSaveReqVO.Item> list) {
141 141 // 1.1 校验产品存在
142   - List<ErpProductDO> productList = productService.validProductList(convertSet(list, ErpStockOutSaveReqVO.Item::getProductId));
  142 + List<ErpProductDO> productList = productService.validProductList(
  143 + convertSet(list, ErpStockOutSaveReqVO.Item::getProductId));
143 144 Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
144 145 // 1.2 校验仓库存在
145 146 warehouseService.validWarehouseList(convertSet(list, ErpStockOutSaveReqVO.Item::getWarehouseId));
... ... @@ -212,16 +213,16 @@ public class ErpStockOutServiceImpl implements ErpStockOutService {
212 213 // ==================== 出库项 ====================
213 214  
214 215 @Override
215   - public List<ErpStockOutItemDO> getStockOutItemListByOutId(Long inId) {
216   - return stockOutItemMapper.selectListByOutId(inId);
  216 + public List<ErpStockOutItemDO> getStockOutItemListByOutId(Long outId) {
  217 + return stockOutItemMapper.selectListByOutId(outId);
217 218 }
218 219  
219 220 @Override
220   - public List<ErpStockOutItemDO> getStockOutItemListByOutIds(Collection<Long> inIds) {
221   - if (CollUtil.isEmpty(inIds)) {
  221 + public List<ErpStockOutItemDO> getStockOutItemListByOutIds(Collection<Long> outIds) {
  222 + if (CollUtil.isEmpty(outIds)) {
222 223 return Collections.emptyList();
223 224 }
224   - return stockOutItemMapper.selectListByOutIds(inIds);
  225 + return stockOutItemMapper.selectListByOutIds(outIds);
225 226 }
226 227  
227 228 }
228 229 \ No newline at end of file
... ...