From 70e8a5aec5d49a95483d4c0e066ccdcc45a02e79 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期日, 09 二月 2025 21:51:37 +0800
Subject: [PATCH] 采购订单接口
---
StandardPda/MES.Service/service/BasicData/MesRohInManager.cs | 94 ++++++++++++++---------------------------------
1 files changed, 28 insertions(+), 66 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
index 8e84976..234d234 100644
--- a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
@@ -25,7 +25,7 @@
mesRohInDatas)
? 1
: 0,
- "3" => UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0,
+ "3" => DeleteData(db, mesRohIn, mesRohInDatas) ? 1 : 0,
_ => throw new NotImplementedException(
$"type娌℃湁{rohInErpRohIn.Type}杩欎釜绫诲瀷")
};
@@ -33,7 +33,7 @@
}
// 鏇存柊鏁版嵁鐨勬柟娉�
- private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn,
+ private bool DeleteData(SqlSugarScope db, MesRohIn mesRohIn,
List<MesRohInData> mesRohInDatas)
{
var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
@@ -88,7 +88,7 @@
}
// 灏� ErpRohIn 瀵硅薄杞崲涓� MesRohIn 瀵硅薄鐨勬柟娉�
- public MesRohIn GetMesRohIn(ErpRohIn rohIn)
+ private MesRohIn GetMesRohIn(ErpRohIn rohIn)
{
var eid = Convert.ToDecimal(rohIn.id);
var mesRohIn = new MesRohIn();
@@ -99,7 +99,7 @@
mesRohIn.EbelnK3id = eid;
mesRohIn.BillNo = rohIn.FBillNo;
mesRohIn.DocumentStatus = rohIn.FDocumentStatus;
- mesRohIn.DocumentType = rohIn.FBillTypeID;
+ mesRohIn.DocumentType = rohIn.FBillTypeId;
mesRohIn.BusinessType = rohIn.FBusinessType;
if (rohIn.FDate != null)
mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate,
@@ -108,22 +108,7 @@
mesRohIn.CloseStatus = rohIn.FCloseStatus;
mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId;
mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId;
- mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
mesRohIn.Purchaser = rohIn.FPurchaserId;
-
- //鏂板 楠屾敹鏂瑰紡
- mesRohIn.ACCTYPE = rohIn.Acctype;
-
- mesRohIn.SettlementParty = rohIn.FSettleId;
- mesRohIn.PaymentParty = rohIn.FChargeId;
- //mesRohIn.Email = rohIn.FProviderEMail;
- mesRohIn.CancellationStatus = rohIn.FCancelStatus;
- mesRohIn.CancellationPerson = rohIn.FCancellerId;
-
- if (rohIn.FCancelDate != null)
- mesRohIn.CancellationDate =
- DateTime.ParseExact(rohIn.FCancelDate,
- "yyyy-MM-dd HH:mm:ss", null);
mesRohIn.CreateBy = rohIn.FCreatorId;
@@ -137,22 +122,34 @@
mesRohIn.LastupdateDate = DateTime.ParseExact(rohIn.FModifyDate,
"yyyy-MM-dd HH:mm:ss", null);
-
mesRohIn.ErpCheckBy = rohIn.FApproverId;
mesRohIn.ErpCheckDate = rohIn.FApproveDate;
- mesRohIn.Changereason = rohIn.FChangeReason;
-
- //if (rohIn.Prearrivaldate != null)
- // mesRohIn.Prearrivaldate = DateTime.ParseExact(rohIn.Prearrivaldate,
- // "yyyy-MM-dd HH:mm:ss", null);
-
+ mesRohIn.Changereason = rohIn.PubDescSeg2;
mesRohIn.ReceiveOrg = Convert.ToDecimal(rohIn.FReceiveOrgId);
+ mesRohIn.Remarks = rohIn.Remarks;
+
+ mesRohIn.SrcDocType = rohIn.FSrcDocType;
+ mesRohIn.SrcDoc = rohIn.FSrcDoc;
+ mesRohIn.TradePathName = rohIn.FTradePathName;
+ mesRohIn.SubType = rohIn.FSubType;
+ mesRohIn.IsReDo = short.Parse(rohIn.FIsReDo ?? "0");
+ mesRohIn.PrivateDescSeg1 = rohIn.PrivateDescSeg1;
+ mesRohIn.Version = rohIn.FVersion;
+
+ //浣滃簾鐨勭浉鍏冲瓧娈�
+ // mesRohIn.CancellationStatus = rohIn.FCancelStatus;
+ // mesRohIn.CancellationPerson = rohIn.FCancellerId;
+ //
+ // if (rohIn.FCancelDate != null)
+ // mesRohIn.CancellationDate =
+ // DateTime.ParseExact(rohIn.FCancelDate,
+ // "yyyy-MM-dd HH:mm:ss", null);
return mesRohIn;
}
// 灏� ErpRohinData 瀵硅薄杞崲涓� MesRohInData 瀵硅薄鐨勬柟娉�
- public List<MesRohInData> GetMesRohInDatas(
+ private List<MesRohInData> GetMesRohInDatas(
List<ErpRohinData> erpRohinDatas, string type)
{
return erpRohinDatas.Select(s =>
@@ -168,47 +165,16 @@
ItemId = s.FMaterialId,
PurchaseUnit = s.FUnitId,
PurchaseQty = Convert.ToDecimal(s.FQty),
- InventoryUnit = s.FStockUnitID,
PricingUnit = s.FPriceUnitId,
PricingQty = Convert.ToDecimal(s.FPriceUnitQty),
- DeliveryDate = s.FDeliveryDate != null
- ? DateTime.ParseExact(s.FDeliveryDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
- EarliestDeliveryDate = s.FDeliveryEarlyDate != null
- ? DateTime.ParseExact(s.FDeliveryEarlyDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
- LatestDeliveryDate = s.FDeliveryLastDate != null
- ? DateTime.ParseExact(s.FDeliveryLastDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
Demand = s.FRequireOrgId,
Receiving = s.FReceiveOrgId,
- ReceivingDepartment = s.FReceiveDeptId,
- Settlement = s.FEntrySettleOrgId,
+ ReceivingDept = s.FReceiveDeptId,
DemandOrg = s.FRequireOrgId,
ReceivingOrg = s.FReceiveOrgId,
- SettlementOrg = s.FEntrySettleOrgId,
IsGift = s.FGiveAway,
Remarks = s.FEntryNote,
- SupplierItemCode = s.FSupMatId,
- SupplierItemName = s.FSupMatName,
- OutsourcingOrderId = s.FSubreqBillNo,
BatchNumber = s.FLot,
- BusinessClose = s.FMRPCloseStatus,
- BusinessFreeze = s.FMRPFreezeStatus,
- Freezer = s.FFreezerId,
- FreezeTime = s.FFreezeDate != null
- ? DateTime.ParseExact(s.FFreezeDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
- BusinessTerminate = s.FMRPTerminateStatus,
- Terminator = s.FTerminaterId,
- TerminateTime = s.FTerminateDate != null
- ? DateTime.ParseExact(s.FTerminateDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //绱鏀舵枡鏁�
RemainingReceivedQty =
Convert.ToDecimal(s.FRemainReceiveQty),
@@ -220,16 +186,12 @@
ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //搴撳瓨鍙��鏁�
SourceDocumentType = s.FSrcBillTypeId,
SourceDocumentId = s.FSrcBillNo,
- DemandTrackingId = s.FReqTraceNo,
- PlanTrackingId = s.FMtoNo,
- ChangeFlag = s.FChangeFlag,
DemandSource = s.FDemandType,
DemandDocumentId = s.FDemandBillNo,
DemandDocumentLineId = s.FDemandBillEntrySeq,
- DemandDept = s.FRequireDeptId,
- FCGDDSctzda = s.F_CGDD_SCTZDA,
- FCGDDXHA = s.F_CGDD_XHA,
- FXifgTextApv = s.F_XIFG_Text_apv
+ RdProject = s.RdProject,
+ Project = s.Project,
+ ProjectPurchaser = s.ProjectPurchaser
};
var single = rohInDataManager.GetSingle(it =>
--
Gitblit v1.9.3