任务单接口修改

CRZ

2025-12-03 035f614428d37d07976e995719a5d5bfb5472648

 MES.Service/service/WomcaaManager.cs

@@ -17,6 +17,31 @@

    private readonly WomcabManager _womcabManager = new();

    /// <summary>
    /// 验证BOM是否为空
    /// </summary>
    /// <param name="erpCabs">BOM明细列表</param>
    /// <param name="billNo">生产任务单号</param>
    /// <exception cref="Exception">当BOM为空时抛出异常</exception>
    private void ValidateBomNotEmpty(List<ErpCAB> erpCabs, string billNo)
    {
        if (erpCabs == null || erpCabs.Count == 0)
        {
            throw new Exception($"生产任务单 {billNo} 的BOM为空，不允许推送到MES系统");
        }

        // 检查是否有有效的BOM明细（物料编码不为空且需领用量大于0）
        var validBomItems = erpCabs.Where(cab => 
            !string.IsNullOrWhiteSpace(cab.FMaterialID2) && 
            !string.IsNullOrWhiteSpace(cab.FNeedQty2) &&
            decimal.TryParse(cab.FNeedQty2, out decimal qty) && qty > 0).ToList();

        if (validBomItems.Count == 0)
        {
            throw new Exception($"生产任务单 {billNo} 的BOM明细无效（物料编码为空或需领用量为0），不允许推送到MES系统");
        }
    }

    public bool SaveList(List<ErpWOM> rohIns)
    {
        var result = rohIns.Select(Save).ToList();
@@ -28,6 +53,9 @@
        var womErpCaa = wom. ErpCaa;
        var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
        var mesWomcabs =  MapErpCABtoWomcab(wom.ErpCabs);

        // 验证BOM是否为空
        ValidateBomNotEmpty(wom.ErpCabs, womErpCaa.FBillNo);

        return UseTransaction(db =>
        {
@@ -66,21 +94,21 @@
            if (mesWomcabs.Count > 0)
            {

           // var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002, CAB003 = s.Cab003 }).ToList();
            var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002}).ToList();
            var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002, CAB003 = s.Cab003 }).ToList();
            //var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002}).ToList();


            /*db.Deleteable<Womcab>()
            db.Deleteable<Womcab>()
                .Where(it => mesWomcab
                .Any(p => p.CAB001 == it.Cab001 
                && p.CAB002 == it.Cab002 
                && p.CAB003 == it.Cab003))
                .ExecuteCommand();*/
            db.Deleteable<Womcab>()
                .Where(it => mesWomcab
                .Any(p => p.CAB001 == it.Cab001
                && p.CAB002 == it.Cab002))
                .ExecuteCommand();
            //db.Deleteable<Womcab>()
            //    .Where(it => mesWomcab
            //    .Any(p => p.CAB001 == it.Cab001
            //    && p.CAB002 == it.Cab002))
            //    .ExecuteCommand();

        };
           
@@ -137,13 +165,13 @@
        .ExecuteCommand() > 0;


        //var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002, CAB003 = s.Cab003 }).ToList();
        var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002}).ToList();
        var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002, CAB003 = s.Cab003 }).ToList();
        //var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002}).ToList();



        //var insertOrUpdate = db.Deleteable<Womcab>().Where(it => mesWomcab.Any(p => p.CAB001 == it.Cab001 && p.CAB002 == it.Cab002 && p.CAB003 == it.Cab003)).ExecuteCommand() > 0;
        var insertOrUpdate = db.Deleteable<Womcab>().Where(it => mesWomcab.Any(p => p.CAB001 == it.Cab001 && p.CAB002 == it.Cab002)).ExecuteCommand() > 0;
        var insertOrUpdate = db.Deleteable<Womcab>().Where(it => mesWomcab.Any(p => p.CAB001 == it.Cab001 && p.CAB002 == it.Cab002 && p.CAB003 == it.Cab003)).ExecuteCommand() > 0;
        //var insertOrUpdate = db.Deleteable<Womcab>().Where(it => mesWomcab.Any(p => p.CAB001 == it.Cab001 && p.CAB002 == it.Cab002)).ExecuteCommand() > 0;


        if (update && insertOrUpdate) return true;
@@ -189,7 +217,8 @@
            Cust_item_no = dto.FCustitemno,
            DemandDate   = DemandDate,
            CustNumber   = dto.CustNumber,
            ModelType    = dto.ModelType
            ModelType    = dto.ModelType,
            OrderNo      = dto.FOrderNo