优化当前机台完成数

shangjian/XGL.Data/DBService/FormingMachineService.cs

@@ -71,17 +71,19 @@ namespace XGL.Data.DBService
 	ord.status ,
 	ord.route_code,
 	ord.attr1,
-	ord.shift_id ,(select count(*) from pro_rfid_process_detail 
-where CONVERT(VARCHAR(10), create_time , 120) = CONVERT(VARCHAR(10), '2023-10-20', 120 ) and workorder_code = ord.workorder_code) as totalCount
+	ord.shift_id ,totalCount
 FROM
 pro_order_workorder ord
 	LEFT JOIN mes_material_transfer_result res 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 
+	left join (select count(*) as totalCount,ordercode from mes_material_transfer_result 
+		where CONVERT(VARCHAR(10), update_time , 120) = CONVERT(VARCHAR(10),'{workDate}', 120) and equipmentCode = '{devicecode}' group by OrderCode) tt 
+on (tt.ordercode = wet.workorder_id )
 	AND rfid.rfid = res.rfid 
 WHERE
  CONVERT(VARCHAR(10), wet.plan_time , 120) = CONVERT(VARCHAR(10), '{workDate}', 120 ) 
- And ord.prod_line_code like '%{devicecode}%'
+ And ord.prod_line_code like '%{devicecode}%' and totalCount is not null
 ORDER BY
 	( isnull( plan_time, '1900-01-01 08:00:00' ) ) DESC";
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);

shangjian/XGL/App.config

@@ -21,7 +21,7 @@
 		<!--线体编码-->
 		<add key="LineCode" value="101" /> 
 		<!--获取设备状态间隔时间 单位秒-->
-		<add key="GetDeviceStateInterval" value="3000" />
+		<add key="GetDeviceStateInterval" value="15000" />
 		<!--获取设备温湿度间隔时间 单位秒-->
 		<add key="GetDeviceTempAndHumInterval" value="15000" />
 		<add key="thriftIp" value="192.168.3.150" />

shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs

@@ -1,62 +1,2 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
+
 

shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref

@@ -1,4 +1,4 @@
-
+D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
 
 FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;;
 FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBoard.xaml;;