Merge remote-tracking branch 'origin/master'

api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java

@@ -153,7 +153,9 @@ public class CompanyProductRelevanceController {
     @AuthRuleAnnotation("")
     @PostMapping("/sale/info/insertFilter")
     public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
-        udiInfoExportRequest.setUnitFk(null);
+        if(StrUtil.isEmpty(udiInfoExportRequest.getUnitFk())){
+            return ResultVOUtils.error(500,"未选择供应商！");
+        }
         companyProductsRelService.insertCompanyProducts(udiInfoExportRequest);
         return ResultVOUtils.success("后台正在导入，请稍后刷新查看！");
     }

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

@@ -30,7 +30,7 @@ public class CompanyProductsRelService {
                 companyProductRelevanceEntity.setAuditStatus("3");
                 companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
                 companyProductRelevanceEntity.setUdiRlIdFk(Integer.parseInt(uuid));
-                companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId());
+                companyProductRelevanceEntity.setCustomerId(Long.parseLong(udiInfoExportRequest.getUnitFk()));
                 boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
             }
 

api-admin/src/main/resources/application-pro.properties

@@ -1,9 +1,9 @@
 # 本地环境
 server.port=9991
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://192.168.0.148:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=Glxp@6066
+spring.datasource.password=123456
 #spring.datasource.password=89083fb2fc145533
 server.servlet.context-path=
 #logging.level.com.glxp.api.admin.dao=debug
@@ -20,21 +20,22 @@ logging.path=output/logs
 # 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称
 #logging.file=D:/udi.log
 
-#file_path=D:/1s/udiwms/udiwmsfile/
-file_path=/home/glxp/udiwms
+file_path=D:/1s/udiwms/udiwmsfile/
+#file_path=/home/glxp/udiwms
 #UDI数据下载
 UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 #中转服务IP地址
-#SPSYNC_IP=http://127.0.0.1:9989
-SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
+#SPSYNC_IP=http://192.168.0.35:9150/SP_SYNC_SERVER
+SPSYNC_IP=http://127.0.0.1:9989
+#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
 #UDI_SERVER_URL=http://127.0.0.1:9995
 ##端口号
 # Redis数据库索引（默认为0）
 spring.redis.database=8 
 # Redis服务器地址
-spring.redis.host=192.168.0.148
+spring.redis.host=127.0.0.1
 # Redis服务器连接端口
 spring.redis.port=6379 
 # Redis服务器连接密码（默认为空）