重新规划服务ID

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgHeatList.xaml.cs

@@ -839,7 +839,7 @@ namespace FLY.FeedbackRenZiJia.UI.Client
 
         private void button_delsnap_Click(object sender, RoutedEventArgs e)
         {
-            if (!WdPassword.Authorize("AirRingHeatList"))
+            if (!WdPassword.Authorize("AirRing"))
                 return;
             mSnaps.DelSnapShot();
             
@@ -1023,7 +1023,7 @@ namespace FLY.FeedbackRenZiJia.UI.Client
                 FLY.ControlLibrary.Window_WarningTip.Show("应用失败", "当前图是反向，需要先去调换旋转架的正反向信号线", TimeSpan.FromSeconds(2));
                 return;
             }
-            if (!WdPassword.Authorize("AirRingHeatList"))
+            if (!WdPassword.Authorize("AirRing"))
                 return;
 
             blowing.IsUsedMap = IsUsedMap;

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia/OBJ_INTERFACE/OBJ_INTERFACE_ID.cs

@@ -12,9 +12,9 @@ namespace FLY.FeedbackRenZiJia.OBJ_INTERFACE
         public const UInt32 HEATBUF_ID = 31002;
         public const UInt32 HEATCELL_ID = 31003;
 
-
+        /// <summary>
+        /// 3个
+        /// </summary>
         public const UInt32 WARNING_OBJ_ID = 20000;
-        public const UInt32 WARNING_OBJ_REASONLIST_ID = 20001;
-        public const UInt32 WARNING_OBJ_NEWESTLIST_ID = 20002;
     }
 }

Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/DynAreaIbc.xaml.cs

@@ -109,7 +109,7 @@ namespace FLY.IBC.UI.Client.UiModule
         
         private void Record_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
-            reason_list_index = mWindow.Record.Count() - 1;
+            reason_list_index = warningReasonWindow.Record.Count() - 1;
             updateError01();
 
         }
@@ -118,7 +118,7 @@ namespace FLY.IBC.UI.Client.UiModule
             FObjBase.PollModule.Current.Poll_JustOnce(
                 new FObjBase.PollModule.PollHandler(delegate ()
                 {
-                    reason_list_index = mWindow.Record.Count() - 1;
+                    reason_list_index = warningReasonWindow.Record.Count() - 1;
 
                     updateError();
                 }), this, MARKNO_UPDATEERROR);

Project.FLY.IBC/FLY.IBC/OBJ_INTERFACE/OBJ_INTERFACE.cs

@@ -8,15 +8,17 @@ namespace FLY.IBC.OBJ_INTERFACE
 {
     public class OBJ_INTERFACE
     {
-        //3个
-        public const UInt32 WARNING_OBJ_ID = 20000;
-
-
         /// <summary>
         /// 4个
         /// </summary>
         public const UInt32 IBC_OBJ_ID = 32000;
 
         public const UInt32 IBC_OBJ_CTRLLIST_ID = 32004;
+
+        //3个
+        public const UInt32 WARNING_OBJ_ID = 20000;
+
+
+
     }
 }

Project.FLY.Thick.Blowing/FLY.Thick.Blowing/OBJ_INTERFACE/OBJ_INTERFACE_ID.cs

@@ -20,10 +20,11 @@ namespace FLY.Thick.Blowing.OBJ_INTERFACE
         public const UInt32 SCANWARNING_ID = 30011;
         public const UInt32 BULKDB_ID = 30012;
 
-        public const UInt32 WARNING_OBJ_ID = 30013;
-        public const UInt32 WARNING_OBJ_REASONLIST_ID = 30014;
-        public const UInt32 WARNING_OBJ_NEWESTLIST_ID = 30015;
+        /// <summary>
+        /// 3个
+        /// </summary>
+        public const UInt32 WARNING_OBJ_ID = 20000;
 
-        public const UInt32 JSONDIST_OBJ_ID = 20000;
+        public const UInt32 JSONDIST_OBJ_ID = 10000;
     }
 }

Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/FLY.HeatingHelper.UI.csproj

@@ -214,9 +214,9 @@
       <Project>{119c3adc-f8e1-4f72-b89b-006236ff8586}</Project>
       <Name>FLY.ControlLibrary</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\thick_public\Project.FLY.UI.Module\FLY.UI.Module\FLY.UI.Module.csproj">
-      <Project>{4df79671-e814-49bd-864d-8257d6c6e072}</Project>
-      <Name>FLY.UI.Module</Name>
+    <ProjectReference Include="..\..\thick_public\Project.FLY.Misc\MISC\Misc.csproj">
+      <Project>{5ee61ac6-5269-4f0f-b8fa-4334fe4a678f}</Project>
+      <Name>Misc</Name>
     </ProjectReference>
     <ProjectReference Include="..\FLY.HeatingHelper\FLY.HeatingHelper.csproj">
       <Project>{973f0eed-3181-4fb9-abd6-196a9e816b77}</Project>

Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_SelectData/ViewModel_UC_SelectData.cs

@@ -23,6 +23,7 @@ namespace FLY.HeatingHelper.UI.UIModule.UC_SelectData
             Command_DefaultLoadDataRange();
             Misc.BindingOperations.SetBinding(Dat, "AnalystIndexFrom", () =>
             {
+                
                 AnalystDataFrom = null;
             });
             Misc.BindingOperations.SetBinding(Dat, "AnalystIndexTo", () =>

Project.FLY.Weight/FLY.Weight.UI.Client/PgMenu.xaml.cs

@@ -46,7 +46,7 @@ namespace FLY.Weight.UI.Client
 
         private void button_ingredient_Click(object sender, RoutedEventArgs e)
         {
-            if (!WdPassword.Authorize("WeighterMenu"))
+            if (!WdPassword.Authorize("Weighter"))
                 return;
 
             PgIngredient p = new PgIngredient();
@@ -57,7 +57,7 @@ namespace FLY.Weight.UI.Client
 
         private void button_screw_Click(object sender, RoutedEventArgs e)
         {
-            if (!WdPassword.Authorize("WeighterMenu"))
+            if (!WdPassword.Authorize("Weighter"))
                 return;
             PgScrew p = new PgScrew();
             container.BuildUp(p);
@@ -67,7 +67,7 @@ namespace FLY.Weight.UI.Client
 
         private void button_hopper_Click(object sender, RoutedEventArgs e)
         {
-            if (!WdPassword.Authorize("WeighterMenu"))
+            if (!WdPassword.Authorize("Weighter"))
                 return;
             PgHopper p = new PgHopper();
             container.BuildUp(p);
@@ -86,7 +86,7 @@ namespace FLY.Weight.UI.Client
 
         private void button_thickness_Click(object sender, RoutedEventArgs e)
         {
-            if (!WdPassword.Authorize("WeighterMenu"))
+            if (!WdPassword.Authorize("Weighter"))
                 return;
 
             PgThickness p = new PgThickness();

Project.FLY.Weight/FLY.Weight/Client/WeightSystemServiceClient.cs

@@ -67,6 +67,8 @@ namespace FLY.Weight.Client
         public WeightSystemServiceClient(UInt32 serviceId, string connName) : base(serviceId) {
             Init();
             ConnName = connName;
+            filePath = connName + "." +filePath;
+
             FObjServiceClientManager.Instance.Connect_to_Another_OBJSys(connName, this);
         }
 
@@ -112,6 +114,7 @@ namespace FLY.Weight.Client
             this.PropertyChanged += WeightSystemClient_PropertyChanged;
         }
 
+        string filePath = "weightSystemClient.json";
         void Save() 
         {
             WeightSystemClientJsonDb jsonDb = new WeightSystemClientJsonDb()
@@ -119,12 +122,12 @@ namespace FLY.Weight.Client
                 BinCnts = BinCnts
             };
             string json = Newtonsoft.Json.JsonConvert.SerializeObject(jsonDb);
-            File.WriteAllText("weightSystemClient.json", json);
+            File.WriteAllText(filePath, json);
         }
         void Load() {
-            if (!File.Exists("weightSystemClient.json"))
+            if (!File.Exists(filePath))
                 return;
-            string json =File.ReadAllText("weightSystemClient.json");
+            string json =File.ReadAllText(filePath);
             var p = Newtonsoft.Json.JsonConvert.DeserializeObject< WeightSystemClientJsonDb>(json);
             BinCnts = p.BinCnts;
         }

Project.FLY.Weight/FLY.Weight/OBJ_INTERFACE/OBJ_INTERFACE.cs

@@ -7,22 +7,19 @@ namespace FLY.Weight.OBJ_INTERFACE
 {
     public class OBJ_INTERFACE
     {
-
+        /// <summary>
+        /// 3个
+        /// </summary>
         public const UInt32 WARNING_OBJ_ID = 20000;
-        public const UInt32 WARNING_OBJ_REASONLIST_ID = WARNING_OBJ_ID + 1;
-        public const UInt32 WARNING_OBJ_NEWESTLIST_ID = WARNING_OBJ_ID + 2;
-
-
-
-        public const UInt32 WEIGHTS_OBJ_ID = 30000;
-        public const UInt32 WEIGHTS_OBJ_SYNCPROP_ID = WEIGHTS_OBJ_ID + 1;
-        public const UInt32 WEIGHTS_OBJ_PLCOS_ID = WEIGHTS_OBJ_ID + 2;
-        public const UInt32 WEIGHTS_OBJ_PLCOS_SYNCPROP_ID = WEIGHTS_OBJ_PLCOS_ID + 1;
 
+        /// <summary>
+        /// 4个
+        /// </summary>
+        public const UInt32 WEIGHTS_OBJ_ID = 35000;
 
-        public const UInt32 WEIGHTS_OBJ_FLOW_ID = 30004;
+        public const UInt32 WEIGHTS_OBJ_FLOW_ID = 35004;
 
-        public const UInt32 WEIGHTS_OBJ_MIX_BASE_ID = 30005;
+        public const UInt32 WEIGHTS_OBJ_MIX_BASE_ID = 35005;
         /// <summary>
         /// 每次配料记录列表, 1~5
         /// </summary>

Project.FLY.Weight/FLY.Weight/Server.OBJProxy/WeightSystem_OBJProxy.cs

@@ -38,7 +38,7 @@ namespace FLY.Weight.Server.OBJProxy
 
             plcOS_OBJProxy = new PLCProxySystem_OBJProxy(
                 objsys_idx,
-                OBJ_INTERFACE.OBJ_INTERFACE.WEIGHTS_OBJ_PLCOS_ID,
+                ID + 2,
                 data.PLCos
                 );
 

thick_public @ 634c9abe

-Subproject commit 60be62824e5c30d5c322b2230d08098458cf99d9
+Subproject commit 634c9abecc11061d5487d82887dee7d76115c519

脚本/unity容器/blowingfix&airRing&weighter&winder&ibc&integrated/unity/root.config

@@ -7,7 +7,6 @@
 
     <!--别名-->
     <alias alias="IOnInit" type="MultiLayout.UiModule.IOnInit, MultiLayout" />
-
     <container>
       <!--客户端配置参数-->
       <register type="Misc.ParamDictionary, MISC" >
@@ -17,7 +16,7 @@
       <register type="FLY.OBJComponents.IService.IJsonDistService,FLY.OBJComponents" mapTo="FLY.OBJComponents.Client.JsonDistServiceClient,FLY.OBJComponents">
         <lifetime type="singleton" />
         <constructor>
-          <param name="serviceId" value="20000" />
+          <param name="serviceId" value="10000" />
           <param name="connName" value="blowing" />
         </constructor>
       </register>