From c418ccde908642c73f86ff43cc999be835a1e77d Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期一, 12 五月 2025 09:51:19 +0800 Subject: [PATCH] 1.首检认证信息输入 2.现场收料优化 --- entity/MesQaItemsDetectDetail5.cs | 12 ++++++ Dto/service/LLJDto.cs | 2 + service/QC/IpqcService.cs | 24 +++++++++++ Controllers/QC/IpqcController.cs | 22 +++++++++++ service/Warehouse/MesXkyService.cs | 2 5 files changed, 60 insertions(+), 2 deletions(-) diff --git a/Controllers/QC/IpqcController.cs b/Controllers/QC/IpqcController.cs index abc4a94..1bd8deb 100644 --- a/Controllers/QC/IpqcController.cs +++ b/Controllers/QC/IpqcController.cs @@ -97,5 +97,27 @@ } } + //鏇存柊妫�楠岄」鐩璇佷俊鎭� + [HttpPost("updateIpqcRzxx")] + public ResponseResult updateIpqcRzxx(LLJDto ipqcDto) + { + try + { + dynamic resultInfos = new ExpandoObject(); + var tbBillList = m.updateIpqcRzxx(ipqcDto); + resultInfos.tbBillList = tbBillList; + 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/Dto/service/LLJDto.cs b/Dto/service/LLJDto.cs index 384969d..e01e503 100644 --- a/Dto/service/LLJDto.cs +++ b/Dto/service/LLJDto.cs @@ -23,6 +23,8 @@ //澶囨敞 public string? Remarks { get; set; } + public string? inRzxxValue { get; set; } + //========================================== //宸℃涓诲瓙琛ㄩ渶瑕佺殑鏁版嵁 public QsItemOqcReq? from { get; set; } diff --git a/entity/MesQaItemsDetectDetail5.cs b/entity/MesQaItemsDetectDetail5.cs index f3c9c97..f3db2e2 100644 --- a/entity/MesQaItemsDetectDetail5.cs +++ b/entity/MesQaItemsDetectDetail5.cs @@ -197,6 +197,18 @@ public int? Ybsl { get; set; } /// <summary> + /// 鏄惁涓洪妫�璁よ瘉淇℃伅 + /// </summary> + [SugarColumn(ColumnName = "IS_RZXX")] + public int? ISRZXX { get; set; } + + /// <summary> + /// 棣栨璁よ瘉淇℃伅 + /// </summary> + [SugarColumn(ColumnName = "ipqc_rzxx")] + public string? IPQCRZXX { get; set; } + + /// <summary> /// 鏍锋湰宸插綍鍏ユ暟 /// </summary> [SugarColumn(IsIgnore = true)] diff --git a/service/QC/IpqcService.cs b/service/QC/IpqcService.cs index 15b90d9..58c47fb 100644 --- a/service/QC/IpqcService.cs +++ b/service/QC/IpqcService.cs @@ -6,6 +6,7 @@ using NewPdaSqlServer.util; using SqlSugar; using static Azure.Core.HttpHeader; +using static Microsoft.EntityFrameworkCore.DbLoggerCategory; namespace NewPdaSqlServer.service.QC; @@ -83,7 +84,8 @@ a.FcheckResu, a.Order, a.Ybsl, - a.YbslIn + a.ISRZXX, + a.IPQCRZXX }).Select((a, b) => new MesQaItemsDetectDetail5 { Guid = a.Guid, @@ -107,6 +109,8 @@ Order = a.Order, Ybsl = a.Ybsl, YbslIn = Ybsl_In, + ISRZXX = a.ISRZXX, + IPQCRZXX = a.IPQCRZXX }).OrderBy(a => a.Order) .ToList(); } @@ -142,4 +146,22 @@ return (pageList, totalCount); } + + + //鏇存柊涓嶅悎鏍兼弿杩� + public int updateIpqcRzxx(LLJDto dto) + { + if (dto == null) throw new ArgumentNullException(nameof(dto), "鍙傛暟瀵硅薄涓嶈兘涓� null"); + + // 鍙傛暟鏍¢獙锛堟牴鎹瓨鍌ㄨ繃绋嬫柊澧炲弬鏁帮級 + if (string.IsNullOrEmpty(dto.pid?.ToString())) + throw new ArgumentException("椤圭洰鏄庣粏id瀛樺湪闂锛岃鑱旂郴绠$悊鍛橈紒", nameof(dto.pid)); + + var withOracle = Db.Updateable<MesQaItemsDetectDetail5>() + .SetColumns(s => s.IPQCRZXX == dto.inRzxxValue) + .Where(s => s.Guid.ToString() == dto.pid) + .ExecuteCommand(); + + return withOracle; + } } \ No newline at end of file diff --git a/service/Warehouse/MesXkyService.cs b/service/Warehouse/MesXkyService.cs index 92ad9ee..ae09d2c 100644 --- a/service/Warehouse/MesXkyService.cs +++ b/service/Warehouse/MesXkyService.cs @@ -26,7 +26,7 @@ ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon(); try { - string data_inserted = "{\r\n \"startDate\": 1745260800000,\r\n \"endDate\": 1745261100000,\r\n \"erpCode\": \"GXF001\"\r\n}"; + string data_inserted = "{\r\n \"startDate\": 1746759300000,\r\n \"endDate\": 1746762300000,\r\n \"erpCode\": \"GXF001\"\r\n}"; ArrayList SQLStringList = new ArrayList(); // var client = new HttpClient(); var url = "https://openapi.xiekeyun.com/delivery/getNoList.json"; -- Gitblit v1.9.3