diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index f65e83b..de00281 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config index 7080ddc..b37dc64 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -37,6 +37,8 @@ + + diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs index bc56ab5..26dce7f 100644 --- a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs @@ -199,7 +199,7 @@ namespace XGL.Views bucketList = bucketList.Distinct().ToList(); //var jsonObject = JsonConvert.DeserializeObject(jsonStrCXJList); - string apiUrl = "http://192.168.202.28:9001/api/v1/ReceiveMesMsg/materialPlanSync"; + string apiUrl = Utils.GetAppSetting("WCSMaterialSyncAddress")=="" ? "http://192.168.202.28:9001/api/v1/ReceiveMesMsg/materialPlanSync": Utils.GetAppSetting("WCSMaterialSyncAddress"); MaterialPlanModel materialPlanModel = new MaterialPlanModel();