11

啊鑫

4 天以前 646ac6f3e1e77d0481e46ea15a6eb6db4ecba065

 MES.Service/service/BasicData/MesRohInManager.cs

@@ -20,12 +20,20 @@
        {
            switch (rohInErpRohIn.Type)
            {
                // case "2":
                //     return InsertData(db, mesRohIn, mesRohInDatas,
                //         rohInErpRohIn.FBILLTYPE)
                //         ? 1
                //         : 0;
                case "3":
                    return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
                case "2":
                case "4":
                case "5":
                    return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
                case "3":
                    return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
                case "B":
                    return SaveOrUpdateData(db, mesRohIn, mesRohInDatas)
                        ? 1
                        : 0;
                default:
                    throw new NotImplementedException(
                        $"type没有{rohInErpRohIn.Type}这个类型");
@@ -128,25 +136,17 @@
        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.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.FHEADNOTE;
      //  mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
        mesRohIn.Email = rohIn.FProviderEMail;
        mesRohIn.CancellationStatus = rohIn.FCancelStatus;
        mesRohIn.CancellationPerson = rohIn.FCancellerId;

@@ -156,11 +156,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)
@@ -169,7 +164,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;
    }
@@ -185,12 +182,15 @@
                EbelnK3id = Convert.ToDecimal(s.id),
                ErpId = Convert.ToDecimal(s.Eid),
                BillNo = s.FBillNo,
                SalesOrderId=s.FDEMANDBILLNO,
                OrderLineId=s.FSEQ,
                OrderLineId=s.FSeq,
                PurchaseOrderLineNumber = s.FSeq,
                SalesOrderId = s.FXSHTH,
                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)
@@ -204,10 +204,10 @@
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                IsGift = s.FGiveAway,
                Remarks = s.Fnote,
                Remarks = s.FNote,
                SupplierItemCode = s.FSupMatId,
                SupplierItemName = s.FSupMatName,
                OutsourcingOrderId = s.FSUBREQBILLNO,
                OutsourcingOrderId = s.FSubreqBillNo,
                BatchNumber = s.FLot,
                BusinessClose = s.FMRPCloseStatus,
                BusinessFreeze = s.FMRPFreezeStatus,
@@ -222,31 +222,29 @@
                    ? 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,
                DemandSource = s.FDemandType,
                DemandDocumentId = s.FDemandBillNo,
                DemandDocumentLineId = s.FDemandBillEntrySeq,
                Demand = s.FRequireOrgId,
                DemandOrg = s.FRequireOrgId,
                ReceivingOrg = s.FReceiveOrgId,
                SettlementOrg = s.FSETTLEORGID,
                PurchaseOrderLineNumber = s.FSEQ,
                Demand =s.FRequireOrgId,
                Receiving = s.FReceiveOrgId,
                Settlement =s.FSETTLEORGID,
                DemandDepartment = s.FRequireDeptId,
                ReceivingDepartment = s.FReceiveDeptId
                ReceivingOrg = s.FReceiveOrgId,
                Settlement = s.FEntrySettleOrgId,
                SettlementOrg = s.FEntrySettleOrgId,
                DemandDept = s.FRequireDeptId,
                ReceivingDept = s.FReceiveDeptId
            };

            var single = rohInDataManager.GetSingle(it =>