From 9d296c888a8ac49f606c0a3ebd843e617cfc0a40 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 16 九月 2025 11:39:07 +0800
Subject: [PATCH] 11
---
MES.Service/service/BasicData/MesRohInManager.cs | 19 +++++++++++++------
MES.Service/service/BasicData/MesSupplierManager.cs | 30 ++++++++++++++++++++++--------
2 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index 043fab3..213d614 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -94,7 +94,6 @@
if (single != null) mesRohIn.Guid = single.Guid;
mesRohIn.EbelnK3id = eid;
mesRohIn.BillNo = rohIn.FBillNo;
- mesRohIn.DocumentStatus = rohIn.FDocumentStatus;
mesRohIn.DocumentType = rohIn.FBillTypeID;
mesRohIn.BusinessType = rohIn.FBusinessType;
/*if (rohIn.FDate != null)
@@ -163,7 +162,6 @@
mesRohIn.PaymentParty = rohIn.FChargeId;
mesRohIn.Email = rohIn.FProviderEMail;
mesRohIn.Remarks = rohIn.Remarks;
- mesRohIn.CancellationStatus = rohIn.FCancelStatus;
mesRohIn.CancellationPerson = rohIn.FCancellerId;
/*if (rohIn.FCancelDate != null)
if (!mesRohIn.CancellationPerson.IsNullOrEmpty())
@@ -267,6 +265,8 @@
mesRohIn.Address = rohIn.Address;
mesRohIn.Acctype = rohIn.Acctype;
mesRohIn.SynchronousDate = DateTime.Now;
+ mesRohIn.DocumentStatus = "C";
+ mesRohIn.CancellationStatus = "A";
return mesRohIn;
}
@@ -337,10 +337,13 @@
SupplierItemName = s.FSupMatName,
OutsourcingOrderId = s.FSUBREQBILLNO,
BatchNumber = s.FLot,
- BusinessClose = s.FMRPCloseStatus,
- BusinessFreeze = s.FMRPFreezeStatus,
+ // BusinessClose = s.FMRPCloseStatus,
+ // BusinessFreeze = s.FMRPFreezeStatus,
+ BusinessClose = "A",
+ BusinessFreeze = "A",
Freezer = s.FFreezerId,
- BusinessTerminate = s.FMRPTerminateStatus,
+ // BusinessTerminate = s.FMRPTerminateStatus,
+ BusinessTerminate = "A",
Terminator = s.FTerminaterId,
TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //绱鏀舵枡鏁�
RemainingReceivedQty =
@@ -360,7 +363,8 @@
DemandDocumentId = s.FDEMANDBILLNO,
DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ,
DemandOrg = s.FRequireOrgId,
- ReceivingOrg = s.FReceiveOrgId,
+ // ReceivingOrg = s.FReceiveOrgId,
+ ReceivingOrg = "1",
SettlementOrg = s.FEntrySettleOrgId,
PurchaseOrderLineNumber = s.FSEQ,
Demand = s.FRequireOrgId,
@@ -430,6 +434,9 @@
{
entity.ItemId = mesItems.Id.ToString();
}
+
+ //BUSINESS_TERMINATE = 'A',RECEIVING_ORG = 1
+
var single = rohInDataManager.GetSingle(it =>
it.EbelnK3id == entity.EbelnK3id);
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index ac1cbd1..d0c065b 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Masuit.Tools;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -97,19 +98,32 @@
Lxr = supplier.FTContact,
Telf1 = supplier.Fmobilephone,
Fstaffid = supplier.FStaffId,
- Fforbidstatus = supplier.FForbidStatus,
- FSubsidiary = string.IsNullOrEmpty(supplier.FUseOrgId)
- ? "1"
- : supplier.FUseOrgId,
- Fumbrella = string.IsNullOrEmpty(supplier.FCreateOrgId)
- ? "1"
- : supplier.FCreateOrgId,
+ // FSubsidiary = string.IsNullOrEmpty(supplier.FUseOrgId)
+ // ? "1"
+ // : supplier.FUseOrgId,
+ // Fumbrella = string.IsNullOrEmpty(supplier.FCreateOrgId)
+ // ? "1"
+ // : supplier.FCreateOrgId,
+ FSubsidiary = "1",
+ Fumbrella = "1",
Remark = supplier.Remark,
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
Factory = "1000",
};
+
+ //Fforbidstatus = supplier.FForbidStatus,
+ if (supplier.FForbidStatus.IsNullOrEmpty())
+ {
+ entity.Fforbidstatus = "A";
+ }
+ else
+ {
+ //鎴戞湡鏈涚殑鍊兼槸A=鍚�,B=鏄�
+ //瀹為檯缁欐垜鐨勫�兼槸0鎴�1锛屾垜甯屾湜涓烘垜杞崲浠嶢鍜孊鐨勬柟寮�
+ entity.Fforbidstatus = supplier.FForbidStatus == "1" ? "B" : "A";
+ }
// 鏌ユ壘鏄惁宸插瓨鍦ㄧ浉鍚屼緵搴斿晢缂栫爜鐨勮褰�
var existingSupplier = Db.Queryable<MesSupplier>()
--
Gitblit v1.9.3