From d4a95a2d9aaf534e3aa6d8832260adff315c9999 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期三, 23 四月 2025 19:37:43 +0800
Subject: [PATCH] 1.来料检添加“技改字段” 2.修改登录接口，输入账号可不区分大小写
---
StandardPda/MESApplication/Controllers/QC/LljController.cs | 149 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 121 insertions(+), 28 deletions(-)
diff --git a/StandardPda/MESApplication/Controllers/QC/LljController.cs b/StandardPda/MESApplication/Controllers/QC/LljController.cs
index f4c58c0..19f3217 100644
--- a/StandardPda/MESApplication/Controllers/QC/LljController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/LljController.cs
@@ -1,10 +1,11 @@
-锘縰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 NetTaste;
using Newtonsoft.Json.Linq;
+using System.Dynamic;
namespace MESApplication.Controllers.QC;
@@ -45,14 +46,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)
@@ -83,6 +84,35 @@
}
}
+
+ [HttpPost("SaveCheckBy")]
+ public ResponseResult SaveCheckBy([FromBody] JObject data)
+ {
+ try
+ {
+ var NewStaffName = data["NewStaffName"].ToString();
+ var userID = data["userID"].ToString();
+ var releaseNo = data["releaseNo"].ToString();
+ var NewStaffUserID = data["NewStaffUserID"].ToString();
+
+ string[] msg = new LljService().SaveCheckBy(NewStaffUserID, userID, releaseNo);
+
+
+
+ return new ResponseResult
+ {
+ status = int.Parse(msg[0]),
+ message = msg[1],
+ data = msg[1]
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
//getItems
[HttpPost("getJYItem")]
public ResponseResult getJYItem([FromBody] JObject data)
@@ -108,6 +138,31 @@
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();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = tbBillList
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
//getXjDetail02ById
[HttpPost("getXjDetail02ById")]
@@ -258,14 +313,13 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().IqcQaSubmit(rkjDto);
- resultInfos.tbBillList = tbBillList;
+ var msg = new LljService().IqcQaSubmit(rkjDto);
+
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 +327,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