diff --git a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java
index 56d83fff..ec784feb 100644
--- a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java
+++ b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanSheetBo.java
@@ -52,6 +52,11 @@ public class ApsPlanSheetBo extends BaseEntity {
*/
private String planType;
+ /**
+ * 排产文件
+ */
+ private String apsUrl;
+
/**
* 排产人
*/
diff --git a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java
index 5824e30c..ea40ba50 100644
--- a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java
+++ b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanSheet.java
@@ -49,6 +49,10 @@ public class ApsPlanSheet extends BaseEntity {
* 排产类型
*/
private String planType;
+ /**
+ * 排产文件
+ */
+ private String apsUrl;
/**
* 排产人
*/
diff --git a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java
index bc762926..65b9f65f 100644
--- a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java
+++ b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanSheetVo.java
@@ -60,6 +60,12 @@ public class ApsPlanSheetVo {
@ExcelProperty(value = "排产类型")
private String planType;
+ /**
+ * 排产文件
+ */
+ @ExcelProperty(value = "排产文件")
+ private String apsUrl;
+
/**
* 排产人
*/
diff --git a/klp-aps/src/main/resources/mapper/aps/ApsPlanSheetMapper.xml b/klp-aps/src/main/resources/mapper/aps/ApsPlanSheetMapper.xml
index b9ee4796..0f32f1ba 100644
--- a/klp-aps/src/main/resources/mapper/aps/ApsPlanSheetMapper.xml
+++ b/klp-aps/src/main/resources/mapper/aps/ApsPlanSheetMapper.xml
@@ -11,6 +11,7 @@
+
@@ -27,6 +28,7 @@
s.line_name AS lineName,
s.plan_code AS planCode,
s.plan_type AS planType,
+ s.aps_url AS apsUrl,
s.scheduler AS scheduler,
s.remark AS masterRemark,
d.remark AS detailRemark,
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java
index 3275b7d9..c28ddcc9 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java
@@ -184,6 +184,8 @@ public class WmsDeliveryWaybillDetailServiceImpl implements IWmsDeliveryWaybillD
lqw.eq(bo.getQuantity() != null, WmsDeliveryWaybillDetail::getQuantity, bo.getQuantity());
lqw.eq(bo.getWeight() != null, WmsDeliveryWaybillDetail::getWeight, bo.getWeight());
lqw.eq(bo.getUnitPrice() != null, WmsDeliveryWaybillDetail::getUnitPrice, bo.getUnitPrice());
+ // 根据创建时间倒叙
+ lqw.orderByDesc(WmsDeliveryWaybillDetail::getCreateTime);
return lqw;
}
/**