From c01d18bc7e003a025e06fc1a2d1ac62fbd036269 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期六, 11 十月 2025 20:06:40 +0800
Subject: [PATCH] 1
---
WebApi/GS.QC/Service/MesQaMjManager.cs | 62 ++++++++++++------------------
1 files changed, 25 insertions(+), 37 deletions(-)
diff --git a/WebApi/GS.QC/Service/MesQaMjManager.cs b/WebApi/GS.QC/Service/MesQaMjManager.cs
index a689112..2de656b 100644
--- a/WebApi/GS.QC/Service/MesQaMjManager.cs
+++ b/WebApi/GS.QC/Service/MesQaMjManager.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Data;
-using System.Text;
+锘縰sing System.Text;
using Gs.Entity.BaseInfo;
using Gs.Entity.Sys;
using GS.QC.Models;
@@ -12,6 +11,7 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using SqlSugar;
+using System.Data;
namespace GS.QC.Service;
@@ -46,15 +46,14 @@
var _sbBy =
new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
- var itemsList = Db
- .Queryable<MesQaMj, MesItems, SysOrganization, MesSupplier>((a,
- b, org, d) => new JoinQueryInfos(
- JoinType.Inner, a.ItemId == b.Id,
- JoinType.Inner, b.FSubsidiary == org.Fid,
- JoinType.Left, a.SuppId == d.Id.ToString()
- ))
- .Where(_sbWhere.ToString())
- .OrderBy(_sbBy.ToString())
+ var itemsList = Db.Queryable<MesQaMj, MesItems, SysOrganization, MesSupplier>(
+ (a, b, org, d) => new JoinQueryInfos(
+ JoinType.Inner, a.ItemId == b.Id,
+ JoinType.Inner, b.FSubsidiary == org.Fid,
+ JoinType.Left, a.SuppId == d.Id.ToString()
+ ))
+ .Where(_sbWhere.ToString())
+ .OrderBy(_sbBy.ToString())
.Select((a, b, org, d) => new MesQaMj
{
FSubsidiary = "(" + org.FNumber + ") " + org.Name,
@@ -66,7 +65,7 @@
.ToPageList(query.currentPage, query.everyPageSize,
ref totalCount);
pageList = new PageList<MesQaMj>(itemsList, totalCount,
- query.everyPageSize);
+ query.everyPageSize);
return ReturnDto<PageList<MesQaMj>>.QuickReturn(pageList,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
@@ -87,17 +86,15 @@
[FromBody] MesQaMj model)
{
var m = base.GetById(model.Guid);
- var sbSql = new StringBuilder();
- sbSql.Append(
- "select i.FSubsidiary,i.[item_name],i.[item_model],i.item_no,mj.SUPP_ID,sup.supp_name,sup.supp_no");
- sbSql.Append(
- " from MES_ITEMS i right join [dbo].[MES_QA_MJ] mj on i.id=mj.ITEM_ID left join [dbo].[MES_SUPPLIER] sup on sup.id=mj.SUPP_ID ");
+ System.Text.StringBuilder sbSql = new StringBuilder();
+ sbSql.Append("select i.FSubsidiary,i.[item_name],i.[item_model],i.item_no,mj.SUPP_ID,sup.supp_name,sup.supp_no");
+ sbSql.Append(" from MES_ITEMS i right join [dbo].[MES_QA_MJ] mj on i.id=mj.ITEM_ID left join [dbo].[MES_SUPPLIER] sup on sup.id=mj.SUPP_ID ");
sbSql.Append(" where i.id=" + m.ItemId);
try
{
- var dset = new DataSet();
- dset = DbHelperSQL.Query(sbSql.ToString());
- var r = dset.Tables[0].Rows[0];
+ DataSet dset = new DataSet();
+ dset = Gs.Toolbox.DbHelperSQL.Query(sbSql.ToString());
+ System.Data.DataRow r = dset.Tables[0].Rows[0];
m.FSubsidiary = r["FSubsidiary"].ToString();
m.ItemNo = r["item_no"].ToString();
m.suppNo = r["supp_no"].ToString();
@@ -106,7 +103,6 @@
{
LogHelper.Debug(ToString(), "GetModel error锛�" + ex.Message);
}
-
if (m != null)
return ReturnDto<MesQaMj>.QuickReturn(m,
ReturnCode.Success, "璇诲彇鎴愬姛锛�");
@@ -127,25 +123,18 @@
var cont = 0;
cont = IsChkOrUnChk(model.Guid.ToString());
if (cont > 0)
- return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,
- "淇敼澶辫触锛岃淇℃伅宸茶瀹℃牳锛�");
+ return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "淇敼澶辫触锛岃淇℃伅宸茶瀹℃牳锛�");
}
-
try
{
//闃插憜鏄笉鏄睘浜庡悓涓�缁勭粐
string supOrg = "", itemOrg = "";
- supOrg = DbHelperSQL
- .GetSingle(
- "select top 1 FSubsidiary from MES_SUPPLIER a where a.id=" +
- model.SuppId).ToString();
- itemOrg = DbHelperSQL
- .GetSingle(
- "select top 1 FSubsidiary from MES_ITEMS a where a.id=" +
- model.ItemId).ToString();
- if (supOrg != itemOrg)
+ supOrg = Gs.Toolbox.DbHelperSQL.GetSingle("select top 1 FSubsidiary from MES_SUPPLIER a where a.id="+model.SuppId.ToString()).ToString();
+ itemOrg = Gs.Toolbox.DbHelperSQL.GetSingle("select top 1 FSubsidiary from MES_ITEMS a where a.id=" + model.ItemId.ToString()).ToString();
+ if (supOrg != itemOrg) {
return ReturnDto<string>.QuickReturn("",
- ReturnCode.Default, "渚涘簲鍟嗗拰鐗╂枡涓嶅湪鍚屼竴缁勭粐涓嬶紝璇烽噸鏂伴�夋嫨锛�");
+ ReturnCode.Default, "渚涘簲鍟嗗拰鐗╂枡涓嶅湪鍚屼竴缁勭粐涓嬶紝璇烽噸鏂伴�夋嫨锛�");
+ }
Db.Ado.BeginTran();
if (!UtilityHelper.CheckGuid(model.Guid))
{
@@ -169,10 +158,9 @@
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
+ LogHelper.Debug(this.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(),
--
Gitblit v1.9.3