From 71af12d1d4abf46e4d4ba89a8e64c8a8dc190362 Mon Sep 17 00:00:00 2001 From: zjh <2207896513@qq.com> Date: 星期四, 27 三月 2025 18:56:15 +0800 Subject: [PATCH] 1.来料检list页面添加下拉框,可精准选择要筛选的项目 2.新建实验室送检接口 --- StandardPda/MESApplication/Controllers/QC/LljController.cs | 83 ++++++++++++++++++++++++++++++----------- 1 files changed, 61 insertions(+), 22 deletions(-) diff --git a/StandardPda/MESApplication/Controllers/QC/LljController.cs b/StandardPda/MESApplication/Controllers/QC/LljController.cs index f4c58c0..79a84b6 100644 --- a/StandardPda/MESApplication/Controllers/QC/LljController.cs +++ b/StandardPda/MESApplication/Controllers/QC/LljController.cs @@ -1,10 +1,10 @@ -锘縰sing System.Dynamic; -using MES.Service.Dto.service; +锘縰sing MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.service.QC; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using System.Dynamic; namespace MESApplication.Controllers.QC; @@ -45,14 +45,14 @@ try { dynamic resultInfos = new ExpandoObject(); - var tbBillList = - new LljService().SetItems(itemNo, quantity, releaseNo); - resultInfos.tbBillList = tbBillList; + + string[] msg = new LljService().SetItems(itemNo, quantity, releaseNo); + return new ResponseResult { - status = 0, - message = "OK", - data = resultInfos + status = int.Parse(msg[0]), + message = msg[1], + data = msg[1] }; } catch (Exception ex) @@ -273,26 +273,65 @@ return ResponseResult.ResponseError(ex); } } - //IqcQaSubmit + + /// <summary> + /// 鑾峰彇U9鍥剧焊鏁版嵁 + /// </summary> + /// <param name="data"></param> + /// <returns></returns> [HttpPost("GetFileUrlByU9List")] - public ResponseResult GetFileUrlByU9List(LLJDto rkjDto) + public async Task<ResponseResult> GetFileUrlByU9List([FromBody] JObject data) { try { - //dynamic resultInfos = new ExpandoObject(); - //var tbBillList = - // new LljService().IqcQaSubmit(rkjDto); - //resultInfos.tbBillList = tbBillList; - string[] fileUrls = - { - "https://new-service.oss-cn-hangzhou.aliyuncs.com/sheet-attachment/1728624575152_ty5VSi9R.png", - "https://new-service.oss-cn-hangzhou.aliyuncs.com/sheet-attachment/1728624610583_EwIN55BL.pdf" -}; + var type = data["type"]?.ToString(); + var itemID = data["u9No"]?.ToString(); + dynamic resultInfos = new ExpandoObject(); + 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 = "" + }; + } + + } + catch (Exception ex) + { + return ResponseResult.ResponseError(ex); + } + } + /// <summary> + /// 瀹為獙瀹ら�佹鏁版嵁淇濆瓨 + /// </summary> + /// <param name="sysSubmit">瀹為獙瀹ら�佹鏁版嵁</param> + /// <returns></returns> + [HttpPost("SaveSysSubmit")] + public ResponseResult SaveSysSubmit(SysSubmit sysSubmit) + { + try + { + + string[] msg = new LljService().SaveSysSubmit(sysSubmit); + return new ResponseResult { - status = 0, - message = "OK", - data = fileUrls + status = int.Parse(msg[0]), + message = msg[1], + data = msg[1] }; } catch (Exception ex) -- Gitblit v1.9.3