钉钉人员接口、检验撤回单据、首检保存备注

zyf

2025-11-27 d7f491034ae9694741178f17f809143f48470520

钉钉人员接口、检验撤回单据、首检保存备注

 MES.Service/Dto/service/SJPageResult.cs

@@ -109,7 +109,7 @@


    /// <summary>
    ///     çº¿ä½“名称
    ///     è´¨æ£€æ–¹æ¡ˆ
    /// </summary>
    [SugarColumn(ColumnName = "QA_PLAN")]
    public string? PlanName { get; set; }

 MES.Service/MES.Service.csproj

@@ -34,7 +34,6 @@

    <ItemGroup>
      <Folder Include="Dto\webApi\TestReport\" />
      <Folder Include="service\DingService\" />
    </ItemGroup>

</Project>

 MES.Service/Modes/DingAPI/DingStaff.cs

@@ -12,7 +12,7 @@
    ///     ID
    /// </summary>
    [SugarColumn(ColumnName = "ID")]
    public decimal Id { get; set; }
    public string Id { get; set; }

    /// <summary>
    ///     å‘˜å·¥å§“名
@@ -24,6 +24,6 @@
    ///     éƒ¨é—¨ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "DEPT_ID")]
    public decimal DeptID { get; set; }
    public string DeptID { get; set; }

}

 MES.Service/Modes/DingAPI/JzcsdData.cs

@@ -6,7 +6,7 @@
using System.Threading.Tasks;

namespace MES.Service.Modes.DingAPI;

/*纠错通知单接口使用*/
public class JzcsdData
/*
产品型号    TextField-K2AD4O5B

 MES.Service/Modes/QsQaItemXj.cs

@@ -136,6 +136,10 @@


    [SugarColumn(IsIgnore = true)] public string? Daa020 { get; set; }
    /// <summary>
    /// æ£€éªŒäºº
    /// </summary>
    [SugarColumn(IsIgnore = true)] public string? fcheckBy { get; set; }
    [SugarColumn(IsIgnore = true)] public decimal? PlanQty { get; set; }

    [SugarColumn(IsIgnore = true)] public string? ItemName { 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/DingService/DingStaffManager.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,159 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using MES.Service.DB;
using MES.Service.Modes;

using Newtonsoft.Json.Linq;   // è§£æž JSON
using System.Net.Http;        // HttpClient
using System.Threading.Tasks;
using Masuit.Tools;

namespace MES.Service.service
{
public class DingStaffManager : Repository<DingStaff>
{
 
        //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„方法

        //这里面写的代码不会给覆盖,如果要重新生成请删除 DingStaffManager.cs


        #region æ•™å­¦æ–¹æ³•
        /// <summary>
        /// ä»“储方法满足不了复杂业务需求，业务代码请在这里面定义方法
        /// </summary>
        public void Study()
        {
	     
           /*********查询*********/

            var data1 = base.GetById(1);//根据ID查询
            var data2 = base.GetList();//查询所有
            var data3 = base.GetList(it => 1 == 1);  //根据条件查询  
            //var data4 = base.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错

            var p = new PageModel() { PageIndex = 1, PageSize = 2 };// åˆ†é¡µæŸ¥è¯¢
            var data5 = base.GetPageList(it => 1 == 1, p);
            Console.Write(p.TotalCount);//返回总数

            var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// åˆ†é¡µæŸ¥è¯¢åŠ æŽ’序
            Console.Write(p.TotalCount);//返回总数
     
            List<IConditionalModel> conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 åˆ†é¡µæŸ¥è¯¢åŠ æŽ’序
            conModels.Add(new ConditionalModel() { FieldName= typeof(DingStaff).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
            var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);

            base.AsQueryable().Where(x => 1 == 1).ToList();//支持了转换成queryable,我们可以用queryable实现复杂功能

 

            /*********插入*********/
            var insertData = new DingStaff() { };//测试参数
            var insertArray = new DingStaff[] { insertData };
            base.Insert(insertData);//插入
            base.InsertRange(insertArray);//批量插入
            var id = base.InsertReturnIdentity(insertData);//插入返回自增列
            base.AsInsertable(insertData).ExecuteCommand();//我们可以转成 Insertable实现复杂插入



            /*********更新*********/
            var updateData = new DingStaff() {  };//测试参数
            var updateArray = new DingStaff[] { updateData };//测试参数
            base.Update(updateData);//根据实体更新
            base.UpdateRange(updateArray);//批量更新
            //base.Update(it => new DingStaff() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列，其它列不更新，条件id=1
            base.AsUpdateable(updateData).ExecuteCommand();  //转成Updateable可以实现复杂的插入



            /*********删除*********/
            var deldata = new DingStaff() {  };//测试参数
            base.Delete(deldata);//根据实体删除
            base.DeleteById(1);//根据主键删除
            base.DeleteById(new int[] { 1,2});//根据主键数组删除
            base.Delete(it=>1==2);//根据条件删除
            base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转成Deleteable实现复杂的操作
        }
        #endregion

        public async Task<bool> GetDingData()
        {
            string tokenApi = "https://oapi.dingtalk.com/gettoken?appkey=dingyzos0r1bizj7g6lr&appsecret=-HP4RvK2OUbqhG3iBUpd_TPe5MZRj8cfLc0b8Skt8rhC3I38kVLY9SS8P3kLWFcH";

            // æ¸…空旧数据
            Db.Deleteable<DingStaff>().ExecuteCommand();

            var staffList = new List<DingStaff>();

            using (var http = new HttpClient())
            {
                // 1. èŽ·å– access_token
                var tokenResponse = await http.GetStringAsync(tokenApi);
                var tokenJson = JObject.Parse(tokenResponse);
                string accessToken = tokenJson["access_token"]?.ToString();

                if (string.IsNullOrEmpty(accessToken))
                    return false;

                // 2. èŽ·å–部门列表
                var departApi = $"https://oapi.dingtalk.com/department/list?access_token={accessToken}";
                var departResponse = await http.GetStringAsync(departApi);
                var departJson = JObject.Parse(departResponse);

                var departments = departJson["department"] as JArray;
                if (departments == null)
                    return false;

                // 3. éåŽ†éƒ¨é—¨
                foreach (var dept in departments)
                {
                    string deptId = (string)dept["id"];

                    int cursor = 0;
                    bool hasMore;

                    do
                    {
                        var userApi =
                            $"https://oapi.dingtalk.com/topapi/v2/user/list?access_token={accessToken}&dept_id={deptId}&cursor={cursor}&size=100";

                        var userResp = await http.GetStringAsync(userApi);
                        var userJson = JObject.Parse(userResp);

                        var result = userJson["result"];
                        var list = result?["list"] as JArray;

                        hasMore = result?["has_more"]?.Value<bool>() ?? false;

                        if (list != null)
                        {
                            foreach (var user in list)
                            {
                                Console.WriteLine($"{user["userid"]?.ToString()},{user["name"]?.ToString()},{deptId}");
                                staffList.Add(new DingStaff
                                {
                                    Id = user["userid"]?.ToString(),
                                    StaffName = user["name"]?.ToString(),
                                    DeptID = deptId
                                });
                            }
                        }

                        cursor++;

                    } while (hasMore);
                }
            }

            // 4. ä¸€æ¬¡æ€§æ’入，极大提升性能！
            Db.Fastest<DingStaff>().BulkCopy(staffList);

            return true;
        }



    }
}

 MES.Service/service/QC/RKJService.cs

@@ -528,8 +528,8 @@


        var query = db
            .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa, SysDepartment,MesUserDepartmentQc>((a, b,
                    da, c, us, ca, d, dq) =>
            .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser, Womcaa, SysDepartment,MesUserDepartmentQc, SysUser>((a, b,
                    da, c, us, ca, d, dq, us2) =>
                new JoinQueryInfos(
                    JoinType.Left, a.ItemNo == b.ItemNo, // å…³è”物料信息
                    JoinType.Left, a.BillNo == da.Daa001, // å…³è”工单信息
@@ -537,7 +537,8 @@
                    JoinType.Left, us.Fcode == a.CreateBy, // å…³è”工单信息
                    JoinType.Left, da.Daa021 == ca.Caa020,//任务单，用于查询销售订单号
                    JoinType.Left, d.Departmentid == Convert.ToDecimal(da.Daa013),//查询车间
                    JoinType.Left, dq.Departmentcode == d.Departmentcode//查询用户权限
                    JoinType.Left, dq.Departmentcode == d.Departmentcode,//查询用户权限
                    JoinType.Left, us2.Fcode == a.FcheckBy
                ))
            // ç”¨æˆ·çº¿ä½“过滤条件
            //.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
@@ -562,7 +563,7 @@
            .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
                (a, b, da, c, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
            // æŸ¥è¯¢å­—段
            .Select((a, b, da, c, us, ca,d,dq) => new QsItemOqcReq
            .Select((a, b, da, c, us, ca,d,dq,us2) => new QsItemOqcReq
            {
                Id = a.Id,
                BillNo = a.BillNo,
@@ -571,16 +572,16 @@
                ItemModel = b.ItemModel,
                CreateDate = a.CreateDate,
                CreateBy = a.CreateBy,
                CreateUser = us.Fname,
                CreateUser = us.Fname==null ? a.CreateBy: us.Fname,
                FcheckResu = a.FcheckResu,
                FcheckBy = a.FcheckBy,
                FcheckBy = us2.Fname,//a.FcheckBy,
                FcheckDate = a.FcheckDate,
                ReleaseNo = a.ReleaseNo,
                Remarks = a.Remarks,
                Daa015 = da.Daa015, // å·¥å•çº¿ä½“
                Daa015 = d.Departmentname=="注塑车间" ? da.Daa020:da.Daa015, // å·¥å•çº¿ä½“
                Fsubmit = a.Fsubmit,
                Quantity = da.Daa008,
                LineNo = c.LineName,
                LineNo = d.Departmentname == "注塑车间" ? da.Daa020 : c.LineName,
                SaleOrderNo = ca.Caa015,
                DepartName = d.Departmentname
            })
@@ -921,6 +922,21 @@
        return 0;
    }

    public int reSubmit(RKJDto dto)
    {
        SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<QsItemOqcReq>()
                 .SetColumns(a => a.Fsubmit == 0)
                 .SetColumns(a => a.FsubmitBy == null)
                 .SetColumns(a => a.FsubmitDate == null)
                 .Where(a => a.ReleaseNo == dto.releaseNo)
                 .ExecuteCommand();
        });

        return 0;
    }

    // å¤‡ä»½ï¼šåŽŸå§‹ç‰ˆæœ¬çš„saveItem方法
    public int saveItemOriginal(RKJDto rkjDto)
    {

 MES.Service/service/QC/SJService.cs

@@ -114,7 +114,7 @@
                Daa003 = a.Daa003,
                Daa004 = a.Daa004,
                Daa008 = a.Daa008,
                LineName = a.LineName,
                LineName = d.Departmentname == "注塑车间" ? da.Daa020 : a.LineName,
                SaleOrder = ca.Caa015,
                DepartName = d.Departmentname,
                PlanName = a.PlanName
@@ -572,7 +572,7 @@
    }


    //主表修改备注字段
    //主表修改不合格描述字段
    public int saveRemarksGid(QsItem dto)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
@@ -580,6 +580,19 @@
            return db.Updateable<QsItemIpiReq>()
                .SetColumns(it =>
                    it.Remarks == dto.Remarks) //SetColumns是可以叠加的 å†™2个就2个字段赋值
                .Where(it => it.Id == dto.gid)
                .ExecuteCommand();
        });
    }

    //主表修改备注字段
    public int saveCommentGid(QsItem dto)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<QsItemIpiReq>()
                .SetColumns(it =>
                    it.Comments == dto.Comments) //SetColumns是可以叠加的 å†™2个就2个字段赋值
                .Where(it => it.Id == dto.gid)
                .ExecuteCommand();
        });
@@ -695,6 +708,57 @@
        }
    }

    public bool SJQaReSubmit(QsItem item)
    {

        if (item == null)
            throw new ArgumentNullException(nameof(item), "质检项数据不能为空");

        if (string.IsNullOrWhiteSpace(item.userNo))
            throw new ArgumentException("用户编号不能为空", nameof(item.userNo));

        var (factory, company) = UserUtil.GetFactory(item.userNo);
        try
        {
            // å®šä¹‰è¾“出参数
            var outputResult = new SugarParameter("o_Result", null, DbType.Int32, ParameterDirection.Output,
                4000);

            var outputMessage = new SugarParameter("o_Msg", null, DbType.String, ParameterDirection.Output, 4000);

            // å®šä¹‰è¾“入参数
            var parameters = new List<SugarParameter>
         {

             new("p_Id", item.gid, DbType.Int32,ParameterDirection.Input),
             new("p_Flag", 2, DbType.Int32,ParameterDirection.Input),
             new("p_User", item.userNo, DbType.String, ParameterDirection.Input),
             outputResult,
             outputMessage
         };

            var db = SqlSugarHelper.GetInstance();

            // ä½¿ç”¨ SqlSugar æ‰§è¡Œå­˜å‚¨è¿‡ç¨‹
            db.Ado.ExecuteCommand(
                "BEGIN PRC_WOMDAA_SJ_UPDATE_RES(:p_Id,:p_Flag,:p_User,:o_Result, :o_Msg); END;",
                parameters.ToArray());

            // èŽ·å–输出参数的值
            var resultValue = outputResult.Value?.ToString();
            var messageValue = outputMessage.Value?.ToString();

            if ("1".Equals(resultValue)) { throw new Exception(messageValue); }
            if ("0".Equals(resultValue)) { throw new Exception(messageValue); }

            return true;
        }
        catch (Exception ex)
        {
            throw new Exception(ex.Message);
        }
    }

    /// <summary>
    /// æ›´æ–°QsItemIpiItem的IsPass值
    /// </summary>
@@ -707,7 +771,7 @@
        {
            return db.Updateable<QsItemIpiItemDetail>()
                .SetColumns(s => s.FcheckResu == isPass.ToString())
                .SetColumns(s => s.Fstand == ((isPass == 1) ? "√" : "0"))
                .SetColumns(s => s.Fstand == ((isPass == 1) ? "√" : "×"))
                .Where(s => s.Pid == id)
                .ExecuteCommand();
        });
@@ -861,11 +925,11 @@

        var db = SqlSugarHelper.GetInstance();

        decimal numUserId = db.Queryable<DingStaff>()
        string numUserId = db.Queryable<DingStaff>()
            .Where(t => t.StaffName == InData.Fname)
            .Select(t => t.Id)
            .First();
        if (numUserId > 0)
        if (numUserId is not null)
        {
            string UserId = Convert.ToString(numUserId);


 MES.Service/service/QC/XJService.cs

@@ -161,7 +161,7 @@

        var query = db
            .Queryable<QsQaItemXj, Womdaa, MesLine,
                MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems>((s, a, c, b, us,ca,d,dq,i) =>
                MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems, SysUser>((s, a, c, b, us,ca,d,dq,i,us2) =>
                new JoinQueryInfos(
                    JoinType.Inner, s.BillNo == a.Daa001,
                    JoinType.Left, a.Daa015 == c.LineNo,
@@ -170,7 +170,8 @@
                    JoinType.Left, ca.Caa020 == a.Daa021,
                    JoinType.Left, d.Departmentcode == c.Departmentcode,
                    JoinType.Left, dq.Departmentcode == d.Departmentcode,//查询用户权限
                    JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002)
                    JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002),
                    JoinType.Left, us2.Fcode == s.SubmitBy
                )
            )
            //.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -193,13 +194,13 @@
                i.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                ca.Caa015.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
                i.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            .Select((s, a, c, b, us,ca,d) => new QsQaItemXj
            .Select((s, a, c, b, us,ca,d,dq,i,us2) => new QsQaItemXj
            {
                Daa020 = c.LineNo,
                Id = s.Id,
                PlanQty = a.Daa008,
                LineName = c.LineName,
                CreateUser = us.Fname,
                LineName = d.Departmentname == "注塑车间" ?  a.Daa020:c.LineName,
                CreateUser = us.Fname==null ? s.CreateBy : us.Fname,
                CreateBy = s.CreateBy,
                CreateDate = s.CreateDate,
                ReleaseNo = s.ReleaseNo,
@@ -212,7 +213,10 @@
                Remarks = s.Remarks,
                SaleOrder = ca.Caa015,
                DepartName = d.Departmentname,
                PlanName = s.PlanName
                PlanName = s.PlanName,
                fcheckBy = us2.Fname,
                SubmitDate= s.SubmitDate,
                SubmitStatus = s.SubmitStatus

            }).OrderBy(s => s.CreateDate, OrderByType.Desc);
        var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
@@ -396,6 +400,23 @@
        return useTransactionWithOracle > 0;
    }


    public bool XJReSubmit(LLJDto rkjDto)
    {
        var useTransactionWithOracle =
            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                return db.Updateable<QsQaItemXj>()
                    .SetColumns(s => s.SubmitStatus == 0)
                    .SetColumns(s => s.SubmitBy == null)
                    .SetColumns(s => s.SubmitDate == null)
                    .Where(s => s.Id == rkjDto.gid)
                    .ExecuteCommand();
            });

        return useTransactionWithOracle > 0;
    }

    // public int saveItem(XJDto xjDto)
    // {
    //     var items = xjDto.items;

 MESApplication/Controllers/DingController/DingStaffController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,195 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Dynamic;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.util;

namespace MESApplication.Controllers
{
    [ApiController]
    [Route("api/[controller]")]
    public class DingStaffController : ControllerBase
    {

        private DingStaffManager m = new DingStaffManager();


        /***进入模版管理可以修改模版***/

        /// <summary>
        /// èŽ·å–所有
        /// </summary>
        /// <returns></returns>
        [HttpPost("GetList")]
        public ResponseResult GetList()
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.GetList();
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }


        /// <summary>
        /// æ ¹æ®ä¸»é”®èŽ·å–
        /// </summary>
        /// <returns></returns>
        [HttpPost("GetById")]
        public ResponseResult GetById(int id)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.GetById(id);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }

        /// <summary>
        /// æ ¹æ®ä¸»é”®åˆ é™¤
        /// </summary>
        /// <returns></returns>
        [HttpPost("DeleteByIds")]
        public ResponseResult DeleteByIds([FromBody] object[] ids)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.DeleteByIds(ids);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }

        /// <summary>
        /// æ·»åŠ  
        /// </summary>
        /// <returns></returns>
        [HttpPost("Insert")]
        public ResponseResult Add([FromBody] DingStaff data)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.Insert(data);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }
        /// <summary>
        /// æ·»åŠ è¿”回自增
        /// </summary>
        /// <returns></returns>
        [HttpPost("InsertReturnIdentity")]
        public ResponseResult InsertReturnIdentity([FromBody] DingStaff data)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.InsertReturnIdentity(data);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }

        /// <summary>
        /// ä¿®æ”¹
        /// </summary>
        /// <returns></returns>
        [HttpPost("Update")]
        public ResponseResult Update([FromBody] DingStaff data)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.Update(data);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }

        /// <summary>
        /// è°ƒç”¨é’‰é’‰æŽ¥å£
        /// </summary>
        /// <returns></returns>
        [HttpPost("UpdateDingData")]
        public async Task<ResponseResult> GetDingDataAsync()
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = await m.GetDingData();
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }


    }
}

 MESApplication/Controllers/QC/RKJController.cs

@@ -411,4 +411,25 @@
        }
    }

    [HttpPost("RKJReSubmit")]
    public ResponseResult reSubmit(RKJDto rkjDto)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var res =
                new RKJService().reSubmit(rkjDto);
            return new ResponseResult
            {
                status = 0,
                message = "撤回成功",
                data = res
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

}

 MESApplication/Controllers/QC/SJController.cs

@@ -468,6 +468,29 @@
        }
    }

    //saveCommentGid
    [HttpPost("saveCommentGid")]
    public ResponseResult saveCommentGid([FromBody] QsItem rkjDto)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new SJService().saveCommentGid(rkjDto);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    //saveRemarksPid
    [HttpPost("saveRemarksPid")]
    public ResponseResult saveRemarksPid([FromBody] QsItem rkjDto)
@@ -584,6 +607,31 @@
    }

    /// <summary>
    /// æ’¤å›žé¦–检
    /// </summary>
    [HttpPost("SJQaReSubmit")]
    public ResponseResult SJQaReSubmit([FromBody] QsItem item)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList = new SJService();
            var detail021 = tbBillList.SJQaReSubmit(item);
            resultInfos.tbBillList = detail021;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    /// æ›´æ–°QsItemIpiItem的IsPass值
    /// </summary>
    /// <param name="data">包含id和isPass的JSON对象</param>

 MESApplication/Controllers/QC/XJController.cs

@@ -515,6 +515,30 @@
    }

    /// <summary>
    /// å·¡æ£€æ’¤å›ž
    /// </summary>
    [HttpPost("XJReSubmit")]
    public ResponseResult XJReSubmit(LLJDto rkjDto)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var res =
                new XJService().XJReSubmit(rkjDto);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = res
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    /// èŽ·å–行不良原因
    /// </summary>
    /// <param name="data"></param>

 MESApplication/MESApplication.csproj

@@ -41,8 +41,4 @@
        <ProjectReference Include="..\MES.Service\MES.Service.csproj" />
    </ItemGroup>

    <ItemGroup>
      <Folder Include="Controllers\DingController\" />
    </ItemGroup>

</Project>

 MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>E:\MES\YC\JK\YC\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2025-11-20T09:13:29.0581394Z||;True|2025-11-11T14:42:15.2817665+08:00||;True|2025-11-10T17:55:37.2391325+08:00||;True|2025-11-10T17:13:43.4800497+08:00||;True|2025-11-08T19:29:01.1502973+08:00||;True|2025-10-31T08:57:33.8830804+08:00||;True|2025-10-30T20:50:33.1401136+08:00||;True|2025-10-30T20:29:13.9337574+08:00||;True|2025-10-30T19:56:28.1077291+08:00||;True|2025-10-30T13:21:26.9927646+08:00||;True|2025-10-24T19:18:08.4129813+08:00||;True|2025-09-29T17:17:51.1103513+08:00||;True|2025-08-29T14:18:40.5594388+08:00||;True|2025-08-28T18:15:38.3971489+08:00||;True|2025-08-28T18:15:06.7333272+08:00||;True|2025-08-27T18:35:09.5980695+08:00||;True|2025-08-26T19:16:55.3617645+08:00||;True|2025-08-21T10:27:13.8176169+08:00||;True|2025-06-26T08:55:26.5542141+08:00||;True|2025-06-25T09:11:45.3214896+08:00||;True|2025-05-23T13:03:55.7681923+08:00||;True|2025-05-23T12:30:20.3979750+08:00||;True|2025-05-06T18:44:59.6980994+08:00||;True|2025-05-06T18:39:53.5994195+08:00||;True|2025-05-06T15:31:35.4635552+08:00||;True|2025-05-06T14:42:04.8934173+08:00||;True|2025-04-28T20:38:10.9382378+08:00||;True|2025-04-28T19:02:47.1742326+08:00||;True|2025-04-28T18:34:57.6622084+08:00||;True|2025-04-28T13:05:23.6608249+08:00||;True|2025-04-28T09:37:26.7461458+08:00||;True|2025-04-28T09:35:49.4586494+08:00||;True|2025-04-23T09:20:16.5810299+08:00||;True|2025-04-22T14:55:52.6602616+08:00||;True|2025-04-22T14:52:09.2986761+08:00||;True|2025-04-22T14:35:55.6073919+08:00||;True|2025-04-21T17:25:11.3783000+08:00||;True|2025-04-15T02:22:50.8483367+08:00||;True|2025-04-14T17:01:19.3567029+08:00||;True|2025-04-10T16:29:29.4614826+08:00||;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||;</History>
    <History>True|2025-11-27T05:10:43.6884211Z||;True|2025-11-25T20:19:47.3811846+08:00||;True|2025-11-25T15:24:26.2317716+08:00||;True|2025-11-24T16:50:55.5178663+08:00||;False|2025-11-24T16:50:45.5207846+08:00||;True|2025-11-24T16:27:54.9491878+08:00||;True|2025-11-21T15:04:40.8491020+08:00||;True|2025-11-20T17:13:29.0581394+08:00||;True|2025-11-11T14:42:15.2817665+08:00||;True|2025-11-10T17:55:37.2391325+08:00||;True|2025-11-10T17:13:43.4800497+08:00||;True|2025-11-08T19:29:01.1502973+08:00||;True|2025-10-31T08:57:33.8830804+08:00||;True|2025-10-30T20:50:33.1401136+08:00||;True|2025-10-30T20:29:13.9337574+08:00||;True|2025-10-30T19:56:28.1077291+08:00||;True|2025-10-30T13:21:26.9927646+08:00||;True|2025-10-24T19:18:08.4129813+08:00||;True|2025-09-29T17:17:51.1103513+08:00||;True|2025-08-29T14:18:40.5594388+08:00||;True|2025-08-28T18:15:38.3971489+08:00||;True|2025-08-28T18:15:06.7333272+08:00||;True|2025-08-27T18:35:09.5980695+08:00||;True|2025-08-26T19:16:55.3617645+08:00||;True|2025-08-21T10:27:13.8176169+08:00||;True|2025-06-26T08:55:26.5542141+08:00||;True|2025-06-25T09:11:45.3214896+08:00||;True|2025-05-23T13:03:55.7681923+08:00||;True|2025-05-23T12:30:20.3979750+08:00||;True|2025-05-06T18:44:59.6980994+08:00||;True|2025-05-06T18:39:53.5994195+08:00||;True|2025-05-06T15:31:35.4635552+08:00||;True|2025-05-06T14:42:04.8934173+08:00||;True|2025-04-28T20:38:10.9382378+08:00||;True|2025-04-28T19:02:47.1742326+08:00||;True|2025-04-28T18:34:57.6622084+08:00||;True|2025-04-28T13:05:23.6608249+08:00||;True|2025-04-28T09:37:26.7461458+08:00||;True|2025-04-28T09:35:49.4586494+08:00||;True|2025-04-23T09:20:16.5810299+08:00||;True|2025-04-22T14:55:52.6602616+08:00||;True|2025-04-22T14:52:09.2986761+08:00||;True|2025-04-22T14:35:55.6073919+08:00||;True|2025-04-21T17:25:11.3783000+08:00||;True|2025-04-15T02:22:50.8483367+08:00||;True|2025-04-14T17:01:19.3567029+08:00||;True|2025-04-10T16:29:29.4614826+08:00||;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||;</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

@@ -732,6 +732,48 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.GetList">
            <summary>
            èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.GetById(System.Int32)">
            <summary>
            æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.DeleteByIds(System.Object[])">
            <summary>
            æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.Add(MES.Service.Modes.DingStaff)">
            <summary>
            æ·»åŠ  
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.InsertReturnIdentity(MES.Service.Modes.DingStaff)">
            <summary>
            æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.Update(MES.Service.Modes.DingStaff)">
            <summary>
            ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.GetDingDataAsync">
            <summary>
            è°ƒç”¨é’‰é’‰æŽ¥å£
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.ProductionOrder.ProductionOrderController.GetList">
            <summary>
                èŽ·å–所有
@@ -781,6 +823,11 @@
            <param name="data"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.SJController.SJQaReSubmit(MES.Service.Dto.service.QsItem)">
            <summary>
            æ’¤å›žé¦–检
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.QC.SJController.UpdateQsItemIpiItemIsPass(Newtonsoft.Json.Linq.JObject)">
            <summary>
            æ›´æ–°QsItemIpiItem的IsPass值
@@ -799,6 +846,11 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.XJController.XJReSubmit(MES.Service.Modes.LLJDto)">
            <summary>
            å·¡æ£€æ’¤å›ž
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.QC.XJController.GetReason(Newtonsoft.Json.Linq.JObject)">
            <summary>
            èŽ·å–行不良原因

 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/MESApplication.xml

@@ -732,6 +732,48 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.GetList">
            <summary>
            èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.GetById(System.Int32)">
            <summary>
            æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.DeleteByIds(System.Object[])">
            <summary>
            æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.Add(MES.Service.Modes.DingStaff)">
            <summary>
            æ·»åŠ  
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.InsertReturnIdentity(MES.Service.Modes.DingStaff)">
            <summary>
            æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.Update(MES.Service.Modes.DingStaff)">
            <summary>
            ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.GetDingDataAsync">
            <summary>
            è°ƒç”¨é’‰é’‰æŽ¥å£
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.ProductionOrder.ProductionOrderController.GetList">
            <summary>
                èŽ·å–所有
@@ -781,6 +823,11 @@
            <param name="data"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.SJController.SJQaReSubmit(MES.Service.Dto.service.QsItem)">
            <summary>
            æ’¤å›žé¦–检
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.QC.SJController.UpdateQsItemIpiItemIsPass(Newtonsoft.Json.Linq.JObject)">
            <summary>
            æ›´æ–°QsItemIpiItem的IsPass值
@@ -799,6 +846,11 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.XJController.XJReSubmit(MES.Service.Modes.LLJDto)">
            <summary>
            å·¡æ£€æ’¤å›ž
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.QC.XJController.GetReason(Newtonsoft.Json.Linq.JObject)">
            <summary>
            èŽ·å–行不良原因

 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

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

@@ -732,6 +732,48 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.GetList">
            <summary>
            èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.GetById(System.Int32)">
            <summary>
            æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.DeleteByIds(System.Object[])">
            <summary>
            æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.Add(MES.Service.Modes.DingStaff)">
            <summary>
            æ·»åŠ  
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.InsertReturnIdentity(MES.Service.Modes.DingStaff)">
            <summary>
            æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.Update(MES.Service.Modes.DingStaff)">
            <summary>
            ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.DingStaffController.GetDingDataAsync">
            <summary>
            è°ƒç”¨é’‰é’‰æŽ¥å£
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.ProductionOrder.ProductionOrderController.GetList">
            <summary>
                èŽ·å–所有
@@ -781,6 +823,11 @@
            <param name="data"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.SJController.SJQaReSubmit(MES.Service.Dto.service.QsItem)">
            <summary>
            æ’¤å›žé¦–检
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.QC.SJController.UpdateQsItemIpiItemIsPass(Newtonsoft.Json.Linq.JObject)">
            <summary>
            æ›´æ–°QsItemIpiItem的IsPass值
@@ -799,6 +846,11 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.XJController.XJReSubmit(MES.Service.Modes.LLJDto)">
            <summary>
            å·¡æ£€æ’¤å›ž
            </summary>
        </member>
        <member name="M:MESApplication.Controllers.QC.XJController.GetReason(Newtonsoft.Json.Linq.JObject)">
            <summary>
            èŽ·å–行不良原因