Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

油漆实验室添加产品描述

Browse Source
This commit is contained in:
赵正易
2024-09-14 15:17:33 +08:00
parent ad17ac8926
commit 1b12c975ce
18 changed files with 87 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Service/mes/qc/IService/IQCStatisticsService.cs
View File

@@ -82,6 +82,7 @@ namespace ZR.Service.mes.qc.IService
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="type"></param>
/// <param name="sortType">排序描述</param>
/// <returns></returns>
List<QcQualityStatisticsFirstDto> DownloadStatisticsTableExcel(
DateTime starttime,
@@ -92,7 +93,8 @@ namespace ZR.Service.mes.qc.IService
string team,
int pageNum,
int pageSize,
int type
int type,
int sortType
);
}
}

39
ZR.Service/mes/qc/QCStatisticsService.cs
View File

@@ -395,7 +395,8 @@ namespace ZR.Service.mes.qc
string team,
int pageNum,
int pageSize,
int type
int type,
int sortType = 0
)
{
try
@@ -414,7 +415,8 @@ namespace ZR.Service.mes.qc
product_description,
team,
pageNum,
pageSize
pageSize,
sortType
),
// 抛光
2
@@ -426,7 +428,8 @@ namespace ZR.Service.mes.qc
product_description,
team,
pageNum,
pageSize
pageSize,
sortType
),
// 包装
3
@@ -438,7 +441,8 @@ namespace ZR.Service.mes.qc
product_description,
team,
pageNum,
pageSize
pageSize,
sortType
),
// 总表
4
@@ -450,7 +454,8 @@ namespace ZR.Service.mes.qc
product_description,
team,
pageNum,
pageSize
pageSize,
sortType
),
_ => throw new Exception("获取的报表类型错误！" + type),
};
@@ -469,7 +474,8 @@ namespace ZR.Service.mes.qc
string product_description,
string team,
int pageNum,
int pageSize
int pageSize,
int sortType
)
{
List<QcQualityStatisticsFirst> list = GetQualityStatisticsTable_first(
@@ -480,7 +486,8 @@ namespace ZR.Service.mes.qc
product_description,
team,
pageNum,
pageSize
pageSize,
sortType
).Item1;
List<QcQualityStatisticsFirstDto> newList = list.Select(
item => new QcQualityStatisticsFirstDto()
@@ -548,7 +555,8 @@ namespace ZR.Service.mes.qc
string product_description,
string team,
int pageNum,
int pageSize
int pageSize,
int sortType
)
{
List<QcQualityStatisticsAgain> list = GetQualityStatisticsTable_again(
@@ -559,7 +567,8 @@ namespace ZR.Service.mes.qc
product_description,
team,
pageNum,
pageSize
pageSize,
sortType
).Item1;
List<QcQualityStatisticsFirstDto> newList = list.Select(
item => new QcQualityStatisticsFirstDto()
@@ -627,7 +636,8 @@ namespace ZR.Service.mes.qc
string product_description,
string team,
int pageNum,
int pageSize
int pageSize,
int sortType
)
{
List<QcQualityStatisticsFinal> list = GetQualityStatisticsTable_final(
@@ -638,7 +648,8 @@ namespace ZR.Service.mes.qc
product_description,
team,
pageNum,
pageSize
pageSize,
sortType
).Item1;
List<QcQualityStatisticsFirstDto> newList = list.Select(
item => new QcQualityStatisticsFirstDto()
@@ -706,7 +717,8 @@ namespace ZR.Service.mes.qc
string product_description,
string team,
int pageNum,
int pageSize
int pageSize,
int sortType
)
{
List<QcQualityStatisticsTotal> list = GetQualityStatisticsTable_total(
@@ -717,7 +729,8 @@ namespace ZR.Service.mes.qc
product_description,
team,
pageNum,
pageSize
pageSize,
sortType
).Item1;
List<QcQualityStatisticsFirstDto> newList = list.Select(
item => new QcQualityStatisticsFirstDto()

2
ZR.Service/mes/ql/IService/IPLBatchService.cs
View File

@@ -7,7 +7,7 @@ namespace ZR.Service.mes.ql.IService
public interface IPLBatchService
{
public (List<PLBatch>, int) GetPLBatchTable(DateTime starttime, DateTime endTime, string code, int pageNum, int pageSize);
public (List<PLBatch>, int) GetPLBatchTable(DateTime starttime, DateTime endTime, string code,string description, int pageNum, int pageSize);
public int AddPLBatchRecords(int num, int size);

2
ZR.Service/mes/ql/IService/IPLRawMaterialService.cs
View File

@@ -7,7 +7,7 @@ namespace ZR.Service.mes.ql.IService
public interface IPLRawMaterialService
{
public (List<PLRawMaterial>, int) GetRawMaterialTable(DateTime starttime, DateTime endTime, string pci, string colorCode, int pageNum, int pageSize);
public (List<PLRawMaterial>, int) GetRawMaterialTable(DateTime starttime, DateTime endTime, string pci, string colorCode,string description, int pageNum, int pageSize);
public int AddRawMaterialRecords(int num, int size);

2
ZR.Service/mes/ql/IService/IPLTestService.cs
View File

@@ -7,7 +7,7 @@ namespace ZR.Service.mes.ql.IService
public interface IPLTestService
{
public (List<PLTest>, int) GetPLTestTable(DateTime starttime, DateTime endTime, string code, int pageNum, int pageSize);
public (List<PLTest>, int) GetPLTestTable(DateTime starttime, DateTime endTime, string code,string description, int pageNum, int pageSize);
public int AddPLTestRecords(int num, int size);

4
ZR.Service/mes/ql/PLBatchService.cs
View File

@@ -66,7 +66,7 @@ namespace ZR.Service.mes.ql
/// <param name="pageSize"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public (List<PLBatch>, int) GetPLBatchTable(DateTime starttime, DateTime endTime, string code, int pageNum, int pageSize)
public (List<PLBatch>, int) GetPLBatchTable(DateTime starttime, DateTime endTime, string code,string description, int pageNum, int pageSize)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
@@ -75,6 +75,7 @@ namespace ZR.Service.mes.ql
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime >= starttime.ToLocalTime())
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime <= endTime.ToLocalTime())
.AndIF(!string.IsNullOrEmpty(code), it => it.Code.Contains(code))
.AndIF(!string.IsNullOrEmpty(description), it => it.Description.Contains(description))
.ToExpression();
//int totalNum = 0;
@@ -103,6 +104,7 @@ namespace ZR.Service.mes.ql
{
Id = 0,
IdGroup = DateTime.Now.ToString("yyyyMMddHHmmssfff"),
Description = "",
Dt = "",
Code = "",
Value01 = "",

4
ZR.Service/mes/ql/PLRawMaterialService.cs
View File

@@ -58,7 +58,7 @@ namespace ZR.Service.mes.ql
/// 查询数据记录，要改成分页查询
/// </summary>
/// <returns></returns>
public (List<PLRawMaterial>, int) GetRawMaterialTable(DateTime starttime, DateTime endTime, string pci, string colorCode, int pageNum, int pageSize)
public (List<PLRawMaterial>, int) GetRawMaterialTable(DateTime starttime, DateTime endTime, string pci, string colorCode,string description, int pageNum, int pageSize)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
@@ -68,6 +68,7 @@ namespace ZR.Service.mes.ql
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime <= endTime.ToLocalTime())
.AndIF(!string.IsNullOrEmpty(pci), it => it.Pci.Contains(pci))
.AndIF(!string.IsNullOrEmpty(colorCode), it => it.Pci.Contains(colorCode))
.AndIF(!string.IsNullOrEmpty(description), it => it.Description.Contains(description))
.ToExpression();
@@ -113,6 +114,7 @@ namespace ZR.Service.mes.ql
{
Id = 0,
IdGroup = DateTime.Now.ToString("yyyyMMddHHmmssfff"),
Description = "",
Code = "",
Pci = "",
Value01 = "",

4
ZR.Service/mes/ql/PLTestService.cs
View File

@@ -66,7 +66,7 @@ namespace ZR.Service.mes.ql
/// <param name="pageSize"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public (List<PLTest>, int) GetPLTestTable(DateTime starttime, DateTime endTime, string code, int pageNum, int pageSize)
public (List<PLTest>, int) GetPLTestTable(DateTime starttime, DateTime endTime, string code,string description, int pageNum, int pageSize)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
@@ -75,6 +75,7 @@ namespace ZR.Service.mes.ql
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime >= starttime.ToLocalTime())
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime <= endTime.ToLocalTime())
.AndIF(!string.IsNullOrEmpty(code), it => it.Code.Contains(code))
.AndIF(!string.IsNullOrEmpty(description), it => it.Description.Contains(description))
.ToExpression();
//int totalNum = 0;
@@ -103,6 +104,7 @@ namespace ZR.Service.mes.ql
{
Id = 0,
IdGroup = DateTime.Now.ToString("yyyyMMddHHmmssfff"),
Description = "",
Dt = "",
Code = "",
Value01 = "",