From 653c206cb4af83dd1841973f69197a4d0632ac02 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Fri, 9 Sep 2022 13:49:25 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/mipsdl/admin/client/http/TestClient.java |  9 ++++++---
 .../com/glxp/mipsdl/admin/util/SubmitOrderUtils.java  | 11 +++--------
 .../resources/mybatis/mapper/test/TestBusTypeDao.xml  |  3 +++
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java
index 8e1348a..51508a6 100644
--- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java
+++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java
@@ -84,7 +84,7 @@ public class TestClient {
         FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
 
         BeanUtils.copyProperties(udiwmsUnitRequest, filterThrCorpRequest);
-        filterThrCorpRequest.setThirdSysFk(udiwmsUnitRequest.getThirdSys());
+        filterThrCorpRequest.setThirdSysFk(thirdId);
         List<ThrCorpEntity> thrCorpEntities = testCorpDao.filterThrCorps(filterThrCorpRequest);
 
         List<UdiwmsUnitResponse> udiwmsUnitResponses = new ArrayList<>();
@@ -120,6 +120,7 @@ public class TestClient {
 
         FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
         BeanUtils.copyProperties(udiwmsProductRequest, filterThrProductsRequest);
+        filterThrProductsRequest.setThirdSysFk(thirdId);
         List<ThrProductsEntity> thrProductsEntities = testProductDao.filterThrProductsRequest(filterThrProductsRequest);
 
         List<UdiwmsProductInfoResponse> udiwmsProductInfoResponses = new ArrayList<>();
@@ -193,6 +194,7 @@ public class TestClient {
 
         BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest();
         BeanUtils.copyProperties(udiwmsBusTypeRequest, bussinessOriginTypeFilterRequest);
+        bussinessOriginTypeFilterRequest.setThirdSys(thirdId);
         List<BussinessOriginTypeEntity> bussinessOriginTypeEntities = testBusTypeDao.filterList(bussinessOriginTypeFilterRequest);
 
         List<UdiwmsBusTypeResponse> udiwmsBusTypeResponses = new ArrayList<>();
@@ -200,6 +202,7 @@ public class TestClient {
             for (BussinessOriginTypeEntity bussinessOriginTypeEntity : bussinessOriginTypeEntities) {
                 UdiwmsBusTypeResponse udiwmsBusTypeResponse = new UdiwmsBusTypeResponse();
                 BeanUtils.copyProperties(bussinessOriginTypeEntity, udiwmsBusTypeResponse);
+                udiwmsBusTypeResponse.setCode(bussinessOriginTypeEntity.getAction());
                 udiwmsBusTypeResponses.add(udiwmsBusTypeResponse);
             }
         }
@@ -310,8 +313,8 @@ public class TestClient {
         uploadLog.setBillNo(orderRequest.getBillNo());
         uploadLog.setFromType(ConstantStatus.THIRD_ORDER_UPLOAD);
         String data = JSONUtil.toJsonStr(orderRequest);
-        FileUtils.saveFileAs(data, thirdId + "_" + stockOrderEntity.getBillNo());
-        String response = "上传成功！";
+        FileUtils.saveFileAs(data, "E:\\单据上传目录\\" + thirdId + "_" + stockOrderEntity.getBillNo() + ".json");
+        String response = JSONUtil.toJsonStr(ResultVOUtils.success("上传成功!"));
         if (StrUtil.isNotBlank(response)) {
             try {
                 BaseResponse baseResponse =
diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/SubmitOrderUtils.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/SubmitOrderUtils.java
index 3b3c6e0..1dba057 100644
--- a/api-sync/src/main/java/com/glxp/mipsdl/admin/util/SubmitOrderUtils.java
+++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/util/SubmitOrderUtils.java
@@ -84,14 +84,9 @@ public class SubmitOrderUtils {
     //转换第三方仓库信息
     public ThrInvWarehouseEntity toInv(String invCode, String thirdId) {
         InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(invCode);
-        try {
-            String thrInvCode = (String) ReflectUtil.getFieldValue(invWarehouseEntity, invWarehouseEntity.getClass().getField(thirdId));
-            ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(thrInvCode, thirdId);
-            return thrInvWarehouseEntity;
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-        return null;
+        String thrInvCode = (String) ReflectUtil.getFieldValue(invWarehouseEntity, thirdId);
+        ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(thrInvCode, thirdId);
+        return thrInvWarehouseEntity;
     }
 
     //转换第三方分库信息
diff --git a/api-sync/src/main/resources/mybatis/mapper/test/TestBusTypeDao.xml b/api-sync/src/main/resources/mybatis/mapper/test/TestBusTypeDao.xml
index f1e87da..25a82d6 100644
--- a/api-sync/src/main/resources/mybatis/mapper/test/TestBusTypeDao.xml
+++ b/api-sync/src/main/resources/mybatis/mapper/test/TestBusTypeDao.xml
@@ -13,6 +13,9 @@
             <if test="action != ''and action != null">
                 AND action LIKE concat(#{action},'%')
             </if>
+            <if test="thirdSys != ''and thirdSys != null">
+                AND thirdSys =#{thirdSys}
+            </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
                 <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>