Merge branch 'jackYun' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into jackYun

Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs

@@ -163,7 +163,10 @@ namespace MyCode.Project.Services.Implementation
                 throw new BaseException("单据已经下推.");
             }
             var one = _yTKJTShopParameterRepository.Queryable().Where(t => t.FSHOPCODE == orderSHeet.ShopCode).First();
-
+            if (one is null)
+            {
+                throw new BaseException($"门店编号：{orderSHeet.ShopCode},门店名称：{orderSHeet.ShopName},没有找到对应的门店参数 ");
+            }
             // TODO 如果是False则同步到云星空销售订单
             if (one.FSYNCHRONIZEWMS == "0")
             {

Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs

@@ -20,11 +20,13 @@ namespace MyCode.Project.WebApi.Controllers
         private IJackYunStockinService _jackYunStockinService;
         private IOrderPushService _orderPushService;
 
-        public TestController(IJackYunTaskService jackYunTaskService, IWMSService wMSService, IJackYunStockinService jackYunStockinService)
+        public TestController(IJackYunTaskService jackYunTaskService, IWMSService wMSService
+            , IJackYunStockinService jackYunStockinService, IOrderPushService orderPushService)
         {
             _jackYunTaskService = jackYunTaskService;
             _wMSService = wMSService;
             _jackYunStockinService = jackYunStockinService;
+            _orderPushService = orderPushService;
         }
 
         /// <summary>

Reportapi/MyCode.Project.WebApi/Web.config

@@ -24,51 +24,30 @@
     <!-- 数据库测试-->
 
 	  <add name="WMSConn" connectionString="Data Source=192.168.221.155; Initial Catalog=ESB_DTC; User ID=app_k3;Password=Postman2025k3; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
-	  <add name="YunTongConn" connectionString="Data Source=192.168.116.209; Initial Catalog=K3ZMFS_0905; User ID=sa;Password=Ac661978! ; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
+	  <add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=YunTong; User ID=sa;Password=123456; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
 	  <!--测试MYSQL内网-->
     <!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->
   </connectionStrings>
   <appSettings>
-
 	  <!-- 当前使用的 账套ID(即数据中心id) -->
-
 	  <!-- 第三方系统登录授权的账套ID（即open.kingdee.com网站的第三方系统登录授权中的数据中心标识）-->
-
 	  <!-- 在第三方系统登录授权页面点击“生成测试链接”按钮后即可查看   -->
-
 	  <add key="X-KDApi-AcctID" value="66d918bdc00906"/>
-
 	  <!-- 第三方系统登录授权的 集成用户名称  -->
-
 	  <!-- 补丁版本为PT-146894 [7.7.0.202111]及后续的版本，则为指定用户登录列表中任一用户  -->
-
 	  <!-- 若第三方系统登录授权已勾选“允许全部用户登录”，则无以上限制  -->
-
 	  <add key="X-KDApi-UserName" value="黄志荣" />
-
 	  <!-- 第三方系统登录授权的 应用ID  -->
-
 	  <add key="X-KDApi-AppID" value="400925_wYdO4+jLQMDf091IQYTB48WNRjSaXKLu"/>
-
 	  <!-- 第三方系统登录授权的 应用密钥  -->
-
 	  <add key="X-KDApi-AppSec" value="41dfa53b0e634b72b01e303d14fa6e35"/>
-
 	  <!-- 账套语系，默认2052  -->
-
 	  <add key="X-KDApi-LCID" value="2052"/>
-
 	  <!-- 组织编码，启用多组织时配置对应的组织编码才有效  -->
-
 	  <!--<add key="X-KDApi-OrgNum" value="*****"/>-->
-
-
-
 	  <!-- 服务Url地址(私有云和公有云都须配置金蝶云星空产品地址，K3Cloud/结尾)-->
-
 	  <add key="X-KDApi-ServerUrl" value="http://192.168.116.83/k3Cloud/"/>
 
-
 	  <!--解决swagger出错问题-->
     <add key="aspnet:UseHostHeaderForRequestUrl" value="true" />
     <!--当前环境,1:生产环境 0：开发环境-->