bug修改,单据同步过滤自助平台,

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java

@@ -259,7 +259,6 @@ public class StockOrderDetailController {
             companyProductRelevanceRequest.setDiType(1);
             companyProductRelevanceRequest.setCustomerId(getCustomerId());
             List<CompanyProductRelevanceResponse> companyProductRelevanceResponses = new ArrayList<>();
-            if (companyProductRelevanceRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
             FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
             filterUdiInfoRequest.setId(stockSelectDataEntity.getRelId());
             filterUdiInfoRequest.setDiType(1);
@@ -271,8 +270,6 @@ public class StockOrderDetailController {
                 companyProductRelevanceResponse.setPrice(udiRelevanceResponses.get(0).getPrice());
                 companyProductRelevanceResponses.add(companyProductRelevanceResponse);
             }
-            } else
-                companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
             if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) {
                 CompanyProductRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0);
                 StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();

api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java

@@ -44,16 +44,17 @@ public class ErpBasicClient {
         BeanUtils.copyProperties(unitMaintainFilterRequest, udiwmsUnitRequest);
         udiwmsUnitRequest.setUnitId(unitMaintainFilterRequest.getErpId());
         BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys());
+
+        try {
             String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getUnits";
             String response = HttpClient.uCloudPost(url, udiwmsUnitRequest, basicThirdSysEntity);
-        try {
             BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpUnitsResponse>>>() {
                     });
             return udiDlDeviceResponse;
         } catch (Exception e) {
             log.error("获取往来单位异常", e);
-            return ResultVOUtils.error(500, "连接ERP服务出错！");
+            return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");
         }
     }
 
@@ -62,15 +63,16 @@ public class ErpBasicClient {
 
         BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterErpGoodsRequest.getThirdSys());
         String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getProducts";
-        String response = HttpClient.uCloudPost(url, filterErpGoodsRequest, basicThirdSysEntity);
+
         try {
+            String response = HttpClient.uCloudPost(url, filterErpGoodsRequest, basicThirdSysEntity);
             BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpProductsResponse>>>() {
                     });
             return udiDlDeviceResponse;
         } catch (Exception e) {
             log.error("获取产品信息异常", e);
-            return ResultVOUtils.error(500, "连接ERP服务出错！");
+            return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");
         }
     }
 
@@ -82,16 +84,16 @@ public class ErpBasicClient {
         udiwmsBusTypeRequest.setThirdSys(filterBasicThirdSysDetailRequest.getThirdSysFk());
         udiwmsBusTypeRequest.setPage(filterBasicThirdSysDetailRequest.getPage());
         udiwmsBusTypeRequest.setLimit(filterBasicThirdSysDetailRequest.getLimit());
+        try {
             String response = HttpClient.uCloudPost(url, udiwmsBusTypeRequest, basicThirdSysEntity);
             log.info(response);
-        try {
             BaseResponse<PageSimpleResponse<BasicThirdSysBusApiEntity>> udiDlDeviceResponse =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<BasicThirdSysBusApiEntity>>>() {
                     });
             return udiDlDeviceResponse;
         } catch (Exception e) {
             log.error("获取单据类型异常", e);
-            return ResultVOUtils.error(500, "连接ERP服务出错！");
+            return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");
         }
     }
 
@@ -99,9 +101,8 @@ public class ErpBasicClient {
     public BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>> getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
         BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(udiwmsWarehouseRequest.getThirdSys());
         String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getWarehouse";
-        String response = HttpClient.uCloudPost(url, udiwmsWarehouseRequest);
         try {
-
+            String response = HttpClient.uCloudPost(url, udiwmsWarehouseRequest);
             BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>> listBaseResponse =
                     JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>>>() {
                     });
@@ -109,7 +110,7 @@ public class ErpBasicClient {
             return listBaseResponse;
         } catch (Exception e) {
             log.error("获取第三方系统的仓库货位码异常", e);
-            return ResultVOUtils.error(500, "下载失败");
+            return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
         }
     }
 

api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java

@@ -346,7 +346,7 @@ public class DlBasicService {
                                     orderEntity.setFromType(ConstantStatus.FROM_UDISP);
                                     orderEntity.setReceiveStatus(0);
                                     orderEntity.setErpFk(null);
-                                    orderEntity.setOutChangeEnable(false);
+//                                    orderEntity.setOutChangeEnable(false);
                                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                                     OrderEntity temp = orderService.findById(orderEntity.getId());
                                     if (temp == null) {

api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java

@@ -1,6 +1,7 @@
 package com.glxp.api.admin.thread;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.db.sql.Order;
 import com.glxp.api.admin.constant.ConstantStatus;
 import com.glxp.api.admin.dao.basic.UdiInfoDao;
 import com.glxp.api.admin.dao.info.SyncDataSetDao;
@@ -307,7 +308,11 @@ public class UpBasicService {
                 orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED);
                 List<OrderEntity> temps = orderService.findAllByTime(orderFilterRequest);
                 if (CollUtil.isNotEmpty(temps)) {
-                    orderEntities.addAll(temps);
+                    for(OrderEntity orderEntity:temps){
+                        if(orderEntity.getFromType() != ConstantStatus.FROM_UDISP){
+                            orderEntities.add(orderEntity);
+                        }
+                    }
                 }
             }
         }

api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml

@@ -47,8 +47,8 @@
             <if test="corpType != ''and corpType != null">
                 AND basic_bussiness_type.corpType = #{corpType}
             </if>
-        </where>
 
+        </where>
         GROUP BY basic_bustype_origin.action;
     </select>
     <select id="filterEnableList" parameterType="com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest"