From b153ee048cf97e18c11c4d40a4a2c83a6006f188 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 25 Oct 2022 09:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B3=E8=A1=A1=E8=A1=A5?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=EF=BC=8C=E5=BE=80=E6=9D=A5=E5=88=86=E5=BA=93?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/inout/impl/OrderServiceImpl.java  |  2 ++
 .../sale/admin/thread/AsyncDiDlHelper.java    | 35 +++++++++++++++++++
 .../mybatis/mapper/inout/OrderDao.xml         |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
index f9b89b2..950c28d 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
@@ -230,6 +230,7 @@ public class OrderServiceImpl implements OrderService {
         return orderDao.findAllByTime(orderFilterRequest);
     }
 
+    //平衡补单
     @Override
     public BaseResponse supplementOrder(String billNo, String orderIdFk) {
         //查询订单数据
@@ -267,6 +268,7 @@ public class OrderServiceImpl implements OrderService {
         supplementOrder.setCorpOrderId(CustomUtil.getId() + "x");
         //修改往来单位及当前库存号
         supplementOrder.setFromCorpId(order.getLocStorageCode());
+        supplementOrder.setFromSubInvCode(order.getInvWarehouseCode());
         supplementOrder.setLocStorageCode(order.getFromCorpId());
         supplementOrder.setInvWarehouseCode(null);
         String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId());
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java
index 9772bf4..660a862 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java
@@ -1,19 +1,25 @@
 package com.glxp.sale.admin.thread;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.glxp.sale.admin.entity.basic.UdiCompanyEntity;
 import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
+import com.glxp.sale.admin.service.receipt.ProductInfoService;
 import com.glxp.sale.admin.util.HttpClient;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @Service
 public class AsyncDiDlHelper {
     @Value("${UDI_SERVER_URL}")
@@ -115,4 +121,33 @@ public class AsyncDiDlHelper {
         }
     }
 
+
+    @Resource
+    ProductInfoService productInfoService;
+
+    @Async
+    public void dlByUuid(String uuid) {
+
+
+        Map<String, Object> paramMap = new HashMap<>(16);
+        paramMap.put("uuid", uuid);
+        String response = HttpClient.mipsGet(udiUrl + "/udidl/device/searchDlByUuid", paramMap);
+        try {
+            BaseResponse<List<ProductInfoEntity>> baseResponse =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
+                    });
+            if (baseResponse != null && baseResponse.getCode() == 20000) {
+                List<ProductInfoEntity> productInfoEntityList = baseResponse.getData();
+                if (CollUtil.isNotEmpty(productInfoEntityList)) {
+                    productInfoService.insertProductInfos(productInfoEntityList);
+                }
+
+            } else {
+                log.error("下载出错");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
index 14ded8d..63be393 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
@@ -310,7 +310,7 @@
         inv_warehouse_sub.name as subInvName
         FROM io_order
         LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
-        LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.code = io_order.invWarehouseCode
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">