diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs index 428229e..dc846a5 100644 --- a/shangjian/XGL.Data/DBService/FormingMachineService.cs +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -1833,7 +1833,136 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC"; } return null; } + public List GetProductProcessListCheckInfo(String recordId) + { + List list = new List(); + string sql = $@" select td.record_id recordId, + td.project_id projectId, + td.material_batch material_batch, + td.project_no projectNo, + td.rule_name ruleName, + td.property_code propertyCode, + td.status, + td.create_by createBy, + td.create_time createTime, + td.update_by updateBy, + td.update_time updateTime, + td.belong_to belongTo + from qc_check_task_detail td + LEFT JOIN qc_check_task qct ON td.belong_to= qct.record_id + left join lanju_op_cloud.dbo.sys_dict_data dic on dic.dict_value = td.unit_code and dic.status ='0' and dic.dict_type = 'unit' + where td.belong_to = '{recordId}' and td.del_flag='0' and td.rule_name is not null + order by td.property_code desc, td.project_id"; + + /* string sql = $@"SELECT * from test_product_check_list where belongTo ='{recordId}'";*/ + DataSet ds = Utils.netClientDBHelper.getDataSet(sql); + if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0) + { + foreach (DataRow dr in ds.Tables[0].Rows) + { + list.Add(new ProductProcessListData() + { + recordId = dr["recordId"]?.ToString() ?? "", + projectId = dr["projectId"]?.ToString() ?? "", + projectNo = dr["projectNo"]?.ToString() ?? "", + ruleName = dr["ruleName"]?.ToString() ?? "", + propertyCode = dr["propertyCode"]?.ToString() ?? "", + status = dr["status"]?.ToString() ?? "", + material_batch = dr["material_batch"]?.ToString() ?? "", + + + }); + } + } + return list; + } + + //by 019188 加载生产过程检 2025-12-19 + public List GetProductProcessCheckInfo(string deviceCode) + { + List list = new List(); + string sql = $@"SELECT qct.record_id,qct.check_no,qct.income_batch_no,qct.order_no,qct.material_code,qct.material_name, + qct.quality,qct.unit,qct.supplier_code,qct.supplier_name,qct.income_time,qct.check_loc,qct.check_status, + qct.check_man_code,qct.check_man_name,qct.check_time,qct.check_result,qct.bz,qct.remark_code,qct.status,qct.create_by,qct.create_time, + qct.update_by,qct.update_time,qct.check_type,qct.sample_quality,qct.noOk_quality,bpa.cpk_type, + sdd.dict_label cpkTypeName,q.type_code,q.check_name,SUBSTRING (pow.workorder_code_sap,4,12) workorderCodeSap + FROM qc_check_task qct + LEFT JOIN qc_check_type q ON q.id = qct.check_type + LEFT JOIN pro_order_workorder pow ON pow.workorder_code = qct.order_no + LEFT JOIN base_product_attached bpa ON concat ( '0000000', bpa.product_code ) = qct.material_code + LEFT JOIN lanju_op_cloud.dbo.sys_dict_data sdd ON sdd.dict_type = 'qms_category' + AND sdd.dict_value = bpa.cpk_type + WHERE qct.check_type = 'checkTypeSCXJ' and qct.check_loc ='{deviceCode}' and CONVERT(date, qct.create_time) = CONVERT(date, GETDATE())"; + /* string sql = $@"SELECT * from test_product_check where check_loc ='{deviceCode}'";*/ + DataSet ds = Utils.netClientDBHelper.getDataSet(sql); + if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0) + { + foreach (DataRow dr in ds.Tables[0].Rows) + { + list.Add(new ProductProcessData() + { + check_no = dr["check_no"].ToString(),//任务编号 + workorderCodeSap = dr["workorderCodeSap"].ToString(),//订单号 + record_id = dr["record_id"].ToString(), + order_no = dr["order_no"].ToString(),//工单号 + material_code = dr["material_code"].ToString(),//产品号 + material_name = dr["material_name"].ToString(),//产品名称 + cpk_type = dr["cpk_type"].ToString(),//CPK品类 + quality = dr["quality"].ToString(),//数量 + sample_quality = dr["sample_quality"].ToString(),//抽样数量 + noOk_quality = dr["noOk_quality"].ToString(),//不合格数量 + unit = dr["unit"].ToString(),//单位 + supplier_name = dr["supplier_name"].ToString(), + income_time = dr["income_time"].ToString(), + check_loc = dr["check_loc"].ToString(), + check_status = dr["check_status"].ToString(), + check_result = dr["check_result"].ToString(), + bz = dr["bz"].ToString(), + remark_code = dr["remark_code"].ToString(), + }); + } + } + + return list; + } + public int UpdateProductProcessCheckTask(ProductProcessData model, string finalResult, string defectCategory, string remark, string isFinal) + { + string formattedDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); + //测试 + // string testsql = $@"update [dbo].[test_product_check] set update_time= '{formattedDateTime}',check_result='{finalResult}',remark_code='{defectCategory}',bz='{remark}' where record_id='{model.record_id}'"; + //正式 + string sql = $@"update [dbo].[qc_check_task] set update_by='{LoginUser.UserName}',update_time= '{formattedDateTime}',check_result='{finalResult}',remark_code='{defectCategory}',bz='{remark}' where record_id='{model.record_id}'"; + + if (isFinal == "1")//if isFinal = "1"(最终提交按钮) check_status="1" else 不处理check_status + { + sql = $@"update [dbo].[qc_check_task] set update_by='{LoginUser.UserName}',update_time= '{formattedDateTime}',check_result='{finalResult}',remark_code='{defectCategory}',bz='{remark}' ,check_status='1' where record_id='{model.record_id}'"; + + } + //正式 + + return Utils.netClientDBHelper.executeUpdate(sql); + } + + public int UpdateProductProcessCheckTaskDetial(List model, string belongto) + { + string formattedDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); + int totalAffectedRows = 0; + //正式 qc_check_task 结果:check_result 缺陷分类:remark_code 备注:bz + foreach (var item in model) + { + //测试 + // string testsql = $@"update [dbo].[test_product_check_list] set updatetime= '{formattedDateTime}',status='{item.status}',material_batch='{item.material_batch}' where recordId='{item.recordId}' and belongto = '{belongto}'"; + string sql = $@"update [dbo].[qc_check_task_detail] set update_by='{LoginUser.UserName}',material_batch = '{item.material_batch}',update_time= '{formattedDateTime}',status='{item.status}' where record_id='{item.recordId}' and belong_to = '{belongto}'"; + totalAffectedRows += Utils.netClientDBHelper.executeUpdate(sql); + } + + return totalAffectedRows; + } + } + +} + public class MesTableSelfDetialModel { public string id { get; set; } @@ -1867,4 +1996,3 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC"; public int table_line { get; set; } public int index { get; set; } } -} diff --git a/shangjian/XGL.Models/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/shangjian/XGL.Models/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs new file mode 100644 index 0000000..5d01041 --- /dev/null +++ b/shangjian/XGL.Models/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")] diff --git a/shangjian/XGL.Models/obj/Debug/XGL.Models.csproj.AssemblyReference.cache b/shangjian/XGL.Models/obj/Debug/XGL.Models.csproj.AssemblyReference.cache new file mode 100644 index 0000000..b283946 Binary files /dev/null and b/shangjian/XGL.Models/obj/Debug/XGL.Models.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Models/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/shangjian/XGL.Models/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs new file mode 100644 index 0000000..5d01041 --- /dev/null +++ b/shangjian/XGL.Models/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")] diff --git a/shangjian/XGL.Models/obj/Release/XGL.Models.csproj.AssemblyReference.cache b/shangjian/XGL.Models/obj/Release/XGL.Models.csproj.AssemblyReference.cache new file mode 100644 index 0000000..b283946 Binary files /dev/null and b/shangjian/XGL.Models/obj/Release/XGL.Models.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Models/obj/x86/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/shangjian/XGL.Models/obj/x86/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs new file mode 100644 index 0000000..5d01041 --- /dev/null +++ b/shangjian/XGL.Models/obj/x86/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")] diff --git a/shangjian/XGL.Models/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/shangjian/XGL.Models/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs new file mode 100644 index 0000000..5d01041 --- /dev/null +++ b/shangjian/XGL.Models/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")] diff --git a/shangjian/XGLFinishPro/Views/Lanju_Product_Process_Check_Report_List.xaml b/shangjian/XGLFinishPro/Views/Lanju_Product_Process_Check_Report_List.xaml new file mode 100644 index 0000000..0d2812b --- /dev/null +++ b/shangjian/XGLFinishPro/Views/Lanju_Product_Process_Check_Report_List.xaml @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +