111

cnf

2025-04-14 88a1ab54409ebf39c0bfa269aa7d513a7ac9219e

111

 MES.Service/Dto/webApi/ZuHeRequestOrder/ZuHeRequestsOrder.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace MES.Service.Dto.webApi.ZuHeRequestOrder
{
    public class ZuHeRequestsOrder
    {

        public List<ComboSingleItem> ComboSingle { get; set; }

    }

    public class ComboSingleItem
    {
        public string RELEASE_NO { get; set; }
    }

}

 MES.Service/Modes/QcIssueResult/UpdateMesQaItems .cs

@@ -25,4 +25,12 @@
    [SugarColumn(ColumnName = "FMRMODE")]
    public string? FMRMODE { get; set; }

    //送货单号
    [SugarColumn(ColumnName = "IS_SJ")]
    public decimal? ISSJ { get; set; }

    //送货单号
    [SugarColumn(ColumnName = "SJ_NO")]
    public string? SJ_NO { get; set; }

}

 MES.Service/Modes/SentLaboratory/GetLaboratoryDetails.cs

@@ -24,6 +24,10 @@
    public string? ITEM_NO { get; set; }
    public string? DEPARTMENTCODE { get; set; }
    public string? JYDH { get; set; }

    public string? buttonStatu { get; set; }
    public decimal? IS_SUBMIT { get; set; }
    public string? ZH_BS { get; set; }
    public decimal? ITEM_ID { get; set; }
    public string? SUPP_NAME { get; set; }

}

 MES.Service/Modes/SentLaboratory/UpdateMesQmsSample.cs

@@ -3,7 +3,7 @@

namespace MES.Service.Modes.SentLaboratory;

//异产品检测单表
//产品检测单表
[SugarTable("MES_QMS_SAMPLE")]
public class UpdateMesQmsSample
{
@@ -143,4 +143,12 @@
    [SugarColumn(ColumnName = "JYDH")]
    public string? JYDH { get; set; }

    //送检状态
    [SugarColumn(ColumnName = "IS_SUBMIT")]
    public decimal? IsSubmit { get; set; }

    //组合标识
    [SugarColumn(ColumnName = "ZH_BS")]
    public string? ZHBS { get; set; }

}

 MES.Service/Modes/SentLaboratory/UpdateMesQmsSamplePjt.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace MES.Service.Modes.SentLaboratory;

//产品检测单----项目信息表
[SugarTable("MES_QMS_SAMPLE_PJT")] 
public class UpdateMesQmsSamplePjt
{
    //SEQ_QMS_EQ_CHECK
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_QMS_EQ_CHECK")]
    public decimal Id { get; set; }

    //主表ID
    [SugarColumn(ColumnName = "PID")]
    public decimal? PID { get; set; }

    //送检单号
    [SugarColumn(ColumnName = "SJ_NO")]
    public string? SJ_NO { get; set; }

    //检验单号
    [SugarColumn(ColumnName = "RELEASE_NO")]
    public string? RELEASE_NO { get; set; }

    //物料编码
    [SugarColumn(ColumnName = "ITEM_NO")]
    public string? ITEM_NO { get; set; }

    //样本数量
    [SugarColumn(ColumnName = "QUANTITY")]
    public string? QUANTITY { get; set; }

    //急料标识
    [SugarColumn(ColumnName = "URGENT_FLAG")]
    public decimal? URGENT_FLAG { get; set; }

    //创建人
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CREATE_BY { get; set; }

    //创建时间
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CREATE_DATE { get; set; }

    //物料内码
    [SugarColumn(ColumnName = "ITEM_ID")]
    public decimal? ITEM_ID { get; set; }

    //供应商名称
    [SugarColumn(ColumnName = "SUPP_NAME")]
    public string? SUPP_NAME { get; set; }

    //测试判定结果
    [SugarColumn(ColumnName = "DECISION_OUTCOMES")]
    public string? DECISION_OUTCOMES { get; set; }
}

 MES.Service/Modes/ZuHeRequestOrder/ZuHeRequestOrders.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace MES.Service.Modes.ZuHeRequestOrder;

[SugarTable("MES_QA_ITEMS_DETECT_01")]
public class ZuHeRequestOrders
{

    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_QM_ID",
       IsPrimaryKey = true)]
    public decimal Id { get; set; }
    //检验单号
    [SugarColumn(ColumnName = "RELEASE_NO")]
    public string? ReleaseNo { get; set; }

    //检验单号
    [SugarColumn(ColumnName = "ZH_BS")]
    public string? ZH_BS { get; set; }

}

 MES.Service/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/bin/Release/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Release/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs

@@ -1,4 +1,5 @@
using MES.Service.DB;
using MES.Service.Dto.webApi.QcIssueResult;
using MES.Service.Modes.QcIssueResult;
using MES.Service.Modes.SentLaboratory;
using Newtonsoft.Json;
@@ -7,6 +8,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;

@@ -14,6 +16,219 @@

public class SaveLaboratoryManager:Repository<UpdateMesQmsSample>
{

    public class ResultObject
    {
        public string? SjReleaseNo { get; set; }
        public decimal? IS_SJ { get; set; }
        public string? DEPARTMENTNAME { get; set; }
        public string? DEPARTMENTCODE { get; set; }
        public DateTime? CREATE_DATE { get; set; }
        public DateTime? CompleteDate { get; set; }
        public string? REMARKS { get; set; }
        public string? SIM_REQ { get; set; }
        //磁铁拉力
        public decimal? Check01 { get; set; }

        //磁铁承重
        public decimal? Check02 { get; set; }

        //盐雾

        public decimal? Check03 { get; set; }

        //IP
        public decimal? Check04 { get; set; }

        //老化测试
        public decimal? Check05 { get; set; }

        //传导辐射
        public decimal? Check06 { get; set; }

        public decimal? Check07 { get; set; }

        //电线拉力
        public decimal? Check08 { get; set; }

        //接口插拔
        public decimal? Check09 { get; set; }

        //光谱测试
        public decimal? Check10 { get; set; }

        //ROHS
        public decimal? Check11 { get; set; }

        //电池充放电
        public decimal? Check12 { get; set; }

        //高温
        public decimal? Check13 { get; set; }

        //低温
        public decimal? Check14 { get; set; }

        //IK
        public decimal? Check15 { get; set; }

        //温升测试
        public decimal? Check16 { get; set; }

        //寿命
        public decimal? Check17 { get; set; }

        //其它
        public decimal? Check18 { get; set; }

        //其它的内容
        public string? Line04 { get; set; }
        public List<AllItem>? allItem { get; set; }
    }

    public class AllItem
    {
        public decimal? Pid { get; set; }
        public string? sj_no { get; set; }
        public string? release_no { get; set; }
        public decimal? ITEM_ID { get; set; }
        public string? ITEM_NO { get; set; }
        public string? QUANTITY { get; set; }
        public decimal? URGENT_FLAG { get; set; }
        public DateTime? CREATE_DATE { get; set; }
        public string? SUPP_NAME { get; set; }
        public string? DECISION_OUTCOMES { get; set; }
       
    }

    public ResultObject GetListAll(string RELEASE_NO)
    {
        // å‡è®¾ä½ æœ‰ä¸€ä¸ªæ•°æ®åº“上下文或数据访问层
        // è¿™é‡Œç”¨æ¨¡æ‹Ÿæ•°æ®ä»£æ›¿å®žé™…数据库查询
        var mainTable = GetMainTableData(RELEASE_NO);
        var subTable = GetSubTableData(RELEASE_NO);

        // åˆ›å»ºè¿”回对象
        var result = new ResultObject
        {

            SjReleaseNo = mainTable.ReleaseNo,
            IS_SJ = mainTable.IsSubmit,
            DEPARTMENTNAME = mainTable.DEPARTMENTNAME,
            DEPARTMENTCODE=mainTable.DEPARTMENTCODE,
            REMARKS = mainTable.REMARKS,
            SIM_REQ = mainTable.SimReq,
            Check01 = mainTable.Check01,
            Check02 = mainTable.Check02,
            Check03 = mainTable.Check03,
            Check04 = mainTable.Check04,
            Check05 = mainTable.Check05,
            Check06 = mainTable.Check06,
            Check07 = mainTable.Check07,
            Check08 = mainTable.Check08,
            Check09 = mainTable.Check09,
            Check10 = mainTable.Check10,
            Check11 = mainTable.Check11,
            Check12 = mainTable.Check12,
            Check13 = mainTable.Check13,
            Check14 = mainTable.Check14,
            Check15 = mainTable.Check15,
            Check16 = mainTable.Check16,
            Check17 = mainTable.Check17,
            Check18 = mainTable.Check18,
            Line04 = mainTable.Line04,
            allItem = subTable.Select(item => new AllItem
            {
                Pid=item.PID,
                sj_no = item.SJ_NO,
                CREATE_DATE = item.CREATE_DATE,
                ITEM_ID = item.ITEM_ID,
                release_no=item.RELEASE_NO,
                ITEM_NO = item.ITEM_NO,
                SUPP_NAME = item.SUPP_NAME,
                QUANTITY=item.QUANTITY,
                URGENT_FLAG=item.URGENT_FLAG,
                DECISION_OUTCOMES=item.DECISION_OUTCOMES,

            }).ToList()
        };

        return result;
    }

    // æ¨¡æ‹Ÿä¸»è¡¨æ•°æ®æŸ¥è¯¢
    private UpdateMesQmsSample GetMainTableData(string RELEASE_NO)
    {
        var db = SqlSugarHelper.GetInstance();

        var map = db.Queryable<UpdateMesQmsSample>()
         .Where(t => t.ReleaseNo == RELEASE_NO)
         .First();
      

        // è¿™é‡Œåº”该是实际的数据库查询逻辑
        // ä¾‹å¦‚：return db.MainTable.FirstOrDefault(m => m.RELEASE_NO == RELEASE_NO);
        return new UpdateMesQmsSample
        {
            ReleaseNo = map.ReleaseNo,
            DEPARTMENTNAME = map.DEPARTMENTNAME,
            CreateDate = map.CreateDate,
            QUANTITY = map.QUANTITY,
            CompleteDate = map.CompleteDate,
            TestReq = map.TestReq,
            SimReq = map.SimReq,
            ItemNo = map.ItemNo,
            UrgentFlag = map.UrgentFlag,
            JYDH = map.JYDH,
            REMARKS = map.REMARKS,
            ItemName = map.ItemName,
            DEPARTMENTCODE = map.DEPARTMENTCODE,
            PAPERBILLNO = map.PAPERBILLNO,
            IsSubmit = map.IsSubmit,
            ZHBS = map.ZHBS,
            Check01 = map.Check01,
            Check02 = map.Check02,
            Check03 = map.Check03,
            Check04 = map.Check04,
            Check05 = map.Check05,
            Check06 = map.Check06,
            Check07 = map.Check07,
            Check08 = map.Check08,
            Check09 = map.Check09,
            Check10 = map.Check10,
            Check11 = map.Check11,
            Check12 = map.Check12,
            Check13 = map.Check13,
            Check14 = map.Check14,
            Check15 = map.Check15,
            Check16 = map.Check16,
            Check17 = map.Check17,
            Check18 = map.Check18,
            Line04=map.Line04
           
        };
    }

    // æ¨¡æ‹Ÿå­è¡¨æ•°æ®æŸ¥è¯¢
    private List<UpdateMesQmsSamplePjt> GetSubTableData(string RELEASE_NO)
    {
        var db = SqlSugarHelper.GetInstance();

        var mapping = db.Queryable<UpdateMesQmsSamplePjt>()
            .Where(t => t.SJ_NO == RELEASE_NO)
            .ToList();

        // å¦‚果查询结果为空，返回空列表
        if (mapping == null || mapping.Count == 0)
        {
            return new List<UpdateMesQmsSamplePjt>();
        }

        // è¿”回查询结果
        return mapping;
   
    }

    public dynamic Save(GetLaboratoryDetails getLaboratoryDetails)
    {

@@ -21,12 +236,17 @@

        return UseTransaction(db =>
        {
            return SaveOrUpdateData(db, mesUpdateMesQmsSample) ? 1 : 0;
            return SaveOrUpdateData(db, mesUpdateMesQmsSample,getLaboratoryDetails) ? 1 : 0;
        }) > 0;
    }

    public UpdateMesQmsSample GetMesQcIssueResults(GetLaboratoryDetails getLaboratoryDetails)
    {

        if (getLaboratoryDetails.URGENT_FLAG == null) {
            getLaboratoryDetails.URGENT_FLAG = 0;
        }

        var mesUpdateMesQmsSample = new UpdateMesQmsSample
        {
            ReleaseNo = getLaboratoryDetails.RELEASE_NO,
@@ -43,8 +263,29 @@
            ItemName = getLaboratoryDetails.ITEM_NAME,
            DEPARTMENTCODE = getLaboratoryDetails.DEPARTMENTCODE,
            PAPERBILLNO = getLaboratoryDetails.LOT_NO,
            IsSubmit = getLaboratoryDetails.IS_SUBMIT,
            ZHBS = getLaboratoryDetails.ZH_BS

        };

        mesUpdateMesQmsSample.Check01 = 0;
        mesUpdateMesQmsSample.Check02 = 0;
        mesUpdateMesQmsSample.Check03 = 0;
        mesUpdateMesQmsSample.Check04 = 0;
        mesUpdateMesQmsSample.Check05 = 0;
        mesUpdateMesQmsSample.Check06 = 0;
        mesUpdateMesQmsSample.Check07 = 0;
        mesUpdateMesQmsSample.Check08 = 0;
        mesUpdateMesQmsSample.Check09 = 0;
        mesUpdateMesQmsSample.Check10 = 0;
        mesUpdateMesQmsSample.Check11 = 0;
        mesUpdateMesQmsSample.Check12 = 0;
        mesUpdateMesQmsSample.Check13 = 0;
        mesUpdateMesQmsSample.Check14 = 0;
        mesUpdateMesQmsSample.Check15 = 0;
        mesUpdateMesQmsSample.Check16 = 0;
        mesUpdateMesQmsSample.Check17 = 0;
        mesUpdateMesQmsSample.Check18 = 0;

        // éåŽ† CHECKBOX å¹¶èµ‹å€¼
        foreach (var item in getLaboratoryDetails.CHECKBOX)
@@ -117,41 +358,161 @@
    /**
    * æ’入数据库表
    */
    private bool SaveOrUpdateData(SqlSugarScope db, UpdateMesQmsSample updateMesQmsSample)
    private bool SaveOrUpdateData(SqlSugarScope db, UpdateMesQmsSample updateMesQmsSample, GetLaboratoryDetails getLaboratoryDetails)
    {

        ////// æŸ¥è¯¢ QcIssueResults è¡¨ä¸­æ˜¯å¦å­˜åœ¨åŒ¹é…çš„记录
        ////var mapping = db.Queryable<UpdateMesQmsSample>()
        ////    .Where(t => t.ReleaseNo == updateMesQmsSample.ReleaseNo)
        ////    .Select(t => new QcIssueResults
        ////    {
        ////        ReleaseNo = t.ReleaseNo,
        ////    })
        ////    .ToList();
        // æŸ¥è¯¢ MES_QMS_SAMPLE è¡¨ä¸­æ˜¯å¦å­˜åœ¨åŒ¹é…çš„记录
        var existingRecord = db.Queryable<UpdateMesQmsSample>()
            .Where(t => t.ReleaseNo == updateMesQmsSample.ReleaseNo)
            .First(); // ä½¿ç”¨ First èŽ·å–第一条记录
       
        if (existingRecord != null)
        {
            Debug.WriteLine("hhhhhhhhh!");
            // æ›´æ–° UpdateMesQaItems è¡¨ä¸­çš„字段
            updateMesQmsSample.Id = existingRecord.Id;

        //// æŸ¥è¯¢ UpdateMesQmsSample è¡¨ä¸­æ˜¯å¦å­˜åœ¨åŒ¹é…çš„记录
        //var existingRecord = db.Queryable<UpdateMesQmsSample>()
        //    .Where(t => t.ReleaseNo == updateMesQmsSample.ReleaseNo)
        //    .First(); // ä½¿ç”¨ First èŽ·å–第一条记录
            // æ‰§è¡Œæ›´æ–°æ“ä½œ
            var updateResult = db.Updateable(updateMesQmsSample).ExecuteCommand();

        //if (existingRecord != null)
        //{
        //    // æ›´æ–° UpdateMesQaItems è¡¨ä¸­çš„字段
        //    updateMesQmsSample.Id = existingRecord.Id;
            var mapping = db.Queryable<UpdateMesQmsSamplePjt>()
             .Where(t => t.RELEASE_NO == updateMesQmsSample.JYDH && t.SJ_NO == updateMesQmsSample.ReleaseNo)
             .Select(t => new UpdateMesQmsSamplePjt
             {
                 PID=t.PID
             })
             .ToList();
            if (mapping.Any())
            {
                updateResult = db.Updateable<UpdateMesQmsSamplePjt>()
             .SetColumns(t => new UpdateMesQmsSamplePjt
             {
                 SJ_NO = updateMesQmsSample.ReleaseNo,
                 RELEASE_NO = updateMesQmsSample.JYDH,
                 ITEM_NO = updateMesQmsSample.ItemNo,
                 QUANTITY = updateMesQmsSample.QUANTITY,
                 URGENT_FLAG = updateMesQmsSample.UrgentFlag,
                 CREATE_DATE = System.DateTime.Now,
                 ITEM_ID = getLaboratoryDetails.ITEM_ID,
                 SUPP_NAME = getLaboratoryDetails.SUPP_NAME
             })
             .Where(t => t.PID == updateMesQmsSample.Id) // æ˜¾å¼æŒ‡å®šæ›´æ–°æ¡ä»¶
             .ExecuteCommand();
               
            }
            else
            {
                Debug.WriteLine("hhhhhhhhaddadah!");
                var mesUpdateMesQmsSamplePjt = new UpdateMesQmsSamplePjt
                {

        //    // æ‰§è¡Œæ›´æ–°æ“ä½œ
        //    var updateResult = db.Updateable(updateMesQmsSample).ExecuteCommand();
        //      return updateResult > 0; // å¦‚果更新成功，返回 true
        
        //}
        //else
        //{
        //    Debug.WriteLine("插入");
            // å¦‚æžœ mapping ä¸ºç©ºï¼Œæ’入新记录到 QcIssueResults è¡¨
                    PID = updateMesQmsSample.Id,
                    SJ_NO = updateMesQmsSample.ReleaseNo,
                    RELEASE_NO = updateMesQmsSample.JYDH,
                    ITEM_NO = updateMesQmsSample.ItemNo,
                    QUANTITY = updateMesQmsSample.QUANTITY,
                    URGENT_FLAG = updateMesQmsSample.UrgentFlag,
                    CREATE_DATE = System.DateTime.Now,
                    ITEM_ID = getLaboratoryDetails.ITEM_ID,
                    SUPP_NAME = getLaboratoryDetails.SUPP_NAME

                };

                updateResult = db.Insertable(mesUpdateMesQmsSamplePjt).ExecuteCommand();

            }
           

             var maping = db.Queryable<UpdateMesQaItems>()
             .Where(t => t.ReleaseNo == updateMesQmsSample.JYDH)
             .Select(t => new UpdateMesQaItems
             {
                 ISSJ = t.ISSJ,
                 SJ_NO = t.SJ_NO
             })
             .ToList();

            if (maping.Any())
            {
                updateResult = db.Updateable<UpdateMesQaItems>()
               .SetColumns(t => new UpdateMesQaItems
               {
                   ISSJ = updateMesQmsSample.IsSubmit,
                   SJ_NO = updateMesQmsSample.ReleaseNo
               })
               .Where(t => t.ReleaseNo == updateMesQmsSample.JYDH) // æ˜¾å¼æŒ‡å®šæ›´æ–°æ¡ä»¶
               .ExecuteCommand();
            }
            else
            {
                throw new NotImplementedException("未找到对应来料检验申请单");
            }

            return updateResult > 0; // å¦‚果更新成功，返回 true

        }
        else
        {
            //Debug.WriteLine("插入");
            //如果 mapping ä¸ºç©ºï¼Œæ’入新记录到 QcIssueResults è¡¨
            var orUpdate = base.Insert(updateMesQmsSample);
            if (orUpdate) return true;
            throw new NotImplementedException("插入或更新失败");
        //}

            var insertedId = 0;

            if (orUpdate)
            {
                // ä½¿ç”¨ RELEASE_NO æŸ¥è¯¢åˆšåˆšæ’入的记录的 id
                 insertedId =(int) db.Queryable<UpdateMesQmsSample>()
                    .Where(it => it.ReleaseNo == updateMesQmsSample.ReleaseNo)
                    .Select(it => it.Id)
                    .Single(); // å¦‚æžœ RELEASE_NO æ˜¯å”¯ä¸€å­—段，可以使用 Single()
            };

            var mesUpdateMesQmsSamplePjt = new UpdateMesQmsSamplePjt
            {
             
                PID= insertedId,
                SJ_NO= updateMesQmsSample.ReleaseNo,
                RELEASE_NO= updateMesQmsSample.JYDH,
                ITEM_NO= updateMesQmsSample.ItemNo,
                QUANTITY= updateMesQmsSample.QUANTITY,
                URGENT_FLAG= updateMesQmsSample.UrgentFlag,
                CREATE_DATE = System.DateTime.Now,
                ITEM_ID= getLaboratoryDetails.ITEM_ID,
                SUPP_NAME=getLaboratoryDetails.SUPP_NAME

            };

            var updateResult = db.Insertable(mesUpdateMesQmsSamplePjt).ExecuteCommand();

            var mapping = db.Queryable<UpdateMesQaItems>()
            .Where(t => t.ReleaseNo == updateMesQmsSample.JYDH)
            .Select(t => new UpdateMesQaItems
            {
                ISSJ = t.ISSJ,
                SJ_NO= t.SJ_NO
            }) 
            .ToList();

            if (mapping.Any())
            {
               updateResult = db.Updateable<UpdateMesQaItems>()
              .SetColumns(t => new UpdateMesQaItems
              {
                 ISSJ= updateMesQmsSample.IsSubmit,
                 SJ_NO = updateMesQmsSample.ReleaseNo
              })
              .Where(t => t.ReleaseNo == updateMesQmsSample.JYDH) // æ˜¾å¼æŒ‡å®šæ›´æ–°æ¡ä»¶
              .ExecuteCommand();
            }
            else
            {
                throw new NotImplementedException("未找到对应来料检验申请单");
            }

           if (orUpdate) return true;
           throw new NotImplementedException("插入或更新失败");
        }

    }

@@ -161,24 +522,51 @@
        {
            var db = SqlSugarHelper.GetInstance();
            // å‡è®¾ db æ˜¯ SQLSugar çš„ SqlSugarClient å®žä¾‹
            var result = db.Deleteable<UpdateMesQmsSample>()
                .Where(t => t.JYDH == JYDH) // æ ¹æ® JYDH åˆ é™¤
                .ExecuteCommand();
            var result = db.Updateable<UpdateMesQmsSample>()
              .SetColumns(t => new UpdateMesQmsSample
              {
                  IsSubmit = 2,
              })
              .Where(t => t.JYDH == JYDH) // æ˜¾å¼æŒ‡å®šæ›´æ–°æ¡ä»¶
              .ExecuteCommand();

            Debug.WriteLine(result);
            var mapping = db.Queryable<UpdateMesQaItems>()
           .Where(t => t.ReleaseNo ==JYDH)
           .Select(t => new UpdateMesQaItems
           {
              ISSJ = t.ISSJ,
           })
           .ToList();

            if (result > 0)
            if (mapping.Any())
            {
                return "删除成功！";
                var updateResult = db.Updateable<UpdateMesQaItems>()
               .SetColumns(t => new UpdateMesQaItems
               {
                   ISSJ = 2,
                   SJ_NO=null
               })
               .Where(t => t.ReleaseNo == JYDH) // æ˜¾å¼æŒ‡å®šæ›´æ–°æ¡ä»¶
               .ExecuteCommand();
            }
            else
            {
                return "未找到匹配的记录，删除失败。";
                throw new NotImplementedException("未找到对应来料检验申请单");
            }

            if (result > 0)
            {
                return "撤回成功！";
            }
            else
            {
                return "未找到匹配的记录，撤回失败。";
            }
        }
        catch (Exception ex)
        {
            return "删除失败，错误信息：" + ex.Message;
            return "撤回失败，错误信息：" + ex.Message;
        }
    }


 MES.Service/service/ZuHeRequestOrder/ZuHeRequestOrderManager.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,164 @@
using MES.Service.DB;
using MES.Service.Dto.webApi.QcIssueResult;
using MES.Service.Dto.webApi.ZuHeRequestOrder;
using MES.Service.Modes.QcIssueResult;
using MES.Service.Modes.ZuHeRequestOrder;
using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace MES.Service.service.ZuHeRequestOrder;

public class ZuHeRequestOrderManager : Repository<ZuHeRequestOrders>
{
    /**
   * ç»„合来料检验申请单
   */
    public dynamic SaveZHBS(ZuHeRequestsOrder zuHeRequestsOrder )
    {

        var mesZuHeRequestsOrder = GetMesQcIssueResults(zuHeRequestsOrder);

        return UseTransaction(db =>
        {
            return SaveOrUpdateData(db, mesZuHeRequestsOrder) ? 1 : 0;
        }) > 0;
    }

    public ZuHeRequestOrders GetMesQcIssueResults(ZuHeRequestsOrder zuHeRequestsOrder)
    {
        // ä»Ž ComboSingle ä¸­æå–所有 RELEASE_NO
        var releaseNoList = zuHeRequestsOrder.ComboSingle.Select(item => item.RELEASE_NO).ToList();

        var mesQcIssueResults = new ZuHeRequestOrders
        {
            ReleaseNo = string.Join(",", releaseNoList) // å°†æ‰€æœ‰ RELEASE_NO æ‹¼æŽ¥æˆä¸€ä¸ªå­—符串
        };

        return mesQcIssueResults;
    }

    /**
  * è§£é™¤æ¥æ–™æ£€éªŒç”³è¯·å•ç»„合
  */
    public dynamic deleateZHBS(ZuHeRequestsOrder zuHeRequestsOrder)
    {

        var mesZuHeRequestsOrder = GetMesQcIssueResults(zuHeRequestsOrder);

        return UseTransaction(db =>
        {
            return ReleaseData(db, mesZuHeRequestsOrder) ? 1 : 0;
        }) > 0;
    }

    /**
    * æ›´æ–°æ•°æ®åº“表进行组合
    */
    private bool SaveOrUpdateData(SqlSugarScope db, ZuHeRequestOrders zuHeRequestOrders )
    {

        try
        {
            // ä»Ž ReleaseNo ä¸­æå–所有 RELEASE_NO
            var releaseNoList = zuHeRequestOrders.ReleaseNo.Split(',').ToList();

            var firstReleaseNo = zuHeRequestOrders.ReleaseNo.Split(',').FirstOrDefault();

            foreach (var releaseNo in releaseNoList)
            {
                // æŸ¥è¯¢ ZuHeRequestOrders è¡¨ä¸­æ˜¯å¦å­˜åœ¨åŒ¹é…çš„记录
                var existingQcIssueResult = db.Queryable<ZuHeRequestOrders>()
                    .Where(t => t.ReleaseNo == releaseNo)
                    .First();

                if (existingQcIssueResult != null)
                {
                    // æ›´æ–° ZuHeRequestOrders è¡¨ä¸­çš„字段
                    var updateResult = db.Updateable<ZuHeRequestOrders>()
                        .SetColumns(t => new ZuHeRequestOrders
                        {
                            ZH_BS = firstReleaseNo,
                        })
                        .Where(t =>  t.ReleaseNo == releaseNo)
                        .ExecuteCommand();

                    if (updateResult <= 0)
                    {
                        throw new Exception($"更新 ZuHeRequestOrders è¡¨å¤±è´¥ï¼ŒReleaseNo: {releaseNo}");
                    }
                }
                else
                {
                        throw new Exception($"未找到检验单号，ReleaseNo: {releaseNo}");
                }
            }

            return true;
        }
        catch (Exception ex)
        {
            Debug.WriteLine($"错误: {ex.Message}");
            throw;
        }

    }

    /**
  * æ›´æ–°æ•°æ®åº“表进行组合
  */
    private bool ReleaseData(SqlSugarScope db, ZuHeRequestOrders zuHeRequestOrders)
    {

        try
        {
            // ä»Ž ReleaseNo ä¸­æå–所有 RELEASE_NO
            var releaseNoList = zuHeRequestOrders.ReleaseNo.Split(',').ToList();

            var firstReleaseNo = zuHeRequestOrders.ReleaseNo.Split(',').FirstOrDefault();

            foreach (var releaseNo in releaseNoList)
            {
                // æŸ¥è¯¢ ZuHeRequestOrders è¡¨ä¸­æ˜¯å¦å­˜åœ¨åŒ¹é…çš„记录
                var existingQcIssueResult = db.Queryable<ZuHeRequestOrders>()
                    .Where(t => t.ReleaseNo == releaseNo)
                    .First();

                if (existingQcIssueResult != null)
                {
                    // æ›´æ–° ZuHeRequestOrders è¡¨ä¸­çš„字段
                    var updateResult = db.Updateable<ZuHeRequestOrders>()
                        .SetColumns(t => new ZuHeRequestOrders
                        {
                            ZH_BS = null,
                        })
                        .Where(t => t.ReleaseNo == releaseNo)
                        .ExecuteCommand();

                    if (updateResult <= 0)
                    {
                        throw new Exception($"更新 ZuHeRequestOrders è¡¨å¤±è´¥ï¼ŒReleaseNo: {releaseNo}");
                    }
                }
                else
                {
                    throw new Exception($"未找到检验单号，ReleaseNo: {releaseNo}");
                }
            }

            return true;
        }
        catch (Exception ex)
        {
            Debug.WriteLine($"错误: {ex.Message}");
            throw;
        }

    }

}

 MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs

@@ -29,7 +29,7 @@
    private readonly string URL = "http://localhost:10054/api/SentLaboratoryTestingItems/";

    /// <summary>
    ///     èŽ·å–所有
    ///     èŽ·å–送检单号
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetList")]
@@ -55,12 +55,12 @@
    }

    [HttpPost("GetLaboratoryList")]
    public ResponseResult GetLaboratoryList()
    public ResponseResult GetLaboratoryList(string RELEASE_NO)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = n.GetList();
            resultInfos.tbBillList = n.GetListAll(RELEASE_NO);

            return new ResponseResult
            {
@@ -75,6 +75,10 @@
        }
    }

    /// <summary>
    ///     ä¿å­˜æˆ–提交送检单数据
    /// </summary>
    /// <returns></returns>
    [HttpPost("SaveLaboratoryDetails")]
    public IActionResult SaveLaboratoryDetails([FromBody] GetLaboratoryDetails getLaboratoryDetails)
    {
@@ -98,6 +102,10 @@
        }
    }

    /// <summary>
    ///     æ’¤å›žé€æ£€å•
    /// </summary>
    /// <returns></returns>
    [HttpPost("DeleteLaboratoryDetails")]
    public IActionResult DeleteLaboratoryDetails(string JYDH)
    {

 MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs

@@ -11,7 +11,10 @@
using Newtonsoft.Json.Linq;
using System.Diagnostics;
using System.Dynamic;
using System.Net;
using System.Text;
using System.Text.Json.Nodes;
using System.Web;

namespace MESApplication.Controllers.QcIssueResult;

@@ -35,6 +38,8 @@
   
        try
        {
            // æ–°å¢žURL解码处理逻辑
            DecodeUrlEncodedProperties(getQcIssueResultDetail);

            // è°ƒç”¨ QcIssueResultManager ä¸­çš„ GetProcessNo æ–¹æ³•æ¥å¯åŠ¨é’‰é’‰å·¥ä½œæµå®žä¾‹
            string result = m.GetProcessNo(getQcIssueResultDetail);
@@ -61,6 +66,27 @@
        }
    }

    // æ–°å¢žè§£ç æ–¹æ³•
    private void DecodeUrlEncodedProperties(object obj)
    {
        if (obj == null) return;

        var properties = obj.GetType().GetProperties();
        foreach (var prop in properties)
        {
            // åªå¤„理字符串类型的属性
            if (prop.PropertyType == typeof(string) && prop.CanWrite)
            {
                var value = prop.GetValue(obj) as string;
                if (!string.IsNullOrEmpty(value))
                {
                    // ä½¿ç”¨UTF8编码进行解码
                    var decodedValue = HttpUtility.UrlDecode(value, Encoding.UTF8);
                    prop.SetValue(obj, decodedValue);
                }
            }
        }
    }

    [HttpPost("Save")]
    public ResponseResult Save(ErpQcIssueResult erpQcIssueResult)

 MESApplication/Controllers/ZuHeRequestOrder/ZuHeRequestOrderController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
using MES.Service.Dto.webApi.ZuHeRequestOrder;
using MES.Service.service.QcIssueResult;
using MES.Service.service;
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics;
using MES.Service.service.ZuHeRequestOrder;

namespace MESApplication.Controllers.ZuHeRequestOrder; 

[ApiController]
[Route("api/[controller]")]
public class ZuHeRequestOrderController : ControllerBase
{

    private readonly MessageCenterManager _manager = new();
    private readonly ZuHeRequestOrderManager m = new();

    private readonly string METHOD = "POST";

    private readonly string TableName = "MES_QA_ITEMS_DETECT_01";

    private readonly string URL = "http://localhost:10054/api/ZuHeRequestOrder/";

    [HttpPost("UpdateZHBS")]
    public IActionResult UpdateZHBS([FromBody] ZuHeRequestsOrder zuHeRequestsOrder)
    {
        try
        {
            // éªŒè¯æ•°æ®
            if (zuHeRequestsOrder == null || zuHeRequestsOrder.ComboSingle == null || zuHeRequestsOrder.ComboSingle.Count == 0)
            {
                return BadRequest("ComboSingle å¿…须是一个非空数组");
            }

            // æ‰“印接收到的数据（调试用）
            foreach (var item in zuHeRequestsOrder.ComboSingle)
            {
                Debug.WriteLine($"RELEASE_NO: {item.RELEASE_NO}");
            }

            // å¤„理数据（例如存储到数据库）
            var result = m.SaveZHBS(zuHeRequestsOrder);

            // è¿”回成功响应
            return Ok(result);
        }
        catch (Exception ex)
        {
            // æ•èŽ·å¼‚常并返回错误信息
            return StatusCode(500, $"启动钉钉工作流实例失败: {ex.Message}");
        }
    }

    [HttpPost("ReleaseCombination")]
    public IActionResult ReleaseCombination([FromBody] ZuHeRequestsOrder zuHeRequestsOrder)
    {
        try
        {
            // éªŒè¯æ•°æ®
            if (zuHeRequestsOrder == null || zuHeRequestsOrder.ComboSingle == null || zuHeRequestsOrder.ComboSingle.Count == 0)
            {
                return BadRequest("ComboSingle å¿…须是一个非空数组");
            }

            // æ‰“印接收到的数据（调试用）
            foreach (var item in zuHeRequestsOrder.ComboSingle)
            {
                Debug.WriteLine($"RELEASE_NO: {item.RELEASE_NO}");
            }

            // å¤„理数据（例如存储到数据库）
            var result = m.deleateZHBS(zuHeRequestsOrder);

            // è¿”回成功响应
            return Ok(result);
        }
        catch (Exception ex)
        {
            // æ•èŽ·å¼‚常并返回错误信息
            return StatusCode(500, $"启动钉钉工作流实例失败: {ex.Message}");
        }
    }

}

 MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\VISUAL STUDIOS JOB\YC\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2025-03-28T06:28:57.3291596Z||;True|2025-03-25T17:51:51.1941007+08:00||;True|2025-03-25T17:28:17.3219786+08:00||;True|2025-03-25T15:25:43.0061330+08:00||;True|2025-03-24T17:58:37.6820871+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
    <History>True|2025-04-10T08:29:29.4614826Z||;True|2025-04-03T12:04:01.6354165+08:00||;True|2025-03-28T14:28:57.3291596+08:00||;True|2025-03-25T17:51:51.1941007+08:00||;True|2025-03-25T17:28:17.3219786+08:00||;True|2025-03-25T15:25:43.0061330+08:00||;True|2025-03-24T17:58:37.6820871+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 MESApplication/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.xml

@@ -716,7 +716,19 @@
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.GetList">
            <summary>
                èŽ·å–所有
                èŽ·å–送检单号
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.SaveLaboratoryDetails(MES.Service.Modes.SentLaboratory.GetLaboratoryDetails)">
            <summary>
                ä¿å­˜æˆ–提交送检单数据
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.DeleteLaboratoryDetails(System.String)">
            <summary>
                æ’¤å›žé€æ£€å•
            </summary>
            <returns></returns>
        </member>

 MESApplication/bin/Release/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.pdb

Binary files differ