ccj 1 سال پیش
والد
کامیت
d384290698

+ 5 - 5
winsea-haixin-platform-backend/src/main/resources/application-dev.yml

@@ -34,8 +34,8 @@ client:
   sync:
     address: http://114.115.215.70:85/webservice/ClientUpdateService?wsdl
 file:
-  path: E://alpha//winsea//file//
-file-root-path: E://file//crew/
+  path: D://alpha//winsea//file//
+file-root-path: D://file//crew/
 front-origin: 192.168.1.162:9527
 jasypt:
   encryptor:
@@ -44,7 +44,7 @@ jasypt:
 logging:
   level:
     root: INFO
-  path: E:/winsea_platform6.0/logs
+  path: D:/winsea_platform6.0/logs
 oss:
   access:
     key:
@@ -58,7 +58,7 @@ oss:
 
 po:
   password: CA1XB-MF7Y-12ST-PSBP2
-  syspath: E://officeTest//
+  syspath: D://officeTest//
 purchase:
   webservice:
     address: http://114.115.215.70:8018/webservice/QuoteServerService?wsdl
@@ -69,7 +69,7 @@ servicer:
       address: http://114.115.215.70:8018/webservice/QuoteServerService?wsdl
 
 system:
-  temp-file-path: E://file//
+  temp-file-path: D://file//
   prod-temp-file-path: /opt/winsea/temp/platform/
   department-deck: efc79c703d6c4a8dafb88b5e60192e82
 

+ 5 - 5
winsea-haixin-platform-backend/src/main/resources/application-local.yml

@@ -36,8 +36,8 @@ client:
   sync:
     address: http://114.115.215.70:85/webservice/ClientUpdateService?wsdl
 file:
-  path: E://alpha//winsea//file//
-file-root-path: E://file//crew/
+  path: D://alpha//winsea//file//
+file-root-path: D://file//crew/
 front-origin: 192.168.1.162:9527
 jasypt:
   encryptor:
@@ -46,7 +46,7 @@ jasypt:
 logging:
   level:
     root: INFO
-  path: E:/winsea_platform6.0/logs
+  path: D:/winsea_platform6.0/logs
 oss:
   access:
     key:
@@ -59,7 +59,7 @@ oss:
     internal: https://taohaoliang.oss-cn-beijing.aliyuncs.com/
 po:
   password: CA1XB-MF7Y-12ST-PSBP2
-  syspath: E://officeTest//
+  syspath: D://officeTest//
 purchase:
   webservice:
     address: http://114.115.215.70:8018/webservice/QuoteServerService?wsdl
@@ -70,7 +70,7 @@ servicer:
       address: http://114.115.215.70:8018/webservice/QuoteServerService?wsdl
 
 system:
-  temp-file-path: E://file//
+  temp-file-path: D://file//
   prod-temp-file-path: /opt/winsea/temp/platform/
   department-deck: efc79c703d6c4a8dafb88b5e60192e82
 

+ 5 - 5
winsea-haixin-platform-backend/src/main/resources/application-prod.yml

@@ -34,8 +34,8 @@ client:
   sync:
     address: http://114.115.215.70:85/webservice/ClientUpdateService?wsdl
 file:
-  path: E://alpha//winsea//file//
-file-root-path: E://file//crew/
+  path: D://alpha//winsea//file//
+file-root-path: D://file//crew/
 front-origin: 192.168.1.162:9527
 jasypt:
   encryptor:
@@ -44,7 +44,7 @@ jasypt:
 logging:
   level:
     root: INFO
-  path: E:/winsea_platform6.0/logs
+  path: D:/winsea_platform6.0/logs
 oss:
   access:
     key:
@@ -58,7 +58,7 @@ oss:
 
 po:
   password: CA1XB-MF7Y-12ST-PSBP2
-  syspath: E://officeTest//
+  syspath: D://officeTest//
 purchase:
   webservice:
     address: http://114.115.215.70:8018/webservice/QuoteServerService?wsdl
@@ -69,7 +69,7 @@ servicer:
       address: http://114.115.215.70:8018/webservice/QuoteServerService?wsdl
 
 system:
-  temp-file-path: E://file//
+  temp-file-path: D://file//
   prod-temp-file-path: /opt/winsea/temp/platform/
   department-deck: efc79c703d6c4a8dafb88b5e60192e82
 

+ 5 - 5
winsea-haixin-platform-backend/src/main/resources/application-test.yml

@@ -34,8 +34,8 @@ client:
   sync:
     address: http://114.115.215.70:85/webservice/ClientUpdateService?wsdl
 file:
-  path: E://alpha//winsea//file//
-file-root-path: E://file//crew/
+  path: D://alpha//winsea//file//
+file-root-path: D://file//crew/
 front-origin: 192.168.1.162:9527
 jasypt:
   encryptor:
@@ -44,7 +44,7 @@ jasypt:
 logging:
   level:
     root: INFO
-  path: E:/winsea_platform6.0/logs
+  path: D:/winsea_platform6.0/logs
 oss:
   access:
     key:
@@ -58,7 +58,7 @@ oss:
 
 po:
   password: CA1XB-MF7Y-12ST-PSBP2
-  syspath: E://officeTest//
+  syspath: D://officeTest//
 purchase:
   webservice:
     address: http://114.115.215.70:8018/webservice/QuoteServerService?wsdl
@@ -69,7 +69,7 @@ servicer:
       address: http://114.115.215.70:8018/webservice/QuoteServerService?wsdl
 
 system:
-  temp-file-path: E://file//
+  temp-file-path: D://file//
   prod-temp-file-path: /opt/winsea/temp/platform/
   department-deck: efc79c703d6c4a8dafb88b5e60192e82
 

+ 1 - 1
winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -25,7 +25,7 @@ spring:
 #运行环境 1.开发环境 2.测试环境 3.生产环境
 com:
   yiliangyiyun:
-    env: 3
+    env: 1
 
 auth:
   anon-methods:

+ 7 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -278,6 +278,13 @@ public class BiInfoController {
                 warehouseBaseInfoEntityWrapper.eq("joint_venture_parties", "洮南市鸿胜粮贸有限公司");
             }
         }
+        if(Objects.equals(companyId, "258fba198eea4cd1a5eddc71ba421b4a")){
+            List<String> tmp = new ArrayList<String>();
+            tmp.add("密山市大自然粮贸有限公司");
+            tmp.add("密山市大自然粮贸有限公司(光复)");
+            tmp.add("黑龙江阳光种业有限公司");
+            warehouseBaseInfoEntityWrapper.in("warehouse_name",tmp);
+        }
         List<WarehouseBaseInfo> warehouseBaseInfoList = warehouseBaseInfoService.selectList(warehouseBaseInfoEntityWrapper);
 //        List<WarehouseBaseInfo> warehouseBaseInfoList = warehouseBaseInfoService.selectList(new EntityWrapper<WarehouseBaseInfo>()
 //                .eq("delete_flag", "0").eq("comp_id", companyId).eq("warehouse_type", "1"));

+ 2 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HttpServletlx.java

@@ -145,12 +145,12 @@ public class HttpServletlx extends HttpServlet {
 						
 						System.out.println(tmp);
 						if (a==0){
-	                        m_savetxt.m_fwrite(buf,"E:/newfile.txt");
+	                        m_savetxt.m_fwrite(buf,"D:/newfile.txt");
 	                        show_json(new String(buf));  //对接口接收数据做处理
 	                        a+=1;
 	                    }
 	                    else{
-	                        m_savetxt.m_fwrite(buf,"E:/newfile1.txt");
+	                        m_savetxt.m_fwrite(buf,"D:/newfile1.txt");
 	                        a=0;
 	                    }
 					}