1. 修正 上料mix记录，不能比较 卸料时的配料重量，那是动态过程，只能取之前的数据。 每次卸料2-3min，取3秒前数据，非常安全

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

@@ -74,7 +74,7 @@ namespace FLY.Weight.UI.Client
                 // kg
                 DataGridTextColumn dgtc = new DataGridTextColumn()
                 {
-                    Binding = new Binding() { Path = new PropertyPath($"Items[{i}].Disp"), StringFormat = "{0:F1}" }
+                    Binding = new Binding() { Path = new PropertyPath($"Items[{i}].Disp"), StringFormat = "{0:F4}" }
                 };
                 StackPanel sp = new StackPanel() { Orientation = Orientation.Horizontal };
                 sp.Children.Add(
@@ -96,7 +96,7 @@ namespace FLY.Weight.UI.Client
                 // %
                 DataGridTextColumn dgtc2 = new DataGridTextColumn()
                 {
-                    Binding = new Binding() { Path = new PropertyPath($"Items[{i}].PDisp"), StringFormat = "{0:F4}" }
+                    Binding = new Binding() { Path = new PropertyPath($"Items[{i}].PDisp"), StringFormat = "{0:F1}" }
                 };
                 StackPanel sp2 = new StackPanel() { Orientation = Orientation.Horizontal };
                 sp2.Children.Add(

Project.FLY.Weight/FLY.Weight/Server/WeightSystem.cs

@@ -253,7 +253,7 @@ namespace FLY.Weight.Server
                         f.Items.Add(item);
                     }
 
-                    if (f_last!=null && f_last.Total > f.Total)
+                    if (f_last!=null)// && f_last.Total > f.Total)
                     {
                         //没错,用以前的是对的！！！！
                         f.Total = f_last.Total;

脚本/nouse/2.update_main_module_AirRing.ps1

-#-----------------------------------------------------------------
-#AirRing
-$data_path = $PSScriptRoot + "\just_AirRing"
-$root_path = $PSScriptRoot + "\.."
-$src_path = $root_path + "\Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Client\bin\Debug"
-$dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug"
-
-$filename="FLY.FeedbackRenZiJia.dll","FLY.FeedbackRenZiJia.UI.Client.dll"
-foreach($n in $filename)
-{
-    cp ($src_path + "\"+ $n) $dest_path
-}
-
-cp ($data_path + "\graphcustom_justAirRing.xml") ($dest_path + "\layout\graphcustom.xml")
-
-if(-not (Test-Path($dest_path+"\main_module\AirRing")))
-{
-    mkdir ($dest_path+"\main_module\AirRing")
-}
-cp ($data_path + "\module.xml") ($dest_path+"\main_module\AirRing")
\ No newline at end of file

脚本/nouse/2.update_main_module_AirRing_Weight.ps1

-#-----------------------------------------------------------------
-#AirRing
-$data_path = $PSScriptRoot + "\just_AirRing"
-$root_path = $PSScriptRoot + "\.."
-$src_path = $root_path + "\Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Client\bin\Debug"
-$dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug"
-
-$filename="FLY.FeedbackRenZiJia.dll","FLY.FeedbackRenZiJia.UI.Client.dll"
-foreach($n in $filename)
-{
-    cp ($src_path + "\"+ $n) $dest_path
-}
-
-cp ($data_path + "\graphcustom_justAirRing.xml") ($dest_path + "\layout\graphcustom.xml")
-
-if(-not (Test-Path($dest_path+"\main_module\AirRing")))
-{
-    mkdir ($dest_path+"\main_module\AirRing")
-}
-cp ($data_path + "\module.xml") ($dest_path+"\main_module\AirRing")
\ No newline at end of file

脚本/nouse/get_exe_airRing.ps1

-	
-$install_dir = $PSScriptRoot + "\和美安装包"
-
-if(Test-Path $install_dir )
-{
-	rm -Recurse -Force $install_dir
-}
-
-mkdir $install_dir
-
-
-#复制 install\* 到 和美安装包
-$files = ("佛山市枫莱尔自动化技术有限公司", "FLY.Install.exe", "install_AirRing.xml")
-foreach($f in $files)
-{
-    cp -Recurse ($PSScriptRoot + "\install\"+$f) $install_dir
-}
-
-mv ($install_dir + "\install_AirRing.xml") ($install_dir + "\install.xml")
-
-
-$install_dir = $install_dir+"\佛山市枫莱尔自动化技术有限公司\windows"
-
-function copy_to($src_dir , $project_name, $other )
-{
-
-	$src_dir = $PSScriptRoot + "\..\" + $src_dir
-	$dest_dir = $install_dir + "\" + $project_name
-
-	#检测文件夹是否存在
-	#存在，删除全部数据，再新创建；
-	#不存在，创建。
-	
-	if(Test-Path $dest_dir )
-	{
-		rm -Recurse -Force $dest_dir
-	}
-	mkdir -p $dest_dir
-	
-	echo 复制 $project_name
-
-	#复制全部 xxx.dll 与 $project_name+".exe"
-	cp ($src_dir + "\*.dll") $dest_dir
-	cp ($src_dir + "\*.exe") $dest_dir
-
-	#删除 *.vshost.exe
-	rm ($dest_dir + "\*.vshost.exe"	)
-
-    #复制其它
-	foreach($f in $other)
-	{
-		cp -Recurse ($src_dir + "\"+$f) $dest_dir
-	}
-}
-
-copy_to `
-"Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug" `
-"FLY.Thick.Blowing.UI.Fix.Client" `
-("csysparam.xml","layout", "main_module", "music", "版本说明.txt", "测厚仪说明书.pdf")
-
-copy_to `
-"Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Server\bin\Debug" `
-"FLY.Thick.Blowing.UI.Fix.Server" `
-("Gage1")
-
-copy_to `
-"Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Server\bin\Debug" `
-"FLY.FeedbackRenZiJia.UI.Server" `
-("Gage1")
-
-echo 复制成功 
-pause
\ No newline at end of file