diff --git a/ZR.Admin.WebApi/appsettings.production.json b/ZR.Admin.WebApi/appsettings.production.json
index 1b9d9ede..f17635e2 100644
--- a/ZR.Admin.WebApi/appsettings.production.json
+++ b/ZR.Admin.WebApi/appsettings.production.json
@@ -26,8 +26,8 @@
"IsAutoCloseConnection": true,
"DbName": "ZrAdmin" //代码生成默认连接数据库
},
-
- "corsUrls": [ "http://localhost:8887", "http://localhost:8886" ], //跨域地址(前端启动项目,前后端分离单独部署需要设置),多个用","隔开
+
+ "corsUrls": [ "http://localhost:8887", "http://localhost:8886", "http://192.168.60.251:8877" ], //跨域地址(前端启动项目,前后端分离单独部署需要设置),多个用","隔开
"JwtSettings": {
"Issuer": "ZRAdmin.NET", //即token的签发者。
"Audience": "ZRAdmin.NET", //指该token是服务于哪个群体的(群体范围)
diff --git a/ZR.Service/mes/mm/MaterialInputService.cs b/ZR.Service/mes/mm/MaterialInputService.cs
index 13a0df58..cdfb040d 100644
--- a/ZR.Service/mes/mm/MaterialInputService.cs
+++ b/ZR.Service/mes/mm/MaterialInputService.cs
@@ -80,7 +80,8 @@ namespace ZR.Service.mes.mm
///
public (List, 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();
@@ -90,7 +91,8 @@ namespace ZR.Service.mes.mm
// 获取这一周中的第几天
DayOfWeek dayOfWeek = datetimespan.DayOfWeek;
int dayOfWeekNumber = (int)dayOfWeek; // 将 DayOfWeek 枚举转换为从 1 开始的数字
-
+ Console.WriteLine("<-获取工单列表-> "+ year+"年"+week+"周"+ dayOfWeekNumber+"日");
+ logger.Error("<-获取工单列表-> " + year + "年" + week + "周" + dayOfWeekNumber + "日");
//todo 已经和正在配料的工单号和毛坯号不能变??????
int total = 0;
List WorkorderList = Context.Queryable()