feat(wms): 物料调拨单
parent
015b0fa0ff
commit
c0b80cf2c5
@ -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.WmsMaterialTransferBillsVo;
|
||||
import org.dromara.wms.domain.bo.WmsMaterialTransferBillsBo;
|
||||
import org.dromara.wms.service.IWmsMaterialTransferBillsService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 物料调拨单
|
||||
* 前端访问路由地址为:/wms/materialTransferBills
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-12-08
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/materialTransferBills")
|
||||
public class WmsMaterialTransferBillsController extends BaseController {
|
||||
|
||||
private final IWmsMaterialTransferBillsService wmsMaterialTransferBillsService;
|
||||
|
||||
/**
|
||||
* 查询物料调拨单列表
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferBills:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsMaterialTransferBillsVo> list(WmsMaterialTransferBillsBo bo, PageQuery pageQuery) {
|
||||
return wmsMaterialTransferBillsService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出物料调拨单列表
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferBills:export")
|
||||
@Log(title = "物料调拨单", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsMaterialTransferBillsBo bo, HttpServletResponse response) {
|
||||
List<WmsMaterialTransferBillsVo> list = wmsMaterialTransferBillsService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "物料调拨单", WmsMaterialTransferBillsVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取物料调拨单详细信息
|
||||
*
|
||||
* @param transferBillsId 主键
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferBills:query")
|
||||
@GetMapping("/{transferBillsId}")
|
||||
public R<WmsMaterialTransferBillsVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("transferBillsId") Long transferBillsId) {
|
||||
return R.ok(wmsMaterialTransferBillsService.queryById(transferBillsId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增物料调拨单
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferBills:add")
|
||||
@Log(title = "物料调拨单", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsMaterialTransferBillsBo bo) {
|
||||
return toAjax(wmsMaterialTransferBillsService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改物料调拨单
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferBills:edit")
|
||||
@Log(title = "物料调拨单", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsMaterialTransferBillsBo bo) {
|
||||
return toAjax(wmsMaterialTransferBillsService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除物料调拨单
|
||||
*
|
||||
* @param transferBillsIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferBills:remove")
|
||||
@Log(title = "物料调拨单", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{transferBillsIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable("transferBillsIds") Long[] transferBillsIds) {
|
||||
return toAjax(wmsMaterialTransferBillsService.deleteWithValidByIds(List.of(transferBillsIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下拉框查询物料调拨单列表
|
||||
*/
|
||||
@GetMapping("/getWmsMaterialTransferBillsList")
|
||||
public R<List<WmsMaterialTransferBillsVo>> getWmsMaterialTransferBillsList(WmsMaterialTransferBillsBo bo) {
|
||||
List<WmsMaterialTransferBillsVo> list = wmsMaterialTransferBillsService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
package org.dromara.wms.domain.bo;
|
||||
|
||||
import org.dromara.wms.domain.WmsMaterialTransferBills;
|
||||
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.*;
|
||||
import org.dromara.wms.domain.WmsMaterialTransferRecord;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 物料调拨单业务对象 wms_material_transfer_bills
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-12-08
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = WmsMaterialTransferBills.class, reverseConvertGenerate = false)
|
||||
public class WmsMaterialTransferBillsBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 调拨记录ID
|
||||
*/
|
||||
@NotNull(message = "调拨记录ID不能为空", groups = { EditGroup.class })
|
||||
private Long transferBillsId;
|
||||
|
||||
/**
|
||||
* 调拨单号
|
||||
*/
|
||||
private String transferBillsCode;
|
||||
|
||||
/**
|
||||
* 调出仓库
|
||||
*/
|
||||
private Long transferOutStoreId;
|
||||
|
||||
/**
|
||||
* 调入仓库
|
||||
*/
|
||||
private Long transferInStoreId;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String billsStatus;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
List<WmsMaterialTransferRecord> list;
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
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.WmsMaterialTransferBills;
|
||||
import org.dromara.wms.domain.vo.WmsMaterialTransferBillsVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 物料调拨单Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-12-08
|
||||
*/
|
||||
public interface WmsMaterialTransferBillsMapper extends BaseMapperPlus<WmsMaterialTransferBills, WmsMaterialTransferBillsVo> {
|
||||
|
||||
/**
|
||||
* 查询物料调拨单列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 物料调拨单集合
|
||||
*/
|
||||
public Page<WmsMaterialTransferBillsVo> selectCustomWmsMaterialTransferBillsVoList(@Param("page") Page<WmsMaterialTransferBillsVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<WmsMaterialTransferBills> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询物料调拨单列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 物料调拨单集合
|
||||
*/
|
||||
public List<WmsMaterialTransferBillsVo> selectCustomWmsMaterialTransferBillsVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<WmsMaterialTransferBills> queryWrapper);
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.wms.service;
|
||||
|
||||
import org.dromara.wms.domain.WmsMaterialTransferBills;
|
||||
import org.dromara.wms.domain.vo.WmsMaterialTransferBillsVo;
|
||||
import org.dromara.wms.domain.bo.WmsMaterialTransferBillsBo;
|
||||
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-12-08
|
||||
*/
|
||||
public interface IWmsMaterialTransferBillsService {
|
||||
|
||||
/**
|
||||
* 查询物料调拨单
|
||||
*
|
||||
* @param transferBillsId 主键
|
||||
* @return 物料调拨单
|
||||
*/
|
||||
WmsMaterialTransferBillsVo queryById(Long transferBillsId);
|
||||
|
||||
/**
|
||||
* 分页查询物料调拨单列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 物料调拨单分页列表
|
||||
*/
|
||||
TableDataInfo<WmsMaterialTransferBillsVo> queryPageList(WmsMaterialTransferBillsBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的物料调拨单列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 物料调拨单列表
|
||||
*/
|
||||
List<WmsMaterialTransferBillsVo> queryList(WmsMaterialTransferBillsBo bo);
|
||||
|
||||
/**
|
||||
* 新增物料调拨单
|
||||
*
|
||||
* @param bo 物料调拨单
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(WmsMaterialTransferBillsBo bo);
|
||||
|
||||
/**
|
||||
* 修改物料调拨单
|
||||
*
|
||||
* @param bo 物料调拨单
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(WmsMaterialTransferBillsBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除物料调拨单信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,147 @@
|
||||
package org.dromara.wms.service.impl;
|
||||
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
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.dromara.system.api.RemoteCodeRuleService;
|
||||
import org.dromara.wms.service.IWmsMaterialTransferRecordService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.wms.domain.bo.WmsMaterialTransferBillsBo;
|
||||
import org.dromara.wms.domain.vo.WmsMaterialTransferBillsVo;
|
||||
import org.dromara.wms.domain.WmsMaterialTransferBills;
|
||||
import org.dromara.wms.mapper.WmsMaterialTransferBillsMapper;
|
||||
import org.dromara.wms.service.IWmsMaterialTransferBillsService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 物料调拨单Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-12-08
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsMaterialTransferBillsServiceImpl implements IWmsMaterialTransferBillsService {
|
||||
|
||||
private final WmsMaterialTransferBillsMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询物料调拨单
|
||||
*
|
||||
* @param transferBillsId 主键
|
||||
* @return 物料调拨单
|
||||
*/
|
||||
@Override
|
||||
public WmsMaterialTransferBillsVo queryById(Long transferBillsId){
|
||||
return baseMapper.selectVoById(transferBillsId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询物料调拨单列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 物料调拨单分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsMaterialTransferBillsVo> queryPageList(WmsMaterialTransferBillsBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<WmsMaterialTransferBills> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsMaterialTransferBillsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的物料调拨单列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 物料调拨单列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsMaterialTransferBillsVo> queryList(WmsMaterialTransferBillsBo bo) {
|
||||
MPJLambdaWrapper<WmsMaterialTransferBills> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<WmsMaterialTransferBills> buildQueryWrapper(WmsMaterialTransferBillsBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<WmsMaterialTransferBills> lqw = JoinWrappers.lambda(WmsMaterialTransferBills.class)
|
||||
.selectAll(WmsMaterialTransferBills.class)
|
||||
.eq(WmsMaterialTransferBills::getDelFlag, "0")
|
||||
.eq(bo.getTransferOutStoreId() != null, WmsMaterialTransferBills::getTransferOutStoreId, bo.getTransferOutStoreId())
|
||||
.eq(bo.getTransferInStoreId() != null, WmsMaterialTransferBills::getTransferInStoreId, bo.getTransferInStoreId())
|
||||
.eq(StringUtils.isNotBlank(bo.getBillsStatus()), WmsMaterialTransferBills::getBillsStatus, bo.getBillsStatus())
|
||||
.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
|
||||
WmsMaterialTransferBills::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime"))
|
||||
;
|
||||
return lqw;
|
||||
}
|
||||
@DubboReference
|
||||
private RemoteCodeRuleService remoteCodeRuleService;
|
||||
private final IWmsMaterialTransferRecordService wmsMaterialTransferRecordService;
|
||||
/**
|
||||
* 新增物料调拨单
|
||||
*
|
||||
* @param bo 物料调拨单
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsMaterialTransferBillsBo bo) {
|
||||
WmsMaterialTransferBills add = MapstructUtils.convert(bo, WmsMaterialTransferBills.class);
|
||||
add.setTransferBillsCode(remoteCodeRuleService.selectCodeRuleCode("wms_1003"));
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
Long transferBillsId = add.getTransferBillsId();
|
||||
bo.setTransferBillsId(transferBillsId);
|
||||
wmsMaterialTransferRecordService.insertByBo(transferBillsId,bo.getList());
|
||||
|
||||
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改物料调拨单
|
||||
*
|
||||
* @param bo 物料调拨单
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsMaterialTransferBillsBo bo) {
|
||||
WmsMaterialTransferBills update = MapstructUtils.convert(bo, WmsMaterialTransferBills.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsMaterialTransferBills 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.WmsMaterialTransferBillsMapper">
|
||||
<resultMap type="org.dromara.wms.domain.vo.WmsMaterialTransferBillsVo" id="WmsMaterialTransferBillsResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomWmsMaterialTransferBillsVoList" resultMap="WmsMaterialTransferBillsResult">
|
||||
select transfer_bills_id, transfer_bills_code, transfer_out_store_id, transfer_in_store_id, bills_status, remark, tenant_id, del_flag, create_dept, create_by, create_time, update_by, update_time from wms_material_transfer_bills t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue