diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsInStockBillController.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsInStockBillController.java index 550ad16f..4e01efa9 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsInStockBillController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsInStockBillController.java @@ -77,6 +77,8 @@ public class WmsInStockBillController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody WmsInStockBillBo bo) { + System.out.println(bo.toString()); + // return R.fail("新增物料入库失败"); return toAjax(wmsInStockBillService.insertByBo(bo)); } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsInStockDetailsController.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsInStockDetailsController.java new file mode 100644 index 00000000..f1cfed54 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsInStockDetailsController.java @@ -0,0 +1,116 @@ +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.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +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.WmsInStockDetailsVo; +import org.dromara.wms.domain.bo.WmsInStockDetailsBo; +import org.dromara.wms.service.IWmsInStockDetailsService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 入库单明细 + * 前端访问路由地址为:/wms/inStockDetails + * + * @author Yinq + * @date 2025-10-28 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/inStockDetails") +public class WmsInStockDetailsController extends BaseController { + + private final IWmsInStockDetailsService wmsInStockDetailsService; + + /** + * 查询入库单明细列表 + */ + @SaCheckPermission("wms:inStockDetails:list") + @GetMapping("/list") + public TableDataInfo list(WmsInStockDetailsBo bo, PageQuery pageQuery) { + return wmsInStockDetailsService.queryPageList(bo, pageQuery); + } + + /** + * 导出入库单明细列表 + */ + @SaCheckPermission("wms:inStockDetails:export") + @Log(title = "入库单明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsInStockDetailsBo bo, HttpServletResponse response) { + List list = wmsInStockDetailsService.queryList(bo); + ExcelUtil.exportExcel(list, "入库单明细", WmsInStockDetailsVo.class, response); + } + + /** + * 获取入库单明细详细信息 + * + * @param inStockDetailsId 主键 + */ + @SaCheckPermission("wms:inStockDetails:query") + @GetMapping("/{inStockDetailsId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("inStockDetailsId") Long inStockDetailsId) { + return R.ok(wmsInStockDetailsService.queryById(inStockDetailsId)); + } + + /** + * 新增入库单明细 + */ + @SaCheckPermission("wms:inStockDetails:add") + @Log(title = "入库单明细", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsInStockDetailsBo bo) { + return toAjax(wmsInStockDetailsService.insertByBo(bo)); + } + + /** + * 修改入库单明细 + */ + @SaCheckPermission("wms:inStockDetails:edit") + @Log(title = "入库单明细", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsInStockDetailsBo bo) { + return toAjax(wmsInStockDetailsService.updateByBo(bo)); + } + + /** + * 删除入库单明细 + * + * @param inStockDetailsIds 主键串 + */ + @SaCheckPermission("wms:inStockDetails:remove") + @Log(title = "入库单明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{inStockDetailsIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("inStockDetailsIds") Long[] inStockDetailsIds) { + return toAjax(wmsInStockDetailsService.deleteWithValidByIds(List.of(inStockDetailsIds), true)); + } + + /** + * 下拉框查询入库单明细列表 + */ + @GetMapping("/getWmsInStockDetailsList") + public R> getWmsInStockDetailsList(WmsInStockDetailsBo bo) { + List list = wmsInStockDetailsService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsInStockBill.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsInStockBill.java index 53bc216e..d3e08240 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsInStockBill.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsInStockBill.java @@ -50,7 +50,7 @@ public class WmsInStockBill extends TenantEntity { /** * 供应商 */ - private String supplier; + private String supplierName; /** * 联系人 diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsInStockDetails.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsInStockDetails.java new file mode 100644 index 00000000..8c981983 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsInStockDetails.java @@ -0,0 +1,76 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 入库单明细对象 wms_in_stock_details + * + * @author Yinq + * @date 2025-10-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_in_stock_details") +public class WmsInStockDetails extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 入库单明细ID + */ + @TableId(value = "in_stock_details_id", type = IdType.AUTO) + private Long inStockDetailsId; + + /** + * 入库单ID + */ + private Long inStockBillId; + + /** + * 仓库ID + */ + private Long warehouseId; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 批次号 + */ + private String batchNumber; + + /** + * 单价 + */ + private Double unitPrice; + + /** + * 入库数量 + */ + private Double inStockAmount; + + /** + * 物料单位 + */ + private String unitName; + + /** + * 总价 + */ + private Double totalPrice; + + /** + * 删除标志（0代表存在 1代表删除） + */ + private String delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInStockBillBo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInStockBillBo.java index fd74c84a..0befb576 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInStockBillBo.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInStockBillBo.java @@ -1,5 +1,6 @@ package org.dromara.wms.domain.bo; +import jdk.dynalink.linker.LinkerServices; import org.dromara.wms.domain.WmsInStockBill; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -8,6 +9,9 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.dromara.wms.domain.WmsInStockDetails; + +import java.util.List; /** * 物料入库业务对象 wms_in_stock_bill @@ -49,7 +53,7 @@ public class WmsInStockBillBo extends BaseEntity { /** * 供应商 */ - private String supplier; + private String supplierName; /** * 联系人 @@ -86,5 +90,5 @@ public class WmsInStockBillBo extends BaseEntity { */ private String remark; - + private List inStockDetailsList; } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInStockDetailsBo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInStockDetailsBo.java new file mode 100644 index 00000000..ac441951 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInStockDetailsBo.java @@ -0,0 +1,70 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.wms.domain.WmsInStockDetails; +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 lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 入库单明细业务对象 wms_in_stock_details + * + * @author Yinq + * @date 2025-10-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsInStockDetails.class, reverseConvertGenerate = false) +public class WmsInStockDetailsBo extends BaseEntity { + + /** + * 入库单明细ID + */ + @NotNull(message = "入库单明细ID不能为空", groups = { EditGroup.class }) + private Long inStockDetailsId; + + /** + * 入库单ID + */ + private Long inStockBillId; + + /** + * 仓库ID + */ + private Long warehouseId; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 批次号 + */ + private String batchNumber; + + /** + * 单价 + */ + private Double unitPrice; + + /** + * 入库数量 + */ + private Double inStockAmount; + + /** + * 物料单位 + */ + private String unitName; + + /** + * 总价 + */ + private Double totalPrice; + + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInStockBillVo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInStockBillVo.java index 48b116d4..8a9f06d7 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInStockBillVo.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInStockBillVo.java @@ -63,7 +63,7 @@ public class WmsInStockBillVo implements Serializable { * 供应商 */ @ExcelProperty(value = "供应商") - private String supplier; + private String supplierName; /** * 联系人 diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInStockDetailsVo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInStockDetailsVo.java new file mode 100644 index 00000000..ed3fa5a7 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInStockDetailsVo.java @@ -0,0 +1,98 @@ +package org.dromara.wms.domain.vo; + +import org.dromara.wms.domain.WmsInStockDetails; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.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 java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 入库单明细视图对象 wms_in_stock_details + * + * @author Yinq + * @date 2025-10-28 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsInStockDetails.class) +public class WmsInStockDetailsVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 入库单明细ID + */ + @ExcelProperty(value = "入库单明细ID") + private Long inStockDetailsId; + + /** + * 入库单ID + */ + @ExcelProperty(value = "入库单ID") + private Long inStockBillId; + + /** + * 仓库ID + */ + @ExcelProperty(value = "仓库ID") + private Long warehouseId; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materialId; + + /** + * 批次号 + */ + @ExcelProperty(value = "批次号") + private String batchNumber; + + /** + * 单价 + */ + @ExcelProperty(value = "单价") + private Double unitPrice; + + /** + * 入库数量 + */ + @ExcelProperty(value = "入库数量") + private Double inStockAmount; + + /** + * 物料单位 + */ + @ExcelProperty(value = "物料单位") + private String unitName; + + /** + * 总价 + */ + @ExcelProperty(value = "总价") + private Double totalPrice; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsBaseLocationMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsBaseLocationMapper.java index 7079e4ec..9a694f30 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsBaseLocationMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsBaseLocationMapper.java @@ -17,21 +17,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface WmsBaseLocationMapper extends BaseMapperPlus { - /** - * 查询库位信息列表 - * - * @param page 分页 - * @param queryWrapper 条件 - * @return 库位信息集合 - */ - public Page selectCustomWmsBaseLocationVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); - - /** - * 查询库位信息列表 - * - * @param queryWrapper 条件 - * @return 库位信息集合 - */ - public List selectCustomWmsBaseLocationVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInStockBillMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInStockBillMapper.java index 239e9a9e..5ac71243 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInStockBillMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInStockBillMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param; import org.dromara.wms.domain.WmsInStockBill; import org.dromara.wms.domain.vo.WmsInStockBillVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.springframework.stereotype.Repository; /** * 物料入库Mapper接口 @@ -17,21 +18,4 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface WmsInStockBillMapper extends BaseMapperPlus { - /** - * 查询物料入库列表 - * - * @param page 分页 - * @param queryWrapper 条件 - * @return 物料入库集合 - */ - public Page selectCustomWmsInStockBillVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); - - /** - * 查询物料入库列表 - * - * @param queryWrapper 条件 - * @return 物料入库集合 - */ - public List selectCustomWmsInStockBillVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); - } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInStockDetailsMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInStockDetailsMapper.java new file mode 100644 index 00000000..d7833272 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInStockDetailsMapper.java @@ -0,0 +1,39 @@ +package org.dromara.wms.mapper; + +import java.util.List; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.wms.domain.WmsInStockDetails; +import org.dromara.wms.domain.vo.WmsInStockDetailsVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.springframework.stereotype.Repository; + +/** + * 入库单明细Mapper接口 + * + * @author Yinq + * @date 2025-10-28 + */ +@Repository +public interface WmsInStockDetailsMapper extends BaseMapperPlus { + + /** + * 查询入库单明细列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 入库单明细集合 + */ + public Page selectCustomWmsInStockDetailsVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询入库单明细列表 + * + * @param queryWrapper 条件 + * @return 入库单明细集合 + */ + public List selectCustomWmsInStockDetailsVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryDetailsMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryDetailsMapper.java index 30aae783..74efe365 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryDetailsMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryDetailsMapper.java @@ -17,21 +17,4 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface WmsInventoryDetailsMapper extends BaseMapperPlus { - /** - * 查询库存明细列表 - * - * @param page 分页 - * @param queryWrapper 条件 - * @return 库存明细集合 - */ - public Page selectCustomWmsInventoryDetailsVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); - - /** - * 查询库存明细列表 - * - * @param queryWrapper 条件 - * @return 库存明细集合 - */ - public List selectCustomWmsInventoryDetailsVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); - } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsWarehouseInfoMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsWarehouseInfoMapper.java index a97f7012..41059ff8 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsWarehouseInfoMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsWarehouseInfoMapper.java @@ -19,21 +19,5 @@ import org.springframework.stereotype.Repository; @Repository public interface WmsWarehouseInfoMapper extends BaseMapperPlus { - /** - * 查询仓库信息列表 - * - * @param page 分页 - * @param queryWrapper 条件 - * @return 仓库信息集合 - */ - public Page selectCustomWmsWarehouseInfoVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); - - /** - * 查询仓库信息列表 - * - * @param queryWrapper 条件 - * @return 仓库信息集合 - */ - public List selectCustomWmsWarehouseInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsInStockDetailsService.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsInStockDetailsService.java new file mode 100644 index 00000000..43698a12 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsInStockDetailsService.java @@ -0,0 +1,69 @@ +package org.dromara.wms.service; + +import org.dromara.wms.domain.WmsInStockDetails; +import org.dromara.wms.domain.vo.WmsInStockDetailsVo; +import org.dromara.wms.domain.bo.WmsInStockDetailsBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 入库单明细Service接口 + * + * @author Yinq + * @date 2025-10-28 + */ +public interface IWmsInStockDetailsService { + + /** + * 查询入库单明细 + * + * @param inStockDetailsId 主键 + * @return 入库单明细 + */ + WmsInStockDetailsVo queryById(Long inStockDetailsId); + + /** + * 分页查询入库单明细列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 入库单明细分页列表 + */ + TableDataInfo queryPageList(WmsInStockDetailsBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的入库单明细列表 + * + * @param bo 查询条件 + * @return 入库单明细列表 + */ + List queryList(WmsInStockDetailsBo bo); + + /** + * 新增入库单明细 + * + * @param bo 入库单明细 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsInStockDetailsBo bo); + + /** + * 修改入库单明细 + * + * @param bo 入库单明细 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsInStockDetailsBo bo); + + /** + * 校验并批量删除入库单明细信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInStockBillServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInStockBillServiceImpl.java index 0245b169..cf33fdd8 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInStockBillServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInStockBillServiceImpl.java @@ -1,36 +1,38 @@ package org.dromara.wms.service.impl; -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.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.springframework.stereotype.Service; +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.wms.domain.WmsInStockBill; +import org.dromara.wms.domain.WmsInStockDetails; import org.dromara.wms.domain.bo.WmsInStockBillBo; import org.dromara.wms.domain.vo.WmsInStockBillVo; -import org.dromara.wms.domain.WmsInStockBill; import org.dromara.wms.mapper.WmsInStockBillMapper; +import org.dromara.wms.mapper.WmsInStockDetailsMapper; import org.dromara.wms.service.IWmsInStockBillService; +import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 物料入库Service业务层处理 * * @author Yinq - * @date 2025-10-28 + * @ date 2025-10-28 */ @RequiredArgsConstructor @Service public class WmsInStockBillServiceImpl implements IWmsInStockBillService { private final WmsInStockBillMapper baseMapper; + private final WmsInStockDetailsMapper wmsInStockDetailsMapper; /** * 查询物料入库 @@ -39,23 +41,23 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService { * @return 物料入库 */ @Override - public WmsInStockBillVo queryById(Long inStockBillId){ + public WmsInStockBillVo queryById(Long inStockBillId) { return baseMapper.selectVoById(inStockBillId); } - /** - * 分页查询物料入库列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 物料入库分页列表 - */ - @Override - public TableDataInfo queryPageList(WmsInStockBillBo bo, PageQuery pageQuery) { - MPJLambdaWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } + /** + * 分页查询物料入库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 物料入库分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsInStockBillBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } /** * 查询符合条件的物料入库列表 @@ -71,19 +73,17 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService { private MPJLambdaWrapper buildQueryWrapper(WmsInStockBillBo bo) { Map params = bo.getParams(); - MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsInStockBill.class) - .selectAll(WmsInStockBill.class) - .eq(StringUtils.isNotBlank(bo.getInStockType()), WmsInStockBill::getInStockType, bo.getInStockType()) - .eq(bo.getProjectId() != null, WmsInStockBill::getProjectId, bo.getProjectId()) - .eq(StringUtils.isNotBlank(bo.getInventoryAmount()), WmsInStockBill::getInventoryAmount, bo.getInventoryAmount()) - .eq(StringUtils.isNotBlank(bo.getSupplier()), WmsInStockBill::getSupplier, bo.getSupplier()) - .eq(StringUtils.isNotBlank(bo.getInStockBillStatus()), WmsInStockBill::getInStockBillStatus, bo.getInStockBillStatus()) - .eq(StringUtils.isNotBlank(bo.getFlowStatus()), WmsInStockBill::getFlowStatus, bo.getFlowStatus()) - .eq(bo.getWarehouseId() != null, WmsInStockBill::getWarehouseId, bo.getWarehouseId()) - .between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, - WmsInStockBill::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")) -; - return lqw; + return JoinWrappers.lambda(WmsInStockBill.class) + .selectAll(WmsInStockBill.class) + .eq(StringUtils.isNotBlank(bo.getInStockType()), WmsInStockBill::getInStockType, bo.getInStockType()) + .eq(bo.getProjectId() != null, WmsInStockBill::getProjectId, bo.getProjectId()) + .eq(StringUtils.isNotBlank(bo.getInventoryAmount()), WmsInStockBill::getInventoryAmount, bo.getInventoryAmount()) + .eq(StringUtils.isNotBlank(bo.getSupplierName()), WmsInStockBill::getSupplierName, bo.getSupplierName()) + .eq(StringUtils.isNotBlank(bo.getInStockBillStatus()), WmsInStockBill::getInStockBillStatus, bo.getInStockBillStatus()) + .eq(StringUtils.isNotBlank(bo.getFlowStatus()), WmsInStockBill::getFlowStatus, bo.getFlowStatus()) + .eq(bo.getWarehouseId() != null, WmsInStockBill::getWarehouseId, bo.getWarehouseId()) + .between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + WmsInStockBill::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); } /** @@ -95,10 +95,16 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService { @Override public Boolean insertByBo(WmsInStockBillBo bo) { WmsInStockBill add = MapstructUtils.convert(bo, WmsInStockBill.class); - validEntityBeforeSave(add); + add.setFlowStatus("就绪"); boolean flag = baseMapper.insert(add) > 0; if (flag) { - bo.setInStockBillId(add.getInStockBillId()); + Long inStockBillId = add.getInStockBillId(); + List inStockDetailsList = bo.getInStockDetailsList(); + // 设置入库单明细的入库单ID + inStockDetailsList.forEach(item -> item.setInStockBillId(inStockBillId)); + wmsInStockDetailsMapper.insert(inStockDetailsList); + + } return flag; } @@ -112,16 +118,16 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService { @Override public Boolean updateByBo(WmsInStockBillBo bo) { WmsInStockBill update = MapstructUtils.convert(bo, WmsInStockBill.class); - validEntityBeforeSave(update); + // validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } /** * 保存前的数据校验 */ - private void validEntityBeforeSave(WmsInStockBill entity){ + /* private void validEntityBeforeSave(WmsInStockBill entity){ //TODO 做一些数据校验,如唯一约束 - } + }*/ /** * 校验并批量删除物料入库信息 @@ -132,9 +138,9 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + /* if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 - } + }*/ return baseMapper.deleteByIds(ids) > 0; } } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInStockDetailsServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInStockDetailsServiceImpl.java new file mode 100644 index 00000000..afe14747 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInStockDetailsServiceImpl.java @@ -0,0 +1,135 @@ +package org.dromara.wms.service.impl; + +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.springframework.stereotype.Service; +import org.dromara.wms.domain.bo.WmsInStockDetailsBo; +import org.dromara.wms.domain.vo.WmsInStockDetailsVo; +import org.dromara.wms.domain.WmsInStockDetails; +import org.dromara.wms.mapper.WmsInStockDetailsMapper; +import org.dromara.wms.service.IWmsInStockDetailsService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 入库单明细Service业务层处理 + * + * @author Yinq + * @date 2025-10-28 + */ +@RequiredArgsConstructor +@Service +public class WmsInStockDetailsServiceImpl implements IWmsInStockDetailsService { + + private final WmsInStockDetailsMapper baseMapper; + + /** + * 查询入库单明细 + * + * @param inStockDetailsId 主键 + * @return 入库单明细 + */ + @Override + public WmsInStockDetailsVo queryById(Long inStockDetailsId){ + return baseMapper.selectVoById(inStockDetailsId); + } + + /** + * 分页查询入库单明细列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 入库单明细分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsInStockDetailsBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的入库单明细列表 + * + * @param bo 查询条件 + * @return 入库单明细列表 + */ + @Override + public List queryList(WmsInStockDetailsBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsInStockDetailsBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsInStockDetails.class) + .selectAll(WmsInStockDetails.class) + .eq(bo.getInStockBillId() != null, WmsInStockDetails::getInStockBillId, bo.getInStockBillId()) + .eq(bo.getWarehouseId() != null, WmsInStockDetails::getWarehouseId, bo.getWarehouseId()) + .eq(bo.getMaterialId() != null, WmsInStockDetails::getMaterialId, bo.getMaterialId()) + .eq(StringUtils.isNotBlank(bo.getBatchNumber()), WmsInStockDetails::getBatchNumber, bo.getBatchNumber()) +; + return lqw; + } + + /** + * 新增入库单明细 + * + * @param bo 入库单明细 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsInStockDetailsBo bo) { + WmsInStockDetails add = MapstructUtils.convert(bo, WmsInStockDetails.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInStockDetailsId(add.getInStockDetailsId()); + } + return flag; + } + + /** + * 修改入库单明细 + * + * @param bo 入库单明细 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsInStockDetailsBo bo) { + WmsInStockDetails update = MapstructUtils.convert(bo, WmsInStockDetails.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsInStockDetails entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除入库单明细信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsInStockDetailsMapper.xml b/ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsInStockDetailsMapper.xml new file mode 100644 index 00000000..be446902 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsInStockDetailsMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + +