From 8452ea0d86fcd34965c49b6f580dca0601c8f596 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期一, 14 四月 2025 20:43:04 +0800
Subject: [PATCH] 平板代码提交
---
StandardPda/MES.Service/Modes/MesItems.cs | 11 +
StandardPda/MES.Service/service/BasicData/MesItemsManager.cs | 5
StandardPda/MESApplication/Controllers/QC/LljController.cs | 66 ++++++++++-
StandardPda/MES.Service/service/QC/LljService.cs | 176 ++++++++++++++++++----------
StandardPda/MES.Service/Dto/webApi/ErpItems.cs | 8 +
StandardPda/MES.Service/Modes/InspectorChangeLog.cs | 42 +++++++
StandardPda/MES.Service/Dto/service/XJPageResult.cs | 5
StandardPda/MES.Service/service/LoginService.cs | 7 +
8 files changed, 249 insertions(+), 71 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/service/XJPageResult.cs b/StandardPda/MES.Service/Dto/service/XJPageResult.cs
index dc3eb6a..19a1c16 100644
--- a/StandardPda/MES.Service/Dto/service/XJPageResult.cs
+++ b/StandardPda/MES.Service/Dto/service/XJPageResult.cs
@@ -18,4 +18,9 @@
/// 涓嬫媺妗嗘悳绱㈡潯浠�
/// </summary>
public string? SelectedIndex { get; set; }
+ /// <summary>
+ /// 鎼滃叏閮紝鎴栬�呭綋鍓嶇敤鎴凤紙榛樿0锛屽綋鍓嶇敤鎴凤紝1锛氬叏閮級
+ /// </summary>
+ public string? UserIndex { get; set; }
+
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/ErpItems.cs b/StandardPda/MES.Service/Dto/webApi/ErpItems.cs
index 51f9269..47686bf 100644
--- a/StandardPda/MES.Service/Dto/webApi/ErpItems.cs
+++ b/StandardPda/MES.Service/Dto/webApi/ErpItems.cs
@@ -39,4 +39,12 @@
public string? PrivateDescSeg11 { get; set; }
public string? PrivateDescSeg7 { get; set; }
public string? PrivateDescSeg2 { get; set; }
+ /// <summary>
+ /// 閲囪喘鍛�
+ /// </summary>
+ public string? Merchandiser { get; set; }
+ /// <summary>
+ /// 浠撶鍛�
+ /// </summary>
+ public string? WarehouseKeeper { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/InspectorChangeLog.cs b/StandardPda/MES.Service/Modes/InspectorChangeLog.cs
new file mode 100644
index 0000000..be942b4
--- /dev/null
+++ b/StandardPda/MES.Service/Modes/InspectorChangeLog.cs
@@ -0,0 +1,42 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes
+{
+ [SugarTable("INSPECTOR_CHANGE_LOG")]
+ public class InspectorChangeLog
+ {
+ /// <summary>
+ /// 涓婚敭锛屽敮涓�鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "CHANGE_ID", IsPrimaryKey = true, IsIdentity = true)]
+ public long ChangeId { get; set; }
+ /// <summary>
+ /// 妫�楠屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "INSPECTION_NO", Length = 50, IsNullable = false)]
+ public string? InspectionNo { get; set; }
+ /// <summary>
+ /// 妫�楠屽憳
+ /// </summary>
+ [SugarColumn(ColumnName = "INSPECTOR", Length = 50, IsNullable = false)]
+ public string? Inspector { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿锛堥粯璁ゅ綋鍓嶆椂闂达級
+ /// </summary>
+
+ [SugarColumn(ColumnName = "CHANGE_TIME", DefaultValue = "SYSDATE")]
+ public DateTime? ChangeTime { get; set; }
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+
+ [SugarColumn(ColumnName = "CHANGED_BY", Length = 50, IsNullable = false)]
+ public string? ChangedBy { get; set; }
+ /// <summary>
+ /// 鏄惁鏈夋晥锛圷:鏈夋晥 N锛氭棤鏁堬級
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_VALID", DefaultValue = "Y", Length = 1)]
+ public string? IsValid { get; set; }
+ }
+}
diff --git a/StandardPda/MES.Service/Modes/MesItems.cs b/StandardPda/MES.Service/Modes/MesItems.cs
index 20bb6ab..671fa72 100644
--- a/StandardPda/MES.Service/Modes/MesItems.cs
+++ b/StandardPda/MES.Service/Modes/MesItems.cs
@@ -522,4 +522,15 @@
/// </summary>
[SugarColumn(ColumnName = "Old_ITEM_NO")]
public string? OldItemNo { get; set; }
+ /// <summary>
+ /// 閲囪喘涓氬姟鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "MERCHANDISER")]
+ public string? Merchandiser { get; set; }
+
+ /// <summary>
+ /// 浠撶鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "WAREHOUSEKEEPER")]
+ public string? WarehouseKeeper { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/BasicData/MesItemsManager.cs b/StandardPda/MES.Service/service/BasicData/MesItemsManager.cs
index 7adff42..03e085c 100644
--- a/StandardPda/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesItemsManager.cs
@@ -147,7 +147,10 @@
UseOrg = erpDetail.FUseOrgId,
CreateDate = DateTime.Now,
Company = "1000",
- Factory = "1000"
+ Factory = "1000",
+ WarehouseKeeper=item.WarehouseKeeper,
+ Merchandiser=item.Merchandiser
+
};
list.Add(items);
}
diff --git a/StandardPda/MES.Service/service/LoginService.cs b/StandardPda/MES.Service/service/LoginService.cs
index 55a7795..f123d70 100644
--- a/StandardPda/MES.Service/service/LoginService.cs
+++ b/StandardPda/MES.Service/service/LoginService.cs
@@ -11,7 +11,12 @@
public DataTable login(string name, string pwd)
{
var sql =
- string.Format(@"select * from SYS_USER where FCODE = '{0}'",
+ string.Format(@"select A.*,B.ROLEIDS from SYS_USER A
+ left join (
+ SELECT LISTAGG(ROLEID, ',') WITHIN GROUP (ORDER BY ROLEID) AS ROLEIDS,userid
+ FROM SYS_USER_ROLE
+ GROUP BY userid
+ )B on b.USERID=a.FID where FCODE = '{0}'",
name);
var dataTable = SQLHelper.ExecuteQuery(sql);
if (dataTable.Rows.Count <= 0) throw new Exception("鐢ㄦ埛涓嶅瓨鍦�");
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index 77f53e7..ee00c40 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -3,10 +3,12 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
+using MySqlConnector;
using Newtonsoft.Json;
using SharpCompress.Factories;
using SqlSugar;
using System.Data;
+using System.Xml.Linq;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
using DbType = System.Data.DbType;
@@ -31,12 +33,14 @@
var pageList = db
.Queryable<LtsLlj, IqcBefore, VMesQaItemsDetect01, SysUser,
- IqcBeforeFrom, SysUser>((a, b, d, e, f, g) =>
+ IqcBeforeFrom, SysUser, InspectorChangeLog, SysUser>((a, b, d, e, f, g,h,i) =>
new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
JoinType.Inner, a.Id == d.Id,
JoinType.Left, a.CreateBy == e.Fcode,
JoinType.Left, f.Id == b.PID,
- JoinType.Left, f.Sid == g.Fid
+ JoinType.Left, f.Sid == g.Fid,
+ JoinType.Left,a.ReleaseNo==h.InspectionNo && h.IsValid=="Y",
+ JoinType.Left,i.Fcode==h.Inspector
))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
@@ -50,9 +54,7 @@
// itemIds is { Length: > 0 },
// (a, b, c) => itemIds.Contains(a.ItemId))
.WhereIF(id > 0, (a, b, d) => a.Id == id)
- .WhereIF(true,
- (a, b, d, e, f, g) =>
- (g.Fcode == queryObj.createUser || g.Fcode == null))
+ .WhereIF(queryObj.createUser!="PL017"&& queryObj.UserIndex=="0", (a, b, d, e, f, g,h, i) => (g.Fcode == queryObj.createUser || i.Fcode == queryObj.createUser))//鍒ゆ柇姝ゅ崟鐨勬楠屽憳锛屾垨鑰呮楠屼负绌哄氨鏄剧ず姝ゅ崟鎹�
//鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉帮紝椤圭洰鎼滅储
//.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
//(a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
@@ -62,35 +64,17 @@
//))
//鏍规嵁涓嬫媺妗嗘悳绱㈡潯浠剁瓫閫夛紙0椤圭洰, 1鐗╂枡缂栧彿, 2鐗╂枡鍚嶇О, 3渚涘簲鍟�, 4閲囪喘鍛橈級
- .WhereIF(
- queryObj.SelectedIndex == "0" && queryObj.SearchValue != null &&
- queryObj.SearchValue != "",
- (a, b, d) => (d.ProjectCodes.ToLower()
- .Contains(queryObj.SearchValue.ToLower())))
- .WhereIF(
- queryObj.SelectedIndex == "1" && queryObj.SearchValue != null &&
- queryObj.SearchValue != "",
- (a, b, d) => (a.ItemNo.ToLower()
- .Contains(queryObj.SearchValue.ToLower())))
- .WhereIF(
- queryObj.SelectedIndex == "2" && queryObj.SearchValue != null &&
- queryObj.SearchValue != "",
- (a, b, d) => (a.ItemName.ToLower()
- .Contains(queryObj.SearchValue.ToLower())))
- .WhereIF(
- queryObj.SelectedIndex == "3" && queryObj.SearchValue != null &&
- queryObj.SearchValue != "",
- (a, b, d) => (a.SuppName.ToLower()
- .Contains(queryObj.SearchValue.ToLower())))
- .WhereIF(
- queryObj.SelectedIndex == "4" && queryObj.SearchValue != null &&
- queryObj.SearchValue != "",
- (a, b, d, e) => (e.Fname.ToLower()
- .Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(queryObj.SelectedIndex == "0" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (d.ProjectCodes.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(queryObj.SelectedIndex == "1" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(queryObj.SelectedIndex == "2" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(queryObj.SelectedIndex == "3" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(queryObj.SelectedIndex == "4" && queryObj.SearchValue != null && queryObj.SearchValue != "", (a, b, d, e) => (e.Fname.ToLower().Contains(queryObj.SearchValue.ToLower())))
.OrderByDescending((a, b, d) => a.Id)
- .Select((a, b, d, e, f, g) => new LtsLlj
+ .Select((a, b, d, e, f, g,h,i) => new LtsLlj
{
- UserName = g.Fname,
+ //UserName = g.Fname,
+ //UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
+ UserName = (i.Fname!=null ||i.Fname!="") ? i.Fname : g.Fname,
FIRST = d.First,
CreateUserName = e.Fname,
NewFngDesc = d.NewFngDesc,
@@ -243,9 +227,9 @@
var parameters = new List<SugarParameter>
{
new("P_RELEASE_NO", releaseNo,
- DbType.String, ParameterDirection.Input),
- outputResult,
- outputMessage
+ DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
};
var db = SqlSugarHelper.GetInstance();
@@ -262,7 +246,62 @@
msg[0] = resultValue;
msg[1] = messageValue;
return msg;
+
}
+
+
+
+
+ /// <summary>
+ /// 淇濆瓨鏂版楠屽憳
+ /// </summary>
+ /// <param name="NewStaffUserID">鏂版楠屽憳ID</param>
+ /// <param name="userID">淇敼浜�</param>
+ /// <param name="releaseNo">妫�楠屽崟鍙�</param>
+ /// <returns></returns>
+ public string[] SaveCheckBy(string NewStaffUserID, string userID, string releaseNo)
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outputResult = new SugarParameter("o_Result", null,
+ DbType.Int32, ParameterDirection.Output,
+ 4000);
+
+ var outputMessage = new SugarParameter("o_Msg", null,
+ DbType.String,
+ ParameterDirection.Output, 4000);
+
+ // 瀹氫箟杈撳叆鍙傛暟
+ var parameters = new List<SugarParameter>
+ {
+ new("P_FCHECK_BY", NewStaffUserID,
+ DbType.String, ParameterDirection.Input),
+ new("p_Release_No", releaseNo,
+ DbType.String, ParameterDirection.Input),
+ new("p_User", userID,
+ DbType.String, ParameterDirection.Input),
+
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN Prc_Mes_Iqc_Qa_Update_CheckBy(:P_FCHECK_BY,:p_Release_No,:p_User, :o_Result, :o_Msg); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+ string[] msg = new string[2];
+ msg[0] = resultValue;
+ msg[1] = messageValue;
+ return msg;
+
+ }
+
+
public string[] SaveSysSubmit(SysSubmit sysSubmit)
{
@@ -279,30 +318,30 @@
var parameters = new List<SugarParameter>
{
new("PI_BILLNO", sysSubmit.PI_BILLNO,
- DbType.String, ParameterDirection.Input),
- new("PI_USER", sysSubmit.PI_USER,
- DbType.String, ParameterDirection.Input),
- new("PI_SAMPLE_STATUS", sysSubmit.PI_SAMPLE_STATUS,
- DbType.String, ParameterDirection.Input),
- new("PI_SAMPLE_TYPE", sysSubmit.PI_SAMPLE_TYPE,
- DbType.String, ParameterDirection.Input),
- new("PI_SAMPLE_REASON", sysSubmit.PI_SAMPLE_REASON,
- DbType.String, ParameterDirection.Input),
- new("PI_INSPECT_TYPE", sysSubmit.PI_INSPECT_TYPE,
- DbType.String, ParameterDirection.Input),
- new("PI_SAMPLE_PREPARATION", sysSubmit.PI_SAMPLE_PREPARATION,
- DbType.String, ParameterDirection.Input),
- new("PI_URGENCY", sysSubmit.PI_URGENCY,
- DbType.String, ParameterDirection.Input),
- new("PI_FIRMWAREVERSION", sysSubmit.PI_FIRMWAREVERSION,
- DbType.String, ParameterDirection.Input),
- new("PI_HARDWAREVERSION", sysSubmit.PI_HARDWAREVERSION,
- DbType.String, ParameterDirection.Input),
- new("PI_REMARK", sysSubmit.PI_REMARK,
- DbType.String, ParameterDirection.Input),
+ DbType.String, ParameterDirection.Input),
+ new("PI_USER", sysSubmit.PI_USER,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_STATUS", sysSubmit.PI_SAMPLE_STATUS,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_TYPE", sysSubmit.PI_SAMPLE_TYPE,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_REASON", sysSubmit.PI_SAMPLE_REASON,
+ DbType.String, ParameterDirection.Input),
+ new("PI_INSPECT_TYPE", sysSubmit.PI_INSPECT_TYPE,
+ DbType.String, ParameterDirection.Input),
+ new("PI_SAMPLE_PREPARATION", sysSubmit.PI_SAMPLE_PREPARATION,
+ DbType.String, ParameterDirection.Input),
+ new("PI_URGENCY", sysSubmit.PI_URGENCY,
+ DbType.String, ParameterDirection.Input),
+ new("PI_FIRMWAREVERSION", sysSubmit.PI_FIRMWAREVERSION,
+ DbType.String, ParameterDirection.Input),
+ new("PI_HARDWAREVERSION", sysSubmit.PI_HARDWAREVERSION,
+ DbType.String, ParameterDirection.Input),
+ new("PI_REMARK", sysSubmit.PI_REMARK,
+ DbType.String, ParameterDirection.Input),
outputResult,
outputMessage
- };
+ };
var db = SqlSugarHelper.GetInstance();
@@ -318,8 +357,8 @@
msg[0] = resultValue;
msg[1] = messageValue;
return msg;
- }
+ }
private string ExtractSubstring(string input, char startChar, char endChar)
{
var startIndex = input.IndexOf(startChar);
@@ -434,6 +473,16 @@
FcheckItemDesc = a.FcheckItemDesc
}).ToList();
}
+
+
+
+ public DataTable getAllInspectors()
+ {
+ OracleSQLHelper SQLHelper = new();
+ var sql =string.Format(@"select a.USER_NAME label,U.FCODE value from IQC_BEFORE_FROM a JOIN SYS_USER U ON U.FID=A.SID");
+ return SQLHelper.ExecuteQuery(sql);
+ }
+
public int SetQSItemDetail(MesQaItemsDetectDetail12 detail)
{
@@ -735,7 +784,7 @@
return withOracle;
}
- public bool IqcQaSubmit(LLJDto dto)
+ public string[] IqcQaSubmit(LLJDto dto)
{
var (factory, company) = UserUtil.GetFactory(dto.userNo);
try
@@ -774,10 +823,11 @@
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
var resultValue = outputResult.Value?.ToString();
var messageValue = outputMessage.Value?.ToString();
-
- if ("1".Equals(resultValue)) throw new Exception(messageValue);
-
- return true;
+ string[] msg = new string[2];
+ msg[0] = resultValue;
+ msg[1] = messageValue;
+ return msg;
+
}
catch (Exception ex)
{
diff --git a/StandardPda/MESApplication/Controllers/QC/LljController.cs b/StandardPda/MESApplication/Controllers/QC/LljController.cs
index 79a84b6..19f3217 100644
--- a/StandardPda/MESApplication/Controllers/QC/LljController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/LljController.cs
@@ -3,6 +3,7 @@
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using NetTaste;
using Newtonsoft.Json.Linq;
using System.Dynamic;
@@ -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)
--
Gitblit v1.9.3