From fd0eeaae6617b3b853822a03482479b653ad0f92 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期四, 26 九月 2024 18:05:48 +0800 Subject: [PATCH] 入库检 --- MESApplication/bin/Release/net8.0/MESApplication.exe | 0 MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0 MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0 MESApplication/bin/Debug/net8.0/MESApplication.dll | 0 MES.Service/bin/Debug/net8.0/MES.Service.dll | 0 MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0 MES.Service/service/QC/RKJService.cs | 3 MESApplication/bin/Debug/net8.0/MES.Service.dll | 0 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/Debug/net8.0/MESApplication.exe | 0 MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0 MES.Service/bin/Release/net8.0/MES.Service.dll | 0 MES.Service/Modes/MesInvItemIns.cs | 264 +++++++++++++++++++++++++++------------------------- MES.Service/Modes/QsItemOqcReq.cs | 2 MESApplication/bin/Release/net8.0/MES.Service.pdb | 0 MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0 MES.Service/bin/Release/net8.0/MES.Service.pdb | 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 22 files changed, 139 insertions(+), 130 deletions(-) diff --git a/MES.Service/Modes/MesInvItemIns.cs b/MES.Service/Modes/MesInvItemIns.cs index 2e05e27..a65fee7 100644 --- a/MES.Service/Modes/MesInvItemIns.cs +++ b/MES.Service/Modes/MesInvItemIns.cs @@ -16,298 +16,304 @@ public decimal Id { get; set; } /// <summary> - /// 鍏ュ簱鍗曞彿 - /// </summary> + /// 鍏ュ簱鍗曞彿 + ///</summary> [SugarColumn(ColumnName = "BILL_NO")] - public string? BillNo { get; set; } + public string BillNo { get; set; } /// <summary> - /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴 - /// </summary> + /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴 + ///</summary> [SugarColumn(ColumnName = "STATUS")] public short? Status { get; set; } /// <summary> - /// 浠撳簱 - /// </summary> + /// 浠撳簱 + ///</summary> [SugarColumn(ColumnName = "DEPOTS_ID")] public decimal? DepotsId { get; set; } /// <summary> - /// 鍘熷洜 - /// </summary> + /// 鍘熷洜 + ///</summary> [SugarColumn(ColumnName = "REASON")] - public string? Reason { get; set; } + public string Reason { get; set; } /// <summary> - /// 鍒涘缓浜� - /// </summary> + /// 鍒涘缓浜� + ///</summary> [SugarColumn(ColumnName = "CREATE_BY")] - public string? CreateBy { get; set; } + public string CreateBy { get; set; } /// <summary> - /// 鍒涘缓鏃堕棿 - /// </summary> + /// 鍒涘缓鏃堕棿 + ///</summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> - /// 鏈�鍚庢洿鏂颁汉 - /// </summary> + /// 鏈�鍚庢洿鏂颁汉 + ///</summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] - public string? LastupdateBy { get; set; } + public string LastupdateBy { get; set; } /// <summary> - /// 鏈�鍚庢洿鏂版椂闂� - /// </summary> + /// 鏈�鍚庢洿鏂版椂闂� + ///</summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> - /// 鍗曟嵁绫诲瀷ID - /// </summary> + /// 鍗曟嵁绫诲瀷ID + ///</summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } /// <summary> - /// 浜嬪姟绫诲瀷ID - /// </summary> + /// 浜嬪姟绫诲瀷ID + ///</summary> [SugarColumn(ColumnName = "TRANSACTION_ID")] public decimal? TransactionId { get; set; } /// <summary> - /// 澶囨敞 - /// </summary> + /// 澶囨敞 + ///</summary> [SugarColumn(ColumnName = "REMARK")] - public string? Remark { get; set; } + public string Remark { get; set; } /// <summary> - /// 閫佽揣鍗曞彿 - /// </summary> + /// 閫佽揣鍗曞彿 + ///</summary> [SugarColumn(ColumnName = "PAPER_BILL_NO")] - public string? PaperBillNo { get; set; } + public string PaperBillNo { get; set; } /// <summary> - /// 閫�鏂欎汉宸ュ彿 - /// </summary> + /// 閫�鏂欎汉宸ュ彿 + ///</summary> [SugarColumn(ColumnName = "USER_NO_BACK")] - public string? UserNoBack { get; set; } + public string UserNoBack { get; set; } /// <summary> - /// 瀹℃牳浜� - /// </summary> + /// 瀹℃牳浜� + ///</summary> [SugarColumn(ColumnName = "CHECK_USER")] - public string? CheckUser { get; set; } + public string CheckUser { get; set; } /// <summary> - /// 瀹℃牳鏃ユ湡 - /// </summary> + /// 瀹℃牳鏃ユ湡 + ///</summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> - /// 鐢熶骇璁㈠崟鍙� - /// </summary> + /// 鐢熶骇璁㈠崟鍙� + ///</summary> [SugarColumn(ColumnName = "TASK_NO")] - public string? TaskNo { get; set; } + public string TaskNo { get; set; } /// <summary> - /// 鍏ュ簱鏃ユ湡 - /// </summary> + /// 鍏ュ簱鏃ユ湡 + ///</summary> [SugarColumn(ColumnName = "INS_DATE")] public DateTime? InsDate { get; set; } /// <summary> - /// 妫�楠岀粨鏋� - /// </summary> + /// 妫�楠岀粨鏋� + ///</summary> [SugarColumn(ColumnName = "CHECK_RES")] - public string? CheckRes { get; set; } + public string CheckRes { get; set; } /// <summary> - /// 宸叉崱鏁伴噺 - /// </summary> + /// 宸叉崱鏁伴噺 + ///</summary> [SugarColumn(ColumnName = "CHECK_QTY")] public decimal? CheckQty { get; set; } /// <summary> - /// 棰嗘枡宸ユ - /// </summary> + /// 棰嗘枡宸ユ + ///</summary> [SugarColumn(ColumnName = "MMLIST")] - public string? Mmlist { get; set; } + public string Mmlist { get; set; } /// <summary> - /// SAP閲囪喘璁㈠崟鍙� - /// </summary> + /// SAP閲囪喘璁㈠崟鍙� + ///</summary> [SugarColumn(ColumnName = "EBELN")] - public string? Ebeln { get; set; } + public string Ebeln { get; set; } /// <summary> - /// 浠撳簱缂栫爜 - /// </summary> + /// 浠撳簱缂栫爜 + ///</summary> [SugarColumn(ColumnName = "DEPOTS_CODE")] - public string? DepotsCode { get; set; } + public string DepotsCode { get; set; } /// <summary> - /// 浜嬪姟绫诲瀷缂栫爜 - /// </summary> + /// 浜嬪姟绫诲瀷缂栫爜 + ///</summary> [SugarColumn(ColumnName = "TRANSCTION_NO")] - public string? TransctionNo { get; set; } + public string TransctionNo { get; set; } /// <summary> - /// 渚涘簲鍟嗙紪鐮� - /// </summary> + /// 渚涘簲鍟嗙紪鐮� + ///</summary> [SugarColumn(ColumnName = "SUPP_NO")] - public string? SuppNo { get; set; } + public string SuppNo { get; set; } /// <summary> - /// 鍏ュ簱鐘舵�� - /// </summary> + /// 鍏ュ簱鐘舵�� + ///</summary> [SugarColumn(ColumnName = "FSTATUS")] public short? Fstatus { get; set; } /// <summary> - /// 宸ュ巶缂栫爜 - /// </summary> + /// 宸ュ巶缂栫爜 + ///</summary> [SugarColumn(ColumnName = "FACTORY")] - public string? Factory { get; set; } + public string Factory { get; set; } /// <summary> - /// 鏄惁宸插洖鍐橲AP - /// </summary> + /// 鏄惁宸插洖鍐橲AP + ///</summary> [SugarColumn(ColumnName = "SAPSTATUS")] public short? Sapstatus { get; set; } /// <summary> - /// SAP杩斿洖鍗曟嵁 - /// </summary> + /// SAP杩斿洖鍗曟嵁 + ///</summary> [SugarColumn(ColumnName = "SAPNO")] - public string? Sapno { get; set; } + public string Sapno { get; set; } /// <summary> - /// SAP杩斿洖骞翠唤 - /// </summary> + /// SAP杩斿洖骞翠唤 + ///</summary> [SugarColumn(ColumnName = "SAPYEAR")] public short? Sapyear { get; set; } /// <summary> - /// SAP杩斿洖淇℃伅 - /// </summary> + /// SAP杩斿洖淇℃伅 + ///</summary> [SugarColumn(ColumnName = "SAPTEXT")] - public string? Saptext { get; set; } + public string Saptext { get; set; } /// <summary> - /// 纭鍏ュ簱鏃ユ湡 - /// </summary> + /// 纭鍏ュ簱鏃ユ湡 + ///</summary> [SugarColumn(ColumnName = "INSDATE")] - public DateTime? InsdateA { get; set; } + public DateTime? Insdate { get; set; } /// <summary> - /// 鏄惁妫�楠� - /// </summary> + /// 鏄惁妫�楠� + ///</summary> [SugarColumn(ColumnName = "ISCHECK")] public decimal? Ischeck { get; set; } /// <summary> - /// 瀹℃牳鍏ュ簱浜� - /// </summary> + /// 瀹℃牳鍏ュ簱浜� + ///</summary> [SugarColumn(ColumnName = "INSBY")] - public string? Insby { get; set; } + public string Insby { get; set; } /// <summary> - /// 鏄惁鏄剧ず - /// </summary> + /// 鏄惁鏄剧ず + ///</summary> [SugarColumn(ColumnName = "IS_VISUAL")] public decimal? IsVisual { get; set; } /// <summary> - /// 鍏徃浠g爜 - /// </summary> + /// 鍏徃浠g爜 + ///</summary> [SugarColumn(ColumnName = "COMPANY")] - public string? Company { get; set; } + public string Company { get; set; } /// <summary> - /// 鎬ユ枡鏍囪瘑 - /// </summary> + /// 鎬ユ枡鏍囪瘑 + ///</summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public short? UrgentFlag { get; set; } /// <summary> - /// 閲囪喘鍗曡鍙� - /// </summary> + /// 閲囪喘鍗曡鍙� + ///</summary> [SugarColumn(ColumnName = "LINE_NO")] - public string? LineNo { get; set; } + public string LineNo { get; set; } /// <summary> - /// 鍐查攢浜嬪姟绫诲瀷缂栫爜 - /// </summary> + /// 鍐查攢浜嬪姟绫诲瀷缂栫爜 + ///</summary> [SugarColumn(ColumnName = "MTTRANSCTION_NO")] public decimal? MttransctionNo { get; set; } /// <summary> - /// 宸ュ崟琛屽彿 - /// </summary> + /// 宸ュ崟琛屽彿 + ///</summary> [SugarColumn(ColumnName = "TASK_LINO")] - public string? TaskLino { get; set; } + public string TaskLino { get; set; } /// <summary> - /// 鎶曟枡閫氱煡鍗曞崟鍙� - /// </summary> + /// 鎶曟枡閫氱煡鍗曞崟鍙� + ///</summary> [SugarColumn(ColumnName = "FBILLNO")] - public string? Fbillno { get; set; } + public string Fbillno { get; set; } /// <summary> - /// 鎶曟枡鍗曡鍙� - /// </summary> + /// 鎶曟枡鍗曡鍙� + ///</summary> [SugarColumn(ColumnName = "FBILL_LINO")] - public string? FbillLino { get; set; } + public string FbillLino { get; set; } /// <summary> - /// 瀹㈡埛缂栧彿 - /// </summary> + /// 瀹㈡埛缂栧彿 + ///</summary> [SugarColumn(ColumnName = "CUST_NO")] - public string? CustNo { get; set; } + public string CustNo { get; set; } /// <summary> - /// 瀹㈡埛鍚嶇О - /// </summary> + /// 瀹㈡埛鍚嶇О + ///</summary> [SugarColumn(ColumnName = "CUST_NAME")] - public string? CustName { get; set; } + public string CustName { get; set; } /// <summary> - /// IQC妫�楠屽崟鍙� - /// </summary> + /// IQC妫�楠屽崟鍙� + ///</summary> [SugarColumn(ColumnName = "IQC_RELEASE_NO")] - public string? IqcReleaseNo { get; set; } + public string IqcReleaseNo { get; set; } /// <summary> - /// 鍒拌揣鍗曞彿 - /// </summary> + /// 鍒拌揣鍗曞彿 + ///</summary> [SugarColumn(ColumnName = "CBILL_NO")] - public string? CbillNo { get; set; } + public string CbillNo { get; set; } /// <summary> - /// 0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇� - /// </summary> + /// 0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇� + ///</summary> [SugarColumn(ColumnName = "PICK_INS")] public decimal? PickIns { get; set; } /// <summary> - /// 鍏ュ簱瀹℃牳浜� - /// </summary> + /// 鍏ュ簱瀹℃牳浜� + ///</summary> [SugarColumn(ColumnName = "FCHECK_USER")] - public string? FcheckUser { get; set; } + public string FcheckUser { get; set; } /// <summary> - /// 鍏ュ簱瀹℃牳鏃ユ湡 - /// </summary> + /// 鍏ュ簱瀹℃牳鏃ユ湡 + ///</summary> [SugarColumn(ColumnName = "FCHECK_DATE")] public DateTime? FcheckDate { get; set; } /// <summary> - /// 浠诲姟姹囨姤鍗� - /// </summary> + /// 浠诲姟姹囨姤鍗�/宸ュ崟鍙凤紙鎴愬搧鍏ュ簱锛� + ///</summary> [SugarColumn(ColumnName = "RBILL_NO")] - public string? RbillNo { get; set; } + public string RbillNo { get; set; } + + /// <summary> + /// 鎶ュ伐浜� + ///</summary> + [SugarColumn(ColumnName = "BGR")] + public string Bgr { get; set; } //鍦ㄦ暟鎹簱鏌ヨ鏃跺拷鐣ヨ繖涓瓧娈� [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; } diff --git a/MES.Service/Modes/QsItemOqcReq.cs b/MES.Service/Modes/QsItemOqcReq.cs index bcab676..edac96c 100644 --- a/MES.Service/Modes/QsItemOqcReq.cs +++ b/MES.Service/Modes/QsItemOqcReq.cs @@ -133,4 +133,6 @@ [SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; } [SugarColumn(IsIgnore = true)] public decimal? ItemInId { get; set; } + + [SugarColumn(IsIgnore = true)] public string Bgr { 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 577348a..3d7e27b 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 549f46b..2cc393a 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 80f6884..397062d 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 17ccd52..e8f920c 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 5ca88ff..f54cc9a 100644 --- a/MES.Service/service/QC/RKJService.cs +++ b/MES.Service/service/QC/RKJService.cs @@ -623,7 +623,8 @@ ItemInId = m.ItemInId, Daa015 = da.Daa015, LineNo = c.LineNo, - Quantity = m.Quantity + Quantity = m.Quantity, + Bgr = c.Bgr }) .OrderBy(a => a.CreateDate, OrderByType.Desc) .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll index 577348a..3d7e27b 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 549f46b..2cc393a 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 563b1dc..2f2690b 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 0d7fa9e..d7943c0 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 a154317..c170483 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 80f6884..397062d 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 17ccd52..e8f920c 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 12df6fd..4ff26eb 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 0d7fa9e..d7943c0 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 3e77686..9d63b25 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 80f6884..397062d 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 17ccd52..e8f920c 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 12df6fd..4ff26eb 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 0d7fa9e..d7943c0 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 3e77686..9d63b25 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