From 2f4699ff377f0e5ea3640bb3670b2fbfbd56e3fb Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期四, 13 十一月 2025 10:47:58 +0800
Subject: [PATCH] 格式化清理代码
---
StandardPda/MES.Service/service/QC/LljService.cs | 152 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 146 insertions(+), 6 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index 2f0d699..5a1690c 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -52,7 +52,7 @@
// itemIds is { Length: > 0 },
// (a, b, c) => itemIds.Contains(a.ItemId))
.WhereIF(id > 0, (a, b, d) => a.Id == id)
- .WhereIF(queryObj.createUser!="PL017"&& queryObj.UserIndex=="0", (a, b, d, e, f, g,h, i) => (g.Fcode == queryObj.createUser || i.Fcode == queryObj.createUser))//鍒ゆ柇姝ゅ崟鐨勬楠屽憳锛屾垨鑰呮楠屼负绌哄氨鏄剧ず姝ゅ崟鎹�
+ // .WhereIF(queryObj.createUser!="PL017"&& queryObj.UserIndex=="0", (a, b, d, e, f, g,h, i) => (g.Fcode == queryObj.createUser || i.Fcode == queryObj.createUser))//鍒ゆ柇姝ゅ崟鐨勬楠屽憳锛屾垨鑰呮楠屼负绌哄氨鏄剧ず姝ゅ崟鎹�
//鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉帮紝椤圭洰鎼滅储
//.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
//(a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
@@ -68,11 +68,11 @@
.WhereIF(queryObj.SelectedIndex == "3" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())))
.WhereIF(queryObj.SelectedIndex == "4" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d, e) => (e.Fname.ToLower().Contains(queryObj.SearchValue.ToLower())))
//.OrderByDescending((a, b, d) => a.Id)
- .Select((a, b, d, e, f, g,h,i) => new LtsLlj
+ .Select((a, b, d, e, f, g, h, i) => new LtsLlj
{
//UserName = g.Fname,
//UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
- UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
+ UserName = i.Fname != null || i.Fname != "" ? i.Fname : g.Fname,
FIRST = d.First,
CreateUserName = e.Fname,
NewFngDesc = d.NewFngDesc,
@@ -83,7 +83,7 @@
return (pageList, totalCount);
}
-
+
public DataTable getBlmsItem()
{
OracleSQLHelper SQLHelper = new();
@@ -91,6 +91,17 @@
var sql1 = @"select DEFECT_NAME
from MES_DEFECT_CODE A
left join MES_DEFECT_TYPE X ON X.TYPE_NO = A.DEFECT_SORT AND X.COMPANY = A.COMPANY AND X.FACTORY = A.FACTORY";
+
+ return SQLHelper.ExecuteQuery(sql1);
+ }
+
+ public DataTable getBlmsItem(string id)
+ {
+ OracleSQLHelper SQLHelper = new();
+ //鏌ヤ笉鑹弿杩�
+ var sql1 = string.Format(
+ @"select FCHECK_ITEM,FUNIT from mes_qa_items_detect_detail5 f where RELEASE_NO='" +
+ id + "' and FUNIT is not null order by FCHECK_ITEM");
return SQLHelper.ExecuteQuery(sql1);
}
@@ -771,8 +782,8 @@
return SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<MesQaItemsDetectDetail5>()
- // .SetColumns(it =>
- // it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .SetColumns(it =>
+ it.Funit == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
.Where(it => it.Id == dto.pid)
.ExecuteCommand();
});
@@ -881,6 +892,135 @@
}
}
+ public List<Component> getYzxBDlist(string id)
+ {
+ OracleSQLHelper SQLHelper = new();
+ //鏌ュ厓鍣ㄤ欢
+ //var sql1 =
+ // string.Format(
+ // @"select ITEMNAME from MES_IQC_CONSISTENCY_ck where PID='" +
+ // id + "' group by ITEMNAME order by ITEMNAME");
+
+ var sql1 =
+ string.Format(
+ @"select CASE WHEN max(MULTI_SELECT) is null THEN ''ELSE '銆�'||max(MULTI_SELECT)||'銆�' END as A,ITEMNAME as ITEMNAME from MES_IQC_CONSISTENCY_ck where PID='" +
+ id + "' group by ITEMNAME order by ITEMNAME");
+ //鏌ユ槑缁�
+ var sql2 =
+ string.Format(@"select * from MES_IQC_CONSISTENCY_ck where PID='" +
+ id + "' order by ITEMNAME,ITEMMODE,SUPPNAME");
+ var dataTable1 = SQLHelper.ExecuteQuery(sql1);
+ var dataTable2 = SQLHelper.ExecuteQuery(sql2);
+ var Components = new List<Component>();
+
+
+ for (var i = 0; i < dataTable1.Rows.Count; i++)
+ {
+ var component = new Component();
+ component.Name = dataTable1.Rows[i]["A"].ToString() + dataTable1.Rows[i]["ITEMNAME"].ToString();
+ component.Specs = new List<string>();
+ component.Manufacturers = new List<string>();
+ component.Id = new List<string>();
+ component.SelectedSpec = -1;
+ component.SelectedMfg = -1;
+ var index = 0;
+ for (var j = 0; j < dataTable2.Rows.Count; j++)
+ if (dataTable2.Rows[j]["ITEMNAME"].ToString() ==
+ dataTable1.Rows[i]["ITEMNAME"].ToString())
+ {
+ component.Specs.Add(dataTable2.Rows[j]["ITEMMODE"]
+ .ToString());
+ component.Manufacturers.Add(dataTable2.Rows[j]["SUPPNAME"]
+ .ToString());
+ component.Id.Add(dataTable2.Rows[j]["ID"].ToString());
+ if (dataTable2.Rows[j]["ISCHACK"].ToString() == "1")
+ {
+ component.SelectedSpec = index;
+ component.SelectedMfg = index;
+ }
+
+ index++;
+ }
+
+ Components.Add(component);
+ }
+
+ return Components;
+ }
+
+ public void saveYzxBDlist(string id, DataTable DB)
+ {
+ OracleSQLHelper SQLHelper = new();
+ //鍏堟妸缁撴灉娓呯┖
+ var sql1 =
+ string.Format(
+ @"update MES_IQC_CONSISTENCY_ck set ISCHACK=0 where PID='" +
+ id + "' ");
+ SQLHelper.ExecuteQuery(sql1);
+ var rowId = "";
+ for (var i = 0; i < DB.Rows.Count; i++)
+ rowId += "'" + DB.Rows[i]["id"] + "',";
+ rowId = rowId.Substring(0, rowId.Length - 1);
+
+
+ //淇敼缁撴灉
+ var sql2 =
+ string.Format(
+ @"update MES_IQC_CONSISTENCY_ck set ISCHACK=1 where PID='" +
+ id + "'and id in(" + rowId + ") ");
+ SQLHelper.ExecuteQuery(sql2);
+ }
+
+ public string[] YzxImgVerify(string id)
+ {
+ var msgStr = new string[2];
+
+ OracleSQLHelper SQLHelper = new();
+ //淇敼缁撴灉
+ //var sql2 = string.Format(
+ // @"select A.ITEMNAME from ( select 888||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_CK where pid='" +
+ // id + "' group by ITEMNAME) A " +
+ // "left join MES_QS_IMAGE b on a.id=b.fid where B.id is null order by ITEMNAME");
+
+
+ var sql2 = string.Format(
+ @"select A.ITEMNAME from ( select 888||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_CK where pid='" + id.ToString() + "' and ITEMNAME not in(select ITEMNAME from MES_IQC_CONSISTENCY_CK where PID='" + id.ToString() + "' and MULTI_SELECT is not null)" +
+ "group by ITEMNAME) A" +
+ " left join MES_QS_IMAGE b on a.id=b.fid where B.id is null" +
+ " union" +
+ " select '鍒嗙粍锛�' || MULTI_SELECT as ITEMNAME from MES_IQC_CONSISTENCY_CK where pid = '" + id.ToString() + "' and MULTI_SELECT is not null and MULTI_SELECT not in(select A.MULTI_SELECT as ITEMNAME from (select 888 || min(id) id, MULTI_SELECT from MES_IQC_CONSISTENCY_CK where pid = '" + id.ToString() + "' and MULTI_SELECT is not null group by MULTI_SELECT,ITEMNAME) A left join MES_QS_IMAGE b on a.id = b.fid where B.id is not null) group by MULTI_SELECT");
+
+ var db = SQLHelper.ExecuteQuery(sql2);
+ if (db.Rows.Count > 0)
+ {
+ msgStr[1] = "鍏冨櫒浠讹細";
+ for (var i = 0; i < db.Rows.Count; i++)
+ msgStr[1] += db.Rows[i]["ITEMNAME"] + ",";
+ msgStr[1] += "鏈畬鎴愬浘鐗囦笂浼狅紝璇蜂笂浼狅紒";
+ msgStr[0] = "1";
+ }
+ else
+ {
+ msgStr[0] = "0";
+ msgStr[1] = "ok";
+ }
+
+ return msgStr;
+ }
+
+ /// <summary>
+ /// 涓�鑷存�ч」鐩�
+ /// </summary>
+ public class Component
+ {
+ public string Name { get; set; }
+ public List<string> Specs { get; set; }
+ public List<string> Manufacturers { get; set; }
+ public List<string> Id { get; set; }
+ public int SelectedSpec { get; set; }
+ public int SelectedMfg { get; set; }
+ }
+
/// <summary>
/// 鏂欏彿鍥剧焊鎺ュ彛杩斿洖瀵硅薄
/// </summary>
--
Gitblit v1.9.3