feat(wms): 生产任务列表增加联查功能
- 在 WmsProductionTaskMapper 中添加 selectVoPagePlus 方法,实现联查查询 - 更新 WmsProductionTaskBo 和 WmsProductionTaskVo,增加联查相关字段 - 修改 WmsProductionTaskServiceImpl 中的 queryPageList 方法,使用新的联查查询 - 更新 WmsStockMapper.xml 中的查询语句,优化库存查询
This commit is contained in:
@@ -35,12 +35,12 @@ public class WmsProductionTaskBo extends BaseEntity {
|
||||
/**
|
||||
* 订单ID
|
||||
*/
|
||||
private Long orderId;
|
||||
private Long orderId; //联查订单号
|
||||
|
||||
/**
|
||||
* 订单明细ID
|
||||
*/
|
||||
private Long orderItemId;
|
||||
private Long orderItemId; //产品联查
|
||||
|
||||
/**
|
||||
* 计划名称
|
||||
|
||||
@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import com.klp.domain.vo.WmsManufacturingSpecVo;
|
||||
import com.klp.domain.vo.WmsProductSpecGroupVo;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -74,5 +76,29 @@ public class WmsProductionTaskVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
// 联查字段
|
||||
/**
|
||||
* 订单编号
|
||||
*/
|
||||
@ExcelProperty(value = "订单编号")
|
||||
private String orderCode;
|
||||
|
||||
/**
|
||||
* 产品ID
|
||||
*/
|
||||
@ExcelProperty(value = "产品ID")
|
||||
private Long productId;
|
||||
|
||||
/**
|
||||
* 制造规范完整对象
|
||||
*/
|
||||
@ExcelProperty(value = "制造规范")
|
||||
private WmsManufacturingSpecVo manufacturingSpec;
|
||||
|
||||
/**
|
||||
* 产品规范组完整对象
|
||||
*/
|
||||
@ExcelProperty(value = "产品规范组")
|
||||
private WmsProductSpecGroupVo productSpecGroup;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user