查询锁定订单

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -671,6 +671,14 @@ public class OrderController extends BladeController {
 	public R<IPage<OrderVO>> ListMessage(Query query,@RequestParam("itemId") Long itemId,
 									   @RequestParam("corpId") Long corpId) {
 		IPage<OrderVO> pages = orderService.orderInventory(Condition.getPage(query),SecureUtil.getTenantId(),OrderTypeEnum.DOMESTIC.getType(),OrderTypeEnum.SALES.getType(),itemId,corpId);
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+				if (corpMessage.isSuccess() && corpMessage.getData() != null){
+					item.setCorpsName(corpMessage.getData().getCname());
+				}
+			});
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -442,9 +442,11 @@
     </select>
     <select id="orderInventory"  resultType="org.springblade.purchase.sales.vo.OrderVO">
         SELECT
+        DISTINCT
 	bo.id,
 	bo.order_no,
-	bo.busines_date
+	bo.busines_date,
+	bo.corp_id
 FROM
 	business_order bo
 	LEFT JOIN business_order_items item ON bo.id = item.pid
@@ -457,7 +459,7 @@ WHERE
 	AND bo.trade_type = #{tradeType}
 	AND bo.bill_type = #{billType}
 	AND item.item_id = #{itemId}
-	AND item.corp_id = #{corpId}
+	AND bo.corp_id = #{corpId}
     </select>
 
 </mapper>