1、获取检验项目前先删除

kyy

2025-08-29 bdfcb2760a617d0fb95ee934696a3dde477d7e68

1、获取检验项目前先删除

 MES.Service/Modes/MessageCenter.cs

@@ -4,7 +4,7 @@

/// <summary>
/// </summary>
[SugarTable("MESSAGE_CENTER")]
[SugarTable("MESSAGE_CENTER1")]
public class MessageCenter
{
    /// <summary>

 MES.Service/service/QC/RKJService.cs

@@ -478,13 +478,12 @@
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (a, b) => a.FcheckResu == null || a.Fsubmit == null ||
                (a, b) =>  a.Fsubmit == null ||
                          a.Fsubmit == 0)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (a, b) => a.FcheckResu != null && a.Fsubmit != null &&
                          a.Fsubmit != 0)
                (a, b) =>  a.Fsubmit == 1)
            .WhereIF(id > 0, (a, b) => a.Id == id)
            .WhereIF(!string.IsNullOrEmpty(queryObj.itemCj),
                (a, b) => b.itemCj.Contains(queryObj.itemCj))
@@ -788,6 +787,15 @@
    {
        var items = rkjDto.items;
        var userNo = rkjDto.userNo;
        
        var db = SqlSugarHelper.GetInstance();
        db.Deleteable<QsItemOqcItem>()
            .Where(s => s.Pid == rkjDto.gid)
            .ExecuteCommand();
        
        db.Deleteable<QsItemOqcItemDetail>()
            .Where(s => s.Gid == rkjDto.gid)
            .ExecuteCommand();

        SqlSugarHelper.UseTransactionWithOracle(db =>
        {

 MES.Service/service/QC/SJService.cs

@@ -319,6 +319,16 @@

    public QsItem SaveItem(QsItem item)
    {
        var db = SqlSugarHelper.GetInstance();
        db.Deleteable<QsItemIpiItem>()
            .Where(s => s.Pid == item.gid)
            .ExecuteCommand();
        
        db.Deleteable<QsItemIpiItemDetail>()
            .Where(s => s.Gid == item.gid)
            .ExecuteCommand();
        
        
        var qsItemIpiItems = item.Items;
        SqlSugarHelper.UseTransactionWithOracle(db =>
        {

 MES.Service/service/QC/XJService.cs

@@ -133,13 +133,12 @@
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (s, a) => s.FcheckResu == null || s.Fsubmit == null ||
                (s, a) =>  s.Fsubmit == null ||
                          s.Fsubmit == 0)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (s, a) => s.FcheckResu != null && s.Fsubmit != null &&
                          s.Fsubmit != 0)
                (s, a) => s.Fsubmit == 1)
            .WhereIF(id > 0, (s, a) => s.Id == id)
            .Select((s, a) => new QsQaItemXj
            {
@@ -360,6 +359,15 @@
    {
        var items = xjDto.items;
        var userNo = xjDto.userNo;
        
        var db = SqlSugarHelper.GetInstance();
        db.Deleteable<QsQaItemXj01>()
            .Where(s => s.Pid == xjDto.gid)
            .ExecuteCommand();
        
        db.Deleteable<QsQaItemXj02>()
            .Where(s => s.Gid == xjDto.gid)
            .ExecuteCommand();

        SqlSugarHelper.UseTransactionWithOracle(db =>
        {

 MES.Service/service/WomcaaManager.cs

@@ -222,11 +222,8 @@
                     : null, /// 组成用量 */
                //Cab009 = dto.FUnitID,/// 单位
                //2024-11-15 14：05 用料清单克转千克
                Cab006 = !string.IsNullOrEmpty(dto.FNeedQty) &&
                         int.TryParse(dto.FUnitID, out var unitId)
                    ? unitId == 10097
                        ? Convert.ToDecimal(dto.FNeedQty) / 1000
                        : Convert.ToDecimal(dto.FNeedQty)
                Cab006 = !string.IsNullOrEmpty(dto.FNeedQty) &&  int.TryParse(dto.FUnitID, out var unitId)   ? unitId == 10097
                        ? Convert.ToDecimal(dto.FNeedQty) / 1000  : Convert.ToDecimal(dto.FNeedQty)
                    : null,
                Cab007 = !string.IsNullOrEmpty(dto.FPickedQty) &&
                         int.TryParse(dto.FUnitID, out var pickedQty)