From 2ba5117206c152cece2e5ac40067a6232dfb2870 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebApi/GS.QC/Service/MesDefectCodeManager.cs | 114 +++++++++++++++++++++++----------------------------------
1 files changed, 46 insertions(+), 68 deletions(-)
diff --git a/WebApi/GS.QC/Service/MesDefectCodeManager.cs b/WebApi/GS.QC/Service/MesDefectCodeManager.cs
index 4572035..9dcf208 100644
--- a/WebApi/GS.QC/Service/MesDefectCodeManager.cs
+++ b/WebApi/GS.QC/Service/MesDefectCodeManager.cs
@@ -1,6 +1,4 @@
-锘縰sing System.Data;
-using System.Dynamic;
-using System.Text;
+锘縰sing System.Text;
using GS.QC.Models;
using Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
@@ -9,6 +7,10 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using System.Data;
+using System.Dynamic;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
namespace GS.QC.Service;
@@ -69,11 +71,10 @@
public ReturnDto<MesDefectCode> GetModel([FromBody] MesDefectCode model)
{
var m = base.GetById(model.Guid);
- var sb = new StringBuilder();
- sb.Append(
- " select max(defect_code)+1 from [dbo].[MES_DEFECT_CODE] w ");
+ System.Text.StringBuilder sb = new StringBuilder();
+ sb.Append(" select max(defect_code)+1 from [dbo].[MES_DEFECT_CODE] w ");
sb.Append(" where pid='" + m.Guid + "'");
- var maxNo = "";
+ string maxNo = "";
try
{
var obj = DbHelperSQL.GetSingle(sb.ToString());
@@ -86,7 +87,6 @@
{
LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
}
-
m.MaxNo = maxNo;
if (m != null)
return ReturnDto<MesDefectCode>.QuickReturn(m, ReturnCode.Success,
@@ -128,12 +128,10 @@
{
LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
Db.Ado.RollbackTran();
- return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,
- ex.Message);
+ return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, ex.Message);
}
- return ReturnDto<string>.QuickReturn(model.Guid.ToString(),
- ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
+ return ReturnDto<string>.QuickReturn(model.Guid.ToString(), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
/// <summary>
@@ -145,44 +143,42 @@
public ReturnDto<int?> DeleteModel([FromBody] JArray guidList)
{
var intArray = guidList.ToObject<string[]>();
- var guid = intArray[0];
- var it = 0;
+ string guid = intArray[0];
+ int it = 0;
int? rtnInt = 0;
//鏍归」涓嶈兘鍒犻櫎
- var pid = "";
+ string pid = "";
try
{
- pid = DbHelperSQL
- .GetSingle(
- "select top 1 pid from MES_DEFECT_CODE where guid='" +
- guid + "' ").ToString();
+ pid = DbHelperSQL.GetSingle("select top 1 pid from MES_DEFECT_CODE where guid='" + guid + "' ").ToString();
}
catch (Exception ex)
{
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- "鍒犻櫎澶辫触:" + ex.Message);
+ "鍒犻櫎澶辫触:" + ex.Message);
}
-
if (pid == "00000000-0000-0000-0000-000000000000")
+ {
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- "璇ラ」鐩负鏍圭洰褰曪紝涓嶈兘鍒犻櫎锛�");
+ "璇ラ」鐩负鏍圭洰褰曪紝涓嶈兘鍒犻櫎锛�");
+ }
//鏈夊瓙椤逛笉鑳藉垹闄�
- var sbSql = new StringBuilder();
- sbSql.Append(" select count(1) from [MES_DEFECT_CODE] where pid='" +
- guid + "' ");
+ System.Text.StringBuilder sbSql = new StringBuilder();
+ sbSql.Append(" select count(1) from [MES_DEFECT_CODE] where pid='" + guid + "' ");
try
{
- it = int.Parse(DbHelperSQL.GetSingle(sbSql.ToString()).ToString());
+ it = int.Parse(Gs.Toolbox.DbHelperSQL.GetSingle(sbSql.ToString()).ToString());
}
catch (Exception ex)
{
LogHelper.Debug(ToString(), "DeleteModel error锛�" + ex.Message);
}
-
if (it > 0)
+ {
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- "鍒犻櫎澶辫触锛岃椤圭洰瀛樺湪瀛愰」锛�");
+ "鍒犻櫎澶辫触锛岃椤圭洰瀛樺湪瀛愰」锛�");
+ }
rtnInt = base.DeleteById(intArray) ? intArray.Length : 0;
if (rtnInt > 0)
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success,
@@ -192,6 +188,7 @@
}
/// <summary>
+ ///
/// </summary>
/// <param name="guidList"></param>
/// <returns></returns>
@@ -201,21 +198,19 @@
string strWhere = model.strWhere;
var lst = new List<dynamic>();
var dset = new DataSet();
- var sbSql = new StringBuilder();
- sbSql.Append(
- "select [type_memo] from [dbo].[MES_DEFECT_TYPE] a where 1=1");
+ System.Text.StringBuilder sbSql = new StringBuilder();
+ sbSql.Append("select [type_memo] from [dbo].[MES_DEFECT_TYPE] a where 1=1");
if (!string.IsNullOrEmpty(strWhere))
sbSql.Append(strWhere);
sbSql.Append(" order by [type_memo] asc");
try
{
- dset = DbHelperSQL.Query(sbSql.ToString());
+ dset = Gs.Toolbox.DbHelperSQL.Query(sbSql.ToString());
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
+ LogHelper.Debug(this.ToString(), "EditModel error锛�" + ex.Message);
}
-
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
lst = dset.Tables[0].TableToDynamicList();
@@ -237,41 +232,25 @@
m.list = new List<dynamic>();
m.list2 = new List<dynamic>();
var dset = new DataSet();
- var sbSql = new StringBuilder();
- sbSql.Append(" select * from [dbo].[MES_DEFECT_CODE] where guid='" +
- guid + "'");
- sbSql.Append(
- " select bind.guid,bind.fType ,u.ACCOUNT,u.USER_NAME,org.NAME as orgName,q.defect_name from [dbo].[SYS_USER_BIND] bind");
+ System.Text.StringBuilder sbSql = new StringBuilder();
+ sbSql.Append(" select * from [dbo].[MES_DEFECT_CODE] where guid='" + guid + "'");
+ sbSql.Append(" select bind.guid,bind.fType ,u.ACCOUNT,u.USER_NAME,org.NAME as orgName,q.defect_name from [dbo].[SYS_USER_BIND] bind");
sbSql.Append(" left join SYS_USER u on bind.aboutGuid=u.guid");
- sbSql.Append(
- " left join mes_staff f on u.STAFF_ID=f.id left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid");
- sbSql.Append(
- " left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary");
- sbSql.Append(" where 1=1 and bind.userGuid='" + guid +
- "' and bind.fType='鍛樺伐鍒嗗尯'");
- sbSql.Append(
- " select bind.guid,bind.fType ,f.item_id,f.item_no,f.item_name,org.NAME as orgName,q.defect_name");
- sbSql.Append(
- " from [dbo].[SYS_USER_BIND] bind left join MES_ITEMS f on bind.aboutGuid=f.item_id");
- sbSql.Append(
- " left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid");
- sbSql.Append(
- " left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary");
- sbSql.Append(" where 1=1 and bind.userGuid='" + guid +
- "' and bind.fType='鐗╂枡鍒嗗尯'");
- sbSql.Append(
- " select bind.guid,bind.fType ,u.depot_section_code,u.depot_section_name");
- sbSql.Append(
- " ,org.NAME as orgName ,q.defect_name from [dbo].[SYS_USER_BIND] bind ");
- sbSql.Append(
- " left join MES_DEPOT_SECTIONS u on bind.aboutGuid=u.depot_section_code ");
+ sbSql.Append(" left join mes_staff f on u.STAFF_ID=f.id left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid");
+ sbSql.Append(" left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary");
+ sbSql.Append(" where 1=1 and bind.userGuid='" + guid + "' and bind.fType='鍛樺伐鍒嗗尯'");
+ sbSql.Append(" select bind.guid,bind.fType ,f.item_id,f.item_no,f.item_name,org.NAME as orgName,q.defect_name");
+ sbSql.Append(" from [dbo].[SYS_USER_BIND] bind left join MES_ITEMS f on bind.aboutGuid=f.item_id");
+ sbSql.Append(" left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid");
+ sbSql.Append(" left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary");
+ sbSql.Append(" where 1=1 and bind.userGuid='" + guid + "' and bind.fType='鐗╂枡鍒嗗尯'");
+ sbSql.Append(" select bind.guid,bind.fType ,u.depot_section_code,u.depot_section_name");
+ sbSql.Append(" ,org.NAME as orgName ,q.defect_name from [dbo].[SYS_USER_BIND] bind ");
+ sbSql.Append(" left join MES_DEPOT_SECTIONS u on bind.aboutGuid=u.depot_section_code ");
sbSql.Append(" left join MES_DEPOTS f on u.depot_guid=f.depot_id");
- sbSql.Append(
- " left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid ");
- sbSql.Append(
- " left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary ");
- sbSql.Append(" where 1=1 and bind.userGuid='" + guid +
- "' and bind.fType='搴撲綅'");
+ sbSql.Append(" left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid ");
+ sbSql.Append(" left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary ");
+ sbSql.Append(" where 1=1 and bind.userGuid='" + guid + "' and bind.fType='搴撲綅'");
try
{
dset = DbHelperSQL.Query(sbSql.ToString());
@@ -292,7 +271,6 @@
{
LogHelper.Debug(ToString(), ex.Message);
}
-
if (m != null)
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
"璇诲彇鎴愬姛锛�");
--
Gitblit v1.9.3