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-06-28 15:21:25 +08:00
parent 9b63150b66
commit c7cd6ba42c
23 changed files with 335 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.MES.ql;
@@ -11,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, int pageNum, int pageSize);
public int AddPLBatchRecords(int num, int size);

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

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.MES.qc;
using ZR.Model.MES.ql;
@@ -12,9 +7,9 @@ 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, int pageNum, int pageSize);
public int AddRawMaterialRecords(int num,int size);
public int AddRawMaterialRecords(int num, int size);
public int DelRawMaterialRecords(string idGroup);

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

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.MES.ql;
@@ -11,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, int pageNum, int pageSize);
public int AddPLTestRecords(int num, int size);

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

@@ -1,15 +1,6 @@
using Infrastructure.Attribute;
using Mapster;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Tokens;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Security.AccessControl;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.MES.ql;
using ZR.Service.mes.ql.IService;
@@ -75,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, int pageNum, int pageSize)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
@@ -89,7 +80,7 @@ namespace ZR.Service.mes.ql
//int totalNum = 0;
List<PLBatch> data = Context.Queryable<PLBatch>()
.Where(predicate)
.OrderByDescending(it=>it.IdGroup)
.OrderByDescending(it => it.IdGroup)
.OrderBy(it => it.Id)
.ToPageList(pageNum, pageSize, ref totalNum);
return (data, totalNum);

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

@@ -1,16 +1,6 @@
using Infrastructure.Attribute;
using Mapster;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Tokens;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Security.AccessControl;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.MES.qc;
using ZR.Model.MES.ql;
using ZR.Service.mes.ql.IService;
@@ -122,10 +112,10 @@ namespace ZR.Service.mes.ql
return new PLRawMaterial()
{
Id = 0,
IdGroup=DateTime.Now.ToString("yyyyMMddHHmmssfff"),
Code="",
Pci="",
Value01="",
IdGroup = DateTime.Now.ToString("yyyyMMddHHmmssfff"),
Code = "",
Pci = "",
Value01 = "",
Value02 = "",
Value03 = "",
Value04 = "",
@@ -136,10 +126,10 @@ namespace ZR.Service.mes.ql
Value09 = "",
Value10 = "",
Value11 = "",
CreatedBy="user",
CreatedTime=DateTime.Now,
UpdatedBy="user",
UpdatedTime=DateTime.Now,
CreatedBy = "user",
CreatedTime = DateTime.Now,
UpdatedBy = "user",
UpdatedTime = DateTime.Now,
};
}
}

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

@@ -1,15 +1,6 @@
using Infrastructure.Attribute;
using Mapster;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Tokens;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Security.AccessControl;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.MES.ql;
using ZR.Service.mes.ql.IService;
@@ -75,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, int pageNum, int pageSize)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();