From 0ac65b10a59bcca5b22bcf03086c8aaa36a8a525 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 12 六月 2025 20:42:41 +0800
Subject: [PATCH] 1，签收送货单接口，添加签收人；2.来料检接口，添加到货时间字段
---
StandardPda/MES.Service/service/BasicData/MesRohInManager.cs | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
index 0332ba0..f185e91 100644
--- a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
@@ -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,7 +133,7 @@
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.SrcDocType = rohIn.FSrcDocType;
mesRohIn.SrcDoc = rohIn.FSrcDoc;
@@ -204,6 +201,11 @@
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);
if (single != null) entity.Id = single.Id;
@@ -214,10 +216,7 @@
&& x.OrgId == s.FReceiveOrgId
&& x.TableType == "MES_ITEMS").First();
- if (mesLinkU9 != null)
- {
- entity.ItemId = mesLinkU9.MesId;
- }
+ if (mesLinkU9 != null) entity.ItemId = mesLinkU9.MesId;
var mesLinkU92 = Db.Queryable<MesLinkU9>()
@@ -225,10 +224,7 @@
&& x.OrgId == s.FReceiveOrgId
&& 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