From 53c58be27bb9ba94ac46a46fb048b27d17ece925 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期五, 29 八月 2025 10:30:40 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_WebApi
---
MES.Service/service/BasicData/MesRohInManager.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index a54c524..04fe4f0 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -109,7 +109,7 @@
mesRohIn.Purchaser = rohIn.FPurchaserId;
mesRohIn.SettlementParty = rohIn.FSettleId;
mesRohIn.PaymentParty = rohIn.FChargeId;
- mesRohIn.Email = rohIn.FProviderEMail;
+ //mesRohIn.Email = rohIn.FProviderEMail;
mesRohIn.Remarks = rohIn.Remarks;
mesRohIn.CancellationStatus = rohIn.FCancelStatus;
mesRohIn.CancellationPerson = rohIn.FCancellerId;
@@ -143,10 +143,10 @@
mesRohIn.ReceiveOrgId = rohIn.FReceiveOrgId;
mesRohIn.ProviderId = rohIn.FProviderId;
- mesRohIn.Anred = rohIn.FTContact;
- mesRohIn.Telf1 = rohIn.Fmobilephone;
- mesRohIn.FixedTelephone = rohIn.FixedTelephone;
- mesRohIn.Address = rohIn.Address;
+ //mesRohIn.Anred = rohIn.FTContact;
+ //mesRohIn.Telf1 = rohIn.Fmobilephone;
+ //mesRohIn.FixedTelephone = rohIn.FixedTelephone;
+ //mesRohIn.Address = rohIn.Address;
mesRohIn.Acctype = rohIn.Acctype;
mesRohIn.SynchronousDate = DateTime.Now;
@@ -229,11 +229,12 @@
PurchaseOrderLineNumber = s.FSEQ,
Demand = s.FRequireOrgId,
Receiving = s.FReceiveOrgId,
- Settlement = s.FSETTLEORGID,
+ //Settlement = s.FSETTLEORGID,
DemandDepartment = s.FRequireDeptId,
ReceivingDepartment = s.FReceiveDeptId,
- SalesOrderId = s.SalesOrderId,
- OrderLineId = s.OrderLineId
+ //SalesOrderId = s.SalesOrderId,
+ //OrderLineId = s.OrderLineId
+ Fsubreqentryid=s.FSUBREQENTRYID
};
if (s.FFreezeDate != null)
--
Gitblit v1.9.3