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

agv 调整

Browse Source
This commit is contained in:
qianhao.xu
2024-05-16 09:30:54 +08:00
parent 5c108fb878
commit 9e24508cf1
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/appsettings.production.json
View File

@@ -26,8 +26,8 @@
"IsAutoCloseConnection": true, "IsAutoCloseConnection": true,
"DbName": "ZrAdmin" //代码生成默认连接数据库 "DbName": "ZrAdmin" //代码生成默认连接数据库
}, },
"corsUrls": [ "http://localhost:8887", "http://localhost:8886" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开 "corsUrls": [ "http://localhost:8887", "http://localhost:8886", "http://192.168.60.251:8877" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开
"JwtSettings": { "JwtSettings": {
"Issuer": "ZRAdmin.NET", //即token的签发者。 "Issuer": "ZRAdmin.NET", //即token的签发者。
"Audience": "ZRAdmin.NET", //指该token是服务于哪个群体的（群体范围） "Audience": "ZRAdmin.NET", //指该token是服务于哪个群体的（群体范围）

6
ZR.Service/mes/mm/MaterialInputService.cs
View File

@@ -80,7 +80,8 @@ namespace ZR.Service.mes.mm
/// <returns></returns> /// <returns></returns>
public (List<ProWorkorder_v2>, int) Getworkorderlist(WorkorderqueryDto query) public (List<ProWorkorder_v2>, int) Getworkorderlist(WorkorderqueryDto query)
{ {
DateTime datetimespan = query.datetimespan;
DateTime datetimespan = new DateTime(query.datetimespan.Year, query.datetimespan.Month, query.datetimespan.Day, 0, 0, 0);
// 获取年份和周数 // 获取年份和周数
Calendar calendar = new GregorianCalendar(); Calendar calendar = new GregorianCalendar();
@@ -90,7 +91,8 @@ namespace ZR.Service.mes.mm
// 获取这一周中的第几天 // 获取这一周中的第几天
DayOfWeek dayOfWeek = datetimespan.DayOfWeek; DayOfWeek dayOfWeek = datetimespan.DayOfWeek;
int dayOfWeekNumber = (int)dayOfWeek; // 将 DayOfWeek 枚举转换为从 1 开始的数字 int dayOfWeekNumber = (int)dayOfWeek; // 将 DayOfWeek 枚举转换为从 1 开始的数字
Console.WriteLine("<-获取工单列表-> "+ year+"年"+week+"周"+ dayOfWeekNumber+"日");
logger.Error("<-获取工单列表-> " + year + "年" + week + "周" + dayOfWeekNumber + "日");
//todo 已经和正在配料的工单号和毛坯号不能变？？？？？？ //todo 已经和正在配料的工单号和毛坯号不能变？？？？？？
int total = 0; int total = 0;
List<ProWorkorder_v2> WorkorderList = Context.Queryable<ProWorkorder_v2>() List<ProWorkorder_v2> WorkorderList = Context.Queryable<ProWorkorder_v2>()