111

啊鑫

3 天以前 96ee6437185cc02f17a8286967fd0f0eb88d9328

 MES.Service/service/WomcaaManager.cs

@@ -1,4 +1,6 @@
using MES.Service.DB;
using System.Globalization;
using Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.util;
@@ -111,7 +113,6 @@
            RoutingId = dto.FRoutingId, ///     工艺路线
            WorkShopId = dto.FREMWorkShopId, ///     产线
            DepotCode = dto.FStockId, ///     仓库
            CreateDate = dto.FDate, ///     单据日期
            Caa004 = dto.FBILLTYPE, ///     单据类型
            Caa023 = dto.FStatus, ///     状态 完工，未完工
            Caa006 = dto.FMaterialId, ///     产品编码
@@ -151,9 +152,9 @@
                : null, ///     ERP源单行号
            Caa020 = dto.PLAN_NUM, ///     ERP源单单号(任务单号)
            //Caa015 = dto.F_UNW_Text_xsddh, ///     销售订单号
            ErpSczz = Convert.ToInt32(dto.FPrdOrgId), ///     生产组织ID
            ErpWtzz = Convert.ToInt32(dto.FEnTrustOrgId), ///     委托组织ID
            Btbz = dto.Btbz, ///     委托组织ID
            // ErpSczz = Convert.ToInt32(dto.FPrdOrgId), ///     生产组织ID
            // ErpWtzz = Convert.ToInt32(dto.FEnTrustOrgId), ///     委托组织ID
            // Btbz = dto.Btbz, ///     委托组织ID
            //Caa015Head = dto.F_XIFG_Integer_tzk, ///     销售订单行号
            //MainProductNo = dto.F_XIFG_Base_w5c, ///     主产品编码
            // MainProductQty =
@@ -165,8 +166,7 @@
            Caa0111 = dto.FPlanFinishDate, ///     预计完工时间备份
            Typea = dto.TypeA, ///     预计完工时间备份
            //Typeb = dto.TypeB ///     预计完工时间备份
            SynchronousDate = DateTime.Now,
            ZH_XSDD = dto.F_WPVT_TEXT_CA9
            SynchronousDate = DateTime.Now

        };

@@ -219,6 +219,24 @@
                .First();
            entity.Caa009 = unit.ToString();
        }
        
        //CreateDate = dto.FDate, ///     单据日期
        if (!dto.FDate.IsNullOrEmpty())
        {
            if (!DateTime.TryParseExact(dto.FDate, "yyyy-MM-d H:m:s",
                    CultureInfo.InvariantCulture,
                    DateTimeStyles.None, out DateTime createDate))
            {
                throw new FormatException(
                    $"创建日期（FCreateDate）解析失败！值：【{dto.FDate}】，支持格式：yyyy-MM-d H:m:s");
            }

            entity.CreateDate = createDate;
        }
        else
        {
            entity.CreateDate = null;
        }

        return entity;
    }
@@ -261,14 +279,19 @@
                Pid = Convert.ToInt32(dto.PID), /// ERP头ID 
                Eid = Convert.ToInt32(dto.Id), /// ERP ID 

                Scrapqty = dto.FFixScrapQty, /// 固定损耗 
                Scrapqty = dto.FFixScrapQty, /// 固定损耗
                Scraprate = dto.FScrapRate, /// 变动损耗率
                Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
                UseRate = Convert.ToDecimal(dto.FUseRate),
                Freplacegroup = !string.IsNullOrEmpty(dto.FReplaceGroup)
                    ? Convert.ToInt32(dto.FReplaceGroup)
                    : 0,
                UseRate = !string.IsNullOrEmpty(dto.FUseRate)
                    ? Convert.ToDecimal(dto.FUseRate)
                    : 0,
                MaterialType = dto.FMaterialType,
                MustQty = Convert.ToDecimal(dto.FMustQty),
                Typeb = dto.TypeB,
                LW_WLBGY = dto.F_WPVT_TEXT_RE5
                MustQty = !string.IsNullOrEmpty(dto.FMustQty)
                    ? Convert.ToDecimal(dto.FMustQty)
                    : 0,
                Typeb = dto.TypeB
                // Fsaleorderno = dto.FSALEORDERNO, /// 销售订单 
                //
                // CustomerItemNumber = dto.F_XIFG_Text_re5, /// 客户货号 
@@ -283,6 +306,51 @@
                .Where(s => s.Eid == womcab.Eid).Single();
            if (entity != null) womcab.Guid = entity.Guid;

            // CAB003 材料编码 => MES_ITEMS.id
            if (!string.IsNullOrEmpty(womcab.Cab003))
            {
                var item = Db.Queryable<MesItems>()
                    .Where(i => i.ItemNo == womcab.Cab003)
                    .Select(i => i.Id)
                    .First();
                if (item != null)
                {
                    womcab.Cab003 = item.ToString();
                }
            }

            // CAB009 单位 => MES_UNIT.id
            if (!string.IsNullOrEmpty(womcab.Cab009))
            {
                var unit = Db.Queryable<MesUnit>()
                    .Where(u => u.Fnumber == womcab.Cab009)
                    .Select(u => u.Id)
                    .First();
                if (unit != null)
                {
                    womcab.Cab009 = unit.ToString();
                }
            }

            // DEPOT_CODE 仓库 => MES_DEPOTS.DEPOT_ID
            if (!string.IsNullOrEmpty(womcab.DepotCode))
            {
                var depot = Db.Queryable<MesDepots>()
                    .Where(d => d.DepotCode == womcab.DepotCode)
                    .Select(d => d.DepotId)
                    .First();
                if (depot != null)
                {
                    womcab.DepotCode = depot.ToString();
                }
            }

            // ISSUING_ORGANIZATION 发料组织 => 1 (固定值)
            womcab.IssuingOrganization = "1";

            // SUPPLY_ORGANIZATION 供应组织 => 1 (固定值)
            womcab.SupplyOrganization = "1";

            womcabList.Add(womcab);
        }