From 44a7c47a724c154c54e256727c75e79d31fd42e2 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 05 六月 2025 21:42:40 +0800
Subject: [PATCH] 优化代码格式，添加到货标识和查询条件
---
StandardPda/MESApplication/Controllers/QC/LljController.cs | 299 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 243 insertions(+), 56 deletions(-)
diff --git a/StandardPda/MESApplication/Controllers/QC/LljController.cs b/StandardPda/MESApplication/Controllers/QC/LljController.cs
index 19f3217..be26b29 100644
--- a/StandardPda/MESApplication/Controllers/QC/LljController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/LljController.cs
@@ -1,11 +1,12 @@
-锘縰sing MES.Service.Dto.service;
+锘縰sing System.Data;
+using System.Dynamic;
+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.Dynamic;
namespace MESApplication.Controllers.QC;
@@ -47,7 +48,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 +96,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 +139,98 @@
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
+ {
+ 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();
@@ -181,6 +265,65 @@
status = 0,
message = "OK",
data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 閫氳繃鏉＄爜鑾峰彇閫佹鍗曚俊鎭�
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("getFromInfo")]
+ public ResponseResult getFromInfo([FromBody] JObject data)
+ {
+ var id = data["Barcode"]?.ToString();
+
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList =
+ new LljService().getFromInfo(id);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <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)
@@ -314,7 +457,92 @@
{
dynamic resultInfos = new ExpandoObject();
var msg = new LljService().IqcQaSubmit(rkjDto);
-
+
+ return new ResponseResult
+ {
+ status = int.Parse(msg[0]),
+ message = msg[1],
+ data = msg[1]
+ };
+ }
+ catch (Exception ex)
+ {
+ 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鍥剧焊鏁版嵁
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("GetFileUrlByU9List")]
+ public async Task<ResponseResult> GetFileUrlByU9List(
+ [FromBody] JObject data)
+ {
+ try
+ {
+ 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
+ };
+
+ 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
+ {
+ var msg = new LljService().SaveSysSubmit(sysSubmit);
+
return new ResponseResult
{
status = int.Parse(msg[0]),
@@ -329,58 +557,17 @@
}
/// <summary>
- /// 鑾峰彇U9鍥剧焊鏁版嵁
+ /// 閫佽揣鍗曠鏀跺苟鐢熸垚鍒拌揣鍗�
/// </summary>
- /// <param name="data"></param>
+ /// <param name="id"></param>
/// <returns></returns>
- [HttpPost("GetFileUrlByU9List")]
- public async Task<ResponseResult> GetFileUrlByU9List([FromBody] JObject data)
+ [HttpPost("SignDelivery")]
+ public async Task<ResponseResult> SignDelivery(string id)
{
try
{
- 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);
-
+ //string[] msg = new LljService().SaveSysSubmit(sysSubmit);
+ var msg = await new LljService().SignDelivery(id);
return new ResponseResult
{
status = int.Parse(msg[0]),
--
Gitblit v1.9.3