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

修改

Browse Source
This commit is contained in:
qianhao.xu
2024-05-13 09:07:57 +08:00
parent 8b8de3e883
commit cc50aa458a
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ZR.Admin.WebApi/DataProtection/key-a2cbf055-c580-4420-95c7-bda9c005da53.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<key id="a2cbf055-c580-4420-95c7-bda9c005da53" version="1">
<creationDate>2024-05-13T00:40:18.6568239Z</creationDate>
<activationDate>2024-05-14T08:12:02.1706772Z</activationDate>
<expirationDate>2024-08-11T00:40:18.575418Z</expirationDate>
<descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
<descriptor>
<encryption algorithm="AES_256_CBC" />
<validation algorithm="HMACSHA256" />
<masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
<!-- Warning: the key below is in an unencrypted form. -->
<value>tzCaWVO7S9NJwFQtt4wmwAhBsDNxJh+ijuD1xNZWXHu7gcHIE07L7AD42Hlu+T4PGZ0AGaBof+FTxvG/U4B3zg==</value>
</masterKey>
</descriptor>
</descriptor>
</key>

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

@@ -103,6 +103,10 @@ namespace ZR.Service.mes.mm
foreach (ProWorkorder_v2 workorder in WorkorderList) foreach (ProWorkorder_v2 workorder in WorkorderList)
{ {
if(string.IsNullOrEmpty(workorder.ClientWorkorder))
{
workorder.ClientWorkorder = "调试:" + workorder.Id;
}
// 配料任务 // 配料任务
bool isExist = Context.Queryable<MmFkWorkorderIngredient>() bool isExist = Context.Queryable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == workorder.ClientWorkorder) .Where(it => it.FkWorkorder == workorder.ClientWorkorder)
@@ -129,13 +133,11 @@ namespace ZR.Service.mes.mm
} }
} }
} }
WorkorderList.RemoveAll(num => num.PreviousNumber <= 0); WorkorderList.RemoveAll(num => num.PreviousNumber <= 0);
total= WorkorderList.Count; total= WorkorderList.Count;
int skip = (query.pageNum ?? 1-1)*(query.pageSize ?? 10); int skip = ((query.pageNum ?? 1)-1)*(query.pageSize ?? 10);
var returndata= WorkorderList var returndata= WorkorderList
.OrderBy(it => it.ClientWorkorder) .OrderBy(it => it.ClientWorkorder)
.Skip(skip) .Skip(skip)