基础信息和采购订单接口更新

啊鑫

2024-10-29 4f0cb973a7db26a9e65247033a95d9a8b3380d4b

 MES.Service/service/BasicData/MesRohInManager.cs

@@ -104,8 +104,8 @@
        mesRohIn.Purchaser = rohIn.FPurchaserId;
        mesRohIn.SettlementParty = rohIn.FSettleId;
        mesRohIn.PaymentParty = rohIn.FChargeId;
        mesRohIn.Emall = rohIn.FProviderEMail;
        mesRohIn.Remarks = rohIn.F_XIFG_Text_qtr1;
        mesRohIn.Email = rohIn.FProviderEMail;
        mesRohIn.Remarks = rohIn.Remarks;
        mesRohIn.CancellationStatus = rohIn.FCancelStatus;
        mesRohIn.CancellationPerson = rohIn.FCancellerId;

@@ -129,14 +129,20 @@
        mesRohIn.ErpCheckBy = rohIn.FApproverId;
        mesRohIn.ErpCheckDate = rohIn.FApproveDate;
        mesRohIn.Changereason = rohIn.FChangeReason;
        mesRohIn.Prearrivaldate = rohIn.FPREARRIVALDATE != null
            ? DateTime.ParseExact(rohIn.FPREARRIVALDATE,
        mesRohIn.Prearrivaldate = rohIn.Prearrivaldate != null
            ? DateTime.ParseExact(rohIn.Prearrivaldate,
                "yyyy-MM-dd HH:mm:ss", null)
            : null;

        mesRohIn.ReceiveOrgId = rohIn.FReceiveOrgId;
        mesRohIn.ProviderId = rohIn.FProviderId;

        mesRohIn.Remark1 = rohIn.F_XIFG_PrintTimes_qtr;
        mesRohIn.Anred = rohIn.FTContact;
        mesRohIn.Telf1 = rohIn.Fmobilephone;
        mesRohIn.FixedTelephone = rohIn.FixedTelephone;
        mesRohIn.Address = rohIn.Address;
        mesRohIn.Acctype = rohIn.Acctype;


        return mesRohIn;
    }
@@ -149,17 +155,15 @@
        {
            var entity = new MesRohInData
            {
                EbelnK3id = Convert.ToDecimal(s.id),
                 EbelnK3id = Convert.ToDecimal(s.id),
                ErpId = Convert.ToDecimal(s.Eid),
                BillNo = s.FBillNo,
                SalesOrderId = s.F_XIFG_Text_k79,
                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)
@@ -172,11 +176,6 @@
                    ? DateTime.ParseExact(s.FDeliveryLastDate,
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                DemandOrg = s.FRequireOrgId,
                DemandDepartment = s.FRequireDeptId,
                ReceivingOrg = s.FReceiveOrgId,
                ReceivingDepartment = s.FReceiveDeptId,
                SettlementOrg = s.FEntrySettleOrgId,
                IsGift = s.FGiveAway,
                Remarks = s.FEntryNote,
                SupplierItemCode = s.FSupMatId,
@@ -196,32 +195,31 @@
                    ? DateTime.ParseExact(s.FTerminateDate,
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                TotalReceivedQty = Convert.ToDecimal(s.FBASERECEIVEQTY), //累计收料数
                TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //累计收料数
                RemainingReceivedQty =
                    Convert.ToDecimal(s.FRemainReceiveQty),
                TotalStoredQty = Convert.ToDecimal(s.FBASESTOCKINQTY), //累计入库数
                TotalStoredQty = Convert.ToDecimal(s.FStockInQty), //累计入库数
                RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty),
                TotalReturnedQty = Convert.ToDecimal(s.FMrbQty),
                ReturnableReceivedQty =
                    Convert.ToDecimal(s.FBASECHECKRETQTY), //收料可退数
                ReturnableStoredQty =
                    Convert.ToDecimal(s.FBASESTOCKRETQTY), //库存可退数
                ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), //收料可退数
                ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //库存可退数
                SourceDocumentType = s.FSrcBillTypeId,
                SourceDocumentId = s.FSourceBillNo,
                SourceDocumentId = s.FSrcBillNo,
                DemandTrackingId = s.FReqTraceNo,
                PlanTrackingId = s.FMtoNo,
                ChangeFlag = s.FChangeFlag,
                DemandSource = s.FDEMANDTYPE,
                DemandDocumentId = s.FDEMANDBILLNO,
                DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ,
                prearrivaldate = s.FTerminateDate != null
                    ? DateTime.ParseExact(s.FPREARRIVALDATE,
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                Remark1 = s.F_XIFG_Text_ne1,
                Remark2 = s.F_XIFG_Text_6oq,
                Remark3 = s.F_XIFG_Base_c1c,
                Remark4 = s.F_XIFG_Text_qtr4
                DemandOrg = s.FRequireOrgId,
                ReceivingOrg = s.FReceiveOrgId,
                SettlementOrg = s.FEntrySettleOrgId,
                PurchaseOrderLineNumber = s.FSEQ,
                Demand = s.FRequireOrgId,
                Receiving = s.FReceiveOrgId,
                Settlement = s.FSETTLEORGID,
                DemandDepartment = s.FRequireDeptId,
                ReceivingDepartment = s.FReceiveDeptId
            };

            var single = rohInDataManager.GetSingle(it =>