修复产量bug

shangjian/XGL.Data/DBService/FormingMachineService.cs

@@ -20,12 +20,17 @@ namespace XGL.Data.DBService
         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,COUNT(*) OVER () AS totalCount
+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 pro_wet_material_plan_detail wet on wet.workorder_id = ord.workorder_id
 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); ";
+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) ";
 
             DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
             if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)

shangjian/XGL/App.config

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

shangjian/XGL/Views/LanJu_Prepare.xaml.cs

@@ -61,7 +61,11 @@ namespace XGL.Views
                 string date = this.dateStart.SelectedDate.ToString() == "" ? DateTime.Now.ToString() : this.dateStart.SelectedDate.ToString();
 
                 dt = userDbWareHouse.GetWetPlanInfo(date);
-                if (dt == null) return;
+                if (dt == null)
+                {
+                    this.WorkOrder.ItemsSource = null;
+                    return;
+                } 
                 foreach (DataRow i in dt.Rows)
                 {
                     WetMaterialModel wet = new WetMaterialModel();

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/Views/LanJu_Prepare.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1C0BC9A7FBDE1671E4BC7571F9962475849FCB458A5548986D8AF4B1BBB2BC92"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2B6A1D517BEF343A2353158DA8BCB47711BBC629395AAA11C458A4FE5BDC318C"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1C0BC9A7FBDE1671E4BC7571F9962475849FCB458A5548986D8AF4B1BBB2BC92"
+#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2B6A1D517BEF343A2353158DA8BCB47711BBC629395AAA11C458A4FE5BDC318C"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

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;;