From 19f859747388bd18cd811aeb7e647f019b73a022 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 13 Nov 2024 18:18:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=88=A0=E9=99=A4=E5=8C=85=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E7=9A=84=E7=8A=B6=E6=80=81=202.=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=8E=92=E5=BA=8F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/basicdata/mapper/BasicdataTrayMapper.xml   |  3 ++-
 .../wrapper/WarehouseParcelListWrapper.java          | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
index dfc066552..5a262afae 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
@@ -118,7 +118,6 @@
         lwtg.create_time operateTime,
         lwtg.create_user operateUser,
         lwtg.is_fleeing isFleeing
-
         FROM
         logpm_warehouse_tray_goods lwtg
         JOIN logpm_distribution_parcel_list ldpl ON lwtg.association_id = ldpl.id
@@ -171,6 +170,7 @@
                 and ldpl.brand_name   like concat('%',#{param.brandName},'%')
             </if>
         </where>
+        order by lwtg.create_time desc
     </select>
     <select id="selectInventoryList" resultType="com.logpm.basicdata.vo.WarehouseStockListVO">
         SELECT
@@ -320,6 +320,7 @@
                         and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')
                     </if>
                  </where>
+        order by lwtgl.create_time desc
     </select>
     <select id="selectinventoryListhistory" resultType="com.logpm.basicdata.vo.WarehouseStockListVO">
         SELECT
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/WarehouseParcelListWrapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/WarehouseParcelListWrapper.java
index b8fe33033..f6527e2f3 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/WarehouseParcelListWrapper.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/WarehouseParcelListWrapper.java
@@ -40,12 +40,12 @@ public class WarehouseParcelListWrapper extends BaseEntityWrapper<WarehouseParce
 	public WarehouseParcelListVO entityVO(WarehouseParcelListVO warehouseParcelListVO) {
 		if (null != warehouseParcelListVO.getOperateUser()){
 		warehouseParcelListVO.setOperateUserName(userClient.userInfoById(warehouseParcelListVO.getOperateUser()).getData().getName());}
-		warehouseParcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, warehouseParcelListVO.getOrderPackageStatus()));
-		warehouseParcelListVO.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, warehouseParcelListVO.getOrderPackageFreezeStatus()));
-		warehouseParcelListVO.setOrderPackageGroundingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, warehouseParcelListVO.getOrderPackageGroundingStatus()));
-		warehouseParcelListVO.setOrderPackageStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, warehouseParcelListVO.getOrderPackageStockupStatus()));
-		warehouseParcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_RESERVATION_STATUS, warehouseParcelListVO.getOrderPackageReservationStatus()));
-		warehouseParcelListVO.setOrderPackageLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, warehouseParcelListVO.getOrderPackageLoadingStatus()));
+//		warehouseParcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, warehouseParcelListVO.getOrderPackageStatus()));
+//		warehouseParcelListVO.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, warehouseParcelListVO.getOrderPackageFreezeStatus()));
+//		warehouseParcelListVO.setOrderPackageGroundingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, warehouseParcelListVO.getOrderPackageGroundingStatus()));
+//		warehouseParcelListVO.setOrderPackageStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, warehouseParcelListVO.getOrderPackageStockupStatus()));
+//		warehouseParcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_RESERVATION_STATUS, warehouseParcelListVO.getOrderPackageReservationStatus()));
+//		warehouseParcelListVO.setOrderPackageLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, warehouseParcelListVO.getOrderPackageLoadingStatus()));
 		return warehouseParcelListVO;
 	}