From 4b8adf76a495aca73c3a1af9b28a15d19b9a03f4 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 28 十一月 2025 14:38:52 +0800
Subject: [PATCH] 代码提交
---
StandardPda/MES.Service/service/QC/SJService.cs | 64 ++++++++++++-------------------
1 files changed, 25 insertions(+), 39 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/SJService.cs b/StandardPda/MES.Service/service/QC/SJService.cs
index 98f4a1a..9d487b2 100644
--- a/StandardPda/MES.Service/service/QC/SJService.cs
+++ b/StandardPda/MES.Service/service/QC/SJService.cs
@@ -1,9 +1,9 @@
-锘縰sing System.Data;
-using MES.Service.DB;
+锘縰sing 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;
@@ -35,8 +35,7 @@
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
- public (List<SJPageResult> item, int TotalCount) getPage(
- SJPageResult queryObj)
+ public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -68,7 +67,7 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
- a => a.FSubmit == 1)
+ a => a.FSubmit == 1)
.OrderBy(a => a.BillNo, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -466,7 +465,7 @@
return withOracle;
}
-
+
public bool SJQaSubmit(LLJDto rkjDto)
{
var useTransactionWithOracle =
@@ -482,7 +481,6 @@
return useTransactionWithOracle > 0;
}
-
public List<Component> getYzxBDlist(string id)
{
OracleSQLHelper SQLHelper = new();
@@ -494,13 +492,11 @@
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_SJ_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_SJ_ck where PID='" + id + "' group by ITEMNAME order by ITEMNAME");
//鏌ユ槑缁�
var sql2 =
- string.Format(
- @"select * from MES_IQC_CONSISTENCY_SJ_ck where PID='" +
- id + "' order by ITEMNAME,ITEMMODE,SUPPNAME");
+ string.Format(@"select * from MES_IQC_CONSISTENCY_SJ_ck where PID='" +
+ id + "' order by ITEMNAME,ITEMMODE,SUPPNAME");
var dataTable1 = SQLHelper.ExecuteQuery(sql1);
var dataTable2 = SQLHelper.ExecuteQuery(sql2);
var Components = new List<Component>();
@@ -539,7 +535,18 @@
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();
@@ -562,7 +569,6 @@
id + "'and id in(" + rowId + ") ");
SQLHelper.ExecuteQuery(sql2);
}
-
public string[] YzxImgVerify(string id)
{
var msgStr = new string[2];
@@ -576,18 +582,11 @@
var sql2 = string.Format(
- @"select A.ITEMNAME from ( select 999||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_SJ_CK where pid='" +
- id +
- "' and ITEMNAME not in(select ITEMNAME from MES_IQC_CONSISTENCY_SJ_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_SJ_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_SJ_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");
+ @"select A.ITEMNAME from ( select 999||min(id) id,ITEMNAME from MES_IQC_CONSISTENCY_SJ_CK where pid='" + id.ToString() + "' and ITEMNAME not in(select ITEMNAME from MES_IQC_CONSISTENCY_SJ_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_SJ_CK where pid = '" + id.ToString() + "' and MULTI_SELECT is not null and MULTI_SELECT not in(select A.MULTI_SELECT as ITEMNAME from (select 999 || min(id) id, MULTI_SELECT from MES_IQC_CONSISTENCY_SJ_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)
@@ -605,18 +604,5 @@
}
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