Browse Source

订单详情,出库记录倒序

liyuan 1 week ago
parent
commit
38b4162631

+ 4 - 2
blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/order/service/impl/OrderServiceImpl.java

@@ -101,7 +101,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		LambdaQueryWrapper<PjShip> shipLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		shipLambdaQueryWrapper.eq(PjShip::getTenantId, AuthUtil.getTenantId())
 			.eq(PjShip::getIsDeleted, 0)
-			.eq(PjShip::getOrdId, detail.getId());
+			.eq(PjShip::getOrdId, detail.getId())
+			.orderByDesc(PjShip::getBusinesDate);
 		List<PjShip> pjShipList = shipMapper.selectList(shipLambdaQueryWrapper);
 		for (PjShip item : pjShipList) {
 			if ("SHGD".equals(item.getBizTypeName())) {
@@ -123,7 +124,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		List<ShipItemsRecord> shipItemsRecordList = shipItemsRecordService.list(new LambdaQueryWrapper<ShipItemsRecord>()
 			.eq(ShipItemsRecord::getTenantId, AuthUtil.getTenantId())
 			.eq(ShipItemsRecord::getIsDeleted, 0)
-			.eq(ShipItemsRecord::getSrcId, detail.getId()));
+			.eq(ShipItemsRecord::getSrcId, detail.getId())
+			.orderByDesc(ShipItemsRecord::getCreateTime));
 		vo.setShipItemsRecordList(shipItemsRecordList.isEmpty() ? new ArrayList<>() : shipItemsRecordList);
 		return vo;
 	}