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

样式调整

Browse Source
This commit is contained in:
赵正易
2024-05-29 08:57:22 +08:00
parent 6f2b846473
commit 6677691305
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ZR.Service/mes/wms/WMentryWarehousing_productService.cs
View File

@@ -79,7 +79,8 @@ namespace ZR.Service.mes.wms
// 修改入库检验 为入库完成 WmFgentryInspect
UseTran2(() =>
{
if(preparegoodsList!=null&& preparegoodsList.Count() > 0) {
if (preparegoodsList != null && preparegoodsList.Count() > 0)
{
foreach (var preparegood in preparegoodsList)
{
if (!string.IsNullOrEmpty(preparegood.PackageCode))
@@ -225,23 +226,23 @@ namespace ZR.Service.mes.wms
{
return null;
}
WmGoodsChangeLog changeLog = Context.Queryable<WmGoodsChangeLog>()
.Where(it => it.Description.Contains(packageCodeDto.PatchCode))
string SerialNumber = packageCodeDto.PatchCode.Split('_')[1] ?? "000";
WmPackageLcl packageLcl = Context.Queryable<WmPackageLcl>()
.Where(it => it.WorkOrderId == packageCodeDto.WorkoderID)
.Where(it => it.SerialNumber == SerialNumber)
.OrderByDescending(it => it.CreatedTime)
.First();
if(changeLog != null)
if (packageLcl != null)
{
// 拼箱
if(changeLog.Type == 1)
if (packageLcl.Type == 1)
{
var json = JsonSerializer.Deserialize<WmGoodsConsolidationJSON>(changeLog.JsonMsg);
packageCodeDto.Remark = "标签涉及拼箱，参考标签:" + json.NewPartnumber;
packageCodeDto.Remark = "标签最后涉及拼箱";
}
// 拆箱
else if (changeLog.Type == 2)
else if (packageLcl.Type == 2)
{
var json = JsonSerializer.Deserialize<WmGoodsUnpackingJSON>(changeLog.JsonMsg);
packageCodeDto.Remark = "标签涉及拆箱参考数据，主箱:" + json.MainPackage.PatchCode + "\n次标签1:"+json.NewPatchCode1 + "\n次标签2:" + json.NewPatchCode2;
packageCodeDto.Remark = "标签最后涉及拆箱";
}
}
@@ -249,7 +250,7 @@ namespace ZR.Service.mes.wms
}
catch (Exception ex)
{
throw new Exception(ex.Message);
throw new Exception("格式化异常:" + ex.Message);
}
/*// 初步进行解析检测，增加解析成功率