diff --git a/shangjian/.vs/BL/v17/HierarchyCache.v1.txt b/shangjian/.vs/BL/v17/HierarchyCache.v1.txt index 5509f6a..50d7174 100644 Binary files a/shangjian/.vs/BL/v17/HierarchyCache.v1.txt and b/shangjian/.vs/BL/v17/HierarchyCache.v1.txt differ diff --git a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs index 61cdfab..0361eda 100644 --- a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs +++ b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs @@ -94,7 +94,38 @@ namespace XGL.Dats.DBServiceFinishProd /// public DataTable GetUserInfoFromCloudServer(string userID) { - string sql = $@"SELECT user_name,nick_name,sex FROM [dbo].[sys_user] where del_flag = '0' and pe_snr = '{userID}'"; + string sql = $@"SELECT user_name,nick_name,sex FROM [dbo].[sys_user] where del_flag = '0' and pe_snr like '%{userID}%'"; + DataSet dtset = Utils.cloudDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + /// + /// 刷卡功能用户编码打卡 + /// + /// + /// + public DataTable GetUserCodeServer(string userID) + { + string sql = $@"SELECT user_name,nick_name,sex FROM [dbo].[sys_user] where del_flag = '0' and user_name = '{userID}'"; + DataSet dtset = Utils.cloudDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } + + /// + /// 找出所有的打卡人员 + /// + /// + /// + public DataTable GetUserCodeServerAll() + { + string sql = $@"SELECT user_name,nick_name,sex FROM [dbo].[sys_user] where del_flag = '0'"; DataSet dtset = Utils.cloudDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) { @@ -620,7 +651,7 @@ workorder.unit,workorder.shift_id ,batch.batch_code,batch.batch_quantity,sort_no from pro_order_workorder workorder WITH (NOLOCK) left JOIN base_shifts_t shifts WITH (NOLOCK) on workorder.shift_id = shifts.shift_id left JOIN pro_order_workorder_batch batch WITH (NOLOCK) on workorder.workorder_id = batch.workorder_id -LEFT JOIN ( SELECT * FROM qc_check_task WHERE check_type='checkTypeCPPC' ) chack ON batch.batch_code = chack.income_batch_no +LEFT JOIN ( SELECT * FROM qc_check_task WHERE check_type='checkTypeCPPC' AND del_flag =0) chack ON workorder.workorder_code = chack.order_no AND batch.batch_code = chack.income_batch_no left join (SELECT sum(quantity_feedback) as batchQty,workorder_code,batch FROM [dbo].[mes_report_work] where del_flag = 0 GROUP BY workorder_code,batch) qty on qty.workorder_code = workorder.workorder_code and batch.batch_code = qty.batch where 1=1 and batch.del_flag = 0 and workorder.del_flag = 0 and workorder.parent_order ='0' and CONVERT(VARCHAR(10), workorder.product_date , 120)= CONVERT(VARCHAR(10), '{date}' , 120) and workorder.prod_line_code like '%{deviceCode}%' order by sort_no,batch_code"; @@ -641,7 +672,7 @@ where 1=1 and batch.del_flag = 0 and workorder.del_flag = 0 and /// public DataTable GetProductStepListInfo(string deviceCode, string productCode) { - string sql = $@"SELECT childprocess_code,childprocess_name FROM [dbo].[mes_unit_price] + string sql = $@"SELECT childprocess_code,childprocess_name,attr1 FROM [dbo].[mes_unit_price] where product_code = '{productCode.Replace("0000000","")}' and line_code = '{deviceCode}' ORDER BY childprocess_code"; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); @@ -677,7 +708,7 @@ where 1=1 and /// public DataTable GetUnitPriceData(string deviceCode ,string sheredata) { - string sql = $@"select [workorder_code], [workorder_code_sap], [product_name], SUBSTRING([product_code], 8, LEN(product_code)) as product_code, [user_name], [nick_name], [childprocess_code], [childprocess_name] ,[create_by], [create_time], [line_code] ,[attr1] + string sql = $@"select [workorder_code], [workorder_code_sap], [product_name], SUBSTRING([product_code], 8, LEN(product_code)) as product_code, [user_name], [nick_name], [childprocess_code], [childprocess_name] ,[create_by], [create_time], [line_code] ,[attr1],[attr2] from mes_unitprice_report where line_code = '{deviceCode}' AND create_time BETWEEN '{sheredata} 00:00:00' AND '{sheredata} 23:59:59' ORDER BY childprocess_code,create_time"; @@ -1024,7 +1055,17 @@ where detail.parent_work_order = '{processid}'"; //where CONVERT(VARCHAR(10), w return Utils.netClientDBHelper.executeUpdate(sql1) > 0 ? true : false; } + /// + /// 删除打卡 + /// + /// + public bool Updaterdaka(string userId, string startAddr, string data) + { + string sql1 = $@"DELETE FROM mes_attendance_records WHERE user_id='{userId}' AND start_addr='{startAddr}'AND attendance_date='{data}' "; + return Utils.netClientDBHelper.executeUpdate(sql1) > 0 ? true : false; + + } /// /// 写入开始、报工状态 /// diff --git a/shangjian/XGLFinishPro/App.config b/shangjian/XGLFinishPro/App.config index 97c2775..28b4f44 100644 --- a/shangjian/XGLFinishPro/App.config +++ b/shangjian/XGLFinishPro/App.config @@ -10,7 +10,7 @@ - + diff --git a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs index ffd715d..c0571fd 100644 --- a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs +++ b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs @@ -392,7 +392,7 @@ namespace XGLFinishPro.Views createCheckProductTask createCheckProductTask = new createCheckProductTask(); createCheckProductTask.factoryCode = Utils.GetAppSetting("SiteCode");//工厂编码 createCheckProductTask.incomeBatchNo = comboBoxBatch.Text.ToString();//批次号 - createCheckProductTask.orderNo = lbCurrOrderNo.Content.ToString();//订单号 + createCheckProductTask.orderNo = selectedRow["workorder_code"].ToString();//订单号 if (getorder != null && getorder.Rows.Count > 0) { createCheckProductTask.materialCode = getorder.Rows[0]["product_code"].ToString(); ;//物料编码 @@ -427,11 +427,14 @@ namespace XGLFinishPro.Views // 获取响应内容 string responseBody = response.Content.ReadAsStringAsync().Result; // 或者 .Wait(); CustomMessageBox.Show("批次成品检验任务创建成功！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning, 2000); + LogHelper.instance.log.Error("批次成品检验任务创建成功~即将准备更改工单状态"); + return AddConsumInfo(reportWorkSqlList, newReportCode); } else { // 输出失败信息 - CustomMessageBox.Show("批次成品入库检验任务创建接口调用失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning, 3000); + CustomMessageBox.Show("批次成品入库检验任务创建接口调用失败,请咨询开发人员", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning, 3000); + LogHelper.instance.log.Error("批次成品入库检验任务创建接口返回失败！"); } } } @@ -441,9 +444,9 @@ namespace XGLFinishPro.Views CustomMessageBox.Show("批次成品入库检验任务创建接口调用失败：" + ex.Message, CustomMessageBoxButton.OK, CustomMessageBoxIcon.Error); } } + return false; //if (result.code == 200) //{ - return AddConsumInfo(reportWorkSqlList, newReportCode); //} //else //{ @@ -478,6 +481,7 @@ namespace XGLFinishPro.Views string insertConsumeSql = formingMachineService.GetInsertConsumeInfoSql(selectedConsumeRow, newReportCode, _siteCode); reportWorkSqlList.Add(insertConsumeSql); + LogHelper.instance.log.Error("报工SQL：生成"+ insertConsumeSql); //// 获取 DataGridRow //var dataGridRow = dgConsumeInfo.ItemContainerGenerator.ContainerFromItem(row) as DataGridRow; @@ -507,10 +511,12 @@ namespace XGLFinishPro.Views //} } } - + LogHelper.instance.log.Error("准备执行插入SQL"+ reportWorkSqlList.Count+"条"); bool isReportSuccess = formingMachineService.GetExecuteReportWorkSql(reportWorkSqlList); - - + if (isReportSuccess) + { + LogHelper.instance.log.Error("完成插入!"); + } return isReportSuccess; ; } diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs index f1a7dbb..294f953 100644 --- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs +++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs @@ -493,7 +493,6 @@ namespace XGLFinishPro.Views CustomMessageBox.Show("你选择的工单不能报工，请检查工单状态，当前工单状态为："+ st, CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); return; } - //20240424预报工功能，不能限制批次报工次数， //if (selectedRow["batchStatus"].ToString().Equals("0")) //{ diff --git a/shangjian/XGLFinishPro/Views/LanJu_User.xaml b/shangjian/XGLFinishPro/Views/LanJu_User.xaml index ac257c8..e87ebea 100644 --- a/shangjian/XGLFinishPro/Views/LanJu_User.xaml +++ b/shangjian/XGLFinishPro/Views/LanJu_User.xaml @@ -6,10 +6,10 @@ xmlns:local="clr-namespace:XGLFinishPro.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" HorizontalAlignment="Stretch" - VerticalAlignment="Stretch" Loaded="UserControl_Loaded" + VerticalAlignment="Stretch" Loaded="UserControl_Loaded" mc:Ignorable="d"> - + + + + + + + + + + + + + + + + + + + + + + + - @@ -294,13 +320,15 @@