取数逻辑更改

shangjian/AutoUpdate/bin/Debug/AutoUpdate.application

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
   <assemblyIdentity name="AutoUpdate.application" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="AutoUpdate" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <description asmv2:publisher="HP" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" />
   <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
     <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>jmdpeV3d0u6iWdBPN4dhr2L2dVWme5oYZd5aPRm+oYU=</dsig:DigestValue>
+        <dsig:DigestValue>IfQ2LLDWJC73HvMngEFjpyEOT7eiZ99iYdurmK8S2RA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest

@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>j5D+9oUALJ/4wUhf4EV2qXiJ/BGxp9B00XdfuYnCRnI=</dsig:DigestValue>
+        <dsig:DigestValue>c7WQpMXek3r/jb4SdOtNd1qocYw496LLF05iMXjF3aU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
   <assemblyIdentity name="AutoUpdate.application" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="AutoUpdate" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <description asmv2:publisher="HP" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" />
   <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
     <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>jmdpeV3d0u6iWdBPN4dhr2L2dVWme5oYZd5aPRm+oYU=</dsig:DigestValue>
+        <dsig:DigestValue>IfQ2LLDWJC73HvMngEFjpyEOT7eiZ99iYdurmK8S2RA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f67dc885e7551d573c533635607a154a9fcfd039
+eea3ff7a82b036285dd19ec3ef2dc8d3e7eddf67

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.FileListAbsolute.txt

@@ -32,24 +32,6 @@ D:\000000000\CompanyPro\中一悬挂链\trunk\代码\前台\AutoUpdate\obj\x86\D
 D:\000000000\CompanyPro\中一悬挂链\trunk\代码\前台\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CopyComplete
 D:\000000000\CompanyPro\中一悬挂链\trunk\代码\前台\AutoUpdate\obj\x86\Debug\AutoUpdate.exe
 D:\000000000\CompanyPro\中一悬挂链\trunk\代码\前台\AutoUpdate\obj\x86\Debug\AutoUpdate.pdb
-E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\7z.dll
-E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\7z64.dll
-E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.exe.config
-E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.exe.manifest
-E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.application
-E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.exe
-E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.pdb
-E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\SevenZipSharp.dll
-E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.AssemblyReference.cache
-E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.SuggestedBindingRedirects.cache
-E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.Properties.Resources.resources
-E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.GenerateResource.cache
-E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CoreCompileInputs.cache
-E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.exe.manifest
-E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.application
-E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CopyComplete
-E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.exe
-E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.pdb
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\7z.dll
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\7z64.dll
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.exe.config
@@ -68,3 +50,21 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\A
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CopyComplete
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.exe
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.pdb
+E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\7z.dll
+E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\7z64.dll
+E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.exe.config
+E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.exe.manifest
+E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.application
+E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.exe
+E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.pdb
+E:\workspace\LanJu\client\shangjian\AutoUpdate\bin\Debug\SevenZipSharp.dll
+E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.AssemblyReference.cache
+E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.SuggestedBindingRedirects.cache
+E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.Properties.Resources.resources
+E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.GenerateResource.cache
+E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CoreCompileInputs.cache
+E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.exe.manifest
+E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.application
+E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CopyComplete
+E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.exe
+E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.pdb

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest

@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>j5D+9oUALJ/4wUhf4EV2qXiJ/BGxp9B00XdfuYnCRnI=</dsig:DigestValue>
+        <dsig:DigestValue>c7WQpMXek3r/jb4SdOtNd1qocYw496LLF05iMXjF3aU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-65ea42614d5210ce1f76f304a0b99eadc686e4a3
+0abd85b80046b9258518751daf3009dfc20e23db

shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-cfb04e75b94c39ee4374f63be8ad6b6fac4e7180
+ae55a20c78909b7f5eb9ba6dc5a5b469abf93216

shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt

@@ -201,6 +201,7 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\C
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb
+D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NLog.dll
 E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Config\log4net.config
 E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll.config
 E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\CommonFunc.dll
@@ -210,6 +211,7 @@ E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Google.Protobuf.dll
 E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\log4net.dll
 E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\MySql.Data.dll
 E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\Newtonsoft.Json.dll
+E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NLog.dll
 E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.dll
 E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OOXML.dll
 E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NPOI.OpenXml4Net.dll
@@ -240,5 +242,3 @@ E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.C
 E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
 E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll
 E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb
-E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NLog.dll
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NLog.dll

shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache

@@ -4,7 +4,7 @@
 library
 C#
 .cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\
+E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\
 CommonFunc
 none
 false
@@ -13,7 +13,7 @@ DEBUG;TRACE
 12023204370
 2-1355062061
 241494203934
-44-239516262
+44-170053996
 HMessageBox.xaml;
 
 False

shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref

@@ -1,4 +1,4 @@
 
 
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\HMessageBox.xaml;;
+FE:\workspace\LanJu\client\shangjian\CommonFunc\HMessageBox.xaml;;
 

shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-51790d22c3b0468f4e446c933001b592c3e5c2c3
+bc174b8fc67ac08f66a67e37a513d69b6869cfa6

shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache

@@ -4,12 +4,12 @@
 winexe
 C#
 .cs
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\
+E:\workspace\LanJu\client\shangjian\LanJu\obj\Debug\
 LanJu
 none
 false
 DEBUG;TRACE
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\App.xaml
+E:\workspace\LanJu\client\shangjian\LanJu\App.xaml
 9-1725419280
 
 131720844138

shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref

@@ -1,12 +1,12 @@
 
 
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\MainWindow.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Complete.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_DeviceItems.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Flow.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Index.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Material.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Operator.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Paused.xaml;;
-FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Prepare.xaml;;
+FE:\workspace\LanJu\client\shangjian\LanJu\MainWindow.xaml;;
+FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Complete.xaml;;
+FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_DeviceItems.xaml;;
+FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Flow.xaml;;
+FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Index.xaml;;
+FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Material.xaml;;
+FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Operator.xaml;;
+FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Paused.xaml;;
+FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Prepare.xaml;;
 

shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-75b64367c22655afbbe469bfdef148da7e480363
+93e6bdf40a6f5d4b88993bae3e272b7f08763f68

shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-57f46a9d84fe0cf9b52d094f86f1528843920246
+47ffa676f6bdf3bae90defb59fba4f8fa246ddda

shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.FileListAbsolute.txt

@@ -1,15 +1,3 @@
-E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\WPFupdate.exe.config
-E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\WPFupdate.exe
-E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\WPFupdate.pdb
-E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.dll
-E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.pdb
-E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.xml
-E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.AssemblyReference.cache
-E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.SuggestedBindingRedirects.cache
-E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CoreCompileInputs.cache
-E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CopyComplete
-E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.exe
-E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.pdb
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\WPFupdate.exe.config
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\WPFupdate.exe
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\WPFupdate.pdb
@@ -22,3 +10,15 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupd
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CopyComplete
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.exe
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.pdb
+E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\WPFupdate.exe.config
+E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\WPFupdate.exe
+E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\WPFupdate.pdb
+E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.dll
+E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.pdb
+E:\workspace\LanJu\client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.xml
+E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.AssemblyReference.cache
+E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.SuggestedBindingRedirects.cache
+E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CoreCompileInputs.cache
+E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CopyComplete
+E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.exe
+E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.pdb

shangjian/XGL.Data/DBService/FormingMachineService.cs

@@ -19,18 +19,46 @@ namespace XGL.Data.DBService
         /// <returns></returns>
         public DataTable GetFormingMachineInfo(string devicecode)
         { 
-            string sql = $@"SELECT DISTINCT ord.workorder_id,ord.workorder_code,res.OrderCode,ord.product_name,product_code,isnull(car_num,0) as car_num,
-isnull(plan_time,'1900-01-01 08:00:00') as plan_time,ord.status ,ord.route_code,ord.attr1,(SELECT COUNT(*) AS totalCount
-FROM pro_order_workorder ord
-LEFT JOIN mes_material_transfer_result res  on ord.workorder_id = res.OrderCode
-LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid
-where equipmentCode = '{devicecode}'  and CONVERT(VARCHAR(10), res.update_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120) 
-GROUP BY CONVERT(VARCHAR(10), res.update_time , 120)) as TotalCount
-FROM mes_material_transfer_result res
-left JOIN  pro_order_workorder ord on res.OrderCode = ord.workorder_id
-LEFT JOIN  pro_wet_material_plan_detail wet  on wet.workorder_id = res.OrderCode
-LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid
-where equipmentCode = '{devicecode}'  and CONVERT(VARCHAR(10), res.update_time , 120)= CONVERT(VARCHAR(10), GetDate() , 120) ";
+            string sql = $@"SELECT DISTINCT
+	ord.workorder_id,
+	ord.workorder_code,
+	res.OrderCode,
+	ord.product_name,
+	product_code,
+	isnull( car_num, 0 ) AS car_num,
+	isnull( plan_time, '1900-01-01 08:00:00' ) AS plan_time,
+	ord.status ,
+	ord.route_code,
+	ord.attr1,
+	ord.shift_id 
+FROM
+	mes_material_transfer_result res
+	LEFT JOIN pro_order_workorder ord ON res.OrderCode = ord.workorder_id
+	LEFT JOIN pro_wet_material_plan_detail wet ON wet.workorder_id = res.OrderCode
+	LEFT JOIN pro_rfid_process_detail rfid ON rfid.workorder_code = ord.workorder_code 
+	AND rfid.rfid = res.rfid 
+WHERE
+	equipmentCode = '{devicecode}' 
+	AND rfid.create_time >= (
+	SELECT
+		CONCAT ( CONVERT ( VARCHAR ( 10 ), GetDate( ), 120 ), ' ', Shift_Start_Time ) AS Shift_Start_Time 
+	FROM
+		base_shifts_t 
+	WHERE
+		Shift_Start_Time <= CONVERT ( TIME, GETDATE( ) ) 
+		AND Shift_End_Time > CONVERT ( TIME, GETDATE( ) ) 
+	) 
+	AND rfid.create_time<= (
+	SELECT
+		CONCAT ( CONVERT ( VARCHAR ( 10 ), GetDate( ), 120 ), ' ', Shift_End_Time ) AS Shift_End_Time 
+	FROM
+		base_shifts_t 
+	WHERE
+		Shift_Start_Time <= CONVERT ( TIME, GETDATE( ) ) 
+		AND Shift_End_Time > CONVERT ( TIME, GETDATE( ) ) 
+	) 
+ORDER BY
+	( isnull( plan_time, '1900-01-01 08:00:00' ) ) DESC";
 
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
@@ -39,6 +67,26 @@ where equipmentCode = '{devicecode}'  and CONVERT(VARCHAR(10), res.update_time ,
             }
             return null;
         }
+        /// <summary>
+        /// 获取成型机状态
+        /// </summary>
+        /// <param name="bdt"></param>
+        /// <param name="edt"></param>
+        /// <returns></returns>
+        public string getnumber(string order, string devicecode)
+        {
+            string sql = $@"SELECT COUNT(*) FROM pro_rfid_process_detail WHERE workorder_code='{order}' AND machine_code='{devicecode}'";
+
+            DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
+            if (dtset != null && dtset.Tables.Count > 0)
+            {
+                // 获取查询结果中的计数值并转换为字符串
+                string countAsString = dtset.Tables[0].Rows[0][0].ToString();
+                return countAsString;
+            }
+            return null;
+        }
+
 
         /// <summary>
         /// 获取成型机状态

shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-79f02adf94b81a462e2d021ffaeb806c569f29e2
+45efadceadc58f77d05a25f4464e8495a412c5d8

shangjian/XGL.Model/Model/FoamingMac/FoamingMacModel.cs

@@ -32,5 +32,6 @@ namespace XGL.Models.Model.FoamingMac
         public string rfid { get; set; }
 
         public string totalCount { get; set; }
+        public string isbai { get; set;}
     }
 }

shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ba8f52b01cbb380daf24abf11e9369249f394d6c
+e875e48168eeec01a6513a832f5824108995a472

shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-4c1eda63a6eb933282d4915d9cfa5b18a18739b1
+da04babf50ef3035790f6c85a018240439a4cf82

shangjian/XGL/App.config

@@ -12,7 +12,7 @@
 		<!--设备编码-->
 		<add key="DeviceCode" value="C6" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
-		<add key="ClientMode" value="1" />
+		<add key="ClientMode" value="0" />
 		<add key="SerialPort" value="COM5" />
 		<add key="DryingHouseList" value="H1,H2,H3" />
 	 

shangjian/XGL/Views/LanJu_Operator.xaml

@@ -424,7 +424,7 @@
                 </DataGridTextColumn>
                 <DataGridTextColumn Width="140" Header="工单完成数" Binding="{Binding attr1}" />
                 <DataGridTextColumn Width="180" Header="当前机台完成数" Binding="{Binding totalCount}" />
-             
+                <DataGridTextColumn Width="180" Header="班次" Binding="{Binding isbai}" />
                 <!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
                 <!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->