From b66929fcda6db58e42d164cffffceda7548c406e Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 23 八月 2024 14:52:16 +0800
Subject: [PATCH] 入库检更改部分
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/appsettings.json | 6
MES.Service/Modes/Womdab.cs | 124 ++++++++++
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MESApplication.xml | 36 ---
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MESApplication/bin/Release/net8.0/publish/web.config | 3
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Dto/service/RKJDaa001.cs | 33 --
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/MesInvItemIns.cs | 60 ++--
MES.Service/Modes/QsItemOqcReq.cs | 203 ++++++++--------
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
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
MESApplication/bin/Release/net8.0/publish/MESApplication.xml | 36 ---
MES.Service/Modes/MesInvTransaction.cs | 74 ++++++
MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json | 5
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/service/QC/RKJService.cs | 75 +++---
MES.Service/Dto/service/RkDaa002.cs | 27 ++
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
MESApplication/bin/Release/net8.0/publish/appsettings.json | 6
32 files changed, 409 insertions(+), 279 deletions(-)
diff --git a/MES.Service/Dto/service/RKJDaa001.cs b/MES.Service/Dto/service/RKJDaa001.cs
index d0b9ee6..e7a61de 100644
--- a/MES.Service/Dto/service/RKJDaa001.cs
+++ b/MES.Service/Dto/service/RKJDaa001.cs
@@ -9,37 +9,16 @@
public class RKJDaa001 : Page
{
// 閫佹鎵规
- [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; }
+ [SugarColumn(ColumnName = "ITEM_IN_ID")]
+ public decimal? ItemInId { get; set; }
// 浠诲姟鍗曞彿
- [SugarColumn(ColumnName = "TASK_NO")] public string? TaskNo { get; set; }
+ [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; }
+
+ [SugarColumn(ColumnName = "ITEM_NAME")]
+ public string? ItemName { get; set; }
// 璁㈠崟鏁伴噺
[SugarColumn(ColumnName = "QUANTITY")]
public decimal? Quantity { get; set; }
-
- // 鐢熶骇璁㈠崟
- [SugarColumn(ColumnName = "MOCODE")] public string? Mocode { get; set; }
-
- // 瑙勬牸鍨嬪彿
- [SugarColumn(ColumnName = "BOARD_MODEL")]
- public string? BoardModel { get; set; }
-
- // 浜у搧绫诲瀷
- [SugarColumn(ColumnName = "CBILL_NO")] public string? cbillNo { get; set; }
-
- // 浜х嚎缂栫爜
- [SugarColumn(ColumnName = "LINE_NO")] public string? LineNo { get; set; }
-
-
- //ITEM_NO
- [SugarColumn(ColumnName = "ITEM_NO")] public string? itemNo { get; set; }
-
-
- [SugarColumn(ColumnName = "COLOR_NAME")]
- public string? ColorName { get; set; }
-
-
- [SugarColumn(ColumnName = "BOARD_NAME")]
- public string? BoardName { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/RkDaa002.cs b/MES.Service/Dto/service/RkDaa002.cs
new file mode 100644
index 0000000..cd53487
--- /dev/null
+++ b/MES.Service/Dto/service/RkDaa002.cs
@@ -0,0 +1,27 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Dto.service;
+
+[SugarTable("V_QS_RK_DAA002")] // Specifies the table/view name
+public class RkDaa002
+{
+ [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; }
+
+ [SugarColumn(ColumnName = "QUANTITY")]
+ public decimal? Quantity { get; set; }
+
+ [SugarColumn(ColumnName = "CBILL_NO")] public string? CBillNo { get; set; }
+
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ [SugarColumn(ColumnName = "ITEM_IN_ID")]
+ public decimal? ItemInId { get; set; }
+
+ [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; }
+
+ [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; }
+
+ [SugarColumn(ColumnName = "ITEM_NAME")]
+ public string? ItemName { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemIns.cs b/MES.Service/Modes/MesInvItemIns.cs
index 930e1a3..2e05e27 100644
--- a/MES.Service/Modes/MesInvItemIns.cs
+++ b/MES.Service/Modes/MesInvItemIns.cs
@@ -19,7 +19,7 @@
/// 鍏ュ簱鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "BILL_NO")]
- public string BillNo { get; set; }
+ public string? BillNo { get; set; }
/// <summary>
/// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
@@ -37,13 +37,13 @@
/// 鍘熷洜
/// </summary>
[SugarColumn(ColumnName = "REASON")]
- public string Reason { get; set; }
+ public string? Reason { get; set; }
/// <summary>
/// 鍒涘缓浜�
/// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
- public string CreateBy { get; set; }
+ public string? CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
@@ -55,7 +55,7 @@
/// 鏈�鍚庢洿鏂颁汉
/// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string LastupdateBy { get; set; }
+ public string? LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
@@ -79,25 +79,25 @@
/// 澶囨敞
/// </summary>
[SugarColumn(ColumnName = "REMARK")]
- public string Remark { get; set; }
+ public string? Remark { get; set; }
/// <summary>
/// 閫佽揣鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "PAPER_BILL_NO")]
- public string PaperBillNo { get; set; }
+ public string? PaperBillNo { get; set; }
/// <summary>
/// 閫�鏂欎汉宸ュ彿
/// </summary>
[SugarColumn(ColumnName = "USER_NO_BACK")]
- public string UserNoBack { get; set; }
+ public string? UserNoBack { get; set; }
/// <summary>
/// 瀹℃牳浜�
/// </summary>
[SugarColumn(ColumnName = "CHECK_USER")]
- public string CheckUser { get; set; }
+ public string? CheckUser { get; set; }
/// <summary>
/// 瀹℃牳鏃ユ湡
@@ -109,7 +109,7 @@
/// 鐢熶骇璁㈠崟鍙�
/// </summary>
[SugarColumn(ColumnName = "TASK_NO")]
- public string TaskNo { get; set; }
+ public string? TaskNo { get; set; }
/// <summary>
/// 鍏ュ簱鏃ユ湡
@@ -121,7 +121,7 @@
/// 妫�楠岀粨鏋�
/// </summary>
[SugarColumn(ColumnName = "CHECK_RES")]
- public string CheckRes { get; set; }
+ public string? CheckRes { get; set; }
/// <summary>
/// 宸叉崱鏁伴噺
@@ -133,31 +133,31 @@
/// 棰嗘枡宸ユ
/// </summary>
[SugarColumn(ColumnName = "MMLIST")]
- public string Mmlist { get; set; }
+ public string? Mmlist { get; set; }
/// <summary>
/// SAP閲囪喘璁㈠崟鍙�
/// </summary>
[SugarColumn(ColumnName = "EBELN")]
- public string Ebeln { get; set; }
+ public string? Ebeln { get; set; }
/// <summary>
/// 浠撳簱缂栫爜
/// </summary>
[SugarColumn(ColumnName = "DEPOTS_CODE")]
- public string DepotsCode { get; set; }
+ public string? DepotsCode { get; set; }
/// <summary>
/// 浜嬪姟绫诲瀷缂栫爜
/// </summary>
[SugarColumn(ColumnName = "TRANSCTION_NO")]
- public string TransctionNo { get; set; }
+ public string? TransctionNo { get; set; }
/// <summary>
/// 渚涘簲鍟嗙紪鐮�
/// </summary>
[SugarColumn(ColumnName = "SUPP_NO")]
- public string SuppNo { get; set; }
+ public string? SuppNo { get; set; }
/// <summary>
/// 鍏ュ簱鐘舵��
@@ -169,7 +169,7 @@
/// 宸ュ巶缂栫爜
/// </summary>
[SugarColumn(ColumnName = "FACTORY")]
- public string Factory { get; set; }
+ public string? Factory { get; set; }
/// <summary>
/// 鏄惁宸插洖鍐橲AP
@@ -181,7 +181,7 @@
/// SAP杩斿洖鍗曟嵁
/// </summary>
[SugarColumn(ColumnName = "SAPNO")]
- public string Sapno { get; set; }
+ public string? Sapno { get; set; }
/// <summary>
/// SAP杩斿洖骞翠唤
@@ -193,7 +193,7 @@
/// SAP杩斿洖淇℃伅
/// </summary>
[SugarColumn(ColumnName = "SAPTEXT")]
- public string Saptext { get; set; }
+ public string? Saptext { get; set; }
/// <summary>
/// 纭鍏ュ簱鏃ユ湡
@@ -211,7 +211,7 @@
/// 瀹℃牳鍏ュ簱浜�
/// </summary>
[SugarColumn(ColumnName = "INSBY")]
- public string Insby { get; set; }
+ public string? Insby { get; set; }
/// <summary>
/// 鏄惁鏄剧ず
@@ -223,7 +223,7 @@
/// 鍏徃浠ｇ爜
/// </summary>
[SugarColumn(ColumnName = "COMPANY")]
- public string Company { get; set; }
+ public string? Company { get; set; }
/// <summary>
/// 鎬ユ枡鏍囪瘑
@@ -235,7 +235,7 @@
/// 閲囪喘鍗曡鍙�
/// </summary>
[SugarColumn(ColumnName = "LINE_NO")]
- public string LineNo { get; set; }
+ public string? LineNo { get; set; }
/// <summary>
/// 鍐查攢浜嬪姟绫诲瀷缂栫爜
@@ -247,43 +247,43 @@
/// 宸ュ崟琛屽彿
/// </summary>
[SugarColumn(ColumnName = "TASK_LINO")]
- public string TaskLino { get; set; }
+ public string? TaskLino { get; set; }
/// <summary>
/// 鎶曟枡閫氱煡鍗曞崟鍙�
/// </summary>
[SugarColumn(ColumnName = "FBILLNO")]
- public string Fbillno { get; set; }
+ public string? Fbillno { get; set; }
/// <summary>
/// 鎶曟枡鍗曡鍙�
/// </summary>
[SugarColumn(ColumnName = "FBILL_LINO")]
- public string FbillLino { get; set; }
+ public string? FbillLino { get; set; }
/// <summary>
/// 瀹㈡埛缂栧彿
/// </summary>
[SugarColumn(ColumnName = "CUST_NO")]
- public string CustNo { get; set; }
+ public string? CustNo { get; set; }
/// <summary>
/// 瀹㈡埛鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "CUST_NAME")]
- public string CustName { get; set; }
+ public string? CustName { get; set; }
/// <summary>
/// IQC妫�楠屽崟鍙�
/// </summary>
[SugarColumn(ColumnName = "IQC_RELEASE_NO")]
- public string IqcReleaseNo { get; set; }
+ public string? IqcReleaseNo { get; set; }
/// <summary>
/// 鍒拌揣鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "CBILL_NO")]
- public string CbillNo { get; set; }
+ public string? CbillNo { get; set; }
/// <summary>
/// 0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇�
@@ -295,7 +295,7 @@
/// 鍏ュ簱瀹℃牳浜�
/// </summary>
[SugarColumn(ColumnName = "FCHECK_USER")]
- public string FcheckUser { get; set; }
+ public string? FcheckUser { get; set; }
/// <summary>
/// 鍏ュ簱瀹℃牳鏃ユ湡
@@ -307,7 +307,7 @@
/// 浠诲姟姹囨姤鍗�
/// </summary>
[SugarColumn(ColumnName = "RBILL_NO")]
- public string RbillNo { get; set; }
+ public string? RbillNo { get; set; }
//鍦ㄦ暟鎹簱鏌ヨ鏃跺拷鐣ヨ繖涓瓧娈�
[SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
diff --git a/MES.Service/Modes/MesInvTransaction.cs b/MES.Service/Modes/MesInvTransaction.cs
new file mode 100644
index 0000000..3c920d9
--- /dev/null
+++ b/MES.Service/Modes/MesInvTransaction.cs
@@ -0,0 +1,74 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 搴撳瓨浜嬪姟澶勭悊琛�
+ ///</summary>
+ [SugarTable("MES_INV_TRANSACTION")]
+ public class MesInvTransaction
+ {
+ /// <summary>
+ /// ID
+ ///</summary>
+ [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true )]
+ public decimal Id { get; set; }
+ /// <summary>
+ /// 浜嬪姟绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="TRANSACTION_NAME" )]
+ public string TransactionName { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName="REMARK" )]
+ public string Remark { 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="LASTUPDATE_BY" )]
+ public string LastupdateBy { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName="LASTUPDATE_DATE" )]
+ public DateTime? LastupdateDate { get; set; }
+ /// <summary>
+ /// 鍗曟嵁ID
+ ///</summary>
+ [SugarColumn(ColumnName="BUSINESS_ID" )]
+ public decimal? BusinessId { get; set; }
+ /// <summary>
+ /// 浜ゆ槗绫诲瀷|1-鍏ュ簱0-杞簱-1鍑哄簱
+ ///</summary>
+ [SugarColumn(ColumnName="BUSINESS_TYPE" )]
+ public decimal? BusinessType { get; set; }
+ /// <summary>
+ /// 浜嬪姟缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="TRANSACTION_NO" )]
+ public decimal? TransactionNo { get; set; }
+ /// <summary>
+ /// 鍒嗗巶缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="FACTORY" )]
+ public string Factory { get; set; }
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ ///</summary>
+ [SugarColumn(ColumnName="COMPANY" )]
+ public string Company { get; set; }
+ }
+}
diff --git a/MES.Service/Modes/QsItemOqcReq.cs b/MES.Service/Modes/QsItemOqcReq.cs
index 82a24fd..a934f30 100644
--- a/MES.Service/Modes/QsItemOqcReq.cs
+++ b/MES.Service/Modes/QsItemOqcReq.cs
@@ -12,52 +12,6 @@
public class QsItemOqcReq
{
/// <summary>
- /// 宸ュ崟鍙�
- /// </summary>
- [Column("BILL_NO")]
- [SugarColumn(ColumnName = "BILL_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "宸ュ崟鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string? BillNo { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 妫�楠屼汉鍛�
- /// </summary>
- [Column("FCHECK_BY")]
- [SugarColumn(ColumnName = "FCHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屼汉鍛橀暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckBy { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [Column("FCHECK_DATE")]
- [SugarColumn(ColumnName = "FCHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckDate { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [Column("FCHECK_RESU")]
- [SugarColumn(ColumnName = "FCHECK_RESU")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠岀粨鏋滈暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckResu { get; set; }
-
- /// <summary>
/// 搴忓垪SEQ_QS_RKJ
/// </summary>
[Column("ID")]
@@ -66,70 +20,121 @@
public decimal? Id { get; set; }
/// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [Column("ITEM_NO")]
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鐗╂枡缂栫爜闀垮害涓嶈兘瓒呭嚭100")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏇存柊浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃ユ湡
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("MODIFY1_BY")]
- [SugarColumn(ColumnName = "MODIFY1_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "Modify1By闀垮害涓嶈兘瓒呭嚭100")]
- public string? Modify1By { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟鍙�
- /// </summary>
- [Column("RELEASE_NO")]
- [SugarColumn(ColumnName = "RELEASE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屽崟鍙烽暱搴︿笉鑳借秴鍑�100")]
+ /// 妫�楠屽崟鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "RELEASE_NO")]
public string? ReleaseNo { get; set; }
/// <summary>
- /// 妯″叿鍙�
- /// </summary>
- [Column("MOID_NUM")]
- [SugarColumn(ColumnName = "MOID_NUM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妯″叿鍙烽暱搴︿笉鑳借秴鍑�50")]
+ /// 妫�楠屾棩鏈�
+ ///</summary>
+ [SugarColumn(ColumnName = "FCHECK_DATE")]
+ public DateTime? FcheckDate { get; set; }
+
+ /// <summary>
+ /// 妫�楠屼汉鍛�
+ ///</summary>
+ [SugarColumn(ColumnName = "FCHECK_BY")]
+ public string? FcheckBy { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string? ItemNo { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ ///</summary>
+ [SugarColumn(ColumnName = "FCHECK_RESU")]
+ public string? FcheckResu { 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 = "LASTUPDATE_BY")]
+ public string? LastupdateBy { get; set; }
+
+ /// <summary>
+ /// 鏇存柊鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ public DateTime? LastupdateDate { get; set; }
+
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "MODIFY1_BY")]
+ public string? Modify1By { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string? BillNo { get; set; }
+
+ /// <summary>
+ /// 妯″叿鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "MOID_NUM")]
public string? MoidNum { get; set; }
+ /// <summary>
+ /// 瀹℃牳浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "FSUBMIT_BY")]
+ public string? FsubmitBy { get; set; }
- //Remarks
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
+ /// <summary>
+ /// 瀹℃牳鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "FSUBMIT_DATE")]
+ public DateTime? FsubmitDate { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "FSUBMIT")]
+ public decimal? Fsubmit { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARKS")]
public string? Remarks { get; set; }
- [SugarColumn(IsIgnore = true)] public string? LineName { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
- [SugarColumn(IsIgnore = true)] public string? BoardName { get; set; }
+ // 娣诲姞浠ヤ笅瀛楁浠ラ�傚簲鏌ヨ杩斿洖鐨勬暟鎹�
+ [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
- [SugarColumn(IsIgnore = true)] public string? Mocode { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? BoardModel { get; set; }
-
- [SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
[SugarColumn(IsIgnore = true)] public string? TaskNo { get; set; }
- //colorName
- [SugarColumn(IsIgnore = true)] public string? ColorName { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? CbillNo { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Dab001 { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Daa015 { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? LineNo { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womdab.cs b/MES.Service/Modes/Womdab.cs
new file mode 100644
index 0000000..80c6344
--- /dev/null
+++ b/MES.Service/Modes/Womdab.cs
@@ -0,0 +1,124 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 宸ュ崟瀛愯〃
+ ///</summary>
+ [SugarTable("WOMDAB")]
+ public class Womdab
+ {
+ /// <summary>
+ /// 鑷鍒�
+ ///</summary>
+ [SugarColumn(ColumnName="ID" )]
+ public decimal? Id { get; set; }
+ /// <summary>
+ /// PID
+ ///</summary>
+ [SugarColumn(ColumnName="PID" )]
+ public decimal? Pid { get; set; }
+ /// <summary>
+ /// 宸ュ崟鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="DAB001" )]
+ public string Dab001 { get; set; }
+ /// <summary>
+ /// 搴忓彿
+ ///</summary>
+ [SugarColumn(ColumnName="DAB002" )]
+ public string Dab002 { get; set; }
+ /// <summary>
+ /// 鏉愭枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="DAB003" )]
+ public string Dab003 { get; set; }
+ /// <summary>
+ /// 鏉愭枡鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName="DAB004" )]
+ public string Dab004 { get; set; }
+ /// <summary>
+ /// 鏉愭枡瑙勬牸
+ ///</summary>
+ [SugarColumn(ColumnName="DAB005" )]
+ public string Dab005 { get; set; }
+ /// <summary>
+ /// 闇�棰嗙敤閲�
+ ///</summary>
+ [SugarColumn(ColumnName="DAB006" )]
+ public decimal? Dab006 { get; set; }
+ /// <summary>
+ /// 宸查鐢ㄩ噺
+ ///</summary>
+ [SugarColumn(ColumnName="DAB007" )]
+ public decimal? Dab007 { get; set; }
+ /// <summary>
+ /// 宸ヨ壓
+ ///</summary>
+ [SugarColumn(ColumnName="DAB008" )]
+ public string Dab008 { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName="DAB009" )]
+ public string Dab009 { get; set; }
+ /// <summary>
+ /// 鏉愭枡绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="DAB010" )]
+ public string Dab010 { get; set; }
+ /// <summary>
+ /// 涓绘枡
+ ///</summary>
+ [SugarColumn(ColumnName="DAB011" )]
+ public string Dab011 { get; set; }
+ /// <summary>
+ /// 缁勬垚鐢ㄩ噺
+ ///</summary>
+ [SugarColumn(ColumnName="DAB012" )]
+ public decimal? Dab012 { get; set; }
+ /// <summary>
+ /// 搴曟暟
+ ///</summary>
+ [SugarColumn(ColumnName="DAB013" )]
+ public decimal? Dab013 { get; set; }
+ /// <summary>
+ /// 鏄惁鏇挎枡
+ ///</summary>
+ [SugarColumn(ColumnName="DAB014" )]
+ public string Dab014 { get; set; }
+ /// <summary>
+ /// 鐐逛綅
+ ///</summary>
+ [SugarColumn(ColumnName="DAB015" )]
+ public string Dab015 { get; set; }
+ /// <summary>
+ /// 鎶曟枡鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="DAB016" )]
+ public string Dab016 { get; set; }
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="DAB017" )]
+ public string Dab017 { get; set; }
+ /// <summary>
+ /// 浠撳簱鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName="DAB018" )]
+ public string Dab018 { get; set; }
+ /// <summary>
+ /// 棰嗘枡鏂瑰紡
+ ///</summary>
+ [SugarColumn(ColumnName="DAB019" )]
+ public string Dab019 { get; set; }
+ /// <summary>
+ /// 鍥哄畾鎹熻��
+ ///</summary>
+ [SugarColumn(ColumnName="SCRAPQTY" )]
+ public decimal? Scrapqty { get; set; }
+ }
+}
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 9f0b7b9..63a7a02 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 91b1dec..d9ad629 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 4f74eae..64a9a86 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 668f6a7..e9dbd0c 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/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index aeca6d4..8656f8a 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -54,13 +54,14 @@
//鑾峰彇宸ュ崟鍙�
- public List<RKJDaa001> GetDaa001s(string lineNo)
+ public List<RkDaa002> GetDaa001s(string lineNo)
{
var db = SqlSugarHelper.GetInstance();
- return db.Queryable<RKJDaa001>()
- .Where(t => t.LineNo == lineNo)
- .OrderBy(t => t.BillNo, OrderByType.Desc)
- .ToList();
+ // return db.Queryable<RKJDaa001>()
+ // .Where(t => t.LineNo == lineNo)
+ // .OrderBy(t => t.BillNo, OrderByType.Desc)
+ // .ToList();
+ return null;
}
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
@@ -457,46 +458,42 @@
{
var db = SqlSugarHelper.GetInstance();
- var id = Convert.ToDecimal(queryObj.id);
-
- string[]? lineNo = null;
-
- if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
- lineNo = _baseService.getUserLineNo(queryObj.createUser);
-
- return db.Queryable<QsItemOqcReq, RKJDaa001>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.BillNo == b.BillNo))
- .WhereIF(lineNo != null && lineNo.Length > 0,
- (a, b) => lineNo.Contains(b.LineNo))
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- "鏈畬鎴�".Equals(queryObj.result),
- (a, b) => a.FcheckResu == null)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- !"鏈畬鎴�".Equals(queryObj.result),
- (a, b) => a.FcheckResu != null)
- .WhereIF(id > 0, (a, b) => a.Id == id)
- .Select((a, b) => new QsItemOqcReq
+ return db
+ .Queryable<QsItemOqcReq, Womdaa, MesItems, MesInvItemIns, Womdab,
+ MesInvTransaction, RKJDaa001>(
+ (a, da, b, c, d, ca, m) => new JoinQueryInfos(
+ JoinType.Left, da.Daa001 == a.BillNo,
+ JoinType.Left, a.ItemId == b.Id,
+ JoinType.Left, a.BillNo == c.BillNo,
+ JoinType.Left, c.CbillNo == d.Dab001,
+ JoinType.Left,
+ c.TransctionNo == ca.TransactionNo.ToString() &&
+ c.Company == ca.Company && c.Factory == ca.Factory,
+ JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo
+ ))
+ .Select((a, da, b, c, d, ca, m) => new QsItemOqcReq
{
- Id = a.Id,
- ReleaseNo = a.ReleaseNo,
BillNo = a.BillNo,
- LineName = b.LineNo,
- Quantity = b.Quantity,
- CreateBy = a.CreateBy,
+ Remarks = a.Remarks,
+ Id = a.Id,
CreateDate = a.CreateDate,
- ItemNo = a.ItemNo,
- Mocode = b.Mocode,
- BoardModel = b.BoardModel,
- TaskNo = b.TaskNo,
+ CreateBy = a.CreateBy,
FcheckResu = a.FcheckResu,
+ ItemNo = a.ItemNo,
FcheckBy = a.FcheckBy,
FcheckDate = a.FcheckDate,
- MoidNum = a.MoidNum,
- BoardName = b.BoardName,
- ColorName = b.ColorName,
- Remarks = a.Remarks
+ ReleaseNo = a.ReleaseNo,
+ // 娣诲姞鍏朵粬瀛楁
+ // 濡傛灉鍦� QsItemOqcReq 涓畾涔変簡棰濆瀛楁锛屽垯闇�瑕佸皢瀹冧滑璧嬪��
+ // 渚嬪:
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel,
+ TaskNo = c.TaskNo,
+ CbillNo = c.CbillNo,
+ Dab001 = d.Dab001,
+ Daa015 = da.Daa015,
+ LineNo = c.LineNo,
+ Quantity = m.Quantity
}).OrderBy(a => a.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
}
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 9f0b7b9..63a7a02 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 91b1dec..d9ad629 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 1a0c5d7..03e3c54 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 cfa4c24..4067afb 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 7aa1bc8..0159b86 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/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 4f74eae..64a9a86 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 668f6a7..e9dbd0c 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 a7fa172..b1da865 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 030469c..4067afb 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 77021cb..83ea1b9 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/MESApplication.xml b/MESApplication/bin/Release/net8.0/MESApplication.xml
index 57c4b2f..f07d581 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -678,42 +678,6 @@
</summary>
<returns></returns>
</member>
- <member name="M:MESApplication.Controllers.OrganizeController.GetList">
- <summary>
- 鑾峰彇鎵�鏈�
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.GetById(System.Int32)">
- <summary>
- 鏍规嵁涓婚敭鑾峰彇
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.DeleteByIds(System.Object[])">
- <summary>
- 鏍规嵁涓婚敭鍒犻櫎
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.Add(MES.Service.Modes.Organize)">
- <summary>
- 娣诲姞
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.InsertReturnIdentity(MES.Service.Modes.Organize)">
- <summary>
- 娣诲姞杩斿洖鑷
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.Update(MES.Service.Modes.Organize)">
- <summary>
- 淇敼
- </summary>
- <returns></returns>
- </member>
<member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
<summary>
鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Release/net8.0/appsettings.json b/MESApplication/bin/Release/net8.0/appsettings.json
index d3d3f6f..41c8e8b 100644
--- a/MESApplication/bin/Release/net8.0/appsettings.json
+++ b/MESApplication/bin/Release/net8.0/appsettings.json
@@ -8,8 +8,8 @@
},
"AllowedHosts": "*",
"AppSettings": {
- "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
- "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"
+ "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
+ "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
}
}
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index 4f74eae..64a9a86 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 668f6a7..e9dbd0c 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.deps.json b/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
index 6cd3c2a..e23a3b1 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
@@ -1160,10 +1160,7 @@
"SqlSugarCore": "5.1.4.158"
},
"runtime": {
- "MES.Service.dll": {
- "assemblyVersion": "1.0.0",
- "fileVersion": "1.0.0.0"
- }
+ "MES.Service.dll": {}
}
}
}
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index a7fa172..b1da865 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 030469c..4067afb 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 77021cb..83ea1b9 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
index 57c4b2f..f07d581 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -678,42 +678,6 @@
</summary>
<returns></returns>
</member>
- <member name="M:MESApplication.Controllers.OrganizeController.GetList">
- <summary>
- 鑾峰彇鎵�鏈�
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.GetById(System.Int32)">
- <summary>
- 鏍规嵁涓婚敭鑾峰彇
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.DeleteByIds(System.Object[])">
- <summary>
- 鏍规嵁涓婚敭鍒犻櫎
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.Add(MES.Service.Modes.Organize)">
- <summary>
- 娣诲姞
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.InsertReturnIdentity(MES.Service.Modes.Organize)">
- <summary>
- 娣诲姞杩斿洖鑷
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.Update(MES.Service.Modes.Organize)">
- <summary>
- 淇敼
- </summary>
- <returns></returns>
- </member>
<member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
<summary>
鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Release/net8.0/publish/appsettings.json b/MESApplication/bin/Release/net8.0/publish/appsettings.json
index d3d3f6f..41c8e8b 100644
--- a/MESApplication/bin/Release/net8.0/publish/appsettings.json
+++ b/MESApplication/bin/Release/net8.0/publish/appsettings.json
@@ -8,8 +8,8 @@
},
"AllowedHosts": "*",
"AppSettings": {
- "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
- "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"
+ "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
+ "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
}
}
diff --git a/MESApplication/bin/Release/net8.0/publish/web.config b/MESApplication/bin/Release/net8.0/publish/web.config
index 00d405f..4cc5990 100644
--- a/MESApplication/bin/Release/net8.0/publish/web.config
+++ b/MESApplication/bin/Release/net8.0/publish/web.config
@@ -8,5 +8,4 @@
<aspNetCore processPath="dotnet" arguments=".\MESApplication.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
-</configuration>
-<!--ProjectGuid: C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA-->
\ No newline at end of file
+</configuration>
\ No newline at end of file
--
Gitblit v1.9.3