From 964b796bb505b036953d16b652c66b03e3616d23 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 07 五月 2025 15:27:14 +0800
Subject: [PATCH] 接口完善
---
StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs | 16 ++++----
StandardInterface/MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs | 31 ++++++++++-----
StandardInterface/MESApplication/Controllers/Base/LoginController.cs | 44 +++++++++++++++++++++-
3 files changed, 71 insertions(+), 20 deletions(-)
diff --git a/StandardInterface/MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs b/StandardInterface/MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs
index 9ffc23e..ef667f2 100644
--- a/StandardInterface/MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs
+++ b/StandardInterface/MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs
@@ -9,7 +9,7 @@
public class GetQcIssueResultDetail
{
- //鏁伴噺
+ //鐢宠鏁伴噺
public string? FbatchQty { get; set; }
@@ -17,24 +17,35 @@
public string? ItemName { get; set; }
- //瑙勬牸鍨嬪彿
+ //瑙勬牸缂栫爜
- public string? ItemModel { get; set; }
+ public string? ItemNo { get; set; }
- //閫佹鍗曚綅
-
+ //渚涘簲鍟嗗悕绉�
public string? SuppName { get; set; }
- //璁㈠崟鍙�(閲囪喘鍗曞彿)
- public string? CgOrder { get; set; }
+ //娴嬭瘯浜у搧璐ㄩ噺鐘跺喌鍙婄敵璇峰師鍥�
+ public string? AppicationReason { get; set; }
- //瀵逛笉鍚堟牸鎴栨綔鍦ㄤ笉鍚堟牸鐨勬弿杩�
+ //璁㈠崟鍙�(閲囪喘鍗曞彿)
+ public string? BadReason { get; set; }
+
+ //澶囨敞
public string? remark { get; set; }
//妫�楠屽崟鍙�
public string? ReleaseNo { get; set; }
- //鐢ㄦ埛鍚嶇О
- public string? Fname { get; set; }
+ //鐢ㄦ埛鍐呯爜
+ public string? StaffNo { get; set; }
+
+ //璇勫鐘舵��
+ public string? IqcStatus { get; set; }
+
+ //鐢宠閮ㄩ棬
+ public string? Department { get; set; }
+
+ //鐢宠閮ㄩ棬
+ public string? WorkShop { get; set; }
}
diff --git a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs b/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
index 72200c6..3d424b1 100644
--- a/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
+++ b/StandardInterface/MES.Service/service/QcIssueResult/QcIssueResultManager.cs
@@ -218,7 +218,7 @@
var db = SqlSugarHelper.GetInstance();
var stafflist = db.Queryable<DingNameCode>()
- .Where(t => t.STAFF_NO == getQcIssueResultDetail.Fname)
+ .Where(t => t.STAFF_NO == getQcIssueResultDetail.StaffNo)
.Select(t => new DingNameCode
{
STAFF_NAME = t.STAFF_NAME,
@@ -250,7 +250,7 @@
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues1 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
Name = "TextField_K5AVR59BD28",
- Value = getQcIssueResultDetail.ItemModel,
+ Value = getQcIssueResultDetail.ItemNo,
};
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues2 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
@@ -270,12 +270,12 @@
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues5 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
Name = "TextField_1DAQ9890FDWG0",
- Value = "娴嬭瘯浜у搧璐ㄩ噺鐘跺喌鍙婄敵璇峰師鍥�",
+ Value = getQcIssueResultDetail.AppicationReason,
};
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues6 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
Name = "DDSelectField_76Z6HC5W1F0",
- Value = "澶栬涓嶈壇",
+ Value = getQcIssueResultDetail.BadReason,
};
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues7 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
@@ -291,17 +291,17 @@
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues9 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
Name = "DDSelectField_1AL6MWUUUOHS0",
- Value = "閫�璐�",
+ Value = getQcIssueResultDetail.IqcStatus,
};
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues10 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
Name = "DepartmentField_10ZVNJNJCRJK0",
- Value = "娴嬭瘯鐢宠閮ㄩ棬",
+ Value = getQcIssueResultDetail.Department,
};
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues11 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
Name = "DDSelectField_HG2SQUPO2NK0",
- Value = "鐢熶骇涓�閮�",
+ Value = getQcIssueResultDetail.WorkShop,
};
AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues12 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues
{
@@ -354,7 +354,7 @@
FormComponentValues = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues>
{
formComponentValues1,formComponentValues2,formComponentValues3, formComponentValues4, formComponentValues5, formComponentValues6, formComponentValues7, formComponentValues8,
- formComponentValues9, formComponentValues11
+ formComponentValues9,formComponentValues10, formComponentValues11
},
TargetSelectActioners = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners>
{
diff --git a/StandardInterface/MESApplication/Controllers/Base/LoginController.cs b/StandardInterface/MESApplication/Controllers/Base/LoginController.cs
index aede14c..0861d0e 100644
--- a/StandardInterface/MESApplication/Controllers/Base/LoginController.cs
+++ b/StandardInterface/MESApplication/Controllers/Base/LoginController.cs
@@ -1,9 +1,10 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.@base;
+锘縰sing MES.Service.Dto.@base;
using MES.Service.service;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System.Dynamic;
namespace MESApplication.Controllers.Base;
@@ -105,4 +106,43 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ public class Root
+ {
+ public string version { get; set; }
+
+ public string apkUrl { get; set; }
+ }
+
+ /// <summary>
+ /// 鑾峰彇App鏈�鏂扮増鏈俊鎭�
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("getAppUpgradeInfo")]
+ public async Task<ResponseResult> getAppUpgradeInfo()
+ {
+
+ try
+ {
+ HttpClient client = new();
+ var requestUrl = $"http://192.168.1.104:8081/UpgradeInformation.json";
+ var response = await client.GetAsync(requestUrl);
+ response.EnsureSuccessStatusCode(); // 妫�鏌TTP鐘舵�佺爜
+ var responseContent = await response.Content.ReadAsStringAsync();
+ var a = JsonConvert.DeserializeObject<Root>(responseContent);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = a
+ };
+
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3