11

啊鑫

3 天以前 9d296c888a8ac49f606c0a3ebd843e617cfc0a40

 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,
@@ -431,6 +435,9 @@
                entity.ItemId = mesItems.Id.ToString();
            }

            //BUSINESS_TERMINATE = 'A',RECEIVING_ORG = 1
            

            var single = rohInDataManager.GetSingle(it =>
                it.EbelnK3id == entity.EbelnK3id);
            if (single != null) entity.Guid = single.Guid;