feat(wms): 完善wms
- 实现调拨打印的 CRUD功能 - 修改供应商和客户基础信息bug - 入库单子表新加agv相关字段，当入库单为agv入库时更新agv入库任务界面并且状态为未打印（未调用），当agv入库单子表打印时调用agv接口（待完善逻辑）hwmom-htk
parent
5b4d539ce8
commit
6e269354ac
@ -0,0 +1,117 @@
|
||||
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.WmsAllocateTaskVo;
|
||||
import org.dromara.wms.domain.bo.WmsAllocateTaskBo;
|
||||
import org.dromara.wms.service.IWmsAllocateTaskService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 调拨打印
|
||||
* 前端访问路由地址为:/wms/wmsAllocateTask
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-09-01
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/wmsAllocateTask")
|
||||
public class WmsAllocateTaskController extends BaseController {
|
||||
|
||||
private final IWmsAllocateTaskService wmsAllocateTaskService;
|
||||
|
||||
/**
|
||||
* 查询调拨打印列表
|
||||
*/
|
||||
@SaCheckPermission("wms:wmsAllocateTask:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsAllocateTaskVo> list(WmsAllocateTaskBo bo, PageQuery pageQuery) {
|
||||
return wmsAllocateTaskService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出调拨打印列表
|
||||
*/
|
||||
@SaCheckPermission("wms:wmsAllocateTask:export")
|
||||
@Log(title = "调拨打印", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsAllocateTaskBo bo, HttpServletResponse response) {
|
||||
List<WmsAllocateTaskVo> list = wmsAllocateTaskService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "调拨打印", WmsAllocateTaskVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取调拨打印详细信息
|
||||
*
|
||||
* @param allocateTaskId 主键
|
||||
*/
|
||||
@SaCheckPermission("wms:wmsAllocateTask:query")
|
||||
@GetMapping("/{allocateTaskId}")
|
||||
public R<WmsAllocateTaskVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long allocateTaskId) {
|
||||
return R.ok(wmsAllocateTaskService.queryById(allocateTaskId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增调拨打印
|
||||
*/
|
||||
@SaCheckPermission("wms:wmsAllocateTask:add")
|
||||
@Log(title = "调拨打印", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsAllocateTaskBo bo) {
|
||||
return toAjax(wmsAllocateTaskService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改调拨打印
|
||||
*/
|
||||
@SaCheckPermission("wms:wmsAllocateTask:edit")
|
||||
@Log(title = "调拨打印", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsAllocateTaskBo bo) {
|
||||
return toAjax(wmsAllocateTaskService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除调拨打印
|
||||
*
|
||||
* @param allocateTaskIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("wms:wmsAllocateTask:remove")
|
||||
@Log(title = "调拨打印", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{allocateTaskIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] allocateTaskIds) {
|
||||
return toAjax(wmsAllocateTaskService.deleteWithValidByIds(List.of(allocateTaskIds), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询调拨打印列表
|
||||
*/
|
||||
|
||||
@GetMapping("/getWmsAllocateTaskList")
|
||||
public R<List<WmsAllocateTaskVo>> getWmsAllocateTaskList(WmsAllocateTaskBo bo) {
|
||||
List<WmsAllocateTaskVo> list = wmsAllocateTaskService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,107 @@
|
||||
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.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 调拨打印对象 wms_allocate_task
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-09-01
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_allocate_task")
|
||||
public class WmsAllocateTask extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 调拨任务表主键
|
||||
*/
|
||||
private Long allocateTaskId;
|
||||
|
||||
/**
|
||||
* 单号
|
||||
*/
|
||||
private String allocateCode;
|
||||
|
||||
/**
|
||||
* 批次码
|
||||
*/
|
||||
private String batchCode;
|
||||
|
||||
/**
|
||||
* 条码数量
|
||||
*/
|
||||
private Long materialQty;
|
||||
|
||||
/**
|
||||
* 分包数量
|
||||
*/
|
||||
private Long apportionQty;
|
||||
|
||||
/**
|
||||
* 物料id
|
||||
*/
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 物料编码
|
||||
*/
|
||||
private String materialCode;
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
private String materialName;
|
||||
|
||||
/**
|
||||
* 物料规格
|
||||
*/
|
||||
private String materialSpe;
|
||||
|
||||
/**
|
||||
* 计量单位名称
|
||||
*/
|
||||
private String unitName;
|
||||
|
||||
/**
|
||||
* 是否有条码
|
||||
*/
|
||||
private String codeYesNo;
|
||||
|
||||
/**
|
||||
* 物料大类
|
||||
*/
|
||||
private String materialCategories;
|
||||
|
||||
/**
|
||||
* 推荐库位id
|
||||
*/
|
||||
private Long locationId;
|
||||
|
||||
/**
|
||||
* 入库状态(0-待入库,1-已入库,2-入库中)
|
||||
*/
|
||||
private String inboundStatus;
|
||||
|
||||
/**
|
||||
* 实际入库时间
|
||||
*/
|
||||
private Date actualInboundTime;
|
||||
|
||||
/**
|
||||
* 子表id
|
||||
*/
|
||||
private Long aoDId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,106 @@
|
||||
package org.dromara.wms.domain.bo;
|
||||
|
||||
import org.dromara.wms.domain.WmsAllocateTask;
|
||||
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 java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* 调拨打印业务对象 wms_allocate_task
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-09-01
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = WmsAllocateTask.class, reverseConvertGenerate = false)
|
||||
public class WmsAllocateTaskBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 调拨任务表主键
|
||||
*/
|
||||
private Long allocateTaskId;
|
||||
|
||||
/**
|
||||
* 单号
|
||||
*/
|
||||
private String allocateCode;
|
||||
|
||||
/**
|
||||
* 批次码
|
||||
*/
|
||||
private String batchCode;
|
||||
|
||||
/**
|
||||
* 条码数量
|
||||
*/
|
||||
private Long materialQty;
|
||||
|
||||
/**
|
||||
* 分包数量
|
||||
*/
|
||||
private Long apportionQty;
|
||||
|
||||
/**
|
||||
* 物料id
|
||||
*/
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 物料编码
|
||||
*/
|
||||
private String materialCode;
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
private String materialName;
|
||||
|
||||
/**
|
||||
* 物料规格
|
||||
*/
|
||||
private String materialSpe;
|
||||
|
||||
/**
|
||||
* 计量单位名称
|
||||
*/
|
||||
private String unitName;
|
||||
|
||||
/**
|
||||
* 是否有条码
|
||||
*/
|
||||
private String codeYesNo;
|
||||
|
||||
/**
|
||||
* 物料大类
|
||||
*/
|
||||
private String materialCategories;
|
||||
|
||||
/**
|
||||
* 推荐库位id
|
||||
*/
|
||||
private Long locationId;
|
||||
|
||||
/**
|
||||
* 入库状态(0-待入库,1-已入库,2-入库中)
|
||||
*/
|
||||
private String inboundStatus;
|
||||
|
||||
/**
|
||||
* 实际入库时间
|
||||
*/
|
||||
private Date actualInboundTime;
|
||||
|
||||
/**
|
||||
* 子表id
|
||||
*/
|
||||
private Long aoDId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,130 @@
|
||||
package org.dromara.wms.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.dromara.wms.domain.WmsAllocateTask;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.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_allocate_task
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-09-01
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = WmsAllocateTask.class)
|
||||
public class WmsAllocateTaskVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 调拨任务表主键
|
||||
*/
|
||||
@ExcelProperty(value = "调拨任务表主键")
|
||||
private Long allocateTaskId;
|
||||
|
||||
/**
|
||||
* 单号
|
||||
*/
|
||||
@ExcelProperty(value = "单号")
|
||||
private String allocateCode;
|
||||
|
||||
/**
|
||||
* 批次码
|
||||
*/
|
||||
@ExcelProperty(value = "批次码")
|
||||
private String batchCode;
|
||||
|
||||
/**
|
||||
* 条码数量
|
||||
*/
|
||||
@ExcelProperty(value = "条码数量")
|
||||
private Long materialQty;
|
||||
|
||||
/**
|
||||
* 分包数量
|
||||
*/
|
||||
@ExcelProperty(value = "分包数量")
|
||||
private Long apportionQty;
|
||||
|
||||
/**
|
||||
* 物料id
|
||||
*/
|
||||
@ExcelProperty(value = "物料id")
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 物料编码
|
||||
*/
|
||||
@ExcelProperty(value = "物料编码")
|
||||
private String materialCode;
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
@ExcelProperty(value = "物料名称")
|
||||
private String materialName;
|
||||
|
||||
/**
|
||||
* 物料规格
|
||||
*/
|
||||
@ExcelProperty(value = "物料规格")
|
||||
private String materialSpe;
|
||||
|
||||
/**
|
||||
* 计量单位名称
|
||||
*/
|
||||
@ExcelProperty(value = "计量单位名称")
|
||||
private String unitName;
|
||||
|
||||
/**
|
||||
* 是否有条码
|
||||
*/
|
||||
@ExcelProperty(value = "是否有条码")
|
||||
private String codeYesNo;
|
||||
|
||||
/**
|
||||
* 物料大类
|
||||
*/
|
||||
@ExcelProperty(value = "物料大类")
|
||||
private String materialCategories;
|
||||
|
||||
/**
|
||||
* 推荐库位id
|
||||
*/
|
||||
@ExcelProperty(value = "推荐库位id")
|
||||
private Long locationId;
|
||||
|
||||
/**
|
||||
* 入库状态(0-待入库,1-已入库,2-入库中)
|
||||
*/
|
||||
@ExcelProperty(value = "入库状态(0-待入库,1-已入库,2-入库中)")
|
||||
private String inboundStatus;
|
||||
|
||||
/**
|
||||
* 实际入库时间
|
||||
*/
|
||||
@ExcelProperty(value = "实际入库时间")
|
||||
private Date actualInboundTime;
|
||||
|
||||
/**
|
||||
* 子表id
|
||||
*/
|
||||
@ExcelProperty(value = "子表id")
|
||||
private Long aoDId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.wms.mapper;
|
||||
|
||||
import org.dromara.wms.domain.WmsAllocateTask;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateTaskVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 调拨打印Mapper接口
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-09-01
|
||||
*/
|
||||
public interface WmsAllocateTaskMapper extends BaseMapperPlus<WmsAllocateTask, WmsAllocateTaskVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.wms.service;
|
||||
|
||||
import org.dromara.wms.domain.WmsAllocateTask;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateTaskVo;
|
||||
import org.dromara.wms.domain.bo.WmsAllocateTaskBo;
|
||||
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 zch
|
||||
* @date 2025-09-01
|
||||
*/
|
||||
public interface IWmsAllocateTaskService {
|
||||
|
||||
/**
|
||||
* 查询调拨打印
|
||||
*
|
||||
* @param allocateTaskId 主键
|
||||
* @return 调拨打印
|
||||
*/
|
||||
WmsAllocateTaskVo queryById(Long allocateTaskId);
|
||||
|
||||
/**
|
||||
* 分页查询调拨打印列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 调拨打印分页列表
|
||||
*/
|
||||
TableDataInfo<WmsAllocateTaskVo> queryPageList(WmsAllocateTaskBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的调拨打印列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 调拨打印列表
|
||||
*/
|
||||
List<WmsAllocateTaskVo> queryList(WmsAllocateTaskBo bo);
|
||||
|
||||
/**
|
||||
* 新增调拨打印
|
||||
*
|
||||
* @param bo 调拨打印
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(WmsAllocateTaskBo bo);
|
||||
|
||||
/**
|
||||
* 修改调拨打印
|
||||
*
|
||||
* @param bo 调拨打印
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(WmsAllocateTaskBo 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.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.WmsAllocateTaskBo;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateTaskVo;
|
||||
import org.dromara.wms.domain.WmsAllocateTask;
|
||||
import org.dromara.wms.mapper.WmsAllocateTaskMapper;
|
||||
import org.dromara.wms.service.IWmsAllocateTaskService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 调拨打印Service业务层处理
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-09-01
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsAllocateTaskServiceImpl implements IWmsAllocateTaskService {
|
||||
|
||||
private final WmsAllocateTaskMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询调拨打印
|
||||
*
|
||||
* @param allocateTaskId 主键
|
||||
* @return 调拨打印
|
||||
*/
|
||||
@Override
|
||||
public WmsAllocateTaskVo queryById(Long allocateTaskId){
|
||||
return baseMapper.selectVoById(allocateTaskId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询调拨打印列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 调拨打印分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsAllocateTaskVo> queryPageList(WmsAllocateTaskBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<WmsAllocateTask> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsAllocateTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的调拨打印列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 调拨打印列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsAllocateTaskVo> queryList(WmsAllocateTaskBo bo) {
|
||||
MPJLambdaWrapper<WmsAllocateTask> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<WmsAllocateTask> buildQueryWrapper(WmsAllocateTaskBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<WmsAllocateTask> lqw = JoinWrappers.lambda(WmsAllocateTask.class)
|
||||
.selectAll(WmsAllocateTask.class)
|
||||
.eq(bo.getAllocateTaskId() != null, WmsAllocateTask::getAllocateTaskId, bo.getAllocateTaskId())
|
||||
.eq(StringUtils.isNotBlank(bo.getAllocateCode()), WmsAllocateTask::getAllocateCode, bo.getAllocateCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getBatchCode()), WmsAllocateTask::getBatchCode, bo.getBatchCode())
|
||||
.eq(bo.getMaterialQty() != null, WmsAllocateTask::getMaterialQty, bo.getMaterialQty())
|
||||
.eq(bo.getApportionQty() != null, WmsAllocateTask::getApportionQty, bo.getApportionQty())
|
||||
.eq(bo.getMaterialId() != null, WmsAllocateTask::getMaterialId, bo.getMaterialId())
|
||||
.eq(StringUtils.isNotBlank(bo.getMaterialCode()), WmsAllocateTask::getMaterialCode, bo.getMaterialCode())
|
||||
.like(StringUtils.isNotBlank(bo.getMaterialName()), WmsAllocateTask::getMaterialName, bo.getMaterialName())
|
||||
.eq(StringUtils.isNotBlank(bo.getMaterialSpe()), WmsAllocateTask::getMaterialSpe, bo.getMaterialSpe())
|
||||
.eq(StringUtils.isNotBlank(bo.getUnitName()), WmsAllocateTask::getUnitName, bo.getUnitName())
|
||||
.eq(StringUtils.isNotBlank(bo.getCodeYesNo()), WmsAllocateTask::getCodeYesNo, bo.getCodeYesNo())
|
||||
.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsAllocateTask::getMaterialCategories, bo.getMaterialCategories())
|
||||
.eq(bo.getLocationId() != null, WmsAllocateTask::getLocationId, bo.getLocationId())
|
||||
.eq(StringUtils.isNotBlank(bo.getInboundStatus()), WmsAllocateTask::getInboundStatus, bo.getInboundStatus())
|
||||
.eq(bo.getActualInboundTime() != null, WmsAllocateTask::getActualInboundTime, bo.getActualInboundTime())
|
||||
.eq(bo.getAoDId() != null, WmsAllocateTask::getAoDId, bo.getAoDId())
|
||||
.orderByDesc(WmsAllocateTask::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增调拨打印
|
||||
*
|
||||
* @param bo 调拨打印
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsAllocateTaskBo bo) {
|
||||
WmsAllocateTask add = MapstructUtils.convert(bo, WmsAllocateTask.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setAllocateTaskId(add.getAllocateTaskId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改调拨打印
|
||||
*
|
||||
* @param bo 调拨打印
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsAllocateTaskBo bo) {
|
||||
WmsAllocateTask update = MapstructUtils.convert(bo, WmsAllocateTask.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsAllocateTask 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,7 @@
|
||||
<?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.WmsAllocateTaskMapper">
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue