MES.Service/Dto/webApi/ProductionOrder/ErpProductionOrder.cs
ÎļþÃû´Ó MES.Service/Dto/webApi/ErpProductionOrder.cs ÐÞ¸Ä @@ -1,6 +1,6 @@ namespace MES.Service.Dto.webApi namespace MES.Service.Dto.webApi.ProductionOrder { public class ErpProductionOrder public class ErpProductionOrder { //public string? Id { get; set; } public string? SalesOrder { get; set; } MES.Service/Dto/webApi/ProductionOrder/ProductionsOrder.cs
ÎļþÃû´Ó MES.Service/Dto/webApi/ProductionOrder.cs ÐÞ¸Ä @@ -4,9 +4,9 @@ using System.Text; using System.Threading.Tasks; namespace MES.Service.Dto.webApi namespace MES.Service.Dto.webApi.ProductionOrder { public class ProductionOrder public class ProductionsOrder { public ErpProductionOrder erpProductionOrder { get; set; } } MES.Service/Modes/ProductionOrder/ProductionOrders.cs
ÎļþÃû´Ó MES.Service/Modes/ProductionOrders.cs ÐÞ¸Ä @@ -1,6 +1,6 @@ using SqlSugar; namespace MES.Service.Modes; namespace MES.Service.Modes.ProductionOrder; //éè´§å头 [SugarTable("MES_PRODUCTION_ORDER")] MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs
@@ -10,19 +10,19 @@ public class GetQcIssueResultDetail { //æ°é [SugarColumn(ColumnName = "FBATCH_QTY")] public string? FbatchQty { get; set; } //产ååç§° [SugarColumn(ColumnName = "ITEM_NAME")] public string? ItemName { get; set; } //è§æ ¼åå· [SugarColumn(ColumnName = "ITEM_MODEL")] public string? ItemModel { get; set; } //鿣åä½ [SugarColumn(ColumnName = "SUPP_NAME")] public string? SuppName { get; set; } ////订åå·(éè´åå·) MES.Service/Modes/QcIssueResult/GetReleaseNoDetail.cs
ÎļþÒÑɾ³ý MES.Service/Modes/QcIssueResult/UpdateMesQaItems .cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace MES.Service.Modes.QcIssueResult; [SugarTable("MES_QA_ITEMS_DETECT_01")] public class UpdateMesQaItems { [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_QM_ID", IsPrimaryKey = true)] public decimal Id { get; set; } //éè´§åå· [SugarColumn(ColumnName = "RELEASE_NO")] public string? ReleaseNo { get; set; } //éè´§åå· [SugarColumn(ColumnName = "FNG_HANDLE")] public string? FngHandle{ get; set; } } MES.Service/Modes/SentLaboratory/GetLaboratoryDetails.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,29 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace MES.Service.Modes.SentLaboratory; public class GetLaboratoryDetails { public string? RELEASE_NO { get; set; } public string? DEPARTMENTNAME { get; set; } public DateTime? CREATE_DATE1 { get; set; } public string? LOT_NO { get; set; } public string? ITEM_NAME { get; set; } public string? QUANTITY { get; set; } public decimal? URGENT_FLAG { get; set; } public DateTime? COMPLETE_DATE { get; set; } public string? TEST_REQ { get; set; } public string? SIM_REQ { get; set; } public List<SentLaboratoryTestingItems>? CHECKBOX { get; set; } public string? Line04 { get; set; } public string? REMARKS { get; set; } public string? ITEM_NO { get; set; } public string? DEPARTMENTCODE { get; set; } public string? JYDH { get; set; } } MES.Service/Modes/SentLaboratory/SentLaboratoryTestingItems.cs
ÎļþÃû´Ó MES.Service/Modes/SentLaboratoryTestingItems.cs ÐÞ¸Ä @@ -1,6 +1,6 @@ using SqlSugar; namespace MES.Service.Modes; namespace MES.Service.Modes.SentLaboratory; /// <summary> /// å®éªå®¤éæ£é¡¹ç®è¡¨ @@ -19,5 +19,5 @@ /// </summary> [SugarColumn(ColumnName = "INSPECTION_ITEMS")] public string? InspectionItems { get; set; } } MES.Service/Modes/SentLaboratory/UpdateMesQmsSample.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,146 @@ using SqlSugar; namespace MES.Service.Modes.SentLaboratory; //å¼äº§åæ£æµå表 [SugarTable("MES_QMS_SAMPLE")] public class UpdateMesQmsSample { //SEQ_QMS_EQ_CHECK [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_QMS_EQ_CHECK")] public decimal Id { get; set; } //鿣åå· [SugarColumn(ColumnName = "RELEASE_NO")] public string? ReleaseNo { get; set; } //产åç¼ç [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; } //产ååç§° [SugarColumn(ColumnName = "ITEM_NAME")] public string? ItemName { get; set; } //ç³è¯·é¨é¨ç¼å· [SugarColumn(ColumnName = "DEPARTMENTCODE")] public string? DEPARTMENTCODE { get; set; } //ç³è¯·é¨é¨åç§° [SugarColumn(ColumnName = "DEPARTMENTNAME")] public string? DEPARTMENTNAME { get; set; } //ç³è¯·æ¥æ [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } //æ ·æ¬æ°é [SugarColumn(ColumnName = "QUANTITY")] public string? QUANTITY { get; set; } //è¦æ±å®ææ¶é´ [SugarColumn(ColumnName = "COMPLETE_DATE")] public DateTime? CompleteDate { get; set; } //æµè¯è¦æ± [SugarColumn(ColumnName = "TEST_REQ")] public string? TestReq { get; set; } //æ¥ææ è¯ [SugarColumn(ColumnName = "URGENT_FLAG")] public decimal? UrgentFlag { get; set; } //éè´§åå· [SugarColumn(ColumnName = "PAPER_BILL_NO")] public string? PAPERBILLNO { get; set; } //夿³¨ [SugarColumn(ColumnName = "REMARKS")] public string? REMARKS { get; set; } //模æè¦æ± [SugarColumn(ColumnName = "SIM_REQ")] public string? SimReq { get; set; } //ç£éæå [SugarColumn(ColumnName = "CHECK_01")] public decimal? Check01 { get; set; } //ç£éæ¿é [SugarColumn(ColumnName = "CHECK_02")] public decimal? Check02 { get; set; } //çé¾ [SugarColumn(ColumnName = "CHECK_03")] public decimal? Check03 { get; set; } //IP [SugarColumn(ColumnName = "CHECK_04")] public decimal? Check04 { get; set; } //èåæµè¯ [SugarColumn(ColumnName = "CHECK_05")] public decimal? Check05 { get; set; } //ä¼ å¯¼è¾å° [SugarColumn(ColumnName = "CHECK_06")] public decimal? Check06 { get; set; } //è·è½æµè¯ [SugarColumn(ColumnName = "CHECK_07")] public decimal? Check07 { get; set; } //çµçº¿æå [SugarColumn(ColumnName = "CHECK_08")] public decimal? Check08 { get; set; } //æ¥å£ææ [SugarColumn(ColumnName = "CHECK_09")] public decimal? Check09 { get; set; } //å è°±æµè¯ [SugarColumn(ColumnName = "CHECK_10")] public decimal? Check10 { get; set; } //ROHS [SugarColumn(ColumnName = "CHECK_11")] public decimal? Check11 { get; set; } //çµæ± å æ¾çµ [SugarColumn(ColumnName = "CHECK_12")] public decimal? Check12 { get; set; } //髿¸© [SugarColumn(ColumnName = "CHECK_13")] public decimal? Check13 { get; set; } //使¸© [SugarColumn(ColumnName = "CHECK_14")] public decimal? Check14 { get; set; } //IK [SugarColumn(ColumnName = "CHECK_15")] public decimal? Check15 { get; set; } //æ¸©åæµè¯ [SugarColumn(ColumnName = "CHECK_16")] public decimal? Check16 { get; set; } //å¯¿å½ [SugarColumn(ColumnName = "CHECK_17")] public decimal? Check17 { get; set; } //å ¶å® [SugarColumn(ColumnName = "CHECK_18")] public decimal? Check18 { get; set; } //å ¶å®çå 容 [SugarColumn(ColumnName = "LINE_04")] public string? Line04 { get; set; } //æ£éªåå· [SugarColumn(ColumnName = "JYDH")] public string? JYDH { get; set; } } MES.Service/bin/Debug/net8.0/MES.Service.dllBinary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MES.Service/service/BasicData/ProductionOrderManager.cs
ÎļþÒÑɾ³ý MES.Service/service/ProductionOrder/ProductionOrderManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,278 @@ using AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models; using AlibabaCloud.SDK.Dingtalkyida_1_0.Models; using AlibabaCloud.TeaUtil.Models; using MES.Service.DB; using MES.Service.Dto.webApi.DeliveryNote; using MES.Service.Dto.webApi.ProductionOrder; using MES.Service.Modes.DeliveryNote; using MES.Service.Modes.ProductionOrder; using MES.Service.service; using SqlSugar; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using Tea; public class ProductionOrderManager : Repository<ProductionOrders> { /** * åå§åè´¦å·Clientï¼ç¨äºè·åtoken * @return Client * @throws Exception */ public static AlibabaCloud.SDK.Dingtalkoauth2_1_0.Client CreateClient1() { AlibabaCloud.OpenApiClient.Models.Config config = new AlibabaCloud.OpenApiClient.Models.Config(); config.Protocol = "https"; config.RegionId = "central"; return new AlibabaCloud.SDK.Dingtalkoauth2_1_0.Client(config); } /** * è·åééç Access Token * @return string è¿åè·åå°ç Access Token */ public string GetToken() { AlibabaCloud.SDK.Dingtalkoauth2_1_0.Client client = CreateClient1(); AlibabaCloud.SDK.Dingtalkoauth2_1_0.Models.GetAccessTokenRequest getAccessTokenRequest = new AlibabaCloud.SDK.Dingtalkoauth2_1_0.Models.GetAccessTokenRequest { AppKey = "dingyzos0r1bizj7g6lr", AppSecret = "-HP4RvK2OUbqhG3iBUpd_TPe5MZRj8cfLc0b8Skt8rhC3I38kVLY9SS8P3kLWFcH", }; try { var response = client.GetAccessToken(getAccessTokenRequest); return response.Body.AccessToken; // è¿åè·åå°ç Access Token } catch (TeaException err) { Console.WriteLine($"TeaException: Code={err.Code}, Message={err.Message}"); return null; } catch (Exception _err) { Console.WriteLine($"Exception: {_err.Message}"); return null; } } /** * åå§åè´¦å·Client,ç¨äºOA审æ¹ç¸å ³åè½ * @return Client * @throws Exception */ public static AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client CreateClientOa() { AlibabaCloud.OpenApiClient.Models.Config config = new AlibabaCloud.OpenApiClient.Models.Config(); config.Protocol = "https"; config.RegionId = "central"; return new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client(config); } public string GetSpaceId() { string accessToken = GetToken(); if (string.IsNullOrEmpty(accessToken)) { return "è·å Access Token 失败"; } AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClientOa(); AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetAttachmentSpaceHeaders getAttachmentSpaceHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetAttachmentSpaceHeaders(); getAttachmentSpaceHeaders.XAcsDingtalkAccessToken = accessToken; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetAttachmentSpaceRequest getAttachmentSpaceRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetAttachmentSpaceRequest { UserId = "923188102", AgentId = 3179487642, }; try { var response = client.GetAttachmentSpaceWithOptions(getAttachmentSpaceRequest, getAttachmentSpaceHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions()); return (Newtonsoft.Json.JsonConvert.SerializeObject(response.Body)); } catch (TeaException err) { return $"TeaException: Code={err.Code}, Message={err.Message}"; } catch (Exception _err) { return $"Exception: {_err.Message}"; } } public string GetProcessList() { DateTime targetTime = new DateTime(2025, 3, 10, 0, 0, 0, DateTimeKind.Utc); // 转æ¢ä¸º Unix æ¶é´æ³ long unixTimestamp = ((DateTimeOffset)targetTime).ToUnixTimeMilliseconds(); Debug.WriteLine(unixTimestamp); long currentTimestamp = ((DateTimeOffset)DateTime.UtcNow).ToUnixTimeMilliseconds(); Debug.WriteLine(currentTimestamp); // è¾åºå½åæ¶é´ç Unix æ¶é´æ³ string accessToken = GetToken(); if (string.IsNullOrEmpty(accessToken)) { return "è·å Access Token 失败"; } AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClientOa(); AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsHeaders listProcessInstanceIdsHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsHeaders(); listProcessInstanceIdsHeaders.XAcsDingtalkAccessToken = accessToken; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsRequest listProcessInstanceIdsRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsRequest { ProcessCode = "PROC-BBA5632D-DC7C-4267-A3E2-757E2B7023BC", StartTime = unixTimestamp, EndTime = currentTimestamp, NextToken = 0, MaxResults = 10, UserIds = new List<string> { "923188102" }, //Statuses = new List<string> // { // }, }; try { var response = client.ListProcessInstanceIdsWithOptions(listProcessInstanceIdsRequest, listProcessInstanceIdsHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions()); return (Newtonsoft.Json.JsonConvert.SerializeObject(response.Body)); } catch (TeaException err) { return $"TeaException: Code={err.Code}, Message={err.Message}"; } catch (Exception _err) { return $"Exception: {_err.Message}"; } } public string GetPermissions() { string accessToken = GetToken(); if (string.IsNullOrEmpty(accessToken)) { return "è·å Access Token 失败"; } AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClientOa(); AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetSpaceWithDownloadAuthHeaders getSpaceWithDownloadAuthHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetSpaceWithDownloadAuthHeaders(); getSpaceWithDownloadAuthHeaders.XAcsDingtalkAccessToken = accessToken; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetSpaceWithDownloadAuthRequest getSpaceWithDownloadAuthRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetSpaceWithDownloadAuthRequest { UserId = "071839512032683883", AgentId = 3179487642, ProcessInstanceId = "3vHyv40ZQUe2zK6wvl11dg06561742534701", FileId = "173564282626", //FileIdList = new List<string> // { // "123" // }, }; try { var response = client.GetSpaceWithDownloadAuthWithOptions(getSpaceWithDownloadAuthRequest, getSpaceWithDownloadAuthHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions()); return (Newtonsoft.Json.JsonConvert.SerializeObject(response.Body)); } catch (TeaException err) { return $"TeaException: Code={err.Code}, Message={err.Message}"; } catch (Exception _err) { return $"Exception: {_err.Message}"; } } /** * åå§åè´¦å·Client,ç¨äºç³è¯·æä»¶ä¸´æ¶å ç»å°å * @return Client * @throws Exception */ public static AlibabaCloud.SDK.Dingtalkyida_1_0.Client CreateClient() { AlibabaCloud.OpenApiClient.Models.Config config = new AlibabaCloud.OpenApiClient.Models.Config(); config.Protocol = "https"; config.RegionId = "central"; return new AlibabaCloud.SDK.Dingtalkyida_1_0.Client(config); } public string GetFileUrl(string imageUrl) { string accessToken = GetToken(); if (string.IsNullOrEmpty(accessToken)) { return "è·å Access Token 失败"; } AlibabaCloud.SDK.Dingtalkyida_1_0.Client client = CreateClient(); AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetOpenUrlHeaders getOpenUrlHeaders = new AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetOpenUrlHeaders(); getOpenUrlHeaders.XAcsDingtalkAccessToken = accessToken; AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetOpenUrlRequest getOpenUrlRequest = new AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetOpenUrlRequest { SystemToken = "54A66HC1YDSSO9DP61Y93CWQ2W9B36IZZOY6MC81", UserId = "923188102", Language = "zh_CN", FileUrl = imageUrl, Timeout = 3600000, }; try { var response = client.GetOpenUrlWithOptions("APP_Q7PLYKXMKFUJ5HY6DMWR", getOpenUrlRequest, getOpenUrlHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions()); return (Newtonsoft.Json.JsonConvert.SerializeObject(response.Body)); } catch (TeaException err) { return $"TeaException: Code={err.Code}, Message={err.Message}"; } catch (Exception _err) { return $"Exception: {_err.Message}"; } } public dynamic Save(ErpProductionOrder erpProductionOrder) { //var erpProductionOrder = productionOrder.erpProductionOrder; var mesProductionOrder = GetMesProductionOrder(erpProductionOrder); return UseTransaction(db => { return SaveOrUpdateData(db, mesProductionOrder) ? 1 : 0; }) > 0; } public dynamic SaveList(List<ErpProductionOrder> erpProductionOrder) { var result = erpProductionOrder.Select(Save).ToList(); return result.All(b => b); } public ProductionOrders GetMesProductionOrder(ErpProductionOrder erpProductionOrder) { var mesProductionOrders = new ProductionOrders { ImageUrl = erpProductionOrder.ImageUrl, SalesOrder = erpProductionOrder.SalesOrder }; return mesProductionOrders; } private bool SaveOrUpdateData(SqlSugarScope db, ProductionOrders productionOrders) { var orUpdate = base.Insert(productionOrders); if (orUpdate) return true; throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); } } MES.Service/service/ProductionOrder/ResultDataAndSpaceId.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace MES.Service.service.ProductionOrder; public class ResultDataAndSpaceId { public ResultInfo Result { get; set; } public bool Success { get; set; } } public class ResultInfo { public string SpaceId { get; set; } } MES.Service/service/QcIssueResult/QcIssueResultManager.cs
@@ -16,11 +16,12 @@ using MES.Service.Dto.webApi.QcIssueResult; using MES.Service.Dto.webApi.DeliveryNote; using MES.Service.Modes.DeliveryNote; using Newtonsoft.Json; namespace MES.Service.service.QcIssueResult; //å¼å¸¸å¤ç½®åç»æè¡¨ [SugarTable("MES_QCISSUE_RESULT")] [SugarTable("MES_QA_ITEMS_DETECT_01")] public class QcIssueResultManager: Repository<QcIssueResults> { /** @@ -138,166 +139,175 @@ DingDingCode=t.DingDingCode, }) .ToList(); string UserId = mapping.FirstOrDefault().DingDingCode; if (mapping.Any()) { string UserId = mapping.FirstOrDefault().DingDingCode; // ä½¿ç¨ JSON åºååè¾åºå¯¹è±¡ç详ç»å 容 string getQcIssueResultDetailJson = JsonConvert.SerializeObject(getQcIssueResultDetail, Formatting.Indented); Debug.WriteLine("GetQcIssueResultDetail: " + getQcIssueResultDetailJson); Debug.WriteLine(UserId); // è·å Access Token string accessToken = GetToken(); if (string.IsNullOrEmpty(accessToken)) { return "è·å Access Token 失败"; } // è·å Access Token string accessToken = GetToken(); if (string.IsNullOrEmpty(accessToken)) { return "è·å Access Token 失败"; } AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClient(); AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceHeaders startProcessInstanceHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceHeaders(); Debug.WriteLine(accessToken); startProcessInstanceHeaders.XAcsDingtalkAccessToken = accessToken; // 使ç¨è·åå°ç Access Token AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues1 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextField-K2AD4O5B", Value = "产ååç§°", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues2 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextField_DYFD1EESLVC0", Value = "è§æ ¼åå·", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues3 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextField_1AVN2BNVY1OG0", Value = "æ°é", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues4 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextField_1DKEMESOOGSG0", Value = "鿣åä½", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues5 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "DDDateField_20LKOACGMLXC0", Value = DateTime.Now.ToString("yyyy-MM-dd"), }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues6 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextField_WBNBWGFHR000", Value = "订åå·", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues7 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextareaField_1ZP3BDPMYY800", Value = "对ä¸åæ ¼ææ½å¨ä¸åæ ¼çæè¿°:", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues8 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "SignatureField_SKF9Q82DZUO0", Value = getQcIssueResultDetail.Fname, }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues9 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "DDSelectField_1AK82Q8A2NB40", Value = "éè´§", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues10 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextareaField_1LM82CPPR35S0", Value = "æéå 容", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues11 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextareaField_AK4JLDDNS2O0", Value = "è®©æ¥æ¥æ¶å 容", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues12 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextareaField_K69R6770WLS0", Value = "éè´§å¤æ³¨", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues13 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextareaField_194UFGLMI02O0", Value = "æ¥åºå¤æ³¨", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues14 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "DDSelectField_1RN2L4RWQ0AO0", Value = "å¦", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues15 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "InnerContactField_WNG7AU9R2AO0", Value = "å ç¾", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues16 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "DDAttachment_23VB5MMC1R1C0", Value = "éä»¶", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners targetSelectActioners0 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners { ActionerKey = "null", ActionerUserIds = new List<string> AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClient(); AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceHeaders startProcessInstanceHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceHeaders(); Debug.WriteLine(accessToken); startProcessInstanceHeaders.XAcsDingtalkAccessToken = accessToken; // 使ç¨è·åå°ç Access Token AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues1 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextField-K2AD4O5B", Value = getQcIssueResultDetail.ItemName, }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues2 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextField_DYFD1EESLVC0", Value = getQcIssueResultDetail.ItemModel, }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues3 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextField_1AVN2BNVY1OG0", Value = getQcIssueResultDetail.FbatchQty, }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues4 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextField_1DKEMESOOGSG0", Value = getQcIssueResultDetail.SuppName, }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues5 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "DDDateField_20LKOACGMLXC0", Value = DateTime.Now.ToString("yyyy-MM-dd"), }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues6 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextField_WBNBWGFHR000", Value = "订åå·", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues7 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextareaField_1ZP3BDPMYY800", Value = getQcIssueResultDetail.remark, }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues8 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "SignatureField_SKF9Q82DZUO0", Value = getQcIssueResultDetail.Fname, }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues9 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "DDSelectField_1AK82Q8A2NB40", Value = "éè´§", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues10 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextareaField_1LM82CPPR35S0", Value = "æéå 容", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues11 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextareaField_AK4JLDDNS2O0", Value = "è®©æ¥æ¥æ¶å 容", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues12 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextareaField_K69R6770WLS0", Value = "éè´§å¤æ³¨", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues13 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "TextareaField_194UFGLMI02O0", Value = "æ¥åºå¤æ³¨", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues14 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "DDSelectField_1RN2L4RWQ0AO0", Value = "å¦", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues15 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "InnerContactField_WNG7AU9R2AO0", Value = "å ç¾", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues16 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues { Name = "DDAttachment_23VB5MMC1R1C0", Value = "éä»¶", }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners targetSelectActioners0 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners { ActionerKey = "null", ActionerUserIds = new List<string> { UserId }, }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestApprovers approvers0 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestApprovers { ActionType = "OR", UserIds = new List<string> }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestApprovers approvers0 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestApprovers { ActionType = "OR", UserIds = new List<string> { UserId }, }; }; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest startProcessInstanceRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest { OriginatorUserId = UserId, ProcessCode = "PROC-BBA5632D-DC7C-4267-A3E2-757E2B7023BC", DeptId = 1, FormComponentValues = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues> AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest startProcessInstanceRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest { formComponentValues1,formComponentValues2,formComponentValues3, formComponentValues4, formComponentValues5, formComponentValues6, formComponentValues7, formComponentValues8, OriginatorUserId = UserId, ProcessCode = "PROC-BBA5632D-DC7C-4267-A3E2-757E2B7023BC", DeptId = 1, FormComponentValues = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues> { formComponentValues1,formComponentValues2,formComponentValues3, formComponentValues4, formComponentValues5, formComponentValues6, formComponentValues7, formComponentValues8, formComponentValues9,formComponentValues10, formComponentValues11, formComponentValues12, formComponentValues13, formComponentValues14 }, TargetSelectActioners = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners> TargetSelectActioners = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners> { targetSelectActioners0 }, Approvers = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestApprovers> Approvers = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestApprovers> { approvers0 }, CcList = new List<string> CcList = new List<string> { UserId }, CcPosition = "START", CcPosition = "START", }; return "1"; //try //{ // string requestContent = Newtonsoft.Json.JsonConvert.SerializeObject(startProcessInstanceRequest); // Debug.WriteLine("startProcessInstanceRequestå 容ï¼"); // Debug.WriteLine(requestContent); // var response = client.StartProcessInstanceWithOptions(startProcessInstanceRequest, startProcessInstanceHeaders, new RuntimeOptions()); // return $"éé工使µå®ä¾å¯å¨æå: {Newtonsoft.Json.JsonConvert.SerializeObject(response.Body)}"; //} //catch (TeaException err) //{ // string requestContent = Newtonsoft.Json.JsonConvert.SerializeObject(startProcessInstanceRequest); // Debug.WriteLine("startProcessInstanceRequestå 容ï¼"); // Debug.WriteLine(startProcessInstanceRequest); // return $"TeaException: Code={err.Code}, Message={err.Message}"; //} //catch (Exception _err) //{ // return $"Exception: {_err.Message}"; //} }; // åºåå FormComponentValues å表为 JSON æ ¼å¼ string formComponentValuesJson = JsonConvert.SerializeObject(startProcessInstanceRequest.FormComponentValues, Formatting.Indented); Debug.WriteLine("FormComponentValues: " + formComponentValuesJson); try { string requestContent = Newtonsoft.Json.JsonConvert.SerializeObject(startProcessInstanceRequest); Debug.WriteLine("startProcessInstanceRequestå 容ï¼"); Debug.WriteLine(requestContent); var response = client.StartProcessInstanceWithOptions(startProcessInstanceRequest, startProcessInstanceHeaders, new RuntimeOptions()); return $"éé工使µå®ä¾å¯å¨æå: {Newtonsoft.Json.JsonConvert.SerializeObject(response.Body)}"; } catch (TeaException err) { string requestContent = Newtonsoft.Json.JsonConvert.SerializeObject(startProcessInstanceRequest); Debug.WriteLine("startProcessInstanceRequestå 容ï¼"); Debug.WriteLine(startProcessInstanceRequest); return $"TeaException: Code={err.Code}, Message={err.Message}"; } catch (Exception _err) { return $"Exception: {_err.Message}"; } } else { return "æ¨ä¸æ¯å ¬å¸æåæè¿æªè¢«å å ¥å°æ°æ®åºä¸æååå¡«åéè¯¯ï¼æ»ä¹æªæ¾å°å¹é çç¨æ·ä¿¡æ¯"; } } @@ -357,45 +367,60 @@ private bool SaveOrUpdateData(SqlSugarScope db, QcIssueResults qcIssueResults) { // æ£æ¥ProcessNoæ¯å¦å·²ç»åå¨äºæ°æ®åºä¸ var existingRecord = db.Queryable<QcIssueResults>() .Where(it => it.ProcessNo == qcIssueResults.ProcessNo) .First(); // 使ç¨FirstOrDefaultæ¿ä»£ // æ¥è¯¢ QcIssueResults è¡¨ä¸æ¯å¦åå¨å¹é çè®°å½ var mapping = db.Queryable<QcIssueResults>() .Where(t => t.ProcessNo == qcIssueResults.ProcessNo) .Select(t => new QcIssueResults { ReleaseNo = t.ReleaseNo, }) .ToList(); if (existingRecord != null) if (mapping.Any()) { // 妿åå¨ï¼æ´æ°è®°å½ existingRecord.ProcessNo = qcIssueResults.ProcessNo; // å设Dataæ¯éè¦æ´æ°çåæ®µ existingRecord.FReview = qcIssueResults.FReview; // æ´æ°å ¶ä»å段 // ... æ´æ°å ¶ä»éè¦æ´æ°çåæ®µ string ReleaseNo = mapping.FirstOrDefault().ReleaseNo; // æ§è¡æ´æ°æä½ var updateResult = db.Updateable(existingRecord).ExecuteCommand(); return updateResult > 0; // å¦ææ´æ°æåï¼è¿åtrue // åªæ´æ° ReleaseNo å FReview ä¸¤ä¸ªåæ®µ var updateResult = db.Updateable<QcIssueResults>() .SetColumns(t => new QcIssueResults { ReleaseNo = ReleaseNo, FReview = qcIssueResults.FReview }) .Where(t => t.ProcessNo == qcIssueResults.ProcessNo) // æ¾å¼æå®æ´æ°æ¡ä»¶ .ExecuteCommand(); // æ¥è¯¢ UpdateMesQaItems è¡¨ä¸æ¯å¦åå¨å¹é çè®°å½ var existingRecord = db.Queryable<UpdateMesQaItems>() .Where(it => it.ReleaseNo == ReleaseNo) .First(); // ä½¿ç¨ First è·åç¬¬ä¸æ¡è®°å½ Debug.WriteLine($"æ¥è¯¢å°ç mapping: {JsonConvert.SerializeObject(existingRecord)}"); if (existingRecord != null) { // æ´æ° UpdateMesQaItems 表ä¸çåæ®µ existingRecord.FngHandle = qcIssueResults.FReview; // æ§è¡æ´æ°æä½ updateResult = db.Updateable(existingRecord).ExecuteCommand(); return updateResult > 0; // å¦ææ´æ°æåï¼è¿å true } else { throw new Exception("æªæ¾å°éè¦æ´æ°çè®°å½"); } } else { // 妿 mapping ä¸ºç©ºï¼æå ¥æ°è®°å½å° QcIssueResults 表 var orUpdate = base.Insert(qcIssueResults); if (orUpdate) return true; throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); } } ///** // * å°å¸¦ææµç¨å·åæ£éªåå·çæ°è®°å½æå ¥è¡¨ä¸ // */ //public dynamic GetDingUserId() //{ // return UseTransaction(db => // { // return SaveOrUpdateData(db) ? 1 : 0; // }) > 0; //} //public string FindDingUserId(SqlSugarScope db,DingNameCode dingNameCode) //{ //} } MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,157 @@ using MES.Service.DB; using MES.Service.Modes.QcIssueResult; using MES.Service.Modes.SentLaboratory; using Newtonsoft.Json; using SqlSugar; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; namespace MES.Service.service.SentLaboratory; public class SaveLaboratoryManager:Repository<UpdateMesQmsSample> { public dynamic Save(GetLaboratoryDetails getLaboratoryDetails) { var mesUpdateMesQmsSample = GetMesQcIssueResults(getLaboratoryDetails); return UseTransaction(db => { return SaveOrUpdateData(db, mesUpdateMesQmsSample) ? 1 : 0; }) > 0; } public UpdateMesQmsSample GetMesQcIssueResults(GetLaboratoryDetails getLaboratoryDetails) { var mesUpdateMesQmsSample = new UpdateMesQmsSample { ReleaseNo = getLaboratoryDetails.RELEASE_NO, DEPARTMENTNAME = getLaboratoryDetails.DEPARTMENTNAME, CreateDate = getLaboratoryDetails.CREATE_DATE1, QUANTITY = getLaboratoryDetails.QUANTITY, CompleteDate = getLaboratoryDetails.COMPLETE_DATE, TestReq=getLaboratoryDetails.TEST_REQ, SimReq = getLaboratoryDetails.SIM_REQ, ItemNo = getLaboratoryDetails.ITEM_NO, UrgentFlag = getLaboratoryDetails.URGENT_FLAG, JYDH = getLaboratoryDetails.JYDH, REMARKS = getLaboratoryDetails.REMARKS, ItemName = getLaboratoryDetails.ITEM_NAME, DEPARTMENTCODE = getLaboratoryDetails.DEPARTMENTCODE, PAPERBILLNO = getLaboratoryDetails.LOT_NO, }; // éå CHECKBOX å¹¶èµå¼ foreach (var item in getLaboratoryDetails.CHECKBOX) { switch (item.InspectionItems) { case "ç£éæå": mesUpdateMesQmsSample.Check01 = 1; break; case "ç£éæ¿é": mesUpdateMesQmsSample.Check02 = 1; break; case "çé¾": mesUpdateMesQmsSample.Check03 = 1; break; case "IP": mesUpdateMesQmsSample.Check04 = 1; break; case "èåæµè¯": mesUpdateMesQmsSample.Check05 = 1; break; case "ä¼ å¯¼è¾å°": mesUpdateMesQmsSample.Check06 = 1; break; case "è·è½æµè¯": mesUpdateMesQmsSample.Check07 = 1; break; case "çµçº¿æå": mesUpdateMesQmsSample.Check08 = 1; break; case "æ¥å£ææ": mesUpdateMesQmsSample.Check09 = 1; break; case "å è°±æµè¯": mesUpdateMesQmsSample.Check10 = 1; break; case "ROHS": mesUpdateMesQmsSample.Check11 = 1; break; case "çµæ± å æ¾çµ": mesUpdateMesQmsSample.Check12 = 1; break; case "髿¸©": mesUpdateMesQmsSample.Check13 = 1; break; case "使¸©": mesUpdateMesQmsSample.Check14 = 1; break; case "IK": mesUpdateMesQmsSample.Check15 = 1; break; case "æ¸©åæµè¯": mesUpdateMesQmsSample.Check16 = 1; break; case "寿å½": mesUpdateMesQmsSample.Check17 = 1; break; case "å ¶å®": mesUpdateMesQmsSample.Check18 = 1; mesUpdateMesQmsSample.Line04 = getLaboratoryDetails.Line04; break; default: // 妿 InspectionItems ä¸å¹é 任使¡ä»¶ï¼å¯ä»¥éæ©å¿½ç¥æè®°å½æ¥å¿ break; } } return mesUpdateMesQmsSample; } /** * æå ¥æ°æ®åºè¡¨ */ private bool SaveOrUpdateData(SqlSugarScope db, UpdateMesQmsSample updateMesQmsSample) { ////// æ¥è¯¢ QcIssueResults è¡¨ä¸æ¯å¦åå¨å¹é çè®°å½ ////var mapping = db.Queryable<UpdateMesQmsSample>() //// .Where(t => t.ReleaseNo == updateMesQmsSample.ReleaseNo) //// .Select(t => new QcIssueResults //// { //// ReleaseNo = t.ReleaseNo, //// }) //// .ToList(); //// æ¥è¯¢ UpdateMesQmsSample è¡¨ä¸æ¯å¦åå¨å¹é çè®°å½ //var existingRecord = db.Queryable<UpdateMesQmsSample>() // .Where(t => t.ReleaseNo == updateMesQmsSample.ReleaseNo) // .First(); // ä½¿ç¨ First è·åç¬¬ä¸æ¡è®°å½ //if (existingRecord != null) //{ // // æ´æ° UpdateMesQaItems 表ä¸çåæ®µ // updateMesQmsSample.Id = existingRecord.Id; // // æ§è¡æ´æ°æä½ // var updateResult = db.Updateable(updateMesQmsSample).ExecuteCommand(); // return updateResult > 0; // å¦ææ´æ°æåï¼è¿å true //} //else //{ // Debug.WriteLine("æå ¥"); // 妿 mapping ä¸ºç©ºï¼æå ¥æ°è®°å½å° QcIssueResults 表 var orUpdate = base.Insert(updateMesQmsSample); if (orUpdate) return true; throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); //} } } MES.Service/service/SentLaboratory/SentLaboratoryTestingItemsManager.cs
ÎļþÃû´Ó MES.Service/service/BasicData/SentLaboratoryTestingItemsManager.cs ÐÞ¸Ä @@ -1,8 +1,15 @@ using MES.Service.DB; using MES.Service.Dto.webApi.QcIssueResult; using MES.Service.Modes; using MES.Service.Modes.QcIssueResult; using MES.Service.Modes.SentLaboratory; using Microsoft.Data.SqlClient; using Newtonsoft.Json; using Oracle.ManagedDataAccess.Client; using SqlSugar; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -72,4 +79,34 @@ .ExecuteCommand(); //转æDeleteableå®ç°å¤æçæä½ } public string GetBillCode(string param1, string param2, string param3) { string result = null; // è¿æ¥å符串 string connectionString = "User Id=yc_dev;Password=ycdev;Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.100)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))"; // SQL æ¥è¯¢ string sql = "SELECT getbillcode1(:param1, :param2, :param3) FROM dual"; using (OracleConnection connection = new OracleConnection(connectionString)) { using (OracleCommand command = new OracleCommand(sql, connection)) { // æ·»å åæ° command.Parameters.Add("param1", OracleDbType.Varchar2).Value = param1; command.Parameters.Add("param2", OracleDbType.Varchar2).Value = param2; command.Parameters.Add("param3", OracleDbType.Varchar2).Value = param3; // æå¼è¿æ¥ connection.Open(); // æ§è¡æ¥è¯¢ result = command.ExecuteScalar()?.ToString(); } } return result; } } MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs
@@ -1,11 +1,16 @@ using System.Dynamic; using System.Diagnostics; using System.Dynamic; using MES.Service.Dto.webApi; using MES.Service.Modes; using MES.Service.Modes.QcIssueResult; using MES.Service.Modes.SentLaboratory; using MES.Service.service; using MES.Service.service.BasicData; using MES.Service.service.SentLaboratory; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers.BasicData; @@ -15,6 +20,7 @@ { private readonly MessageCenterManager _manager = new(); private readonly SentLaboratoryTestingItemsManager m = new(); private readonly SaveLaboratoryManager n = new(); private readonly string METHOD = "POST"; @@ -33,6 +39,8 @@ { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetList(); resultInfos.ReleaseNo = m.GetBillCode("1000", "1000", "SJDH"); return new ResponseResult { status = 0, @@ -45,4 +53,55 @@ return ResponseResult.ResponseError(ex); } } [HttpPost("GetLaboratoryList")] public ResponseResult GetLaboratoryList() { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = n.GetList(); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } [HttpPost("SaveLaboratoryDetails")] public IActionResult SaveLaboratoryDetails([FromBody] GetLaboratoryDetails getLaboratoryDetails) { try { var result = n.Save(getLaboratoryDetails); string getLaboratoryDetailsJson = JsonConvert.SerializeObject(getLaboratoryDetails, Formatting.Indented); Debug.WriteLine("getLaboratoryDetails: " + getLaboratoryDetailsJson); //return Ok(result); return Ok(result); } catch (Exception ex) { // æè·å¼å¸¸å¹¶è¿åéè¯¯ä¿¡æ¯ return StatusCode(500, $"{ex.Message}"); } } //[HttpPost("DeleteLaboratoryDetails")] //public IActionResult DeleteLaboratoryDetails(string JYDH) //{ //} } MESApplication/Controllers/ProductionOrder/ProductionOrderController.cs
ÎļþÃû´Ó MESApplication/Controllers/BasicData/ProductionOrderController.cs ÐÞ¸Ä @@ -1,8 +1,11 @@ using MES.Service.Dto.webApi; using MES.Service.Dto.webApi.DeliveryNote; using MES.Service.Dto.webApi.ProductionOrder; using MES.Service.Modes; using MES.Service.Modes.ProductionOrder; using MES.Service.Modes.QcIssueResult; using MES.Service.service; using MES.Service.service.ProductionOrder; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; @@ -10,7 +13,7 @@ using System.Diagnostics; using System.Dynamic; namespace MESApplication.Controllers.BasicData; namespace MESApplication.Controllers.ProductionOrder; [ApiController] [Route("api/ProductionOrder")] @@ -136,12 +139,17 @@ } [HttpPost("GetFileUrl")] public IActionResult StartGetUrl() { public IActionResult StartGetUrl(string imageUrl) { try { // è°ç¨ QcIssueResultManager ä¸ç GetProcessNo æ¹æ³æ¥å¯å¨éé工使µå®ä¾ string result = m.GetFileUrl(); //string result = m.GetSpaceId(); //ResultDataAndSpaceId resultData = JsonConvert.DeserializeObject<ResultDataAndSpaceId>(result); //string SpaceId = resultData.Result.SpaceId; //string result = m.GetPermissions(); //string jsonPart = result.Substring(result.IndexOf("{")); //Debug.WriteLine(jsonPart); @@ -155,6 +163,9 @@ ////var save = m.SaveProcessNo(ReleaseNo, instanceId); ////resultInfos.tbBillList = save; Debug.WriteLine(imageUrl); string result = m.GetFileUrl(imageUrl); Debug.WriteLine(result); return Ok(result); } catch (Exception ex) MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs
@@ -33,6 +33,7 @@ try { // è°ç¨ QcIssueResultManager ä¸ç GetProcessNo æ¹æ³æ¥å¯å¨éé工使µå®ä¾ string result = m.GetProcessNo(getQcIssueResultDetail); @@ -45,8 +46,8 @@ dynamic resultInfos = new ExpandoObject(); string ProcessNo = instanceId; //var save = m.SaveProcessNo(ReleaseNo, instanceId); //resultInfos.tbBillList = save; var save = m.SaveProcessNo(getQcIssueResultDetail.ReleaseNo, instanceId); resultInfos.tbBillList = save; return Ok(result); } MESApplication/bin/Debug/net8.0/MES.Service.dllBinary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.dllBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exeBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdbBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -462,12 +462,6 @@ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.GetList"> <summary> è·åææ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeController.Save(MES.Service.Dto.webApi.SaleDeliveryNotice)"> <summary> åæ¡ä¸»è¡¨æ°æ®ä¿åæä½ @@ -870,6 +864,12 @@ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ProductionOrder.ProductionOrderController.GetList"> <summary> è·åææ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList"> <summary> è·åææ