11

啊鑫

2025-02-13 311f8814b600f85caa0eae21c20798f53717f07e

11

 StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs

@@ -31,7 +31,7 @@
    public string? FApproverId { get; set; }
    public string? FApproveDate { get; set; }

    // public string? FCancelStatus { get; set; }
    public string? FCancelStatus { get; set; }
    // public string? FCancellerId { get; set; }
    // public string? FCancelDate { get; set; }
}

 StandardPda/MES.Service/service/BasicData/MesRohInManager.cs

@@ -97,6 +97,16 @@
        var single = base.GetSingle(it => it.EbelnK3id == eid);
        if (single != null) mesRohIn.Id = single.Id;

        var mesLinkU9 = Db.Queryable<MesLinkU9>()
            .Where(s=>s.U9Id == rohIn.FSupplierId
                      && s.OrgId == rohIn.FReceiveOrgId
                      && s.TableType == "MES_SUPPLIER").First();

        if (mesLinkU9 != null)
        {
            mesRohIn.Supplier = mesLinkU9.MesId;
        }
        
        mesRohIn.EbelnK3id = eid;
        mesRohIn.BillNo = rohIn.FBillNo;
        mesRohIn.DocumentStatus = rohIn.FDocumentStatus;
@@ -105,7 +115,7 @@
        if (rohIn.FDate != 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;
@@ -128,6 +138,7 @@
        mesRohIn.Changereason = rohIn.PubDescSeg2;
        mesRohIn.ReceiveOrg = Convert.ToDecimal(rohIn.FReceiveOrgId);
        mesRohIn.Remarks = rohIn.Remarks;
        mesRohIn.CancellationStatus = rohIn.FCancelStatus;

        mesRohIn.SrcDocType = rohIn.FSrcDocType;
        mesRohIn.SrcDoc = rohIn.FSrcDoc;
@@ -164,7 +175,7 @@
                BusinessFreeze = s.FStatus,
                PurchaseOrderLineNumber = s.FSeq,
                SalesOrderId = s.FDemandBillEntrySeq,
                ItemId = s.FMaterialId,
                
                PurchaseUnit = s.FUnitId,
                PurchaseQty = Convert.ToDecimal(s.FQty),
                PricingUnit = s.FPriceUnitId,
@@ -199,6 +210,17 @@
            var single = rohInDataManager.GetSingle(it =>
                it.EbelnK3id == entity.EbelnK3id);
            if (single != null) entity.Id = single.Id;
            
            //ItemId = s.FMaterialId,
            var mesLinkU9 = Db.Queryable<MesLinkU9>()
                .Where(x=>x.U9Id == s.FMaterialId
                          && x.OrgId == s.FReceiveOrgId
                          && x.TableType == "MES_ITEMS").First();

            if (mesLinkU9 != null)
            {
                entity.ItemId = mesLinkU9.MesId;
            }

            return entity;
        }).ToList();