From 3296c70dfc999ff1d09ac28d6205197c11825c5f Mon Sep 17 00:00:00 2001 From: zjh <2207896513@qq.com> Date: 星期四, 22 五月 2025 14:58:26 +0800 Subject: [PATCH] 1,来料检添加‘往期检验履历’,‘最大抽检数量’两个字段 2,一致性核对添加图片是否上传校验 --- StandardPda/MESApplication/Controllers/QC/LljController.cs | 143 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 1 deletions(-) diff --git a/StandardPda/MESApplication/Controllers/QC/LljController.cs b/StandardPda/MESApplication/Controllers/QC/LljController.cs index 7f9a583..3952b61 100644 --- a/StandardPda/MESApplication/Controllers/QC/LljController.cs +++ b/StandardPda/MESApplication/Controllers/QC/LljController.cs @@ -1,10 +1,13 @@ -锘縰sing MES.Service.Dto.service; +锘縰sing Masuit.Tools; +using MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.service.QC; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using NetTaste; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using System.Data; using System.Dynamic; namespace MESApplication.Controllers.QC; @@ -138,6 +141,93 @@ 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(); + DataTable dt = JsonConvert.DeserializeObject<DataTable>(dataDt); + try + { + new LljService().saveYzxBDlist(id, dt); + string[] 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> @@ -219,6 +309,35 @@ } } + + /// <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")] @@ -358,6 +477,28 @@ return ResponseResult.ResponseError(ex); } } + //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鍥剧焊鏁版嵁 -- Gitblit v1.9.3