From ed05efdc17aab076146b134ebe105b6382f221d7 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 10 七月 2025 10:09:29 +0800
Subject: [PATCH] 格式化代码
---
MES.Service/service/BasicData/MesRohInManager.cs | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index 35acb3c..a55d547 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -30,6 +30,8 @@
return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
case "2":
case "4":
+ case "5":
+ case "B":
return SaveOrUpdateData(db, mesRohIn, mesRohInDatas)
? 1
: 0;
@@ -135,25 +137,18 @@
mesRohIn.DocumentStatus = rohIn.FDocumentStatus;
mesRohIn.DocumentType = rohIn.FBillTypeID;
mesRohIn.BusinessType = rohIn.FBusinessType;
-
if (rohIn.FDate != null)
mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate,
"yyyy-MM-dd HH:mm:ss", null);
-
mesRohIn.Supplier = rohIn.FSupplierId;
mesRohIn.CloseStatus = rohIn.FCloseStatus;
mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId;
mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId;
mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
- mesRohIn.QtyAcceptance = rohIn.Facctype;
mesRohIn.Purchaser = rohIn.FPurchaserId;
- mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
mesRohIn.SettlementParty = rohIn.FSettleId;
mesRohIn.PaymentParty = rohIn.FChargeId;
mesRohIn.Email = rohIn.FProviderEMail;
- mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
- mesRohIn.Remarks = rohIn.F_UNW_BZ;
- mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
mesRohIn.CancellationStatus = rohIn.FCancelStatus;
mesRohIn.CancellationPerson = rohIn.FCancellerId;
@@ -163,11 +158,6 @@
"yyyy-MM-dd HH:mm:ss", null);
mesRohIn.CreateBy = rohIn.FCreatorId;
-
- if (rohIn.FCreateDate != null)
- mesRohIn.CreateDate = DateTime.ParseExact(rohIn.FCreateDate,
- "yyyy-MM-dd HH:mm:ss", null);
-
mesRohIn.LastupdateBy = rohIn.FModifierId;
if (rohIn.FModifyDate != null)
@@ -176,7 +166,9 @@
mesRohIn.ErpCheckBy = rohIn.FApproverId;
mesRohIn.ErpCheckDate = rohIn.FApproveDate;
- mesRohIn.Changereason = rohIn.FCHANGEREASON;
+ mesRohIn.Changereason = rohIn.FChangeReason;
+ mesRohIn.CreateDate = DateTime.Now;
+ mesRohIn.ReceiveOrg = Convert.ToDecimal(rohIn.FReceiveOrgId);
return mesRohIn;
}
@@ -192,7 +184,9 @@
EbelnK3id = Convert.ToDecimal(s.id),
ErpId = Convert.ToDecimal(s.Eid),
BillNo = s.FBillNo,
- SalesOrderId = s.F_UNW_Text_xsddh,
+ OrderLineId = s.FSeq,
+ PurchaseOrderLineNumber = s.FSeq,
+ SalesOrderId = s.FXSHTH,
ItemId = s.FMaterialId,
PurchaseUnit = s.FUnitId,
PurchaseQty = Convert.ToDecimal(s.FQty),
@@ -212,10 +206,10 @@
"yyyy-MM-dd HH:mm:ss", null)
: null,
IsGift = s.FGiveAway,
- Remarks = s.FEntryNote,
+ Remarks = s.FNote,
SupplierItemCode = s.FSupMatId,
SupplierItemName = s.FSupMatName,
- OutsourcingOrderId = s.FSUBREQBILLNO,
+ OutsourcingOrderId = s.FSubreqBillNo,
BatchNumber = s.FLot,
BusinessClose = s.FMRPCloseStatus,
BusinessFreeze = s.FMRPFreezeStatus,
@@ -230,26 +224,31 @@
? DateTime.ParseExact(s.FTerminateDate,
"yyyy-MM-dd HH:mm:ss", null)
: null,
- TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty),
- RemainingReceivedQty =
- Convert.ToDecimal(s.FRemainReceiveQty),
- TotalStoredQty = Convert.ToDecimal(s.FStockInQty),
+ TotalReceivedQty = Convert.ToDecimal(s.FQty) -
+ Convert.ToDecimal(s.FRemainReceiveQty),
+ RemainingReceivedQty = Convert.ToDecimal(s.FRemainReceiveQty),
+ TotalStoredQty = Convert.ToDecimal(s.FQty) -
+ Convert.ToDecimal(s.FRemainStockINQty),
RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty),
TotalReturnedQty = Convert.ToDecimal(s.FMrbQty),
- ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY),
- ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY),
+ ReturnableReceivedQty = Convert.ToDecimal(s.FBaseCheckRetQty),
+ ReturnableStoredQty = Convert.ToDecimal(s.FBaseStockRetQty),
SourceDocumentType = s.FSrcBillTypeId,
SourceDocumentId = s.FSrcBillNo,
DemandTrackingId = s.FReqTraceNo,
PlanTrackingId = s.FMtoNo,
ChangeFlag = s.FChangeFlag,
- DemandSource = s.FDEMANDTYPE,
- DemandDocumentId = s.FDEMANDBILLNO,
- DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ,
- PurchaseOrderLineNumber = s.PurchaseOrderLineNumber,
- Demand = s.Demand,
- Receiving = s.Receiving,
- Settlement = s.Settlement
+ DemandSource = s.FDemandType,
+ DemandDocumentId = s.FDemandBillNo,
+ DemandDocumentLineId = s.FDemandBillEntrySeq,
+ Demand = s.FRequireOrgId,
+ DemandOrg = s.FRequireOrgId,
+ Receiving = s.FReceiveOrgId,
+ ReceivingOrg = s.FReceiveOrgId,
+ Settlement = s.FEntrySettleOrgId,
+ SettlementOrg = s.FEntrySettleOrgId,
+ DemandDept = s.FRequireDeptId,
+ ReceivingDept = s.FReceiveDeptId
};
var single = rohInDataManager.GetSingle(it =>
--
Gitblit v1.9.3