From a27f32ecbfc7390ceb9e3a8d8651c57ada88bfa0 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 19 十二月 2025 20:51:42 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/XB_MES_API
---
StandardPda/MES.Service/service/QC/XJService.cs | 69 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/XJService.cs b/StandardPda/MES.Service/service/QC/XJService.cs
index e10bc17..93c22d0 100644
--- a/StandardPda/MES.Service/service/QC/XJService.cs
+++ b/StandardPda/MES.Service/service/QC/XJService.cs
@@ -1,9 +1,9 @@
-锘縰sing MES.Service.DB;
+锘縰sing System.Data;
+using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
-using System.Data;
namespace MES.Service.service.QC;
@@ -108,7 +108,8 @@
}).ToList();
}
- public (List<QsQaItemXj> item, int TotalCount) getPage(XJPageResult queryObj)
+ public (List<QsQaItemXj> item, int TotalCount) getPage(
+ XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -123,17 +124,16 @@
var pageList = db
.Queryable<QsQaItemXj, Womdaa,
- MesItems>((s, a, b) =>
+ MesItems>((s, a, b) =>
new JoinQueryInfos(
JoinType.Inner, s.BillNo == a.Daa001,
JoinType.Left, s.ItemId == b.Id
)
)
-
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (s, a, b) => s.Fsubmit == null || s.Fsubmit == 0)
+ (s, a, b) => s.Fsubmit == null || s.Fsubmit == 0)
// .WhereIF(
// StringUtil.IsNotNullOrEmpty(queryObj.result) &&
// !"鏈畬鎴�".Equals(queryObj.result),
@@ -141,9 +141,9 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (s, a, b) => s.Fsubmit == 1)
+ (s, a, b) => s.Fsubmit == 1)
.WhereIF(id > 0, (s, a, b) => s.Id == id)
- .Select((s, a, b) => new QsQaItemXj
+ .Select((s, a, b) => new QsQaItemXj
{
Id = s.Id,
PlanQty = a.Daa008,
@@ -552,6 +552,7 @@
.ExecuteCommand();
});
}
+
public List<Component> getYzxBDlist(string id)
{
OracleSQLHelper SQLHelper = new();
@@ -563,11 +564,13 @@
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_XJ_ck where PID='" + id + "' group by ITEMNAME order by ITEMNAME");
+ @"select CASE WHEN max(MULTI_SELECT) is null THEN ''ELSE '銆�'||max(MULTI_SELECT)||'銆�' END as A,ITEMNAME as ITEMNAME from MES_IQC_CONSISTENCY_XJ_ck where PID='" +
+ id + "' group by ITEMNAME order by ITEMNAME");
//鏌ユ槑缁�
var sql2 =
- string.Format(@"select * from MES_IQC_CONSISTENCY_XJ_ck where PID='" +
- id + "' order by ITEMNAME,ITEMMODE,SUPPNAME");
+ string.Format(
+ @"select * from MES_IQC_CONSISTENCY_XJ_ck where PID='" +
+ id + "' order by ITEMNAME,ITEMMODE,SUPPNAME");
var dataTable1 = SQLHelper.ExecuteQuery(sql1);
var dataTable2 = SQLHelper.ExecuteQuery(sql2);
var Components = new List<Component>();
@@ -606,18 +609,7 @@
return Components;
}
- /// <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; }
- }
+
public void saveYzxBDlist(string id, DataTable DB)
{
OracleSQLHelper SQLHelper = new();
@@ -640,6 +632,7 @@
id + "'and id in(" + rowId + ") ");
SQLHelper.ExecuteQuery(sql2);
}
+
public string[] YzxImgVerify(string id)
{
var msgStr = new string[2];
@@ -653,11 +646,18 @@
var sql2 = string.Format(
- @"select A.ITEMNAME from ( select 777||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_XJ_CK where pid='" + id.ToString() + "' and ITEMNAME not in(select ITEMNAME from MES_IQC_CONSISTENCY_XJ_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_XJ_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_XJ_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");
+ @"select A.ITEMNAME from ( select 777||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_XJ_CK where pid='" +
+ id +
+ "' and ITEMNAME not in(select ITEMNAME from MES_IQC_CONSISTENCY_XJ_CK where PID='" +
+ id + "' 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_XJ_CK where pid = '" +
+ id +
+ "' 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_XJ_CK where pid = '" +
+ id +
+ "' 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)
@@ -676,4 +676,17 @@
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; }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3