From 852b0843b6771211c4c214658f2f3bc7ae95bb66 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 6 Dec 2022 15:35:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=88=B0=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0=E6=9C=AA?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/admin/controller/inout/OrderController.java  | 4 ++--
 .../main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

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<WarehouseEntity> warehouseEntities = codesService.findByOrderId(warehouseQueryRequest);
             List<PostUdimsOrderRequest.OrderBean.CodeBean> codeBeans = new ArrayList<>();
             warehouseEntities.forEach(data -> {
@@ -854,7 +854,7 @@ public class OrderController {
             FilterOrderDetailRequest filterOrderDetailRequest = new FilterOrderDetailRequest();
             filterOrderDetailRequest.setOrderId(orderBean.getOrderId());
             //查询业务单据详情
-            List<StockOrderDetailEntity> orderDetailList = stockOrderDetailService.findByScanOrderId(orderBean.getOrderId());
+            List<StockOrderDetailEntity> orderDetailList = stockOrderDetailService.findByOrderIdFk(stockOrder.getId());
             if (CollUtil.isNotEmpty(orderDetailList)) {
                 List<PostUdimsOrderDetailRequest> 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})
         </foreach>
     </insert>
+
+    <select id="selectUuidById" resultType="java.lang.String">
+        select uuid from basic_udirel where id = #{relId}
+    </select>
 </mapper>
\ No newline at end of file