diff --git a/ZR.Admin.WebApi/DataProtection/key-a2cbf055-c580-4420-95c7-bda9c005da53.xml b/ZR.Admin.WebApi/DataProtection/key-a2cbf055-c580-4420-95c7-bda9c005da53.xml
new file mode 100644
index 00000000..b0b67f6f
--- /dev/null
+++ b/ZR.Admin.WebApi/DataProtection/key-a2cbf055-c580-4420-95c7-bda9c005da53.xml
@@ -0,0 +1,16 @@
+
+
+ 2024-05-13T00:40:18.6568239Z
+ 2024-05-14T08:12:02.1706772Z
+ 2024-08-11T00:40:18.575418Z
+
+
+
+
+
+
+ tzCaWVO7S9NJwFQtt4wmwAhBsDNxJh+ijuD1xNZWXHu7gcHIE07L7AD42Hlu+T4PGZ0AGaBof+FTxvG/U4B3zg==
+
+
+
+
\ No newline at end of file
diff --git a/ZR.Service/mes/mm/MaterialInputService.cs b/ZR.Service/mes/mm/MaterialInputService.cs
index d2c07f47..13c4f80d 100644
--- a/ZR.Service/mes/mm/MaterialInputService.cs
+++ b/ZR.Service/mes/mm/MaterialInputService.cs
@@ -103,6 +103,10 @@ namespace ZR.Service.mes.mm
foreach (ProWorkorder_v2 workorder in WorkorderList)
{
+ if(string.IsNullOrEmpty(workorder.ClientWorkorder))
+ {
+ workorder.ClientWorkorder = "调试:" + workorder.Id;
+ }
// 配料任务
bool isExist = Context.Queryable()
.Where(it => it.FkWorkorder == workorder.ClientWorkorder)
@@ -129,13 +133,11 @@ namespace ZR.Service.mes.mm
}
}
-
-
}
WorkorderList.RemoveAll(num => num.PreviousNumber <= 0);
total= WorkorderList.Count;
- int skip = (query.pageNum ?? 1-1)*(query.pageSize ?? 10);
+ int skip = ((query.pageNum ?? 1)-1)*(query.pageSize ?? 10);
var returndata= WorkorderList
.OrderBy(it => it.ClientWorkorder)
.Skip(skip)