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

WMS相关文件添加，仅添加文件，可启动但未测试

Browse Source
This commit is contained in:
赵正易
2024-03-08 08:28:14 +08:00
committed by qianhao.xu
parent 8a9176549a
commit 9532be659f
83 changed files with 3767 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ZR.Service/mes/pro/IService/IProWorkorderServiceV2.cs
View File

@@ -38,6 +38,7 @@ namespace ZR.Service.mes.pro.IService
public int UpdateWorkOrder(ProWorkorder_v2 workorder);
public int UpdateworkorderSort(string id ,int sort);
public int UpdateworkorderSort2(string oldId,int oldSort, string newId,int newSort);
public int StartWorkOrder(string id);

15
ZR.Service/mes/pro/ProWorkorderServiceV2.cs
View File

@@ -174,7 +174,8 @@ namespace ZR.Service.mes.pro
public (string, string) ExportExceldata(int year, int week, int date)
{
//1.0 读取表数据
var list = Queryable().Where(it => it.Year == year && it.Week == week && it.Date == date).ToList();
var list = Queryable().Where(it => it.Year == year && it.Week == week && it.Date == date)
.OrderBy(it => it.Sort).ToList();
//2.0 保存为excel
IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
@@ -397,5 +398,17 @@ namespace ZR.Service.mes.pro
DateTime firstDayOfThisWeek = firstDayOfFirstWeek.AddDays((weekNum - 1) * 7);
return firstDayOfThisWeek;
}
public int UpdateworkorderSort2(string oldId, int oldSort, string newId, int newSort)
{
int finalreuslt = 0;
int result1 = Context.Updateable<ProWorkorder_v2>().Where(it => it.Id == oldId).SetColumns(it => it.Sort == newSort).ExecuteCommand();
int result2 = Context.Updateable<ProWorkorder_v2>().Where(it => it.Id == newId).SetColumns(it => it.Sort == oldSort).ExecuteCommand();
if (result1 > 0 && result2 >0)
{
finalreuslt = 1;
}
return finalreuslt;
}
}
}