Yangwl
/
lanju-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报表数据

Browse Source
master
范 1 year ago
parent dc71e71a94
commit 28fb8a0401
3 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File

8
shangjian/XGL.Data/DBService/FormingMachineService.cs
Unescape Escape View File

@ -608,9 +608,9 @@ VALUES
#region 生成报工数据 #region 生成报工数据
//获取子工单的信息 //获取子工单的信息
#region 订单不能是已经被删除的 #region 订单不能是已经被删除的
//string getSubOrderSql = $"select workorder_code,product_code,product_name,quantity_split,unit from pro_order_workorder where parent_order = '{selectRow["workorder_code"]}' and del_flag=0"; string getSubOrderSql = $"select workorder_code,product_code,product_name,quantity_split,unit from pro_order_workorder where parent_order = '{selectRow["workorder_code"]}' and del_flag=0";
#endregion #endregion
string getSubOrderSql = $"select workorder_code,product_code,product_name,quantity_split,unit from pro_order_workorder where parent_order = '{selectRow["workorder_code"]}'"; //string getSubOrderSql = $"select workorder_code,product_code,product_name,quantity_split,unit from pro_order_workorder where parent_order = '{selectRow["workorder_code"]}'";
string subOrder = ""; string subOrder = "";
//string subProductCode = ""; //string subProductCode = "";
//string subProductName = ""; //string subProductName = "";
@ -783,9 +783,9 @@ VALUES
//获取子工单的信息 //获取子工单的信息
#region 子单不能是已经被删除的 #region 子单不能是已经被删除的
//string getSubOrderSql = $"select workorder_code,product_code,product_name,quantity_split,unit from pro_order_workorder where parent_order = '{orderId}' and del_flag=0"; string getSubOrderSql = $"select workorder_code,product_code,product_name,quantity_split,unit from pro_order_workorder where parent_order = '{orderId}' and del_flag=0";
#endregion #endregion
string getSubOrderSql = $"select workorder_code,product_code,product_name,quantity_split,unit from pro_order_workorder where parent_order = '{orderId}' "; //string getSubOrderSql = $"select workorder_code,product_code,product_name,quantity_split,unit from pro_order_workorder where parent_order = '{orderId}' ";
string subOrder = ""; string subOrder = "";
string subProductCode = ""; string subProductCode = "";
string subProductName = ""; string subProductName = "";

5
shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
Unescape Escape View File

@ -307,8 +307,7 @@ namespace XGLFinishPro.Views
//modelWareHouse = new List<WorkOrder>(); //modelWareHouse = new List<WorkOrder>();
DataTable dt = userDbWareHouse.GetWetPlanInfo(deviceCode, LoginUser.WorkDate); DataTable dt = userDbWareHouse.GetWetPlanInfo(deviceCode, DateTime.Parse(LoginUser.WorkDate).ToString("yyyy-MM-dd"));
if (dt == null) return;
if (dt != null && dt.Rows.Count > 0) if (dt != null && dt.Rows.Count > 0)
{ {
foreach (DataRow row in dt.Rows) foreach (DataRow row in dt.Rows)
@ -319,9 +318,9 @@ namespace XGLFinishPro.Views
dt.AcceptChanges(); dt.AcceptChanges();
} }
} }
if (dt == null) return;
this.dgWorkOrderInfo.ItemsSource = null; this.dgWorkOrderInfo.ItemsSource = null;
if (dt != null && dt.Rows.Count > 0)
this.dgWorkOrderInfo.ItemsSource = dt.DefaultView; this.dgWorkOrderInfo.ItemsSource = dt.DefaultView;
} }
catch (Exception ex) catch (Exception ex)

2
shangjian/XGLFinishPro/config/ConnectionConfig.Config
Unescape Escape View File

@ -11,8 +11,6 @@
<!--本地的业务数据库--> <!--本地的业务数据库-->
<!--<MESClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1RrSFmIjPm8S</MESClientConnectionString>--> <!--<MESClientConnectionString>vadMWi9D6ZBkwIr78LoLmGwiSCvVnpY3nMB7IyQlxFiV2OD5s5WUgOabwGwWK3THofFvPL2rHpOvJVIvtz0oZU/NFQyT8KQlbk0rHjUXoU7wgRdUumDJ1RrSFmIjPm8S</MESClientConnectionString>-->
<!--榄菊业务数据库--> <!--榄菊业务数据库-->

Write Preview
Loading…
Cancel
Save