11

啊鑫

2 天以前 9d296c888a8ac49f606c0a3ebd843e617cfc0a40

11

 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,
@@ -430,6 +434,9 @@
            {
                entity.ItemId = mesItems.Id.ToString();
            }
            
            //BUSINESS_TERMINATE = 'A',RECEIVING_ORG = 1
            

            var single = rohInDataManager.GetSingle(it =>
                it.EbelnK3id == entity.EbelnK3id);

 MES.Service/service/BasicData/MesSupplierManager.cs

@@ -1,4 +1,5 @@
using MES.Service.DB;
using Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -97,19 +98,32 @@
            Lxr = supplier.FTContact,
            Telf1 = supplier.Fmobilephone,
            Fstaffid = supplier.FStaffId,
            Fforbidstatus = supplier.FForbidStatus,
            FSubsidiary = string.IsNullOrEmpty(supplier.FUseOrgId)
                ? "1"
                : supplier.FUseOrgId,
            Fumbrella = string.IsNullOrEmpty(supplier.FCreateOrgId)
                ? "1"
                : supplier.FCreateOrgId,
            // FSubsidiary = string.IsNullOrEmpty(supplier.FUseOrgId)
            //     ? "1"
            //     : supplier.FUseOrgId,
            // Fumbrella = string.IsNullOrEmpty(supplier.FCreateOrgId)
            //     ? "1"
            //     : supplier.FCreateOrgId,
            FSubsidiary = "1",
            Fumbrella = "1",
            Remark = supplier.Remark,
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000",
        };
        
        //Fforbidstatus = supplier.FForbidStatus,
        if (supplier.FForbidStatus.IsNullOrEmpty())
        {
            entity.Fforbidstatus = "A";
        }
        else
        {
            //我期望的值是A=否,B=是
            //实际给我的值是0或1，我希望为我转换从A和B的方式
            entity.Fforbidstatus = supplier.FForbidStatus == "1" ? "B" : "A";
        }

        // 查找是否已存在相同供应商编码的记录
        var existingSupplier = Db.Queryable<MesSupplier>()