From 5adecb7ffd986930d2f4e195c0273e4db73b5315 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 07 二月 2025 18:36:51 +0800
Subject: [PATCH] 优化首检
---
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MES.Service/Modes/MesRohInData.cs | 7
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MES.Service/Dto/service/SJPageResult.cs | 4
MES.Service/Modes/MesRohIn.cs | 6
MES.Service/service/QC/LljService.cs | 14
MES.Service/Modes/MesQualityStandard.cs | 375 ++++++++++++++----------------
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MES.Service/Modes/QsItemOqcReq.cs | 8
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MES.Service/Dto/webApi/ErpRohinData.cs | 3
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MES.Service/Modes/MesQaIqc.cs | 5
MES.Service/service/QC/XJService.cs | 20
MES.Service/Modes/QsQaItemXj.cs | 1
MESApplication/bin/Debug/net8.0/log/2024122817.log | 15 +
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MES.Service/Dto/service/QsItem.cs | 1
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Debug/net8.0/log/2024123012.log | 3
MES.Service/service/BasicData/MesRohInManager.cs | 4
MES.Service/Dto/webApi/ErpRohIn.cs | 3
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MES.Service/service/QC/SJService.cs | 67 ++++
MES.Service/service/WomcaaManager.cs | 3
MES.Service/service/WomcaaWWManager.cs | 3
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/log/2025010913.log | 24 ++
MES.Service/Dto/service/RKJDaa001.cs | 11
MESApplication/bin/Debug/net8.0/log/2024122917.log | 3
MES.Service/Modes/Womcaa.cs | 8
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MESApplication/bin/Debug/net8.0/log/2025020617.log | 18 +
MESApplication/Controllers/QC/LljController.cs | 4
MES.Service/Modes/MesQa.cs | 6
MES.Service/Dto/webApi/ErpCAA.cs | 2
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MESApplication/Controllers/QC/SJController.cs | 27 ++
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/service/QC/RKJService.cs | 33 +-
MESApplication/Controllers/QC/XJController.cs | 7
MESApplication/bin/Debug/net8.0/log/2024123013.log | 3
MES.Service/Modes/LtsLlj.cs | 19 +
MESApplication/Controllers/QC/RKJController.cs | 4
51 files changed, 451 insertions(+), 260 deletions(-)
diff --git a/MES.Service/Dto/service/QsItem.cs b/MES.Service/Dto/service/QsItem.cs
index 944f631..508c3f0 100644
--- a/MES.Service/Dto/service/QsItem.cs
+++ b/MES.Service/Dto/service/QsItem.cs
@@ -23,4 +23,5 @@
public string? StatusUser { get; set; }
public SJPageResult? Result { get; set; }
+ public string? userNo { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/RKJDaa001.cs b/MES.Service/Dto/service/RKJDaa001.cs
index e3da046..f444f26 100644
--- a/MES.Service/Dto/service/RKJDaa001.cs
+++ b/MES.Service/Dto/service/RKJDaa001.cs
@@ -10,8 +10,8 @@
{
// 閫佹鎵规
[SugarColumn(ColumnName = "LOT_NO")] public string? LotNo { get; set; }
- // 閫佹鎵规
- [SugarColumn(ColumnName = "ITEM_IN_ID")] public string? ItemInId { get; set; }
+ // 妫�楠屽崟id
+ [SugarColumn(ColumnName = "ITEM_IN_ID")] public decimal? ItemInId { get; set; }
// 鏁伴噺
[SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; }
// 浜у搧缂栫爜
@@ -19,12 +19,15 @@
// 浜у搧鍚嶇О
[SugarColumn(ColumnName = "ITEM_SNAME")] public string? ItemName { get; set; }
// 浜у搧瑙勬牸
- [SugarColumn(ColumnName = "daa004")] public string? ItemModel { get; set; }
+ [SugarColumn(ColumnName = "ITEM_MODEL")] public string? ItemModel { get; set; }
// 浜х嚎
[SugarColumn(ColumnName = "daa015")] public string? LineNo { get; set; }
// 浜у搧Id
- [SugarColumn(ColumnName = "ITEM_ID")] public string? ItemId { get; set; }
+ [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; }
// 宸ュ崟鍗曞彿
[SugarColumn(ColumnName = "RBILL_NO")] public string? RbillNo { get; set; }
+ // 浠诲姟鍗曞彿
+ [SugarColumn(ColumnName = "WORK_NO")] public string? WorkNo { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
index 7f4b071..2730319 100644
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ b/MES.Service/Dto/service/SJPageResult.cs
@@ -6,6 +6,7 @@
[SugarTable("V_MES_SJ")] //鐢ㄤ簬SqlSugar
public class SJPageResult : Page
{
+ [SugarColumn(ColumnName = "ID")]
public decimal? Id { get; set; }
[SugarColumn(ColumnName = "BILL_NO")] //妫�楠屽崟鍙�
@@ -60,6 +61,9 @@
public string? daa004 { get; set; }
[SugarColumn(ColumnName = "DAA008")] //宸ュ崟鏁伴噺
public string? daa008 { get; set; }
+ [SugarColumn(ColumnName = "ITEM_ID")] //浜у搧Id
+ public decimal? ItemId { get; set; }
+
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index 57d46c1..0e2d567 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -53,6 +53,8 @@
public string? F_XIFG_Text_qtr1 { get; set; }
public string? F_XIFG_Base_83g1 { get; set; }
public string? FStockInQuaAuxQty { get; set; }
+
+ public string? F_XIFG_Text_zzjxqd { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpRohIn.cs b/MES.Service/Dto/webApi/ErpRohIn.cs
index 18f6dd5..447266d 100644
--- a/MES.Service/Dto/webApi/ErpRohIn.cs
+++ b/MES.Service/Dto/webApi/ErpRohIn.cs
@@ -50,4 +50,7 @@
public string? FPREARRIVALDATE { get; set; }
public string? FRECEIVEORGID { get; set; }
public string? F_XIFG_PrintTimes_qtr { get; set; }
+ public string? F_XIFG_Text_zzjxqd { get; set; }
+
+
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpRohinData.cs b/MES.Service/Dto/webApi/ErpRohinData.cs
index 796d177..b333a4b 100644
--- a/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -61,4 +61,7 @@
public string? FdemandbillnoLine { get; set; }
public string? ElectricalProductModel { get; set; }
public string? ElectricalProductName { get; set; }
+ public string? F_XIFG_Text_zzjxqd { get; set; }
+
+
}
\ No newline at end of file
diff --git a/MES.Service/Modes/LtsLlj.cs b/MES.Service/Modes/LtsLlj.cs
index 41776b1..1a33a13 100644
--- a/MES.Service/Modes/LtsLlj.cs
+++ b/MES.Service/Modes/LtsLlj.cs
@@ -82,7 +82,7 @@
///</summary>
[SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
-
+
/// <summary>
/// 閫佹浜哄憳
///</summary>
@@ -93,7 +93,7 @@
///</summary>
[SugarColumn(ColumnName = "MODIFY1_BY")]
public string Modify1By { get; set; }
-
+
/// <summary>
/// 涓嶈壇鎻忚堪
///</summary>
@@ -182,5 +182,20 @@
/// 浠撳簱缂栫爜
///</summary>
[SugarColumn(ColumnName = "DEPOTS_CODE")]
+
public string DepotCode { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public string ItemId { get; set; }
+
+ /// <summary>
+ /// 妫�楠屾彁浜ゆ椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "IQC_DATE")]
+ public string IqcDate { get; set; }
+
+
+
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQa.cs b/MES.Service/Modes/MesQa.cs
index 198761e..8a6bbab 100644
--- a/MES.Service/Modes/MesQa.cs
+++ b/MES.Service/Modes/MesQa.cs
@@ -70,4 +70,10 @@
[SugarColumn(ColumnName = "QS_TYPE")] //鐢ㄤ簬SqlSugar
[StringLength(1, ErrorMessage = "1涓洪妫�锛�2涓哄贰妫�锛�3涓哄叆搴撴闀垮害涓嶈兘瓒呭嚭1")]
public string? QsType { get; set; }
+ /// <summary>
+ /// 鐗╂枡id
+ /// </summary>
+ [Column("ITEM_ID")]
+ [SugarColumn(ColumnName = "ITEM_ID")] //鐢ㄤ簬SqlSugar
+ public decimal? ItemId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaIqc.cs b/MES.Service/Modes/MesQaIqc.cs
index 0ea62ff..06360d7 100644
--- a/MES.Service/Modes/MesQaIqc.cs
+++ b/MES.Service/Modes/MesQaIqc.cs
@@ -16,6 +16,11 @@
///</summary>
[SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
+ /// <summary>
+ /// 鎺ユ敹姘村钩
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public string ItemId { get; set; }
/// <summary>
/// 鎺ユ敹姘村钩
diff --git a/MES.Service/Modes/MesQualityStandard.cs b/MES.Service/Modes/MesQualityStandard.cs
index bf414fa..abffd37 100644
--- a/MES.Service/Modes/MesQualityStandard.cs
+++ b/MES.Service/Modes/MesQualityStandard.cs
@@ -1,204 +1,181 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
+using System;
+using System.Collections.Generic;
+using System.Linq;
using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 璐ㄩ噺鏍囧噯琛�
-/// </summary>
-[Table("MES_QUALITY_STANDARD")]
-[SugarTable("MES_QUALITY_STANDARD")] //鐢ㄤ簬SqlSugar
-public class MesQualityStandard
+namespace MES.Service.Modes
{
/// <summary>
- /// 搴忓垪SEQ_QS
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�20")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鎺ユ敹姘村钩
- /// </summary>
- [Column("FAC_LEVEL")]
- [SugarColumn(ColumnName = "FAC_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鎺ユ敹姘村钩闀垮害涓嶈兘瓒呭嚭100")]
- public string FacLevel { get; set; }
-
- /// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- [Column("FCHECK_LEVEL")]
- [SugarColumn(ColumnName = "FCHECK_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾按骞抽暱搴︿笉鑳借秴鍑�100")]
- public string FcheckLevel { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐘舵��
- /// </summary>
- [Column("FSUBMIT")]
- [SugarColumn(ColumnName = "FSUBMIT")] //鐢ㄤ簬SqlSugar
- public decimal? Fsubmit { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("FSUBMIT_BY")]
- [SugarColumn(ColumnName = "FSUBMIT_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�50")]
- public string FsubmitBy { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃堕棿
- /// </summary>
- [Column("FSUBMIT_DATE")]
- [SugarColumn(ColumnName = "FSUBMIT_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FsubmitDate { get; set; }
-
- /// <summary>
- /// 妯℃暟
- /// </summary>
- [Column("INSPECTION_LEVEL")]
- [SugarColumn(ColumnName = "INSPECTION_LEVEL")] //鐢ㄤ簬SqlSugar
- public decimal? InspectionLevel { get; set; }
-
- /// <summary>
- /// 妫�楠屾柟娉�
- /// </summary>
- [Column("INSPECTION_METHOD")]
- [SugarColumn(ColumnName = "INSPECTION_METHOD")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�50")]
- public string InspectionMethod { get; set; }
-
- /// <summary>
- /// 璐ㄩ噺瑕佹眰
- /// </summary>
- [Column("ITEM_MOD")]
- [SugarColumn(ColumnName = "ITEM_MOD")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "璐ㄩ噺瑕佹眰闀垮害涓嶈兘瓒呭嚭500")]
- public string ItemMod { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [Column("ITEM_NO")]
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鐗╂枡缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string ItemNo { get; set; }
-
- /// <summary>
- /// 姣忔ā澶氬皯涓�
- /// </summary>
- [Column("LEVEL_NUM")]
- [SugarColumn(ColumnName = "LEVEL_NUM")] //鐢ㄤ簬SqlSugar
- public decimal? LevelNum { get; set; }
-
- /// <summary>
- /// 鏈�澶у��
- /// </summary>
- [Column("MAX_VALUE")]
- [SugarColumn(ColumnName = "MAX_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? MaxValue { get; set; }
-
- /// <summary>
- /// 鏈�灏忓��
- /// </summary>
- [Column("MIN_VALUE")]
- [SugarColumn(ColumnName = "MIN_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? MinValue { get; set; }
-
- /// <summary>
- /// 妯″叿鍙�
- /// </summary>
- [Column("MOID_NUM")]
- [SugarColumn(ColumnName = "MOID_NUM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妯″叿鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string MoidNum { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("NOTES")]
- [SugarColumn(ColumnName = "NOTES")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭100")]
- public string Notes { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍦板潃
- /// </summary>
- [Column("PICTURE")]
- [SugarColumn(ColumnName = "PICTURE")] //鐢ㄤ簬SqlSugar
- public byte[]? Picture { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍚嶇О
- /// </summary>
- [Column("PICTURENAME")]
- [SugarColumn(ColumnName = "PICTURENAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "Picturename闀垮害涓嶈兘瓒呭嚭32")]
- public string? Picturename { get; set; }
-
- /// <summary>
- /// 椤圭洰鍚嶇О
- /// </summary>
- [Column("PROJ_NAME")]
- [SugarColumn(ColumnName = "PROJ_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "椤圭洰鍚嶇О闀垮害涓嶈兘瓒呭嚭50")]
- public string ProjName { get; set; }
-
- /// <summary>
- /// 妫�楠屾爣鍑嗙紪鐮�
- /// </summary>
- [Column("QS_CODE")]
- [SugarColumn(ColumnName = "QS_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾爣鍑嗙紪鐮侀暱搴︿笉鑳借秴鍑�100")]
- public string QsCode { get; set; }
-
- /// <summary>
- /// 妫�楠屾爣鍑嗗悕绉�
- /// </summary>
- [Column("QS_NAME")]
- [SugarColumn(ColumnName = "QS_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾爣鍑嗗悕绉伴暱搴︿笉鑳借秴鍑�100")]
- public string QsName { get; set; }
-
- /// <summary>
- /// 1涓洪妫�锛�2涓哄贰妫�锛�3涓哄叆搴撴
- /// </summary>
- [Column("QS_TYPE")]
- [SugarColumn(ColumnName = "QS_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "1涓洪妫�锛�2涓哄贰妫�锛�3涓哄叆搴撴闀垮害涓嶈兘瓒呭嚭1")]
- public string QsType { get; set; }
-
- /// <summary>
- /// 鏍囧噯鍊�
- /// </summary>
- [Column("STANDARD_VALUE")]
- [SugarColumn(ColumnName = "STANDARD_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? StandardValue { get; set; }
-
- /// <summary>
- /// 浣跨敤浠〃
- /// </summary>
- [Column("USING_INSTRUMENTS")]
- [SugarColumn(ColumnName = "USING_INSTRUMENTS")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浣跨敤浠〃闀垮害涓嶈兘瓒呭嚭50")]
- public string UsingInstruments { get; set; }
-}
\ No newline at end of file
+ ///
+ ///</summary>
+ [SugarTable("MES_QUALITY_STANDARD")]
+ public class MesQualityStandard
+ {
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true )]
+ public decimal Id { get; set; }
+ /// <summary>
+ /// 妯″叿鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="MOID_NUM" )]
+ public string MoidNum { get; set; }
+ /// <summary>
+ /// 椤圭洰鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName="PROJ_NAME" )]
+ public string ProjName { get; set; }
+ /// <summary>
+ /// 璐ㄩ噺瑕佹眰
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_MOD" )]
+ public string ItemMod { get; set; }
+ /// <summary>
+ /// 妫�楠屾柟娉�
+ ///</summary>
+ [SugarColumn(ColumnName="INSPECTION_METHOD" )]
+ public string InspectionMethod { get; set; }
+ /// <summary>
+ /// 浣跨敤浠〃
+ ///</summary>
+ [SugarColumn(ColumnName="USING_INSTRUMENTS" )]
+ public string UsingInstruments { get; set; }
+ /// <summary>
+ /// 妫�楠屾按骞�
+ ///</summary>
+ [SugarColumn(ColumnName="INSPECTION_LEVEL" )]
+ public string InspectionLevel { get; set; }
+ /// <summary>
+ /// 姣忔ā澶氬皯涓�
+ ///</summary>
+ [SugarColumn(ColumnName="LEVEL_NUM" )]
+ public string LevelNum { get; set; }
+ /// <summary>
+ /// 涓婇檺
+ ///</summary>
+ [SugarColumn(ColumnName="MAX_VALUE" )]
+ public string MaxValue { get; set; }
+ /// <summary>
+ /// 鏍囧噯
+ ///</summary>
+ [SugarColumn(ColumnName="STANDARD_VALUE" )]
+ public string StandardValue { get; set; }
+ /// <summary>
+ /// 涓嬮檺
+ ///</summary>
+ [SugarColumn(ColumnName="MIN_VALUE" )]
+ public string MinValue { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName="NOTES" )]
+ public string Notes { get; set; }
+ /// <summary>
+ /// 绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="QS_TYPE" )]
+ public string QsType { get; set; }
+ /// <summary>
+ /// 妫�楠屾按骞�
+ ///</summary>
+ [SugarColumn(ColumnName="FCHECK_LEVEL" )]
+ public string FcheckLevel { get; set; }
+ /// <summary>
+ /// 鎺ュ彈姘村钩
+ ///</summary>
+ [SugarColumn(ColumnName="FAC_LEVEL" )]
+ public string FacLevel { get; set; }
+ /// <summary>
+ /// 妫�楠屾爣鍑嗙紪鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="QS_CODE" )]
+ public string QsCode { get; set; }
+ /// <summary>
+ /// 妫�楠屾爣鍑嗗悕绉�
+ ///</summary>
+ [SugarColumn(ColumnName="QS_NAME" )]
+ public string QsName { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_BY" )]
+ public string CreateBy { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_DATE" )]
+ public DateTime? CreateDate { get; set; }
+ /// <summary>
+ /// 瀹℃牳鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName="FSUBMIT" )]
+ public decimal? Fsubmit { get; set; }
+ /// <summary>
+ /// 瀹℃牳浜�
+ ///</summary>
+ [SugarColumn(ColumnName="FSUBMIT_BY" )]
+ public string FsubmitBy { get; set; }
+ /// <summary>
+ /// 瀹℃牳鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName="FSUBMIT_DATE" )]
+ public DateTime? FsubmitDate { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName="PICTURE" )]
+ public byte[]? Picture { get; set; }
+ /// <summary>
+ /// 鍥剧墖
+ ///</summary>
+ [SugarColumn(ColumnName="PICTURENAME" )]
+ public string Picturename { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_NO" )]
+ public string ItemNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡id
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_ID" )]
+ public decimal? ItemId { get; set; }
+ /// <summary>
+ /// 鎸夎溅闂村垎绫荤埗ID
+ ///</summary>
+ [SugarColumn(ColumnName="PID" )]
+ public decimal? Pid { get; set; }
+ /// <summary>
+ /// 绫诲瀷缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_TYPE_NO" )]
+ public string ItemTypeNo { get; set; }
+ /// <summary>
+ /// 绫诲瀷缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_TYPE_ID" )]
+ public decimal? ItemTypeId { get; set; }
+ /// <summary>
+ /// 杞﹂棿id
+ ///</summary>
+ [SugarColumn(ColumnName="WORKSHOP_ID" )]
+ public decimal? WorkshopId { get; set; }
+ /// <summary>
+ /// 缁勭粐id
+ ///</summary>
+ [SugarColumn(ColumnName="ORGID" )]
+ public decimal? Orgid { get; set; }
+ /// <summary>
+ /// 妫�楠屾爣鍑唅d
+ ///</summary>
+ [SugarColumn(ColumnName="AQL1_ID" )]
+ public decimal? Aql1Id { get; set; }
+ /// <summary>
+ /// 椤圭洰鎻忚堪
+ ///</summary>
+ [SugarColumn(ColumnName="MEMO" )]
+ public string Memo { get; set; }
+ }
+}
diff --git a/MES.Service/Modes/MesRohIn.cs b/MES.Service/Modes/MesRohIn.cs
index e16e76e..c19c636 100644
--- a/MES.Service/Modes/MesRohIn.cs
+++ b/MES.Service/Modes/MesRohIn.cs
@@ -195,4 +195,10 @@
public string? CheckDate { get; set; }
+ /// <summary>
+ /// 缁勭粐闂撮渶姹傚崟
+ /// </summary>
+ //[SugarColumn(ColumnName = "FBILLNO")]
+ //public string? FbillNo { get; set; }
+
}
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index 61ae226..4855bde 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -358,4 +358,11 @@
/// </summary>
[SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_NAME")]
public string? ElectricalProductName { get; set; }
+
+ /// <summary>
+ /// 缁勭粐闂撮渶姹傚崟
+ /// </summary>
+ [SugarColumn(ColumnName = "FBILLNO")]
+ public string? FbillNo { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsItemOqcReq.cs b/MES.Service/Modes/QsItemOqcReq.cs
index 8a5874c..fc865d4 100644
--- a/MES.Service/Modes/QsItemOqcReq.cs
+++ b/MES.Service/Modes/QsItemOqcReq.cs
@@ -112,17 +112,19 @@
public string? MoidNum { get; set; }
/// <summary>
- /// 妯″叿鍙�
+ /// 鐗╂枡id
/// </summary>
[Column("ITEM_ID")]
[SugarColumn(ColumnName = "ITEM_ID")] //鐢ㄤ簬SqlSugar
- public string? ItemId { get; set; }
+ public decimal? ItemId { get; set; }
//Remarks
[Column("Remarks")]
[SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
[StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
public string? Remarks { get; set; }
+
+
[SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
[SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
@@ -133,5 +135,7 @@
[SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; }
[SugarColumn(IsIgnore = true)] public string? TaskNo { get; set; }
+
+
}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsQaItemXj.cs b/MES.Service/Modes/QsQaItemXj.cs
index 1f4ae4d..e2e2e1d 100644
--- a/MES.Service/Modes/QsQaItemXj.cs
+++ b/MES.Service/Modes/QsQaItemXj.cs
@@ -139,5 +139,6 @@
[SugarColumn(IsIgnore = true)] public string? BoardStyle { get; set; }
[SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
[SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? ItemId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 3789da6..5e9a014 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -400,4 +400,12 @@
[SugarColumn(ColumnName = "ERP_UPDATE_TIME")]
public string? ErpUpdateTime { get; set; }
+
+ /// <summary>
+ /// 缁勭粐闂撮渶姹傚崟
+ /// </summary>
+ [SugarColumn(ColumnName = "FBILLNO")]
+ public string? FbillNo { get; set; }
+
+
}
\ No newline at end of file
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index ff74ef9..eb77afd 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index 8c9aed7..79f1b06 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index b862762..9140970 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index a785e45..b66d428 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index ed6e131..42f15fe 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -179,6 +179,7 @@
mesRohIn.remark1 = rohIn.F_XIFG_PrintTimes_qtr;
mesRohIn.CheckDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); //褰撳墠鏃堕棿
+ //mesRohIn.FbillNo = rohIn.F_XIFG_Text_zzjxqd; //缁勭粐闂撮渶姹傚崟
return mesRohIn;
}
@@ -265,7 +266,8 @@
Remark4 = s.F_XIFG_Text_qtr4,
FdemandbillnoLine = s.FdemandbillnoLine,
ElectricalProductModel = s.ElectricalProductModel,
- ElectricalProductName = s.ElectricalProductName
+ ElectricalProductName = s.ElectricalProductName,
+ FbillNo = s.F_XIFG_Text_zzjxqd //缁勭粐闂撮渶姹傚崟
};
var single = rohInDataManager.GetSingle(it =>
diff --git a/MES.Service/service/QC/LljService.cs b/MES.Service/service/QC/LljService.cs
index f9aa514..f3727d9 100644
--- a/MES.Service/service/QC/LljService.cs
+++ b/MES.Service/service/QC/LljService.cs
@@ -34,32 +34,32 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- a => a.FcheckResu == null)
+ a => a.FcheckResu == null && a.STATUS == "鏈彁浜�")
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- a => a.FcheckResu != null)
+ a => a.FcheckResu != null && a.STATUS == "宸叉彁浜�")
.WhereIF(id > 0, a => a.Id == id)
.Where(a => depotCodes.Contains(a.DepotCode)) // 浣跨敤 Contains 鏂规硶妯℃嫙 IN 鏉′欢 鏍规嵁浠撳簱杩囨护
.OrderByDescending(a => a.Id)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
-
+
return (pageList, totalCount);
}
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
- public List<MesQaItemsDetectDetail5> SetItems(string itemNo, decimal quantity, string releaseNo)
+ public List<MesQaItemsDetectDetail5> SetItems(string itemId, decimal quantity, string releaseNo)
{
var db = SqlSugarHelper.GetInstance();
var count = db.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Count();
+ && s.ItemId == itemId && s.FTYPE == "1").Count();
if (count <= 0) return [];
var mesQaIqcItem = db
.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Select(
+ && s.ItemId == itemId && s.FTYPE == "1").Select(
b => new MesQaItemsDetectDetail5
{
ReleaseNo = releaseNo,
@@ -247,7 +247,7 @@
FreQty = a.FreQty,
Factory = "1000",
Company = "1000",
- FenterQty = SqlFunc.AggregateCount(b.Id),
+ FenterQty = SqlFunc.AggregateCount(b.Id),
FcheckResu = a.FcheckResu,
FcheckItemDesc = a.FcheckItemDesc
}).ToList();
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 8d615ee..7e48bd7 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -64,31 +64,31 @@
}*/
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
- public List<QsItemOqcItem> SetItems(string itemNo, decimal quantity)
+ public List<QsItemOqcItem> SetItems(decimal itemId, decimal quantity)
{
var db = SqlSugarHelper.GetInstance();
var count = db.Queryable<MesQa>().Where(s => s.QsType == "3"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+ && s.ItemId == itemId && s.Fsubmit == 1).Count();
if (count <= 0) return [];
var qsItemOqcItems = db
.Queryable<MesQualityStandard>()
.Where(b => b.QsType == "3"
- && b.ItemNo == itemNo).Select(
+ && b.ItemId == itemId).Select(
b => new QsItemOqcItem
{
ProjName = b.ProjName,
- ItemMod = b.ItemMod,
+ // ItemMod = b.ItemMod,
InspectionMethod = b.InspectionMethod,
UsingInstruments = b.UsingInstruments,
LevelNum = SqlFunc.IsNull(
- SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
- b.InspectionLevel),
- MaxValue = b.MaxValue,
- StandardValue = b.StandardValue,
- MinValue = b.MinValue,
+ SqlFunc.IsNull( Convert.ToDecimal(b.LevelNum) * Convert.ToDecimal(b.InspectionLevel) , 1),
+ Convert.ToDecimal(b.InspectionLevel)),
+ MaxValue = Convert.ToDecimal(b.MaxValue),
+ StandardValue = Convert.ToDecimal(b.StandardValue),
+ MinValue = Convert.ToDecimal(b.MinValue),
Notes = b.Notes,
FcheckLevel = b.FcheckLevel,
FacLevel = b.FacLevel,
@@ -128,9 +128,11 @@
break;
default:
LEV = ""; // 榛樿鍊�
+
break;
}
-
+ if (string.IsNullOrEmpty(LEV)) throw new Exception("璇ョ墿鏂欐湭缁存姢妫�楠岄」鐩垨妫�楠屾按骞充负绌�");
+
var sql =
"SELECT " + LEV +
" FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL2 B ON B.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO='" +
@@ -176,7 +178,7 @@
return db.Queryable<QsItemOqcItem, QsItemOqcItemDetail>((a, b) =>
new JoinQueryInfos(JoinType.Left, a.Id == b.Pid))
.WhereIF(pid > 0, (a, b) => a.Pid == pid)
- .WhereIF(id > 0, (a, b) => a.Id == id)
+ //.WhereIF(id > 0, (a, b) => a.Id == id)
.GroupBy((a, b) => new
{
a.Id,
@@ -465,7 +467,7 @@
lineNo = _baseService.getUserLineNo(queryObj.createUser);
return db.Queryable<QsItemOqcReq, RKJDaa001>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.BillNo == b.RbillNo && a.ItemId ==b.ItemId))
+ new JoinQueryInfos(JoinType.Left, a.Id == b.ItemInId && a.ItemId ==b.ItemId))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
@@ -485,7 +487,7 @@
CreateBy = a.CreateBy,
CreateDate = a.CreateDate,
ItemNo = a.ItemNo,
- TaskNo = b.LotNo,
+ TaskNo = b.WorkNo,
ItemName = b.ItemName,
ItemModel = b.ItemModel,
LineNo = b.LineNo,
@@ -493,8 +495,9 @@
FcheckBy = a.FcheckBy,
FcheckDate = a.FcheckDate,
MoidNum = a.MoidNum,
-
- Remarks = a.Remarks
+
+ Remarks = a.Remarks,
+ ItemId = a.ItemId
}).OrderBy(a => a.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
}
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index e1cb463..2042c15 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -1,8 +1,10 @@
-锘縰sing MES.Service.DB;
+锘縰sing System.Data;
+using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using DbType = System.Data.DbType;
namespace MES.Service.service.QC;
@@ -92,18 +94,18 @@
// result = "鏈娴�"
// }).ToList();
// }
- public List<QsItemIpiItem> SetQSItems(string itemNo)
+ public List<QsItemIpiItem> SetQSItems(decimal itemId)
{
var db = SqlSugarHelper.GetInstance();
var count = db.Queryable<MesQa>().Where(s => s.QsType == "1"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+ && s.ItemId == itemId && s.Fsubmit == 1).Count();
if (count <= 0) return new List<QsItemIpiItem>();
return db
.Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(
+ .Where(b => b.QsType == "1" && b.ItemId == itemId).Select(
b => new QsItemIpiItem
{
ProjName = b.ProjName,
@@ -111,11 +113,11 @@
InspectionMethod = b.InspectionMethod,
UsingInstruments = b.UsingInstruments,
LevelNum = SqlFunc.IsNull(
- SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
- b.InspectionLevel),
- MaxValue = b.MaxValue,
- StandardValue = b.StandardValue,
- MinValue = b.MinValue,
+ SqlFunc.IsNull( Convert.ToDecimal(b.LevelNum) * Convert.ToDecimal(b.InspectionLevel) , 1),
+ Convert.ToDecimal(b.InspectionLevel)),
+ MaxValue = Convert.ToDecimal(b.MaxValue),
+ StandardValue = Convert.ToDecimal(b.StandardValue),
+ MinValue = Convert.ToDecimal(b.MinValue),
Notes = b.Notes,
FcheckLevel = b.FcheckLevel,
FacLevel = b.FacLevel,
@@ -134,7 +136,8 @@
var qsItemIpiItems = db
.Queryable<QsItemIpiItem>()
.WhereIF(pid > 0, a => a.Pid == pid)
- .WhereIF(id > 0, a => a.Id == id).ToList();
+ .WhereIF(id > 0, a => a.Id == id)
+ .ToList();
var array = qsItemIpiItems.Select(s => s.Id).ToArray();
var qsItemIpiItemDetails = db.Queryable<QsItemIpiItemDetail>()
@@ -455,4 +458,48 @@
return withOracle;
}
+
+ public bool SJQaSubmit(QsItem item)
+ {
+ var (factory, company) = UserUtil.GetFactory(item.userNo);
+ try
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ 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_Id", item.gid, DbType.Int32,ParameterDirection.Input),
+ new("p_Flag", 1, DbType.Int32,ParameterDirection.Input),
+ new("p_User", item.userNo, DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_WOMDAA_SJ_UPDATE_RES(:p_Id,:p_Flag,:p_User,:o_Result, :o_Msg); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+
+ if ("1".Equals(resultValue)) {throw new Exception(messageValue);}
+ if ("0".Equals(resultValue)) {throw new Exception(messageValue);}
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 7514fbc..9acfaa9 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -159,26 +159,26 @@
PlanQty = a.Daa008,//宸ュ崟鏁伴噺
ItemModel = a.Daa004,//瑙勬牸
- ItemName = a.Daa003//浜у搧鍚嶇О
-
+ ItemName = a.Daa003,//浜у搧鍚嶇О
+ ItemId = a.Daa002//浜у搧鍚嶇О
}).OrderBy(s => s.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
}
- public List<QsQaItemXj01> setJYItem(string itemNo)
+ public List<QsQaItemXj01> setJYItem(decimal itemId)
{
var db = SqlSugarHelper.GetInstance();
var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+ && s.ItemId == itemId && s.Fsubmit == 1).Count();
if (count <= 0) return new List<QsQaItemXj01>();
return db
.Queryable<MesQualityStandard>()
.Where(b => b.QsType == "2"
- && b.ItemNo == itemNo).Select(
+ && b.ItemId == itemId).Select(
b => new QsQaItemXj01
{
ProjName = b.ProjName,
@@ -186,11 +186,11 @@
InspectionMethod = b.InspectionMethod,
UsingInstruments = b.UsingInstruments,
LevelNum = SqlFunc.IsNull(
- SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
- b.InspectionLevel),
- MaxValue = b.MaxValue,
- StandardValue = b.StandardValue,
- MinValue = b.MinValue,
+ SqlFunc.IsNull( Convert.ToDecimal(b.LevelNum) * Convert.ToDecimal(b.InspectionLevel) , 1),
+ Convert.ToDecimal(b.InspectionLevel)),
+ MaxValue = Convert.ToDecimal(b.MaxValue),
+ StandardValue = Convert.ToDecimal(b.StandardValue),
+ MinValue = Convert.ToDecimal(b.MinValue),
Notes = b.Notes,
FcheckLevel = b.FcheckLevel,
FacLevel = b.FacLevel,
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 058b28c..9de5e9d 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -190,7 +190,8 @@
//Caa024 = !string.IsNullOrEmpty(dto.FStockInQuaAuxQty)
//? Convert.ToDecimal(dto.FStockInQuaAuxQty)
// : null,//鍚堟牸鍝佸叆搴撴暟閲�
- ErpUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") //褰撳墠鏃堕棿
+ ErpUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), //褰撳墠鏃堕棿
+ FbillNo = dto.F_XIFG_Text_zzjxqd //缁勭粐闂撮渶姹傚崟
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
diff --git a/MES.Service/service/WomcaaWWManager.cs b/MES.Service/service/WomcaaWWManager.cs
index 8ca6ac1..fd06814 100644
--- a/MES.Service/service/WomcaaWWManager.cs
+++ b/MES.Service/service/WomcaaWWManager.cs
@@ -209,7 +209,8 @@
// Caa024 = !string.IsNullOrEmpty(dto.FStockInQuaAuxQty)
// ? Convert.ToDecimal(dto.FStockInQuaAuxQty)
// : null, //鍚堟牸鍝佸叆搴撴暟閲�
- ErpUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") //褰撳墠鏃堕棿
+ ErpUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), //褰撳墠鏃堕棿
+ FbillNo = dto.F_XIFG_Text_zzjxqd //缁勭粐闂撮渶姹傚崟
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
diff --git a/MESApplication/Controllers/QC/LljController.cs b/MESApplication/Controllers/QC/LljController.cs
index 19d5cb6..6fd9ee6 100644
--- a/MESApplication/Controllers/QC/LljController.cs
+++ b/MESApplication/Controllers/QC/LljController.cs
@@ -38,14 +38,14 @@
[HttpPost("setJYItem")]
public ResponseResult setJYItem([FromBody] JObject data)
{
- var itemNo = data["itemNo"].ToString();
+ var itemId = data["itemId"].ToString();
var quantity = Convert.ToDecimal(data["quantity"].ToString());
var releaseNo = data["releaseNo"].ToString();
try
{
dynamic resultInfos = new ExpandoObject();
var tbBillList =
- new LljService().SetItems(itemNo, quantity, releaseNo);
+ new LljService().SetItems(itemId, quantity, releaseNo);
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
diff --git a/MESApplication/Controllers/QC/RKJController.cs b/MESApplication/Controllers/QC/RKJController.cs
index 435d970..fb7b6ac 100644
--- a/MESApplication/Controllers/QC/RKJController.cs
+++ b/MESApplication/Controllers/QC/RKJController.cs
@@ -86,13 +86,13 @@
[HttpPost("setJYItem")]
public ResponseResult setJYItem([FromBody] JObject data)
{
- var itemNo = data["itemNo"].ToString();
+ var itemId = Convert.ToDecimal(data["itemId"].ToString());
var quantity = Convert.ToDecimal(data["quantity"].ToString());
try
{
dynamic resultInfos = new ExpandoObject();
var tbBillList =
- new RKJService().SetItems(itemNo, quantity);
+ new RKJService().SetItems(itemId, quantity);
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
diff --git a/MESApplication/Controllers/QC/SJController.cs b/MESApplication/Controllers/QC/SJController.cs
index 107d6b9..ed0a331 100644
--- a/MESApplication/Controllers/QC/SJController.cs
+++ b/MESApplication/Controllers/QC/SJController.cs
@@ -62,12 +62,13 @@
[HttpPost("SetQSItems")]
public ResponseResult SetQSItems([FromBody] JObject data)
{
- var itemNo = data["itemNo"].ToString();
+ //var itemNo = data["itemNo"].ToString();
+ var itemId = Convert.ToDecimal(data["itemId"].ToString());
try
{
dynamic resultInfos = new ExpandoObject();
var tbBillList = new SJService();
- var detail021 = tbBillList.SetQSItems(itemNo);
+ var detail021 = tbBillList.SetQSItems(itemId);
resultInfos.tbBillList = detail021;
return new ResponseResult
{
@@ -319,4 +320,26 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ [HttpPost("SJQaSubmit")]
+ public ResponseResult SJQaSubmit([FromBody] QsItem item)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new SJService();
+ var detail021 = tbBillList.SJQaSubmit(item);
+ resultInfos.tbBillList = detail021;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/XJController.cs b/MESApplication/Controllers/QC/XJController.cs
index e43cb9f..7f4a12c 100644
--- a/MESApplication/Controllers/QC/XJController.cs
+++ b/MESApplication/Controllers/QC/XJController.cs
@@ -159,12 +159,15 @@
[HttpPost("setJYItem")]
public ResponseResult setJYItem([FromBody] JObject data)
{
- var itemNo = data["itemNo"].ToString();
+ var itemId = Convert.ToDecimal(data["itemId"].ToString());
+
+
+
try
{
dynamic resultInfos = new ExpandoObject();
var tbBillList =
- new XJService().setJYItem(itemNo);
+ new XJService().setJYItem(itemId);
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index ff74ef9..eb77afd 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index 8c9aed7..79f1b06 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index b26a8c3..5ce26e3 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index ffc0030..30b3ab7 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 57c38a7..a3c8c39 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/log/2024122817.log b/MESApplication/bin/Debug/net8.0/log/2024122817.log
new file mode 100644
index 0000000..35d4b3f
--- /dev/null
+++ b/MESApplication/bin/Debug/net8.0/log/2024122817.log
@@ -0,0 +1,15 @@
+2024-12-28 17:23:08:665 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.RKJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\RKJController.cs:line 89\r\n at lambda_method98(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2024-12-28 17:23:08:674 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2024-12-28 17:23:27:519 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.RKJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\RKJController.cs:line 89\r\n at lambda_method98(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2024-12-28 17:23:27:520 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2024-12-28 17:23:36:604 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.RKJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\RKJController.cs:line 89\r\n at lambda_method98(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2024-12-28 17:23:36:605 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2024-12-28 17:27:11:301 鎺ュ彛寮傚父锛歿"ClassName":"System.FormatException","Message":"The input string '' was not in a correct format.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at System.Number.ThrowFormatException[TChar](ReadOnlySpan`1 value)\r\n at System.Number.ParseDecimal[TChar](ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info)\r\n at System.Convert.ToDecimal(String value)\r\n at MESApplication.Controllers.QC.RKJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\RKJController.cs:line 90\r\n at lambda_method36(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2146233033,"Source":"System.Private.CoreLib","WatsonBuckets":null}
+2024-12-28 17:27:11:308 寮傚父鎻愮ず淇℃伅锛�"The input string '' was not in a correct format."
+==================================================================================================================================
+2024-12-28 17:27:33:059 鎺ュ彛寮傚父锛歿"ClassName":"System.FormatException","Message":"The input string '' was not in a correct format.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at System.Number.ThrowFormatException[TChar](ReadOnlySpan`1 value)\r\n at System.Number.ParseDecimal[TChar](ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info)\r\n at System.Convert.ToDecimal(String value)\r\n at MESApplication.Controllers.QC.RKJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\RKJController.cs:line 90\r\n at lambda_method36(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2146233033,"Source":"System.Private.CoreLib","WatsonBuckets":null}
+2024-12-28 17:27:33:060 寮傚父鎻愮ず淇℃伅锛�"The input string '' was not in a correct format."
+==================================================================================================================================
diff --git a/MESApplication/bin/Debug/net8.0/log/2024122917.log b/MESApplication/bin/Debug/net8.0/log/2024122917.log
new file mode 100644
index 0000000..9fe7ec5
--- /dev/null
+++ b/MESApplication/bin/Debug/net8.0/log/2024122917.log
@@ -0,0 +1,3 @@
+2024-12-29 17:42:11:484 鎺ュ彛寮傚父锛歿"ClassName":"System.FormatException","Message":"The input string '' was not in a correct format.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at System.Number.ThrowFormatException[TChar](ReadOnlySpan`1 value)\r\n at System.Number.ParseDecimal[TChar](ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info)\r\n at System.Convert.ToDecimal(String value)\r\n at MESApplication.Controllers.QC.RKJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\RKJController.cs:line 90\r\n at lambda_method64(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2146233033,"Source":"System.Private.CoreLib","WatsonBuckets":null}
+2024-12-29 17:42:11:492 寮傚父鎻愮ず淇℃伅锛�"The input string '' was not in a correct format."
+==================================================================================================================================
diff --git a/MESApplication/bin/Debug/net8.0/log/2024123012.log b/MESApplication/bin/Debug/net8.0/log/2024123012.log
new file mode 100644
index 0000000..4ce2e3b
--- /dev/null
+++ b/MESApplication/bin/Debug/net8.0/log/2024123012.log
@@ -0,0 +1,3 @@
+2024-12-30 12:59:13:190 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.XJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\XJController.cs:line 162\r\n at lambda_method144(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2024-12-30 12:59:13:205 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
diff --git a/MESApplication/bin/Debug/net8.0/log/2024123013.log b/MESApplication/bin/Debug/net8.0/log/2024123013.log
new file mode 100644
index 0000000..f7ca711
--- /dev/null
+++ b/MESApplication/bin/Debug/net8.0/log/2024123013.log
@@ -0,0 +1,3 @@
+2024-12-30 13:00:36:004 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.XJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\XJController.cs:line 162\r\n at lambda_method144(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2024-12-30 13:00:36:012 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
diff --git a/MESApplication/bin/Debug/net8.0/log/2025010913.log b/MESApplication/bin/Debug/net8.0/log/2025010913.log
new file mode 100644
index 0000000..0ed1148
--- /dev/null
+++ b/MESApplication/bin/Debug/net8.0/log/2025010913.log
@@ -0,0 +1,24 @@
+2025-01-09 13:30:04:233 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method302(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-01-09 13:30:04:239 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-01-09 13:32:15:900 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method302(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-01-09 13:32:15:901 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-01-09 13:39:21:901 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method302(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-01-09 13:39:21:902 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-01-09 13:40:29:182 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method302(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-01-09 13:40:29:182 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-01-09 13:42:05:550 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method302(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-01-09 13:42:05:550 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-01-09 13:50:23:267 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method302(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-01-09 13:50:23:267 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-01-09 13:56:50:112 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method302(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-01-09 13:56:50:112 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-01-09 13:59:12:434 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method302(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-01-09 13:59:12:435 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
diff --git a/MESApplication/bin/Debug/net8.0/log/2025020617.log b/MESApplication/bin/Debug/net8.0/log/2025020617.log
new file mode 100644
index 0000000..d56ab7c
--- /dev/null
+++ b/MESApplication/bin/Debug/net8.0/log/2025020617.log
@@ -0,0 +1,18 @@
+2025-02-06 17:06:35:831 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.XJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\XJController.cs:line 162\r\n at lambda_method107(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-02-06 17:06:35:840 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-02-06 17:10:38:200 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.XJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\XJController.cs:line 162\r\n at lambda_method107(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-02-06 17:10:38:203 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-02-06 17:13:03:097 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.XJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\XJController.cs:line 162\r\n at lambda_method107(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-02-06 17:13:03:098 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-02-06 17:18:00:097 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.XJController.setJYItem(JObject data) in D:\\LTSMES\\Interface\\lts_pda\\MESApplication\\Controllers\\QC\\XJController.cs:line 162\r\n at lambda_method107(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-02-06 17:18:00:098 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-02-06 17:21:53:096 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.XJController.setJYItem(JObject data)\r\n at lambda_method107(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-02-06 17:21:53:096 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-02-06 17:27:18:471 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.XJController.setJYItem(JObject data)\r\n at lambda_method107(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-02-06 17:27:18:475 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index b862762..9140970 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index a785e45..b66d428 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index 9bba795..759e783 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index ffc0030..30b3ab7 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index 9e1ed31..19b7609 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index b862762..9140970 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index a785e45..b66d428 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index 9bba795..759e783 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index ffc0030..30b3ab7 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index 9e1ed31..19b7609 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3