Browse Source

fix:

1.删除包件上的状态
2.增加作业的排序时间
master
pref_mail@163.com 3 months ago
parent
commit
19f8597473
  1. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
  2. 12
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/WarehouseParcelListWrapper.java

3
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

12
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;
}

Loading…
Cancel
Save