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

@@ -27,9 +27,6 @@

    public string? FBomId { get; set; }
    public string? FCreateType { get; set; }
    public string? PLAN_ID { get; set; }
    public string? PLAN_SEQ { get; set; }
    public string? PLAN_NUM { get; set; }
    public string? FSrcBillType { get; set; }
    public string? FSrcBillNo { get; set; }
    public string? FSrcBillEntrySeq { get; set; }
@@ -66,6 +63,9 @@
    public decimal? FTotalReworkingQty { get; set; }
    public string? FReasonForRework { get; set; }
    public decimal? FIsForceWholeSet { get; set; }

    public string? FPrevMO { get; set; }
    
    public string? TypeA { get; set; }



 StandardPda/MES.Service/Modes/Womcaa.cs

@@ -513,6 +513,12 @@
    public decimal? Isforcewholeset { get; set; }

    /// <summary>
    ///    分割前原订单编号
    /// </summary>
    [SugarColumn(ColumnName = "PREVMO")]
    public string? PREVMO { get; set; }

    /// <summary>
    ///     1，新增；2，变更
    /// </summary>
    [SugarColumn(ColumnName = "TYPEA")]

 StandardPda/MES.Service/service/WomcaaManager.cs

@@ -57,7 +57,30 @@
            .IgnoreColumnsNull()
            .ExecuteCommand() > 0;

        if (orUpdate && baOrUpdate) return true;

        if (orUpdate && baOrUpdate)
        {
            //定义输入参数
            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_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
            // 获取输出参数的值
            int result = int.Parse((string)outParam1.Value);
            string 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("更新失败");
    }

@@ -102,13 +125,7 @@
            Caa013 = dto.FBomId,

            CreateType = dto.FCreateType,
            Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
                ? Convert.ToInt64(dto.PLAN_ID)
                : null,
            Caa019 = !string.IsNullOrEmpty(dto.PLAN_SEQ)
                ? Convert.ToInt64(dto.PLAN_SEQ)
                : null,
            Caa020 = dto.PLAN_NUM,
            Caa020 = dto.FBillNo,
            SrcBillType = dto.FSrcBillType,
            SrcBillNo = dto.FSrcBillNo,
            SrcBillentryseq = dto.FSrcBillEntrySeq,
@@ -118,7 +135,6 @@
            CloseType = dto.FCloseType,
            SrcSplitBillno = dto.FSrcSplitBillNo,
            Caa016 = dto.FDescription,
            //BTBZ = dto.BTBZ,  
            PrdOrg = dto.FPrdOrgId,
            TrustOrg = dto.FEnTrustOrgId,
            Bomtype = dto.FBOMType,
@@ -140,7 +156,8 @@
            Totalrcvqty = dto.FTotalRcvQty,
            Totalreworkingqty = dto.FTotalReworkingQty,
            Reasonforrework = dto.FReasonForRework,
            Isforcewholeset = dto.FIsForceWholeSet, 
            Isforcewholeset = dto.FIsForceWholeSet,
            PREVMO = dto.FPrevMO,
            Typea = dto.TypeA
        };