From 3296c70dfc999ff1d09ac28d6205197c11825c5f Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 22 五月 2025 14:58:26 +0800
Subject: [PATCH] 1，来料检添加‘往期检验履历’，‘最大抽检数量’两个字段 2，一致性核对添加图片是否上传校验
---
StandardPda/MES.Service/service/BasicData/MesRohInManager.cs | 44 +++++++++++++++-----------------------------
1 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
index ec204c5..f185e91 100644
--- a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
@@ -91,7 +91,7 @@
// 灏� ErpRohIn 瀵硅薄杞崲涓� MesRohIn 瀵硅薄鐨勬柟娉�
private MesRohIn GetMesRohIn(ErpRohIn rohIn)
{
- var eid = Convert.ToDecimal(rohIn.id);
+ var eid = rohIn.id;
var mesRohIn = new MesRohIn();
var single = base.GetSingle(it => it.EbelnK3id == eid);
@@ -102,10 +102,7 @@
&& s.OrgId == rohIn.FReceiveOrgId
&& s.TableType == "MES_SUPPLIER").First();
- if (mesLinkU9 != null)
- {
- mesRohIn.Supplier = mesLinkU9.MesId;
- }
+ if (mesLinkU9 != null) mesRohIn.Supplier = mesLinkU9.MesId;
mesRohIn.EbelnK3id = eid;
mesRohIn.BillNo = rohIn.FBillNo;
@@ -136,10 +133,8 @@
mesRohIn.ErpCheckBy = rohIn.FApproverId;
mesRohIn.ErpCheckDate = rohIn.FApproveDate;
mesRohIn.Changereason = rohIn.PubDescSeg2;
- mesRohIn.ReceiveOrg = Convert.ToDecimal(rohIn.FReceiveOrgId);
+ mesRohIn.ReceiveOrg = rohIn.FReceiveOrgId;
mesRohIn.Remarks = rohIn.Remarks;
- mesRohIn.CancellationStatus = rohIn.FCancelStatus;
-
mesRohIn.SrcDocType = rohIn.FSrcDocType;
mesRohIn.SrcDoc = rohIn.FSrcDoc;
mesRohIn.TradePathName = rohIn.FTradePathName;
@@ -149,7 +144,7 @@
mesRohIn.Version = rohIn.FVersion;
//浣滃簾鐨勭浉鍏冲瓧娈�
- // mesRohIn.CancellationStatus = rohIn.FCancelStatus;
+ mesRohIn.CancellationStatus = rohIn.FCancelStatus;
// mesRohIn.CancellationPerson = rohIn.FCancellerId;
//
// if (rohIn.FCancelDate != null)
@@ -168,8 +163,8 @@
{
var entity = new MesRohInData
{
- EbelnK3id = Convert.ToDecimal(s.id),
- ErpId = Convert.ToDecimal(s.Eid),
+ EbelnK3id = s.id,
+ ErpId = s.Eid,
BillNo = s.FBillNo,
OrderLineId = s.FSeq,
BusinessFreeze = s.FStatus,
@@ -202,8 +197,14 @@
DemandSource = s.FDemandType,
DemandDocumentId = s.FDemandBillNo,
DemandDocumentLineId = s.FDemandBillEntrySeq,
+ RdProject = s.RdProject,
ProjectPurchaser = s.ProjectPurchaser
};
+
+ if (s.FDeliveryDate != null)
+ entity.DeliveryDate =
+ DateTime.ParseExact(s.FDeliveryDate,
+ "yyyy-MM-dd HH:mm:ss", null);
var single = rohInDataManager.GetSingle(it =>
it.EbelnK3id == entity.EbelnK3id);
@@ -215,30 +216,15 @@
&& x.OrgId == s.FReceiveOrgId
&& x.TableType == "MES_ITEMS").First();
- if (mesLinkU9 != null)
- {
- entity.ItemId = mesLinkU9.MesId;
- }
+ if (mesLinkU9 != null) entity.ItemId = mesLinkU9.MesId;
- var mesLinkU91 = Db.Queryable<MesLinkU9>()
- .Where(x => x.U9Id == s.RdProject
- && x.OrgId == s.FReceiveOrgId
- && x.TableType == "MES_ITEMS").First();
-
- if (mesLinkU91 != null)
- {
- entity.RdProject = mesLinkU91.MesId;
- }
var mesLinkU92 = Db.Queryable<MesLinkU9>()
.Where(x => x.U9Id == s.Project
&& x.OrgId == s.FReceiveOrgId
- && x.TableType == "MES_ITEMS").First();
+ && x.TableType == "MES_PROJECT").First();
- if (mesLinkU92 != null)
- {
- entity.Project = mesLinkU92.MesId;
- }
+ if (mesLinkU92 != null) entity.Project = mesLinkU92.MesId;
return entity;
}).ToList();
--
Gitblit v1.9.3