合并上格新增代码

展杰

2024-08-13 a4f725f0fc99e1e51106af1b60263ac3bd2a7c30

 MES.Service/service/WomcaaManager.cs

@@ -74,12 +74,13 @@

    private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
    {
        return new Womcaa
        var entity = new Womcaa
        {
            Erpid = Convert.ToDecimal(dto.Id),
            Caa001 = dto.FBillNo,
            WorkShopId = dto.FWorkShopID0,
            Caa021 = dto.FWorkShopID0,
            RoutingId = dto.FRoutingId,
            WorkShopId = dto.FREMWorkShopId,
            DepotCode = dto.FStockId,
            CreateDate = dto.FDate,
            Caa004 = dto.FBillType,
@@ -109,8 +110,16 @@
            ForceCloserid = dto.FForceCloserId,
            CloseType = dto.FCloseType,
            SrcSplitBillno = dto.FSrcSplitBillNo,
            Caa016 = dto.FMemoItem
            Caa016 = dto.FMemoItem,
            Caa018 = Convert.ToDecimal(dto.planId),
            Caa019 = Convert.ToDecimal(dto.planSeq),
            Caa020 = dto.planNum
        };

        var single = base.GetSingle(it => it.Erpid == entity.Erpid);
        if (single != null) entity.Id = single.Id;

        return entity;
    }

    private List<Womcab> MapErpCABtoWomcab(List<ErpCAB> dtoList)
@@ -123,6 +132,7 @@
            {
                Erpid = Convert.ToDecimal(dto.ID),
                Cab001 = dto.FBillNo,
                Cab002 = dto.FSeq,
                Cab003 = dto.FMaterialID2,
                Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2)
                    ? Convert.ToDecimal(dto.FNeedQty2)
@@ -148,6 +158,10 @@
                Eid = Convert.ToDecimal(dto.PID)
            };

            var entity = Db.Queryable<Womcab>()
                .Where(s => s.Erpid == womcab.Erpid).Single();
            if (entity != null) womcab.Id = entity.Id;

            womcabList.Add(womcab);
        }