wms新增盘点及盘点明细模块
maxw@mesnac.com
6 months ago
parent
6b7f7c443f
commit
680bb712bb
@ -0,0 +1,106 @@
|
||||
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.dromara.wms.domain.bo.WmsAllocateOrderBo;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateOrderVo;
|
||||
import org.dromara.wms.service.IWmsAllocateOrderService;
|
||||
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.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 调拨工单
|
||||
* 前端访问路由地址为:/system/allocateOrder
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/allocateOrder")
|
||||
public class WmsAllocateOrderController extends BaseController {
|
||||
|
||||
private final IWmsAllocateOrderService wmsAllocateOrderService;
|
||||
|
||||
/**
|
||||
* 查询调拨工单列表
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrder:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsAllocateOrderVo> list(WmsAllocateOrderBo bo, PageQuery pageQuery) {
|
||||
return wmsAllocateOrderService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出调拨工单列表
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrder:export")
|
||||
@Log(title = "调拨工单", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsAllocateOrderBo bo, HttpServletResponse response) {
|
||||
List<WmsAllocateOrderVo> list = wmsAllocateOrderService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "调拨工单", WmsAllocateOrderVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取调拨工单详细信息
|
||||
*
|
||||
* @param aoId 主键
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrder:query")
|
||||
@GetMapping("/{aoId}")
|
||||
public R<WmsAllocateOrderVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long aoId) {
|
||||
return R.ok(wmsAllocateOrderService.queryById(aoId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增调拨工单
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrder:add")
|
||||
@Log(title = "调拨工单", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsAllocateOrderBo bo) {
|
||||
return toAjax(wmsAllocateOrderService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改调拨工单
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrder:edit")
|
||||
@Log(title = "调拨工单", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsAllocateOrderBo bo) {
|
||||
return toAjax(wmsAllocateOrderService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除调拨工单
|
||||
*
|
||||
* @param aoIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrder:remove")
|
||||
@Log(title = "调拨工单", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{aoIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] aoIds) {
|
||||
return toAjax(wmsAllocateOrderService.deleteWithValidByIds(List.of(aoIds), true));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,111 @@
|
||||
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.dromara.wms.domain.bo.WmsAllocateOrderDetailBo;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateOrderDetailVo;
|
||||
import org.dromara.wms.service.IWmsAllocateOrderDetailService;
|
||||
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.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 调拨子
|
||||
* 前端访问路由地址为:/system/allocateOrderDetail
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/allocateOrderDetail")
|
||||
public class WmsAllocateOrderDetailController extends BaseController {
|
||||
|
||||
private final IWmsAllocateOrderDetailService wmsAllocateOrderDetailService;
|
||||
|
||||
/**
|
||||
* 查询调拨子列表
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrderDetail:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsAllocateOrderDetailVo> list(WmsAllocateOrderDetailBo bo, PageQuery pageQuery) {
|
||||
return wmsAllocateOrderDetailService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出调拨子列表
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrderDetail:export")
|
||||
@Log(title = "调拨子", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsAllocateOrderDetailBo bo, HttpServletResponse response) {
|
||||
List<WmsAllocateOrderDetailVo> list = wmsAllocateOrderDetailService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "调拨子", WmsAllocateOrderDetailVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取调拨子详细信息
|
||||
*
|
||||
* @param aoDId 主键
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrderDetail:query")
|
||||
@GetMapping("/{aoDId}")
|
||||
public R<WmsAllocateOrderDetailVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long aoDId) {
|
||||
return R.ok(wmsAllocateOrderDetailService.queryById(aoDId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增调拨子
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrderDetail:add")
|
||||
@Log(title = "调拨子", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsAllocateOrderDetailBo bo) {
|
||||
return toAjax(wmsAllocateOrderDetailService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改调拨子
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrderDetail:edit")
|
||||
@Log(title = "调拨子", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsAllocateOrderDetailBo bo) {
|
||||
return toAjax(wmsAllocateOrderDetailService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除调拨子
|
||||
*
|
||||
* @param aoDIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("system:allocateOrderDetail:remove")
|
||||
@Log(title = "调拨子", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{aoDIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] aoDIds) {
|
||||
return toAjax(wmsAllocateOrderDetailService.deleteWithValidByIds(List.of(aoDIds), true));
|
||||
}
|
||||
|
||||
@GetMapping("selectAllocateDetails")
|
||||
public R<List<WmsAllocateOrderDetailVo>> selectAllocateDetails(Long aoDId){
|
||||
return R.ok(wmsAllocateOrderDetailService.selectAllocateDetails());
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,130 @@
|
||||
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_order
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
@Data
|
||||
@TableName("wms_allocate_order")
|
||||
public class WmsAllocateOrder{
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 表主键
|
||||
*/
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long aoId;
|
||||
|
||||
/**
|
||||
* 调拨单号
|
||||
*/
|
||||
private String allocateOrderCode;
|
||||
|
||||
/**
|
||||
* 物料大类
|
||||
*/
|
||||
private String materialCategories;
|
||||
|
||||
/**
|
||||
* 出库仓库ID
|
||||
*/
|
||||
private Long planWarehouseId;
|
||||
|
||||
/**
|
||||
* 工单状态
|
||||
*/
|
||||
private String orderStatus;
|
||||
|
||||
/**
|
||||
* 入库仓库ID
|
||||
*/
|
||||
private Long targetWarehouseId;
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
private String auditBy;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 审核状态(0待审核,1审核通过,2审核未通过)
|
||||
*/
|
||||
private String auditStatus;
|
||||
|
||||
/**
|
||||
* 审核意见
|
||||
*/
|
||||
private String auditComments;
|
||||
|
||||
/**
|
||||
* 是否创建出库单
|
||||
*/
|
||||
private String createOut;
|
||||
|
||||
/**
|
||||
* 出库单号
|
||||
*/
|
||||
private String outCode;
|
||||
|
||||
/**
|
||||
* 是否创建入库单
|
||||
*/
|
||||
private String createIn;
|
||||
|
||||
/**
|
||||
* 入库单号
|
||||
*/
|
||||
private String inCode;
|
||||
|
||||
/**
|
||||
* 入库方式
|
||||
*/
|
||||
private String inMethod;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
private String tenantId;
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private Date updateTime;
|
||||
@TableField(exist = false)
|
||||
private String planWarehouseCode;
|
||||
@TableField(exist = false)
|
||||
private String targetWarehouseCode;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
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;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 调拨子对象 wms_allocate_order_detail
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
@Data
|
||||
@TableName("wms_allocate_order_detail")
|
||||
public class WmsAllocateOrderDetail {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 调拨子表主键
|
||||
*/
|
||||
private Long aoDId;
|
||||
|
||||
/**
|
||||
* 调拨单号
|
||||
*/
|
||||
private String allocateCode;
|
||||
|
||||
/**
|
||||
* 物料id
|
||||
*/
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 调拨数量
|
||||
*/
|
||||
private Long allocateOrderQty;
|
||||
|
||||
/**
|
||||
* erp同步状态
|
||||
*/
|
||||
private String erpSynchronousStatus;
|
||||
|
||||
/**
|
||||
* erp同步数量
|
||||
*/
|
||||
private Long erpSynchronousQty;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
private String tenantId;
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private Date updateTime;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,119 @@
|
||||
package org.dromara.wms.domain.bo;
|
||||
|
||||
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;
|
||||
import org.dromara.wms.domain.WmsAllocateOrder;
|
||||
|
||||
/**
|
||||
* 调拨工单业务对象 wms_allocate_order
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = WmsAllocateOrder.class, reverseConvertGenerate = false)
|
||||
public class WmsAllocateOrderBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 表主键
|
||||
*/
|
||||
// @NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long aoId;
|
||||
|
||||
/**
|
||||
* 调拨单号
|
||||
*/
|
||||
// @NotBlank(message = "调拨单号不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String allocateOrderCode;
|
||||
|
||||
/**
|
||||
* 物料大类
|
||||
*/
|
||||
// @NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String materialCategories;
|
||||
|
||||
/**
|
||||
* 出库仓库ID
|
||||
*/
|
||||
// @NotNull(message = "出库仓库ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long planWarehouseId;
|
||||
|
||||
/**
|
||||
* 工单状态
|
||||
*/
|
||||
// @NotBlank(message = "工单状态不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String orderStatus;
|
||||
|
||||
/**
|
||||
* 入库仓库ID
|
||||
*/
|
||||
// @NotNull(message = "入库仓库ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long targetWarehouseId;
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
// @NotBlank(message = "审核人不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String auditBy;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
// @NotNull(message = "审核时间不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 审核状态(0待审核,1审核通过,2审核未通过)
|
||||
*/
|
||||
// @NotBlank(message = "审核状态(0待审核,1审核通过,2审核未通过)不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String auditStatus;
|
||||
|
||||
/**
|
||||
* 审核意见
|
||||
*/
|
||||
// @NotBlank(message = "审核意见不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String auditComments;
|
||||
|
||||
/**
|
||||
* 是否创建出库单
|
||||
*/
|
||||
@NotBlank(message = "是否创建出库单不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String createOut;
|
||||
|
||||
/**
|
||||
* 出库单号
|
||||
*/
|
||||
// @NotBlank(message = "出库单号不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String outCode;
|
||||
|
||||
/**
|
||||
* 是否创建入库单
|
||||
*/
|
||||
// @NotBlank(message = "是否创建入库单不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String createIn;
|
||||
|
||||
/**
|
||||
* 入库单号
|
||||
*/
|
||||
// @NotBlank(message = "入库单号不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String inCode;
|
||||
|
||||
/**
|
||||
* 入库方式
|
||||
*/
|
||||
// @NotBlank(message = "入库方式不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String inMethod;
|
||||
private String tenantId;
|
||||
private String planWarehouseCode;
|
||||
private String targetWarehouseCode;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package org.dromara.wms.domain.bo;
|
||||
|
||||
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.WmsAllocateOrderDetail;
|
||||
|
||||
/**
|
||||
* 调拨子业务对象 wms_allocate_order_detail
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = WmsAllocateOrderDetail.class, reverseConvertGenerate = false)
|
||||
public class WmsAllocateOrderDetailBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 调拨子表主键
|
||||
*/
|
||||
// @NotNull(message = "调拨子表主键不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long aoDId;
|
||||
|
||||
/**
|
||||
* 调拨单号
|
||||
*/
|
||||
// @NotBlank(message = "调拨单号不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String allocateCode;
|
||||
|
||||
/**
|
||||
* 物料id
|
||||
*/
|
||||
// @NotNull(message = "物料id不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 调拨数量
|
||||
*/
|
||||
// @NotNull(message = "调拨数量不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long allocateOrderQty;
|
||||
|
||||
/**
|
||||
* erp同步状态
|
||||
*/
|
||||
// @NotBlank(message = "erp同步状态不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String erpSynchronousStatus;
|
||||
|
||||
/**
|
||||
* erp同步数量
|
||||
*/
|
||||
// @NotNull(message = "erp同步数量不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long erpSynchronousQty;
|
||||
private String tenantId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
package org.dromara.wms.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import org.dromara.wms.domain.WmsAllocateOrderDetail;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 调拨子视图对象 wms_allocate_order_detail
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = WmsAllocateOrderDetail.class)
|
||||
public class WmsAllocateOrderDetailVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 调拨子表主键
|
||||
*/
|
||||
@ExcelProperty(value = "调拨子表主键")
|
||||
private Long aoDId;
|
||||
|
||||
/**
|
||||
* 调拨单号
|
||||
*/
|
||||
@ExcelProperty(value = "调拨单号")
|
||||
private String allocateCode;
|
||||
|
||||
/**
|
||||
* 物料id
|
||||
*/
|
||||
@ExcelProperty(value = "物料id")
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 调拨数量
|
||||
*/
|
||||
@ExcelProperty(value = "调拨数量")
|
||||
private Long allocateOrderQty;
|
||||
|
||||
/**
|
||||
* erp同步状态
|
||||
*/
|
||||
@ExcelProperty(value = "erp同步状态")
|
||||
private String erpSynchronousStatus;
|
||||
|
||||
/**
|
||||
* erp同步数量
|
||||
*/
|
||||
@ExcelProperty(value = "erp同步数量")
|
||||
private Long erpSynchronousQty;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
private String tenantId;
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private Date updateTime;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,153 @@
|
||||
package org.dromara.wms.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
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 org.dromara.wms.domain.WmsAllocateOrder;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 调拨工单视图对象 wms_allocate_order
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = WmsAllocateOrder.class)
|
||||
public class WmsAllocateOrderVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 表主键
|
||||
*/
|
||||
@ExcelProperty(value = "表主键")
|
||||
private Long aoId;
|
||||
|
||||
/**
|
||||
* 调拨单号
|
||||
*/
|
||||
@ExcelProperty(value = "调拨单号")
|
||||
private String allocateOrderCode;
|
||||
|
||||
/**
|
||||
* 物料大类
|
||||
*/
|
||||
@ExcelProperty(value = "物料大类")
|
||||
private String materialCategories;
|
||||
|
||||
/**
|
||||
* 出库仓库ID
|
||||
*/
|
||||
@ExcelProperty(value = "出库仓库ID")
|
||||
private Long planWarehouseId;
|
||||
|
||||
/**
|
||||
* 工单状态
|
||||
*/
|
||||
@ExcelProperty(value = "工单状态")
|
||||
private String orderStatus;
|
||||
|
||||
/**
|
||||
* 入库仓库ID
|
||||
*/
|
||||
@ExcelProperty(value = "入库仓库ID")
|
||||
private Long targetWarehouseId;
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
@ExcelProperty(value = "审核人")
|
||||
private String auditBy;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
@ExcelProperty(value = "审核时间")
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 审核状态(0待审核,1审核通过,2审核未通过)
|
||||
*/
|
||||
@ExcelProperty(value = "审核状态(0待审核,1审核通过,2审核未通过)")
|
||||
private String auditStatus;
|
||||
|
||||
/**
|
||||
* 审核意见
|
||||
*/
|
||||
@ExcelProperty(value = "审核意见")
|
||||
private String auditComments;
|
||||
|
||||
/**
|
||||
* 是否创建出库单
|
||||
*/
|
||||
@ExcelProperty(value = "是否创建出库单")
|
||||
private String createOut;
|
||||
|
||||
/**
|
||||
* 出库单号
|
||||
*/
|
||||
@ExcelProperty(value = "出库单号")
|
||||
private String outCode;
|
||||
|
||||
/**
|
||||
* 是否创建入库单
|
||||
*/
|
||||
@ExcelProperty(value = "是否创建入库单")
|
||||
private String createIn;
|
||||
|
||||
/**
|
||||
* 入库单号
|
||||
*/
|
||||
@ExcelProperty(value = "入库单号")
|
||||
private String inCode;
|
||||
|
||||
/**
|
||||
* 入库方式
|
||||
*/
|
||||
@ExcelProperty(value = "入库方式")
|
||||
private String inMethod;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
private String tenantId;
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
private Date updateTime;
|
||||
private String planWarehouseCode;
|
||||
private String targetWarehouseCode;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.wms.mapper;
|
||||
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.dromara.wms.domain.WmsAllocateOrderDetail;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateOrderDetailVo;
|
||||
|
||||
/**
|
||||
* 调拨子Mapper接口
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
public interface WmsAllocateOrderDetailMapper extends BaseMapperPlus<WmsAllocateOrderDetail, WmsAllocateOrderDetailVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.wms.mapper;
|
||||
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.dromara.wms.domain.WmsAllocateOrder;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateOrderVo;
|
||||
|
||||
/**
|
||||
* 调拨工单Mapper接口
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
public interface WmsAllocateOrderMapper extends BaseMapperPlus<WmsAllocateOrder, WmsAllocateOrderVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
package org.dromara.wms.service;
|
||||
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.wms.domain.bo.WmsAllocateOrderDetailBo;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateOrderDetailVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 调拨子Service接口
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
public interface IWmsAllocateOrderDetailService {
|
||||
|
||||
/**
|
||||
* 查询调拨子
|
||||
*
|
||||
* @param aoDId 主键
|
||||
* @return 调拨子
|
||||
*/
|
||||
WmsAllocateOrderDetailVo queryById(Long aoDId);
|
||||
|
||||
/**
|
||||
* 分页查询调拨子列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 调拨子分页列表
|
||||
*/
|
||||
TableDataInfo<WmsAllocateOrderDetailVo> queryPageList(WmsAllocateOrderDetailBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的调拨子列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 调拨子列表
|
||||
*/
|
||||
List<WmsAllocateOrderDetailVo> queryList(WmsAllocateOrderDetailBo bo);
|
||||
|
||||
/**
|
||||
* 新增调拨子
|
||||
*
|
||||
* @param bo 调拨子
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(WmsAllocateOrderDetailBo bo);
|
||||
|
||||
/**
|
||||
* 修改调拨子
|
||||
*
|
||||
* @param bo 调拨子
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(WmsAllocateOrderDetailBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除调拨子信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
List<WmsAllocateOrderDetailVo> selectAllocateDetails();
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package org.dromara.wms.service;
|
||||
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.wms.domain.bo.WmsAllocateOrderBo;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateOrderVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 调拨工单Service接口
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
public interface IWmsAllocateOrderService {
|
||||
|
||||
/**
|
||||
* 查询调拨工单
|
||||
*
|
||||
* @param aoId 主键
|
||||
* @return 调拨工单
|
||||
*/
|
||||
WmsAllocateOrderVo queryById(Long aoId);
|
||||
|
||||
/**
|
||||
* 分页查询调拨工单列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 调拨工单分页列表
|
||||
*/
|
||||
TableDataInfo<WmsAllocateOrderVo> queryPageList(WmsAllocateOrderBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的调拨工单列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 调拨工单列表
|
||||
*/
|
||||
List<WmsAllocateOrderVo> queryList(WmsAllocateOrderBo bo);
|
||||
|
||||
/**
|
||||
* 新增调拨工单
|
||||
*
|
||||
* @param bo 调拨工单
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(WmsAllocateOrderBo bo);
|
||||
|
||||
/**
|
||||
* 修改调拨工单
|
||||
*
|
||||
* @param bo 调拨工单
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(WmsAllocateOrderBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除调拨工单信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,141 @@
|
||||
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.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.wms.domain.WmsAllocateOrderDetail;
|
||||
import org.dromara.wms.domain.bo.WmsAllocateOrderDetailBo;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateOrderDetailVo;
|
||||
import org.dromara.wms.mapper.WmsAllocateOrderDetailMapper;
|
||||
import org.dromara.wms.service.IWmsAllocateOrderDetailService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 调拨子Service业务层处理
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsAllocateOrderDetailServiceImpl implements IWmsAllocateOrderDetailService {
|
||||
|
||||
private final WmsAllocateOrderDetailMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询调拨子
|
||||
*
|
||||
* @param aoDId 主键
|
||||
* @return 调拨子
|
||||
*/
|
||||
@Override
|
||||
public WmsAllocateOrderDetailVo queryById(Long aoDId){
|
||||
return baseMapper.selectVoById(aoDId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询调拨子列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 调拨子分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsAllocateOrderDetailVo> queryPageList(WmsAllocateOrderDetailBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsAllocateOrderDetail> lqw = buildQueryWrapper(bo);
|
||||
lqw.orderByDesc(WmsAllocateOrderDetail::getCreateTime);
|
||||
Page<WmsAllocateOrderDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的调拨子列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 调拨子列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsAllocateOrderDetailVo> queryList(WmsAllocateOrderDetailBo bo) {
|
||||
LambdaQueryWrapper<WmsAllocateOrderDetail> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsAllocateOrderDetail> buildQueryWrapper(WmsAllocateOrderDetailBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsAllocateOrderDetail> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getAoDId() != null, WmsAllocateOrderDetail::getAoDId, bo.getAoDId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAllocateCode()), WmsAllocateOrderDetail::getAllocateCode, bo.getAllocateCode());
|
||||
lqw.eq(bo.getMaterialId() != null, WmsAllocateOrderDetail::getMaterialId, bo.getMaterialId());
|
||||
lqw.eq(bo.getAllocateOrderQty() != null, WmsAllocateOrderDetail::getAllocateOrderQty, bo.getAllocateOrderQty());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getErpSynchronousStatus()), WmsAllocateOrderDetail::getErpSynchronousStatus, bo.getErpSynchronousStatus());
|
||||
lqw.eq(bo.getErpSynchronousQty() != null, WmsAllocateOrderDetail::getErpSynchronousQty, bo.getErpSynchronousQty());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增调拨子
|
||||
*
|
||||
* @param bo 调拨子
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsAllocateOrderDetailBo bo) {
|
||||
WmsAllocateOrderDetail add = MapstructUtils.convert(bo, WmsAllocateOrderDetail.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setAoDId(add.getAoDId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改调拨子
|
||||
*
|
||||
* @param bo 调拨子
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsAllocateOrderDetailBo bo) {
|
||||
WmsAllocateOrderDetail update = MapstructUtils.convert(bo, WmsAllocateOrderDetail.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsAllocateOrderDetail entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除调拨子信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<WmsAllocateOrderDetailVo> selectAllocateDetails() {
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,218 @@
|
||||
package org.dromara.wms.service.impl;
|
||||
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
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.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.wms.domain.BaseMaterialInfo;
|
||||
import org.dromara.wms.domain.WmsAllocateOrder;
|
||||
import org.dromara.wms.domain.WmsBaseWarehouse;
|
||||
import org.dromara.wms.domain.WmsReturnOrder;
|
||||
import org.dromara.wms.domain.bo.WmsAllocateOrderBo;
|
||||
import org.dromara.wms.domain.bo.WmsReturnOrderBo;
|
||||
import org.dromara.wms.domain.vo.WmsAllocateOrderVo;
|
||||
import org.dromara.wms.mapper.WmsAllocateOrderMapper;
|
||||
import org.dromara.wms.mapper.WmsInstockOrderMapper;
|
||||
import org.dromara.wms.service.IWmsAllocateOrderService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
/**
|
||||
* 调拨工单Service业务层处理
|
||||
*
|
||||
* @author LionLi
|
||||
* @date 2025-01-09
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsAllocateOrderServiceImpl implements IWmsAllocateOrderService {
|
||||
|
||||
private final WmsAllocateOrderMapper baseMapper;
|
||||
private static final AtomicInteger sequence = new AtomicInteger(1);
|
||||
public static Integer nextSequence() {
|
||||
return sequence.incrementAndGet();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询调拨工单
|
||||
*
|
||||
* @param aoId 主键
|
||||
* @return 调拨工单
|
||||
*/
|
||||
@Override
|
||||
public WmsAllocateOrderVo queryById(Long aoId){
|
||||
return baseMapper.selectVoById(aoId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询调拨工单列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 调拨工单分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsAllocateOrderVo> queryPageList(WmsAllocateOrderBo bo, PageQuery pageQuery) {
|
||||
// LambdaQueryWrapper<WmsAllocateOrder> lqw = buildQueryWrapper(bo);
|
||||
MPJLambdaWrapper<WmsAllocateOrder> lqw = buildJoinQueryWrapper(bo);
|
||||
lqw.orderByDesc(WmsAllocateOrder::getCreateTime);
|
||||
Page<WmsAllocateOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
private MPJLambdaWrapper<WmsAllocateOrder> buildJoinQueryWrapper(WmsAllocateOrderBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<WmsAllocateOrder> lqw = JoinWrappers.lambda(WmsAllocateOrder.class)
|
||||
.selectAll(WmsAllocateOrder.class)
|
||||
.selectAs("a",WmsBaseWarehouse::getWarehouseCode,WmsAllocateOrderVo::getPlanWarehouseCode)
|
||||
.selectAs("b",WmsBaseWarehouse::getWarehouseCode,WmsAllocateOrderVo::getTargetWarehouseCode)
|
||||
.leftJoin(WmsBaseWarehouse.class,"a",WmsBaseWarehouse::getWarehouseId,WmsAllocateOrder::getPlanWarehouseId)
|
||||
.leftJoin(WmsBaseWarehouse.class,"b",WmsBaseWarehouse::getWarehouseId,WmsAllocateOrder::getTargetWarehouseId);
|
||||
lqw.eq(bo.getAoId() != null, WmsAllocateOrder::getAoId, bo.getAoId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAllocateOrderCode()), WmsAllocateOrder::getAllocateOrderCode, bo.getAllocateOrderCode());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsAllocateOrder::getMaterialCategories, bo.getMaterialCategories());
|
||||
lqw.eq(bo.getPlanWarehouseId() != null, WmsAllocateOrder::getPlanWarehouseId, bo.getPlanWarehouseId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getOrderStatus()), WmsAllocateOrder::getOrderStatus, bo.getOrderStatus());
|
||||
lqw.eq(bo.getTargetWarehouseId() != null, WmsAllocateOrder::getTargetWarehouseId, bo.getTargetWarehouseId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAuditBy()), WmsAllocateOrder::getAuditBy, bo.getAuditBy());
|
||||
lqw.eq(bo.getAuditTime() != null, WmsAllocateOrder::getAuditTime, bo.getAuditTime());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), WmsAllocateOrder::getAuditStatus, bo.getAuditStatus());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAuditComments()), WmsAllocateOrder::getAuditComments, bo.getAuditComments());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCreateOut()), WmsAllocateOrder::getCreateOut, bo.getCreateOut());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getOutCode()), WmsAllocateOrder::getOutCode, bo.getOutCode());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCreateIn()), WmsAllocateOrder::getCreateIn, bo.getCreateIn());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getInCode()), WmsAllocateOrder::getInCode, bo.getInCode());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getInMethod()), WmsAllocateOrder::getInMethod, bo.getInMethod());
|
||||
return lqw;
|
||||
}
|
||||
/**
|
||||
* 查询符合条件的调拨工单列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 调拨工单列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsAllocateOrderVo> queryList(WmsAllocateOrderBo bo) {
|
||||
LambdaQueryWrapper<WmsAllocateOrder> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsAllocateOrder> buildQueryWrapper(WmsAllocateOrderBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsAllocateOrder> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getAoId() != null, WmsAllocateOrder::getAoId, bo.getAoId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAllocateOrderCode()), WmsAllocateOrder::getAllocateOrderCode, bo.getAllocateOrderCode());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsAllocateOrder::getMaterialCategories, bo.getMaterialCategories());
|
||||
lqw.eq(bo.getPlanWarehouseId() != null, WmsAllocateOrder::getPlanWarehouseId, bo.getPlanWarehouseId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getOrderStatus()), WmsAllocateOrder::getOrderStatus, bo.getOrderStatus());
|
||||
lqw.eq(bo.getTargetWarehouseId() != null, WmsAllocateOrder::getTargetWarehouseId, bo.getTargetWarehouseId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAuditBy()), WmsAllocateOrder::getAuditBy, bo.getAuditBy());
|
||||
lqw.eq(bo.getAuditTime() != null, WmsAllocateOrder::getAuditTime, bo.getAuditTime());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), WmsAllocateOrder::getAuditStatus, bo.getAuditStatus());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAuditComments()), WmsAllocateOrder::getAuditComments, bo.getAuditComments());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCreateOut()), WmsAllocateOrder::getCreateOut, bo.getCreateOut());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getOutCode()), WmsAllocateOrder::getOutCode, bo.getOutCode());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCreateIn()), WmsAllocateOrder::getCreateIn, bo.getCreateIn());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getInCode()), WmsAllocateOrder::getInCode, bo.getInCode());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getInMethod()), WmsAllocateOrder::getInMethod, bo.getInMethod());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增调拨工单
|
||||
*
|
||||
* @param bo 调拨工单
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsAllocateOrderBo bo) {
|
||||
Date date = new Date();
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHssmm");
|
||||
String orderDate = format.format(date).substring(2);
|
||||
String allocate = "AL";
|
||||
String allocateIn = "ALIN";
|
||||
String allocateOut = "ALOU";
|
||||
String orderLast = "";
|
||||
Integer value = nextSequence();
|
||||
if (value.toString().length()==4){
|
||||
sequence.set(1);
|
||||
orderLast = generateOrder(sequence.get());
|
||||
}else {
|
||||
orderLast = generateOrder(value);
|
||||
}
|
||||
String allocateInOrder = "";
|
||||
String allocateOutOrder = "";
|
||||
String allocateOrder = allocate + orderDate + orderLast;
|
||||
WmsAllocateOrder add = MapstructUtils.convert(bo, WmsAllocateOrder.class);
|
||||
add.setAllocateOrderCode(allocateOrder);
|
||||
if (bo.getCreateIn().equals("1")){
|
||||
allocateInOrder = allocateIn + orderDate + orderLast;
|
||||
add.setInCode(allocateInOrder);
|
||||
}
|
||||
if (bo.getCreateOut().equals("1")){
|
||||
allocateOutOrder = allocateOut + orderDate + orderLast;
|
||||
add.setOutCode(allocateOutOrder);
|
||||
}
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setAoId(add.getAoId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
public String generateOrder(Integer value){
|
||||
if (value.toString().length()<3){
|
||||
String fixedLengthString = String.format("%03d", value);
|
||||
return fixedLengthString;
|
||||
}else if (value.toString().length()==3){
|
||||
return value.toString();
|
||||
}
|
||||
return value.toString();
|
||||
}
|
||||
/**
|
||||
* 修改调拨工单
|
||||
*
|
||||
* @param bo 调拨工单
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsAllocateOrderBo bo) {
|
||||
WmsAllocateOrder update = MapstructUtils.convert(bo, WmsAllocateOrder.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsAllocateOrder 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.WmsAllocateOrderDetailMapper">
|
||||
|
||||
</mapper>
|
||||
@ -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.WmsAllocateOrderMapper">
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue