From 986bbf207ec3ecab9dfbf3fed50b565d2a2676fc Mon Sep 17 00:00:00 2001 From: xwt <2740516069@qq.com> Date: 星期六, 19 七月 2025 14:48:27 +0800 Subject: [PATCH] 来料检上传附件 --- StandardInterface/MES.Service/Dto/service/RKJDaa001.cs | 21 ++++++++++++++------- StandardInterface/MES.Service/Modes/QsItemOqcReq.cs | 6 ++++++ StandardInterface/MES.Service/service/QC/RKJService.cs | 14 ++++++++------ StandardInterface/MESApplication/Controllers/QC/XJController.cs | 2 ++ StandardInterface/MES.Service/Dto/service/RKJDto.cs | 2 ++ StandardInterface/MESApplication/Controllers/QC/LljController.cs | 6 +++--- 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/StandardInterface/MES.Service/Dto/service/RKJDaa001.cs b/StandardInterface/MES.Service/Dto/service/RKJDaa001.cs index 61b439d..679b819 100644 --- a/StandardInterface/MES.Service/Dto/service/RKJDaa001.cs +++ b/StandardInterface/MES.Service/Dto/service/RKJDaa001.cs @@ -7,32 +7,39 @@ [SugarTable("V_QS_RK_DAA001")] //鐢ㄤ簬SqlSugar public class RKJDaa001 : Page -{ - // 閫佹鎵规 +{ // pID [SugarColumn(ColumnName = "ITEM_IN_ID")] public decimal? ItemInId { get; set; } + // 宸ュ崟鍙� + [SugarColumn(ColumnName = "RBILL_NO")] + public string? RBillNo { 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 = "ITEM_MODEL")] + public string? ItemModel { get; set; } //浜х嚎缂栫爜 [SugarColumn(ColumnName = "DAA015")] public string? Daa015 { get; set; } - //浜х嚎缂栫爜 - [SugarColumn(ColumnName = "DAA015")] + //浜х嚎鍚嶇О + [SugarColumn(ColumnName = "DAA020")] public string? Daa020 { get; set; } //鐢宠鍗曞彿 [SugarColumn(ColumnName = "BILL_NO")] - public string? billNo { get; set; } + public string? BillNo { get; set; } } \ No newline at end of file diff --git a/StandardInterface/MES.Service/Dto/service/RKJDto.cs b/StandardInterface/MES.Service/Dto/service/RKJDto.cs index cab909f..822f798 100644 --- a/StandardInterface/MES.Service/Dto/service/RKJDto.cs +++ b/StandardInterface/MES.Service/Dto/service/RKJDto.cs @@ -17,6 +17,8 @@ //澶囨敞 public string? Remarks { get; set; } + // 閫佹鎵规 + public string? RbillNo { get; set; } //========================================== //宸℃涓诲瓙琛ㄩ渶瑕佺殑鏁版嵁 diff --git a/StandardInterface/MES.Service/Modes/QsItemOqcReq.cs b/StandardInterface/MES.Service/Modes/QsItemOqcReq.cs index b1fb7b6..50f6af0 100644 --- a/StandardInterface/MES.Service/Modes/QsItemOqcReq.cs +++ b/StandardInterface/MES.Service/Modes/QsItemOqcReq.cs @@ -119,6 +119,12 @@ [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } + /// <summary> + /// 閫佹鎵规 + /// </summary> + [SugarColumn(ColumnName = "RBILL_NO")] + public string? RbillNo { get; set; } + // 娣诲姞浠ヤ笅瀛楁浠ラ�傚簲鏌ヨ杩斿洖鐨勬暟鎹� [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; } diff --git a/StandardInterface/MES.Service/service/QC/RKJService.cs b/StandardInterface/MES.Service/service/QC/RKJService.cs index d7a9df3..f103adf 100644 --- a/StandardInterface/MES.Service/service/QC/RKJService.cs +++ b/StandardInterface/MES.Service/service/QC/RKJService.cs @@ -17,7 +17,7 @@ var db = SqlSugarHelper.GetInstance(); var date = DateTime.Now.ToString("yyyy-MM-dd"); var sql = - "select max(RELEASE_NO) from QS_ITEM_OQC_REQ where RELEASE_NO like 'RKJN%' and to_char(CREATE_DATE,'yyyy-mm-dd') ='" + + "select max(RELEASE_NO) from QS_ITEM_OQC_REQ where RELEASE_NO like 'RKJY%' and to_char(CREATE_DATE,'yyyy-mm-dd') ='" + date + "'"; var maxBillNo = db.Ado.SqlQuerySingle<string>(sql); @@ -31,7 +31,7 @@ number = no.ToString().PadLeft(4, '0'); } - return "RKJN" + date.Replace("-", "") + number; + return "RKJY" + date.Replace("-", "") + number; } //閫夋嫨浜х嚎 @@ -54,8 +54,8 @@ { var db = SqlSugarHelper.GetInstance(); return db.Queryable<RKJDaa001>() - .Where(t => t.Daa020 == lineNo) - .OrderBy(t => t.ItemInId, OrderByType.Desc) + .Where(t => t.Daa015 == lineNo) + .OrderBy(t => t.BillNo, OrderByType.Desc) .ToList(); //return null; } @@ -228,6 +228,9 @@ xj.CreateBy = userNo; xj.CreateDate = DateTime.Now; + // 鏂板锛氫繚瀛橀�佹鎵规 + if (!string.IsNullOrEmpty(rkjDto.RbillNo)) + xj.RbillNo = rkjDto.RbillNo; var pid = db.Insertable(xj).ExecuteReturnIdentity(); @@ -479,9 +482,8 @@ FcheckBy = a.FcheckBy, FcheckDate = a.FcheckDate, ReleaseNo = a.ReleaseNo, + RbillNo = a.RbillNo, // 娣诲姞鍏朵粬瀛楁 - // 濡傛灉鍦� QsItemOqcReq 涓畾涔変簡棰濆瀛楁锛屽垯闇�瑕佸皢瀹冧滑璧嬪�� - // 渚嬪: ItemName = b.ItemName, ItemModel = b.ItemModel, TaskNo = c.TaskNo, diff --git a/StandardInterface/MESApplication/Controllers/QC/LljController.cs b/StandardInterface/MESApplication/Controllers/QC/LljController.cs index 576e5c6..fd428d0 100644 --- a/StandardInterface/MESApplication/Controllers/QC/LljController.cs +++ b/StandardInterface/MESApplication/Controllers/QC/LljController.cs @@ -351,10 +351,10 @@ [HttpGet("DownloadFtpFile")] public IActionResult DownloadFtpFile([FromQuery] string itemNo, [FromQuery] string fileName) { - // FTP鏈嶅姟鍣ㄤ俊鎭紙璇锋浛鎹负瀹為檯淇℃伅锛� + // FTP鏈嶅姟鍣ㄤ俊鎭� string ftpServer = "ftp://36.26.21.214"; string ftpUser = "hm_ftp"; - string ftpPwd = "dell_123"; // 宸叉洿鏂颁负鐪熷疄瀵嗙爜 + string ftpPwd = "dell_123"; string ftpPath = $"{ftpServer}/IQC/{itemNo}/{fileName}"; try { @@ -362,7 +362,7 @@ request.Method = System.Net.WebRequestMethods.Ftp.DownloadFile; request.Credentials = new System.Net.NetworkCredential(ftpUser, ftpPwd); request.UseBinary = true; - request.UsePassive = true; + request.UsePassive = false; using (var response = (System.Net.FtpWebResponse)request.GetResponse()) using (var ftpStream = response.GetResponseStream()) using (var ms = new System.IO.MemoryStream()) diff --git a/StandardInterface/MESApplication/Controllers/QC/XJController.cs b/StandardInterface/MESApplication/Controllers/QC/XJController.cs index 25228a3..40d2bdc 100644 --- a/StandardInterface/MESApplication/Controllers/QC/XJController.cs +++ b/StandardInterface/MESApplication/Controllers/QC/XJController.cs @@ -122,6 +122,8 @@ dynamic resultInfos = new ExpandoObject(); var tbBillList = new XJService().getBoardItem(lineNo); + // 鎸� itemNo 鍘婚噸 + tbBillList = tbBillList.GroupBy(x => x.ItemNo).Select(g => g.First()).ToList(); resultInfos.tbBillList = tbBillList; return new ResponseResult { -- Gitblit v1.9.3