add 入库单保存主子表

dev
wanghao 7 months ago
parent 9ed76216bd
commit 5462616262

@ -77,6 +77,8 @@ public class WmsInStockBillController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsInStockBillBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsInStockBillBo bo) {
System.out.println(bo.toString());
// return R.fail("新增物料入库失败");
return toAjax(wmsInStockBillService.insertByBo(bo)); return toAjax(wmsInStockBillService.insertByBo(bo));
} }

@ -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<WmsInStockDetailsVo> 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<WmsInStockDetailsVo> list = wmsInStockDetailsService.queryList(bo);
ExcelUtil.exportExcel(list, "入库单明细", WmsInStockDetailsVo.class, response);
}
/**
*
*
* @param inStockDetailsId
*/
@SaCheckPermission("wms:inStockDetails:query")
@GetMapping("/{inStockDetailsId}")
public R<WmsInStockDetailsVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("inStockDetailsIds") Long[] inStockDetailsIds) {
return toAjax(wmsInStockDetailsService.deleteWithValidByIds(List.of(inStockDetailsIds), true));
}
/**
*
*/
@GetMapping("/getWmsInStockDetailsList")
public R<List<WmsInStockDetailsVo>> getWmsInStockDetailsList(WmsInStockDetailsBo bo) {
List<WmsInStockDetailsVo> list = wmsInStockDetailsService.queryList(bo);
return R.ok(list);
}
}

@ -50,7 +50,7 @@ public class WmsInStockBill extends TenantEntity {
/** /**
* *
*/ */
private String supplier; private String supplierName;
/** /**
* *

@ -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;
}

@ -1,5 +1,6 @@
package org.dromara.wms.domain.bo; package org.dromara.wms.domain.bo;
import jdk.dynalink.linker.LinkerServices;
import org.dromara.wms.domain.WmsInStockBill; import org.dromara.wms.domain.WmsInStockBill;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
@ -8,6 +9,9 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import org.dromara.wms.domain.WmsInStockDetails;
import java.util.List;
/** /**
* wms_in_stock_bill * 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 String remark;
private List<WmsInStockDetails> inStockDetailsList;
} }

@ -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;
}

@ -63,7 +63,7 @@ public class WmsInStockBillVo implements Serializable {
* *
*/ */
@ExcelProperty(value = "供应商") @ExcelProperty(value = "供应商")
private String supplier; private String supplierName;
/** /**
* *

@ -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;
}

@ -17,21 +17,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
*/ */
public interface WmsBaseLocationMapper extends BaseMapperPlus<WmsBaseLocation, WmsBaseLocationVo> { public interface WmsBaseLocationMapper extends BaseMapperPlus<WmsBaseLocation, WmsBaseLocationVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<WmsBaseLocationVo> selectCustomWmsBaseLocationVoList(@Param("page") Page<WmsBaseLocationVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<WmsBaseLocation> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<WmsBaseLocationVo> selectCustomWmsBaseLocationVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<WmsBaseLocation> queryWrapper);
} }

@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
import org.dromara.wms.domain.WmsInStockBill; import org.dromara.wms.domain.WmsInStockBill;
import org.dromara.wms.domain.vo.WmsInStockBillVo; import org.dromara.wms.domain.vo.WmsInStockBillVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.springframework.stereotype.Repository;
/** /**
* Mapper * Mapper
@ -17,21 +18,4 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
*/ */
public interface WmsInStockBillMapper extends BaseMapperPlus<WmsInStockBill, WmsInStockBillVo> { public interface WmsInStockBillMapper extends BaseMapperPlus<WmsInStockBill, WmsInStockBillVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<WmsInStockBillVo> selectCustomWmsInStockBillVoList(@Param("page") Page<WmsInStockBillVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<WmsInStockBill> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<WmsInStockBillVo> selectCustomWmsInStockBillVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<WmsInStockBill> queryWrapper);
} }

@ -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<WmsInStockDetails, WmsInStockDetailsVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<WmsInStockDetailsVo> selectCustomWmsInStockDetailsVoList(@Param("page") Page<WmsInStockDetailsVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<WmsInStockDetails> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<WmsInStockDetailsVo> selectCustomWmsInStockDetailsVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<WmsInStockDetails> queryWrapper);
}

@ -17,21 +17,4 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
*/ */
public interface WmsInventoryDetailsMapper extends BaseMapperPlus<WmsInventoryDetails, WmsInventoryDetailsVo> { public interface WmsInventoryDetailsMapper extends BaseMapperPlus<WmsInventoryDetails, WmsInventoryDetailsVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<WmsInventoryDetailsVo> selectCustomWmsInventoryDetailsVoList(@Param("page") Page<WmsInventoryDetailsVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<WmsInventoryDetails> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<WmsInventoryDetailsVo> selectCustomWmsInventoryDetailsVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<WmsInventoryDetails> queryWrapper);
} }

@ -19,21 +19,5 @@ import org.springframework.stereotype.Repository;
@Repository @Repository
public interface WmsWarehouseInfoMapper extends BaseMapperPlus<WmsWarehouseInfo, WmsWarehouseInfoVo> { public interface WmsWarehouseInfoMapper extends BaseMapperPlus<WmsWarehouseInfo, WmsWarehouseInfoVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<WmsWarehouseInfoVo> selectCustomWmsWarehouseInfoVoList(@Param("page") Page<WmsWarehouseInfoVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<WmsWarehouseInfo> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<WmsWarehouseInfoVo> selectCustomWmsWarehouseInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<WmsWarehouseInfo> queryWrapper);
} }

@ -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<WmsInStockDetailsVo> queryPageList(WmsInStockDetailsBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<WmsInStockDetailsVo> 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<Long> ids, Boolean isValid);
}

@ -1,24 +1,25 @@
package org.dromara.wms.service.impl; 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.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; 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.bo.WmsInStockBillBo;
import org.dromara.wms.domain.vo.WmsInStockBillVo; import org.dromara.wms.domain.vo.WmsInStockBillVo;
import org.dromara.wms.domain.WmsInStockBill;
import org.dromara.wms.mapper.WmsInStockBillMapper; import org.dromara.wms.mapper.WmsInStockBillMapper;
import org.dromara.wms.mapper.WmsInStockDetailsMapper;
import org.dromara.wms.service.IWmsInStockBillService; import org.dromara.wms.service.IWmsInStockBillService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection;
/** /**
* Service * Service
@ -31,6 +32,7 @@ import java.util.Collection;
public class WmsInStockBillServiceImpl implements IWmsInStockBillService { public class WmsInStockBillServiceImpl implements IWmsInStockBillService {
private final WmsInStockBillMapper baseMapper; private final WmsInStockBillMapper baseMapper;
private final WmsInStockDetailsMapper wmsInStockDetailsMapper;
/** /**
* *
@ -71,19 +73,17 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService {
private MPJLambdaWrapper<WmsInStockBill> buildQueryWrapper(WmsInStockBillBo bo) { private MPJLambdaWrapper<WmsInStockBill> buildQueryWrapper(WmsInStockBillBo bo) {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsInStockBill> lqw = JoinWrappers.lambda(WmsInStockBill.class) return JoinWrappers.lambda(WmsInStockBill.class)
.selectAll(WmsInStockBill.class) .selectAll(WmsInStockBill.class)
.eq(StringUtils.isNotBlank(bo.getInStockType()), WmsInStockBill::getInStockType, bo.getInStockType()) .eq(StringUtils.isNotBlank(bo.getInStockType()), WmsInStockBill::getInStockType, bo.getInStockType())
.eq(bo.getProjectId() != null, WmsInStockBill::getProjectId, bo.getProjectId()) .eq(bo.getProjectId() != null, WmsInStockBill::getProjectId, bo.getProjectId())
.eq(StringUtils.isNotBlank(bo.getInventoryAmount()), WmsInStockBill::getInventoryAmount, bo.getInventoryAmount()) .eq(StringUtils.isNotBlank(bo.getInventoryAmount()), WmsInStockBill::getInventoryAmount, bo.getInventoryAmount())
.eq(StringUtils.isNotBlank(bo.getSupplier()), WmsInStockBill::getSupplier, bo.getSupplier()) .eq(StringUtils.isNotBlank(bo.getSupplierName()), WmsInStockBill::getSupplierName, bo.getSupplierName())
.eq(StringUtils.isNotBlank(bo.getInStockBillStatus()), WmsInStockBill::getInStockBillStatus, bo.getInStockBillStatus()) .eq(StringUtils.isNotBlank(bo.getInStockBillStatus()), WmsInStockBill::getInStockBillStatus, bo.getInStockBillStatus())
.eq(StringUtils.isNotBlank(bo.getFlowStatus()), WmsInStockBill::getFlowStatus, bo.getFlowStatus()) .eq(StringUtils.isNotBlank(bo.getFlowStatus()), WmsInStockBill::getFlowStatus, bo.getFlowStatus())
.eq(bo.getWarehouseId() != null, WmsInStockBill::getWarehouseId, bo.getWarehouseId()) .eq(bo.getWarehouseId() != null, WmsInStockBill::getWarehouseId, bo.getWarehouseId())
.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, .between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
WmsInStockBill::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")) WmsInStockBill::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
;
return lqw;
} }
/** /**
@ -95,10 +95,16 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService {
@Override @Override
public Boolean insertByBo(WmsInStockBillBo bo) { public Boolean insertByBo(WmsInStockBillBo bo) {
WmsInStockBill add = MapstructUtils.convert(bo, WmsInStockBill.class); WmsInStockBill add = MapstructUtils.convert(bo, WmsInStockBill.class);
validEntityBeforeSave(add); add.setFlowStatus("就绪");
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
bo.setInStockBillId(add.getInStockBillId()); Long inStockBillId = add.getInStockBillId();
List<WmsInStockDetails> inStockDetailsList = bo.getInStockDetailsList();
// 设置入库单明细的入库单ID
inStockDetailsList.forEach(item -> item.setInStockBillId(inStockBillId));
wmsInStockDetailsMapper.insert(inStockDetailsList);
} }
return flag; return flag;
} }
@ -112,16 +118,16 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService {
@Override @Override
public Boolean updateByBo(WmsInStockBillBo bo) { public Boolean updateByBo(WmsInStockBillBo bo) {
WmsInStockBill update = MapstructUtils.convert(bo, WmsInStockBill.class); WmsInStockBill update = MapstructUtils.convert(bo, WmsInStockBill.class);
validEntityBeforeSave(update); // validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
} }
/** /**
* *
*/ */
private void validEntityBeforeSave(WmsInStockBill entity){ /* private void validEntityBeforeSave(WmsInStockBill entity){
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }*/
/** /**
* *
@ -132,9 +138,9 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService {
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){ /* if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验
} }*/
return baseMapper.deleteByIds(ids) > 0; return baseMapper.deleteByIds(ids) > 0;
} }
} }

@ -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<WmsInStockDetailsVo> queryPageList(WmsInStockDetailsBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<WmsInStockDetails> lqw = buildQueryWrapper(bo);
Page<WmsInStockDetailsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<WmsInStockDetailsVo> queryList(WmsInStockDetailsBo bo) {
MPJLambdaWrapper<WmsInStockDetails> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<WmsInStockDetails> buildQueryWrapper(WmsInStockDetailsBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsInStockDetails> 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<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.wms.mapper.WmsInStockDetailsMapper">
<resultMap type="org.dromara.wms.domain.vo.WmsInStockDetailsVo" id="WmsInStockDetailsResult">
</resultMap>
<select id="selectCustomWmsInStockDetailsVoList" resultMap="WmsInStockDetailsResult">
select in_stock_details_id, tenant_id, in_stock_bill_id, warehouse_id, materiel_id, batch_number, unit_price, in_stock_amount, unit_name, total_price, del_flag, create_dept, create_by, create_time, update_by, update_time from wms_in_stock_details t
${ew.getCustomSqlSegment}
</select>
</mapper>
Loading…
Cancel
Save