From b98df034707a61fd2857dbccd5a232605076ca59 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期四, 20 十一月 2025 10:26:08 +0800
Subject: [PATCH] 标准版初始化
---
WebApi/GS.QC/Service/MesDefectCodeManager.cs | 70 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/WebApi/GS.QC/Service/MesDefectCodeManager.cs b/WebApi/GS.QC/Service/MesDefectCodeManager.cs
index 96d6f31..315385d 100644
--- a/WebApi/GS.QC/Service/MesDefectCodeManager.cs
+++ b/WebApi/GS.QC/Service/MesDefectCodeManager.cs
@@ -1,15 +1,17 @@
-锘縰sing System.Text;
-using GS.QC.Models;
+锘縰sing Gs.Entity.Sys;
using Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
using Gs.Toolbox.ApiCore.Group;
+using GS.QC.Models;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
using Newtonsoft.Json.Linq;
+using SqlSugar;
using System.Data;
using System.Dynamic;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Text;
namespace GS.QC.Service;
@@ -41,24 +43,53 @@
try
{
var _sbWhere = new StringBuilder(" 1=1" + query.keyWhere);
- var _sbBy =
- new StringBuilder(query.sortName + " " + query.sortOrder);
+ var _sbBy = new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
- var itemsList = Db.Queryable<MesDefectCode>("a")
+ var itemsList = Db.Queryable<MesDefectCode, SysUser>(
+ (a, u) => new object[]
+ {
+ JoinType.Left, a.LastupdateBy == u.Account
+ })
.Where(_sbWhere.ToString())
.OrderBy(_sbBy.ToString())
- .ToPageList(query.currentPage, query.everyPageSize,
- ref totalCount);
+.Select((a, u) => new MesDefectCode
+{
+ Guid = a.Guid,
+ DefectCode = a.DefectCode,
+ DefectName = a.DefectName,
+ Memo = a.Memo,
+ DefectSort = a.DefectSort,
+ DefectRate = a.DefectRate,
+ CreateBy = a.CreateBy,
+ CreateDate = a.CreateDate,
- pageList = new PageList<MesDefectCode>(itemsList, totalCount,
- query.everyPageSize);
- return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList,
- ReturnCode.Success, "璇诲彇鎴愬姛");
+ LastupdateBy = u.UserName, // 杩欓噷鐢ㄥ鍚嶆浛鎹㈣处鍙�
+ LastupdateDate = a.LastupdateDate,
+ WorkshopCenterCode = a.WorkshopCenterCode,
+ WorkshopCenterName = a.WorkshopCenterName,
+ ProcNo = a.ProcNo,
+ DOrder = a.DOrder,
+ SType = a.SType,
+ Type1 = a.Type1,
+ Type2 = a.Type2,
+ Type3 = a.Type3,
+ Type4 = a.Type4,
+ Type5 = a.Type5,
+ Type6 = a.Type6,
+ Type7 = a.Type7,
+ Type8 = a.Type8,
+ Pid = a.Pid
+})
+ .Where(_sbWhere.ToString())
+ .OrderBy(_sbBy.ToString())
+ .ToPageList(query.currentPage, query.everyPageSize, ref totalCount);
+
+ pageList = new PageList<MesDefectCode>(itemsList, totalCount, query.everyPageSize);
+ return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList, ReturnCode.Success, "璇诲彇鎴愬姛");
}
catch (Exception ex)
{
- return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList,
- ReturnCode.Default, ex.Message);
+ return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList, ReturnCode.Default, ex.Message);
}
}
@@ -240,10 +271,17 @@
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.guid");
+ 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='搴撲綅'");
try
{
dset = DbHelperSQL.Query(sbSql.ToString());
@@ -256,6 +294,8 @@
m.list = _tb;
var _tb2 = dset.Tables[2].TableToDynamicList();
m.list2 = _tb2;
+ var _tb3 = dset.Tables[3].TableToDynamicList();
+ m.list3 = _tb3;
}
}
catch (Exception ex)
--
Gitblit v1.9.3