diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index b2733f5a..a10dff63 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -840,7 +840,7 @@ public class OrderController { orderBean.setInvWarehouseCode(unitMaintainPlatform.getInvSubCode()); orderBean.setCorpOrderId(stockOrder.getBillNo()); WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); - warehouseQueryRequest.setOrderId(stockOrder.getBillNo()); + warehouseQueryRequest.setOrderId(stockOrder.getOrderIdFk()); List warehouseEntities = codesService.findByOrderId(warehouseQueryRequest); List codeBeans = new ArrayList<>(); warehouseEntities.forEach(data -> { @@ -854,7 +854,7 @@ public class OrderController { FilterOrderDetailRequest filterOrderDetailRequest = new FilterOrderDetailRequest(); filterOrderDetailRequest.setOrderId(orderBean.getOrderId()); //查询业务单据详情 - List orderDetailList = stockOrderDetailService.findByScanOrderId(orderBean.getOrderId()); + List orderDetailList = stockOrderDetailService.findByOrderIdFk(stockOrder.getId()); if (CollUtil.isNotEmpty(orderDetailList)) { List orderDetails = new ArrayList<>(); for (StockOrderDetailEntity stockOrderDetailEntity : orderDetailList) { diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 3ba24422..87047f3c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -778,4 +778,8 @@ #{item.udplatCode}, #{item.supName}, #{item.price}, #{modifyTime}) + + \ No newline at end of file