生产用料清单单号删除

hao

22 小时以前 c98705ac9833f1b8fd2122ffb4d2d9eb45bf7bfa

 StandardInterface/MES.Service/service/WomcaaManager.cs

@@ -49,11 +49,23 @@
    private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
        List<Womcab> mesWomcabs)
    {
        if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
        /*if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);

        if (mesWomcabs.Count > 0)
            db.Deleteable<Womcab>()
                .Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
                .Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();*/


        //20251212 焕美改成单号删除
        // 删除主表：按 Caa001 删除旧单据
        db.Deleteable<Womcaa>()
            .Where(s => s.Caa001 == mesWomcaa.Caa001)
            .ExecuteCommand();

        // 删除子表：按 Cab001 删除所有旧行
        db.Deleteable<Womcab>()
            .Where(s => s.Cab001 == mesWomcaa.Caa001)  
            .ExecuteCommand();

        //单条插入忽略空字段
        var orUpdate = db.Insertable(mesWomcaa)
@@ -98,9 +110,31 @@
        List<Womcab> mesWomcabs)
    {

        //定义输入参数
        var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
        // 定义输出参数
        var outParam1 = new SugarParameter("c_Result", null, true);
        var outParam2 = new SugarParameter("C_MSG", null, true);
        // 使用 SqlSugar 执行存储过程
        Db.Ado.ExecuteCommand(
            "BEGIN PRC_UPDATE_DAA2(:P_WORK_NO,:c_Result,:C_MSG); END;",
            inputParam1, outParam1, outParam2);
        // 获取输出参数的值
        var result = int.Parse((string)outParam1.Value);
        var message = outParam2.Value == DBNull.Value
            ? string.Empty
            : (string)outParam2.Value;
        if (result == 1)
        {
            //存储过程失败则事务进行回滚
            db.Ado.RollbackTran();
            throw new Exception(message);
        }

      
        // 提交事务
        db.Ado.CommitTran();

/*
        var decimals = mesWomcabs.Select(s => s.Id).ToArray();

        var update = true;
@@ -119,33 +153,23 @@

        if (update && insertOrUpdate)
        {
            //定义输入参数
            var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
            // 定义输出参数
            var outParam1 = new SugarParameter("c_Result", null, true);
            var outParam2 = new SugarParameter("C_MSG", null, true);
            // 使用 SqlSugar 执行存储过程
            Db.Ado.ExecuteCommand(
                "BEGIN PRC_UPDATE_DAA2(:P_WORK_NO,:c_Result,:C_MSG); END;",
                inputParam1, outParam1, outParam2);
            // 获取输出参数的值
            var result = int.Parse((string)outParam1.Value);
            var message = outParam2.Value == DBNull.Value
                ? string.Empty
                : (string)outParam2.Value;
            if (result == 1)
            {
                //存储过程失败则事务进行回滚
                db.Ado.RollbackTran();
                throw new Exception(message);
            }

            // 提交事务
            db.Ado.CommitTran();
         
            return true;
        }
        throw new NotImplementedException("更新失败");
       
        */
        //20251212 焕美改成单号删除
        // 删除主表：按 Caa001 删除旧单据
        db.Deleteable<Womcaa>()
            .Where(s => s.Caa001 == mesWomcaa.Caa001)
            .ExecuteCommand();

        // 删除子表：按 Cab001 删除所有旧行
        db.Deleteable<Womcab>()
            .Where(s => s.Cab001 == mesWomcaa.Caa001)
            .ExecuteCommand();
        return true;

    }

    private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
@@ -278,6 +302,7 @@
            Sjxs=dto.SJ_xs,
            Nextgx=dto.NEXT_Gx,
            Rks=dto.RKS,
            Khwlbm=dto.KHWLBM,
            //沃尔新增
            // WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD
            //WR_F_SCDD_XH = dto.F_SCDD_XH
@@ -302,8 +327,10 @@
                Cab001 = dto.FBillNo,                         //单据编号
                Cab002 = dto.FSeq,                            //序号
                Cab003 = dto.FMaterialID,                     //子项物料编码
                Cab006 = Convert.ToDecimal(dto.FNeedQty),     //需求数量
                MustQty = Convert.ToDecimal(dto.FMustQty),    //应发数量
               // Cab006 = Convert.ToDecimal(dto.FNeedQty),     //需求数量
                Cab006 = Convert.ToDecimal(dto.FMustQty),       //应发数量
                MustQty = Convert.ToDecimal(dto.FNeedQty),    //需求数量
                // MustQty = Convert.ToDecimal(dto.FMustQty),    //应发数量
                Cab007 = Convert.ToDecimal(dto.FPickedQty),   //已领数量
                PositionNo = dto.FPositionNO,                 //位置号
                SupplyOrganization = dto.FChildSupplyOrgId,   //供应组织