From d7f491034ae9694741178f17f809143f48470520 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期四, 27 十一月 2025 13:12:19 +0800
Subject: [PATCH] 钉钉人员接口、检验撤回单据、首检保存备注
---
MESApplication/Controllers/QC/SJController.cs | 375 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 364 insertions(+), 11 deletions(-)
diff --git a/MESApplication/Controllers/QC/SJController.cs b/MESApplication/Controllers/QC/SJController.cs
index 107d6b9..1461b4d 100644
--- a/MESApplication/Controllers/QC/SJController.cs
+++ b/MESApplication/Controllers/QC/SJController.cs
@@ -1,10 +1,16 @@
锘縰sing System.Dynamic;
+using Masuit.Tools.Models;
+using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
+using MES.Service.Modes.DingAPI;
+using MES.Service.service.ProductionOrder;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using SharpCompress.Common;
+using SqlSugar.Extensions;
namespace MESApplication.Controllers.QC;
@@ -41,9 +47,36 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SJService().getPage(queryObj);
- resultInfos.tbBillList = tbBillList;
+ var (items, totalCount) = new SJService().getPage(queryObj);
+ resultInfos.tbBillList = items;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos,
+ TotalCount = totalCount
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+
+ //SetQSItems
+ [HttpPost("SetQSItems")]
+ public ResponseResult SetQSItems([FromBody] JObject data)
+ {
+ var itemNo = data["itemNo"].ToString();
+ var planName = data["planName"].ToString();
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new SJService();
+ var detail021 = tbBillList.SetQSItems(itemNo, planName);
+ resultInfos.tbBillList = detail021;
return new ResponseResult
{
status = 0,
@@ -57,18 +90,82 @@
}
}
-
- //SetQSItems
- [HttpPost("SetQSItems")]
- public ResponseResult SetQSItems([FromBody] JObject data)
+ [HttpPost("SavePlan")]
+ public ResponseResult SavePlan([FromBody] JObject data)
{
- var itemNo = data["itemNo"].ToString();
+ if (string.IsNullOrEmpty(data["pid"]?.ToString()))
+ {
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = "鐢熸垚鍗曟嵁鍓嶄笉淇濆瓨璐ㄦ鏂规"
+ };
+ }
+ decimal pid = Convert.ToDecimal(data["pid"]);
+ string planName = data["planName"].ToString();
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList = new SJService();
- var detail021 = tbBillList.SetQSItems(itemNo);
- resultInfos.tbBillList = detail021;
+ var SJ = new SJService();
+ decimal res = SJ.SavePlan(pid, planName);
+ resultInfos.res = res;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("GetItemProj")]
+ public ResponseResult GetItemProj([FromBody] JObject data)
+ {
+ var itemNo = data["itemNo"]?.ToString();
+
+ try
+ {
+ var service = new SJService();
+ var qaPlans = service.GetItemProj(itemNo);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.qaPlans = qaPlans; // 杩斿洖鍒板墠绔�
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("CreateNew")]
+ public ResponseResult CreateNew([FromBody] JObject data)
+ {
+ var daaNo = data["daaNo"]?.ToString();
+ var userNo = data["statusUser"]?.ToString();
+ var planName = data["planName"]?.ToString();
+
+ try
+ {
+ var service = new SJService();
+ var (res, msg, billNo) = service.CreateNew(daaNo, userNo,planName);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.res = res;
+ resultInfos.msg = msg;
+ resultInfos.billNo = billNo;// 杩斿洖鍒板墠绔�
+
return new ResponseResult
{
status = 0,
@@ -153,6 +250,127 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ /// <summary>
+ /// 鑾峰彇琛屼笉鑹師鍥�
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("GetReason")]
+ public ResponseResult GetReason([FromBody] JObject data)
+ {
+ string billNo = data["billNo"].ToString();
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new SJService();
+ var reasons = tbBillList.GetReason(billNo);
+ resultInfos.tbBillList = reasons;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = reasons
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("GetDingDept")]
+ public ResponseResult GetDingDept()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new SJService();
+ var depts = tbBillList.getDingDept();
+ resultInfos.tbBillList = depts;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = depts
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("GetDeptTree")]
+ public ResponseResult GetDeptTree()
+ {
+ try
+ {
+ var db = SqlSugarHelper.GetInstance();
+ var flatList = db.Queryable<DingDept>().ToList();
+ var tbBillList = new SJService();
+
+ // 杞崲涓烘爲
+ var tree = tbBillList.BuildDeptTree();
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = tree
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ [HttpPost("GetDingUser")]
+ public ResponseResult GetDingUser()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new SJService();
+ var users = tbBillList.getDingUser();
+ resultInfos.tbBillList = users;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = users
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("DingJZCSD")]
+ public ResponseResult DingJZCSD(JzcsdData Indata)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new SJService();
+ var depts = tbBillList.DingJZCSD(Indata);
+ resultInfos.tbBillList = depts;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = depts
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
[HttpPost("SetQSItemDetail")]
public ResponseResult SetQSItemDetail([FromBody] QsItemIpiItemDetail detail)
@@ -250,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)
@@ -259,6 +500,29 @@
dynamic resultInfos = new ExpandoObject();
var tbBillList =
new SJService().saveRemarksPid(rkjDto);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //saveNotesPid
+ [HttpPost("saveNotesPid")]
+ public ResponseResult saveNotesPid([FromBody] QsItem rkjDto)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList =
+ new SJService().saveNotesPid(rkjDto);
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
@@ -319,4 +583,93 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ [HttpPost("SJQaSubmit")]
+ public ResponseResult SJQaSubmit([FromBody] QsItem item)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new SJService();
+ var detail021 = tbBillList.SJQaSubmit(item);
+ resultInfos.tbBillList = detail021;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <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鐨処sPass鍊�
+ /// </summary>
+ /// <param name="data">鍖呭惈id鍜宨sPass鐨凧SON瀵硅薄</param>
+ /// <returns>鏇存柊缁撴灉</returns>
+ [HttpPost("UpdateQsItemIpiItemIsPass")]
+ public ResponseResult UpdateQsItemIpiItemIsPass([FromBody] JObject data)
+ {
+ try
+ {
+ var id = data["id"]?.ToString();
+ var isPass = data["isPass"]?.ToString();
+
+ if (string.IsNullOrEmpty(id) || string.IsNullOrEmpty(isPass))
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "鍙傛暟涓嶈兘涓虹┖",
+ data = null
+ };
+ }
+
+ dynamic resultInfos = new ExpandoObject();
+ var sjService = new SJService();
+ var result = sjService.UpdateQsItemIpiItemIsPass(Convert.ToDecimal(id), Convert.ToDecimal(isPass));
+ resultInfos.tbBillList = result;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3