feat(aps): 添加排产文件字段支持
- 在 ApsPlanSheet 实体类中新增 apsUrl 字段用于存储排产文件路径 - 在 ApsPlanSheetBo 业务对象中添加 apsUrl 属性定义 - 更新 MyBatis 映射文件 ApsPlanSheetMapper.xml 添加字段映射 - 在 ApsPlanSheetVo 视图对象中增加 apsUrl 字段并配置 Excel 导出 - 为 deliveryWaybillDetail 查询添加按创建时间倒序排序功能
This commit is contained in:
@@ -52,6 +52,11 @@ public class ApsPlanSheetBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String planType;
|
private String planType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 排产文件
|
||||||
|
*/
|
||||||
|
private String apsUrl;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 排产人
|
* 排产人
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -49,6 +49,10 @@ public class ApsPlanSheet extends BaseEntity {
|
|||||||
* 排产类型
|
* 排产类型
|
||||||
*/
|
*/
|
||||||
private String planType;
|
private String planType;
|
||||||
|
/**
|
||||||
|
* 排产文件
|
||||||
|
*/
|
||||||
|
private String apsUrl;
|
||||||
/**
|
/**
|
||||||
* 排产人
|
* 排产人
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -60,6 +60,12 @@ public class ApsPlanSheetVo {
|
|||||||
@ExcelProperty(value = "排产类型")
|
@ExcelProperty(value = "排产类型")
|
||||||
private String planType;
|
private String planType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 排产文件
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "排产文件")
|
||||||
|
private String apsUrl;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 排产人
|
* 排产人
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
<result property="lineName" column="line_name"/>
|
<result property="lineName" column="line_name"/>
|
||||||
<result property="planCode" column="plan_code"/>
|
<result property="planCode" column="plan_code"/>
|
||||||
<result property="planType" column="plan_type"/>
|
<result property="planType" column="plan_type"/>
|
||||||
|
<result property="apsUrl" column="aps_url"/>
|
||||||
<result property="scheduler" column="scheduler"/>
|
<result property="scheduler" column="scheduler"/>
|
||||||
<result property="remark" column="remark"/>
|
<result property="remark" column="remark"/>
|
||||||
<result property="delFlag" column="del_flag"/>
|
<result property="delFlag" column="del_flag"/>
|
||||||
@@ -27,6 +28,7 @@
|
|||||||
s.line_name AS lineName,
|
s.line_name AS lineName,
|
||||||
s.plan_code AS planCode,
|
s.plan_code AS planCode,
|
||||||
s.plan_type AS planType,
|
s.plan_type AS planType,
|
||||||
|
s.aps_url AS apsUrl,
|
||||||
s.scheduler AS scheduler,
|
s.scheduler AS scheduler,
|
||||||
s.remark AS masterRemark,
|
s.remark AS masterRemark,
|
||||||
d.remark AS detailRemark,
|
d.remark AS detailRemark,
|
||||||
|
|||||||
@@ -184,6 +184,8 @@ public class WmsDeliveryWaybillDetailServiceImpl implements IWmsDeliveryWaybillD
|
|||||||
lqw.eq(bo.getQuantity() != null, WmsDeliveryWaybillDetail::getQuantity, bo.getQuantity());
|
lqw.eq(bo.getQuantity() != null, WmsDeliveryWaybillDetail::getQuantity, bo.getQuantity());
|
||||||
lqw.eq(bo.getWeight() != null, WmsDeliveryWaybillDetail::getWeight, bo.getWeight());
|
lqw.eq(bo.getWeight() != null, WmsDeliveryWaybillDetail::getWeight, bo.getWeight());
|
||||||
lqw.eq(bo.getUnitPrice() != null, WmsDeliveryWaybillDetail::getUnitPrice, bo.getUnitPrice());
|
lqw.eq(bo.getUnitPrice() != null, WmsDeliveryWaybillDetail::getUnitPrice, bo.getUnitPrice());
|
||||||
|
// 根据创建时间倒叙
|
||||||
|
lqw.orderByDesc(WmsDeliveryWaybillDetail::getCreateTime);
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user