diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandSaveReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandSaveReqVO.java index 2895cceca..2313cd37f 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandSaveReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandSaveReqVO.java @@ -43,6 +43,15 @@ public class MoldBrandSaveReqVO { @Schema(description = "图片", example = "https://example.com/mold.png") private String images; + @Schema(description = "图纸", example = "https://example.com/drawing.pdf") + private String drawings; + + @Schema(description = "操作手册", example = "https://example.com/manual.pdf") + private String operationManual; + + @Schema(description = "操作视频", example = "https://example.com/video.mp4") + private String operationVideo; + @Schema(description = "版本", example = "V1.0") private String version; diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldBrandDO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldBrandDO.java index a0886ee8a..b6005f487 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldBrandDO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldBrandDO.java @@ -55,6 +55,22 @@ public class MoldBrandDO extends BaseDO { * 图片 */ private String images; + + /** + * 图纸 + */ + private String drawings; + + /** + * 操作手册 + */ + private String operationManual; + + /** + * 操作视频 + */ + private String operationVideo; + /** * 版本 */ diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandRespVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandRespVO.java index 7bd7a66f9..80b71a5e7 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandRespVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandRespVO.java @@ -45,6 +45,18 @@ public class MoldBrandRespVO { @ExcelProperty("图片") private String images; + @Schema(description = "图纸", example = "https://example.com/drawing.pdf") + @ExcelProperty("图纸") + private String drawings; + + @Schema(description = "操作手册", example = "https://example.com/manual.pdf") + @ExcelProperty("操作手册") + private String operationManual; + + @Schema(description = "操作视频", example = "https://example.com/video.mp4") + @ExcelProperty("操作视频") + private String operationVideo; + @Schema(description = "版本", example = "V1.0") @ExcelProperty("版本") private String version; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMapper.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMapper.java index 9f99c25f1..ad62c6b85 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMapper.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMapper.java @@ -77,14 +77,14 @@ public interface ErpStockMapper extends BaseMapperX { default List selectListByWarehouseIdsAndAreaIds(List warehouseIds, List areaIds) { LambdaQueryWrapperX query = new LambdaQueryWrapperX() - .in(CollUtil.isNotEmpty(warehouseIds), ErpStockDO::getWarehouseId, warehouseIds) - .in(CollUtil.isNotEmpty(areaIds), ErpStockDO::getAreaId, areaIds); + .inIfPresent(ErpStockDO::getWarehouseId, warehouseIds) + .inIfPresent(ErpStockDO::getAreaId, areaIds); return selectList(query); } default List selectListByProductIds(List productIds) { return selectList(new LambdaQueryWrapperX() - .in(CollUtil.isNotEmpty(productIds), ErpStockDO::getProductId, productIds)); + .inIfPresent(ErpStockDO::getProductId, productIds)); } default int updateCountIncrement(Long id, BigDecimal count, boolean negativeEnable) { diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/product/ErpProductMapper.xml b/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/product/ErpProductMapper.xml index d979a82f3..74b3362c4 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/product/ErpProductMapper.xml +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/product/ErpProductMapper.xml @@ -12,7 +12,8 @@ SELECT id, name, bar_code, category_id, sub_category_id, sub_category_name, unit_id, purchase_unit_id, purchase_unit_name, purchase_unit_convert_quantity, status, standard, remark, expiry_day, weight, purchase_price, sale_price, - min_price, safety_number, create_time, update_time, creator, updater, deleted + min_price, safety_number, images, + create_time, update_time, creator, updater, deleted FROM erp_product WHERE id IN