From cf5e996699836cc380b1cb469fea341475eb2b81 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期一, 30 六月 2025 15:11:41 +0800
Subject: [PATCH] 代码提交
---
StandardPda/MESApplication/Controllers/QC/LljController.cs | 301 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 272 insertions(+), 29 deletions(-)
diff --git a/StandardPda/MESApplication/Controllers/QC/LljController.cs b/StandardPda/MESApplication/Controllers/QC/LljController.cs
index 7f9a583..7186298 100644
--- a/StandardPda/MESApplication/Controllers/QC/LljController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/LljController.cs
@@ -3,8 +3,10 @@
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-using NetTaste;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System.Data;
using System.Dynamic;
namespace MESApplication.Controllers.QC;
@@ -47,7 +49,7 @@
{
dynamic resultInfos = new ExpandoObject();
- string[] msg = new LljService().SetItems(itemNo, quantity, releaseNo);
+ var msg = new LljService().SetItems(itemNo, quantity, releaseNo);
return new ResponseResult
{
@@ -95,10 +97,10 @@
var releaseNo = data["releaseNo"].ToString();
var NewStaffUserID = data["NewStaffUserID"].ToString();
- string[] msg = new LljService().SaveCheckBy(NewStaffUserID, userID, releaseNo);
+ var msg =
+ new LljService().SaveCheckBy(NewStaffUserID, userID, releaseNo);
-
return new ResponseResult
{
status = int.Parse(msg[0]),
@@ -138,15 +140,107 @@
return ResponseResult.ResponseError(ex);
}
}
+
/// <summary>
- /// 鑾峰彇鎵�鏈夋楠屽憳淇℃伅
+ /// 鑾峰彇涓�鑷存�ф牳瀵归」鐩�
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("getYzxItem")]
+ public ResponseResult getYzxItem([FromBody] JObject data)
+ {
+ var id = data["id"]?.ToString();
+ try
+ {
+ var tbBillList = new LljService().getYzxBDlist(id);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = tbBillList
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇妫�楠屽崟鎵�鏈変笉鑹弿杩�
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("getJYBlmsItem")]
+ public ResponseResult getJYBlmsItem([FromBody] JObject data)
+ {
+ var id = data["id"]?.ToString();
+
+ try
+ {
+ var tbBillList = new LljService().getBlmsItem(id);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = tbBillList
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 淇濆瓨涓�鑷存�ф牳瀵归」鐩�
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("saveYzxItem")]
+ public ResponseResult saveYzxItem([FromBody] JObject data)
+ {
+ var id = data["id"]?.ToString();
+ var dataDt = data["data"]?.ToString();
+ var dt = JsonConvert.DeserializeObject<DataTable>(dataDt);
+ try
+ {
+ if (!dt.Columns.Contains("id"))
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "璇峰厛閫夋嫨鏁版嵁鍐嶄繚瀛橈紒",
+ data = "璇峰厛閫夋嫨鏁版嵁鍐嶄繚瀛橈紒"
+ };
+ }
+ new LljService().saveYzxBDlist(id, dt);
+ var msg = new LljService().YzxImgVerify(id);
+
+ return new ResponseResult
+ {
+ status = int.Parse(msg[0]),
+ message = msg[1],
+ data = ""
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋楠屽憳淇℃伅
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
[HttpPost("getAllInspectors")]
public ResponseResult getAllInspectors([FromBody] JObject data)
{
-
try
{
var tbBillList = new LljService().getAllInspectors();
@@ -191,7 +285,7 @@
/// <summary>
- /// 閫氳繃鏉＄爜鑾峰彇閫佹鍗曚俊鎭�
+ /// 閫氳繃鏉＄爜鑾峰彇閫佹鍗曚俊鎭�
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
@@ -206,12 +300,40 @@
var tbBillList =
new LljService().getFromInfo(id);
resultInfos.tbBillList = tbBillList;
- return new ResponseResult
+ if (resultInfos.tbBillList.Rows.Count>0)
{
- status = 0,
- message = "OK",
- data = resultInfos
- };
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ else
+ {
+ var mj =
+ new LljService().getFromMJCount(id);
+ if (mj>0)
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "璇ョ墿鏂欎负鍏嶆鐗╂枡锛屾棤闇�妫�楠岋紒",
+ data = resultInfos
+ };
+ }
+ else
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "鎵句笉鍒版楠屽崟鎹紝璇风‘璁よ揣鐗╂槸鍚︾鏀讹紒",
+ data = resultInfos
+ };
+ }
+
+ }
+
}
catch (Exception ex)
{
@@ -219,6 +341,34 @@
}
}
+
+ /// <summary>
+ /// 鑾峰彇涓嶈壇鎻忚堪淇℃伅
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("getBlmsItem")]
+ public ResponseResult getBlmsItem([FromBody] JObject data)
+ {
+ try
+ {
+ var tbBillList = new LljService().getBlmsItem();
+ string[] arrRate = tbBillList.AsEnumerable()
+ .Select(d => d.Field<string>("DEFECT_NAME")).ToArray();
+
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = arrRate
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
[HttpPost("SetQSItemDetail")]
@@ -345,7 +495,7 @@
{
dynamic resultInfos = new ExpandoObject();
var msg = new LljService().IqcQaSubmit(rkjDto);
-
+
return new ResponseResult
{
status = int.Parse(msg[0]),
@@ -359,13 +509,37 @@
}
}
+ //IqcQaSubmit
+ [HttpPost("getImgBDlist")]
+ public ResponseResult getImgBDlist([FromBody] JObject data)
+ {
+ try
+ {
+ var id = data["id"]?.ToString();
+
+ var db = new LljService().getImgBDlist(id);
+
+ return new ResponseResult
+ {
+ status = int.Parse("0"),
+ message = "OK",
+ data = db
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
/// <summary>
- /// 鑾峰彇U9鍥剧焊鏁版嵁
+ /// 鑾峰彇U9鍥剧焊鏁版嵁
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
[HttpPost("GetFileUrlByU9List")]
- public async Task<ResponseResult> GetFileUrlByU9List([FromBody] JObject data)
+ public async Task<ResponseResult> GetFileUrlByU9List(
+ [FromBody] JObject data)
{
try
{
@@ -375,32 +549,28 @@
var lljService = new LljService();
var tbBillList = await lljService.GetFileUrlByU9List(type, itemID);
if (tbBillList != null)
- {
return new ResponseResult
{
status = 0,
message = "OK",
data = tbBillList
};
- }
- else
- {
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = ""
- };
- }
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = ""
+ };
}
catch (Exception ex)
{
return ResponseResult.ResponseError(ex);
}
}
+
/// <summary>
- /// 瀹為獙瀹ら�佹鏁版嵁淇濆瓨
+ /// 瀹為獙瀹ら�佹鏁版嵁淇濆瓨
/// </summary>
/// <param name="sysSubmit">瀹為獙瀹ら�佹鏁版嵁</param>
/// <returns></returns>
@@ -409,8 +579,7 @@
{
try
{
-
- string[] msg = new LljService().SaveSysSubmit(sysSubmit);
+ var msg = new LljService().SaveSysSubmit(sysSubmit);
return new ResponseResult
{
@@ -424,4 +593,78 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ /// <summary>
+ /// 閫佽揣鍗曠鏀跺苟鐢熸垚鍒拌揣鍗�
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ [HttpPost("SignDelivery")]
+ public async Task<ResponseResult> SignDelivery(string id)
+ {
+ try
+ {
+ //string[] msg = new LljService().SaveSysSubmit(sysSubmit);
+ var msg = await new LljService().SignDelivery(id);
+ return new ResponseResult
+ {
+ status = int.Parse(msg[0]),
+ message = msg[1],
+ data = msg[1]
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ /// <summary>
+ /// 閫佽揣鍗曠鏀跺苟鐢熸垚鍒拌揣鍗�
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ [HttpPost("SignDelivery2")]
+ public async Task<ResponseResult> SignDelivery2(string id,string c_user)
+ {
+ try
+ {
+ //string[] msg = new LljService().SaveSysSubmit(sysSubmit);
+ var msg = await new LljService().SignDelivery2(id, c_user);
+ return new ResponseResult
+ {
+ status = int.Parse(msg[0]),
+ message = msg[1],
+ data = msg[1]
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ /// <summary>
+ /// 鑾峰彇鎼哄浜戞祴璇曠幆澧冪鍚�
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ [HttpGet("getTestXKYSign")]
+ public async Task<ResponseResult> getTestXKYSign()
+ {
+ try
+ {
+ //string[] msg = new LljService().SaveSysSubmit(sysSubmit);
+ var msg = await new LljService().getTestXKYSign();
+ return new ResponseResult
+ {
+ status = int.Parse(msg[0]),
+ message = "OK",
+ data = msg[1]
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3