订单选择增加时间排序、计划取消修改包件状态

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -676,6 +676,8 @@
                 and ldsa.customer_address  like concat('%',#{par.customerAddress},'%')
             </if>
         </where>
+        ORDER BY
+        ldsa.warehouse_entry_time DESC
     </select>
     <select id="selectListGrounding" resultType="com.logpm.distribution.vo.DistributionStockArticleGroundingVO">
         select ldsa.grounding_status groundingStatus,lwtg.association_type associationType,lwtg.tray_id trayId,lwtg.tray_code trayCode,ldsa.id stockArticleId

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java

@@ -37,6 +37,7 @@ import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
+import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.reservation.ReservationPackageStatusConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -182,6 +183,7 @@ public class DistributionReservationPackageServiceImpl extends BaseServiceImpl<D
 		//取消配送  该包件进入可配送状态
 		DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
 		parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
+		parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
 		parcelListEntity.setId(packageId);
 		parcelListService.updateById(parcelListEntity);
 		//此包件对应的订单预约数量维护