diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordPageReqVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordPageReqVO.java index c478e4fef2..0a00356978 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordPageReqVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordPageReqVO.java @@ -22,7 +22,8 @@ public class ErpStockRecordPageReqVO extends PageParam { @Schema(description = "仓库编号", example = "32407") private Long warehouseId; - + @Schema(description = "产品分类", example = "32407") + private Long categoryId; @Schema(description = "业务类型", example = "10") private Integer bizType; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockRecordDO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockRecordDO.java index 7bc5e5a01e..6e7351286e 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockRecordDO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockRecordDO.java @@ -36,6 +36,12 @@ public class ErpStockRecordDO extends BaseDO { * 关联 {@link ErpProductDO#getId()} */ private Long productId; + /** + * 分类编号 + * + * 关联 {@link ErpProductDO#getId()} + */ + private Long categoryId; /** * 仓库编号 * diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockRecordMapper.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockRecordMapper.java index bfd8b6751a..e3cf6ecef3 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockRecordMapper.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockRecordMapper.java @@ -18,6 +18,7 @@ public interface ErpStockRecordMapper extends BaseMapperX { default PageResult selectPage(ErpStockRecordPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ErpStockRecordDO::getProductId, reqVO.getProductId()) + .eqIfPresent(ErpStockRecordDO::getCategoryId, reqVO.getCategoryId()) .eqIfPresent(ErpStockRecordDO::getWarehouseId, reqVO.getWarehouseId()) .eqIfPresent(ErpStockRecordDO::getBizType, reqVO.getBizType()) .likeIfPresent(ErpStockRecordDO::getBizNo, reqVO.getBizNo()) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java index 604056789b..bdb3222062 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java @@ -77,7 +77,7 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService { // 1.2 校验入库项的有效性 List purchaseInItems = validatePurchaseInItems(createReqVO.getItems()); // 1.3 校验结算账户 - accountService.validateAccount(createReqVO.getAccountId()); + //accountService.validateAccount(createReqVO.getAccountId()); // 1.4 生成入库单号,并校验唯一性 String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_IN_NO_PREFIX); if (purchaseInMapper.selectByNo(no) != null) { diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java index 2c8913d641..cda7313c5f 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java @@ -63,7 +63,7 @@ public class ErpPurchaseOrderServiceImpl implements ErpPurchaseOrderService { // 1.1 校验订单项的有效性 List purchaseOrderItems = validatePurchaseOrderItems(createReqVO.getItems()); // 1.2 校验供应商 - supplierService.validateSupplier(createReqVO.getSupplierId()); + //supplierService.validateSupplier(createReqVO.getSupplierId()); // 1.3 校验结算账户 if (createReqVO.getAccountId() != null) { accountService.validateAccount(createReqVO.getAccountId()); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockRecordServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockRecordServiceImpl.java index 3f0a8cab99..c0931b09ff 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockRecordServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockRecordServiceImpl.java @@ -46,6 +46,7 @@ public class ErpStockRecordServiceImpl implements ErpStockRecordService { createReqBO.getProductId(), createReqBO.getWarehouseId(), createReqBO.getCount()); // 2. 创建库存明细 ErpStockRecordDO stockRecord = BeanUtils.toBean(createReqBO, ErpStockRecordDO.class) + .setCategoryId(createReqBO.getCategoryId()) .setTotalCount(totalCount); stockRecordMapper.insert(stockRecord); }