Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

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;
+
     /**
      * 排产人
      */

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;
     /**
      * 排产人
      */

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;
+
     /**
      * 排产人
      */

klp-aps/src/main/resources/mapper/aps/ApsPlanSheetMapper.xml

@@ -11,6 +11,7 @@
         <result property="lineName" column="line_name"/>
         <result property="planCode" column="plan_code"/>
         <result property="planType" column="plan_type"/>
+        <result property="apsUrl" column="aps_url"/>
         <result property="scheduler" column="scheduler"/>
         <result property="remark" column="remark"/>
         <result property="delFlag" column="del_flag"/>
@@ -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,

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;
     }
     /**