| StandardInterface/MES.Service/Modes/LtsCqj.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/Modes/MesCqItemsDetect01.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/Modes/MesCqItemsDetectDetail12.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/Modes/MesCqItemsDetectDetail5.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/Modes/MesQsImage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/service/QC/CqjService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MESApplication/Controllers/QC/CqjController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MESApplication/appsettings.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
StandardInterface/MES.Service/Modes/LtsCqj.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,124 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// è¶ ææ£éªè§å¾ V_CQJ /// </summary> [SugarTable("V_CQJ")] public class LtsCqj { /// <summary> /// ID /// </summary> [SugarColumn(ColumnName = "ID")] public decimal? Id { get; set; } /// <summary> /// æ£éªåå· /// </summary> [SugarColumn(ColumnName = "RELEASE_NO")] public string? ReleaseNo { get; set; } /// <summary> /// ç©æID /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } /// <summary> /// ç©æç¼ç /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; } /// <summary> /// ç©æåç§° /// </summary> [SugarColumn(ColumnName = "ITEM_NAME")] public string? ItemName { get; set; } /// <summary> /// è§æ ¼åå· /// </summary> [SugarColumn(ColumnName = "ITEM_MODEL")] public string? ItemModel { get; set; } /// <summary> /// éæ£æ¹æ¬¡ /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string? LotNo { get; set; } /// <summary> /// æäº¤æ è¯ /// </summary> [SugarColumn(ColumnName = "FSUBMIT")] public decimal? Fsubmit { get; set; } /// <summary> /// å建æ¶é´ /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// å建人 /// </summary> [SugarColumn(ColumnName = "CJR")] public string? Cjr { get; set; } /// <summary> /// æ£éªç»æ /// </summary> [SugarColumn(ColumnName = "FCHECK_RESU")] public string? FcheckResu { get; set; } /// <summary> /// 夿³¨ä¿¡æ¯ /// </summary> [SugarColumn(ColumnName = "LOT_NO1")] public string? LotNo1 { get; set; } /// <summary> /// ä¸è¯æè¿° /// </summary> [SugarColumn(ColumnName = "FNG_DESC")] public string? FngDesc { get; set; } /// <summary> /// 鿣æ°é /// </summary> [SugarColumn(ColumnName = "FBATCH_QTY")] public decimal? FbatchQty { get; set; } /// <summary> /// æäº¤äºº /// </summary> [SugarColumn(ColumnName = "TJR")] public string? Tjr { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "FNUMBER")] public string? Fnumber { get; set; } /// <summary> /// éæ£äºº /// </summary> [SugarColumn(ColumnName = "SJR")] public string? Sjr { get; set; } /// <summary> /// 鿣åå· /// </summary> [SugarColumn(ColumnName = "DECLARATION_NO")] public string? DeclarationNo { get; set; } /// <summary> /// æ£éªé¡¹ç®æ°éï¼éæ°æ®åºå段ï¼ç¨äºå端æ¾ç¤ºï¼ /// </summary> [SugarColumn(IsIgnore = true)] public int? InspectionItemCount { get; set; } } StandardInterface/MES.Service/Modes/MesCqItemsDetect01.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,127 @@ using System.ComponentModel.DataAnnotations.Schema; using SqlSugar; namespace MES.Service.Modes; /// <summary> /// è¶ ææ£éªå主表 MES_CQ_ITEMS_DETECT_01 /// </summary> [Table("MES_CQ_ITEMS_DETECT_01")] [SugarTable("MES_CQ_ITEMS_DETECT_01")] public class MesCqItemsDetect01 { /// <summary> /// 主é®ID /// </summary> [Column("ID")] [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_CQ_ID", ColumnName = "ID")] public decimal? Id { get; set; } /// <summary> /// æ£éªåå· /// </summary> [SugarColumn(ColumnName = "RELEASE_NO")] public string? ReleaseNo { get; set; } /// <summary> /// ç©æID /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } /// <summary> /// ç©æç¼ç /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; } /// <summary> /// éæ£æ¹æ¬¡ /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string? LotNo { get; set; } /// <summary> /// æäº¤æ è¯ /// </summary> [SugarColumn(ColumnName = "FSUBMIT")] public decimal? Fsubmit { get; set; } /// <summary> /// æ£éªç»æ /// </summary> [SugarColumn(ColumnName = "FCHECK_RESU")] public string? FcheckResu { get; set; } /// <summary> /// æ£éªæ¥æ /// </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 = "LOT_NO1")] public string? LotNo1 { get; set; } /// <summary> /// ä¸è¯æè¿° /// </summary> [SugarColumn(ColumnName = "FNG_DESC")] public string? FngDesc { get; set; } /// <summary> /// 鿣æ°é /// </summary> [SugarColumn(ColumnName = "FBATCH_QTY")] public decimal? FbatchQty { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "ITEM_UNIT")] public decimal? ItemUnit { 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 = "FACTORY")] public string? Factory { get; set; } /// <summary> /// å ¬å¸ /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } } StandardInterface/MES.Service/Modes/MesCqItemsDetectDetail12.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,85 @@ using System.ComponentModel.DataAnnotations.Schema; using SqlSugar; namespace MES.Service.Modes; /// <summary> /// è¶ ææ£éªç»æè¡¨ MES_CQ_ITEMS_DETECT_DETAIL12 /// </summary> [Table("MES_CQ_ITEMS_DETECT_DETAIL12")] [SugarTable("MES_CQ_ITEMS_DETECT_DETAIL12")] public class MesCqItemsDetectDetail12 { /// <summary> /// 主é®ID /// </summary> [Column("ID")] [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_CQ_ID", ColumnName = "ID")] public decimal? Id { get; set; } /// <summary> /// 主表IDï¼å ³èMES_CQ_ITEMS_DETECT_DETAIL5ï¼ /// </summary> [SugarColumn(ColumnName = "MAIN_ID")] public decimal? MainId { get; set; } /// <summary> /// æ£éªåå· /// </summary> [SugarColumn(ColumnName = "RELEASE_NO")] public string? ReleaseNo { get; set; } /// <summary> /// æ åå¼ /// </summary> [SugarColumn(ColumnName = "FSTAND")] public string? Fstand { 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(IsIgnore = true)] public DateTime? LastupdateDate { get; set; } /// <summary> /// å·¥å /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// å ¬å¸ /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// æ°éï¼ç¨äºæ¹éæå ¥ï¼ /// </summary> [SugarColumn(IsIgnore = true)] public int? count { get; set; } } StandardInterface/MES.Service/Modes/MesCqItemsDetectDetail5.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,157 @@ using System.ComponentModel.DataAnnotations.Schema; using SqlSugar; namespace MES.Service.Modes; /// <summary> /// è¶ ææ£éªé¡¹ç®è¡¨ MES_CQ_ITEMS_DETECT_DETAIL5 /// </summary> [Table("MES_CQ_ITEMS_DETECT_DETAIL5")] [SugarTable("MES_CQ_ITEMS_DETECT_DETAIL5")] public class MesCqItemsDetectDetail5 { /// <summary> /// 主é®ID /// </summary> [Column("ID")] [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_CQ_ID", ColumnName = "ID")] public decimal? Id { get; set; } /// <summary> /// æ£éªåå· /// </summary> [SugarColumn(ColumnName = "RELEASE_NO")] public string? ReleaseNo { get; set; } /// <summary> /// æ¥åæ°´å /// </summary> [SugarColumn(ColumnName = "FAC_LEVEL")] public string? FacLevel { get; set; } /// <summary> /// æ£éªé¡¹ç® /// </summary> [SugarColumn(ColumnName = "FCHECK_ITEM")] public string? FcheckItem { get; set; } /// <summary> /// æ£éªå·¥å · /// </summary> [SugarColumn(ColumnName = "FCHECK_TOOL")] public string? FcheckTool { get; set; } /// <summary> /// ä¸é /// </summary> [SugarColumn(ColumnName = "FDOWN_ALLOW")] public string? FdownAllow { get; set; } /// <summary> /// æ£éªç级 /// </summary> [SugarColumn(ColumnName = "FCHECK_LEVEL")] public string? FcheckLevel { get; set; } /// <summary> /// æ åå¼ /// </summary> [SugarColumn(ColumnName = "FSTAND")] public string? Fstand { get; set; } /// <summary> /// ä¸é /// </summary> [SugarColumn(ColumnName = "FUP_ALLOW")] public string? FupAllow { get; set; } /// <summary> /// æ ·æ¬é /// </summary> [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")] public string? SampleSizeNo { get; set; } /// <summary> /// è§æ ¼è¦æ± /// </summary> [SugarColumn(ColumnName = "FSPEC_REQU")] public string? FspecRequ { get; set; } /// <summary> /// ææ¶æ°é /// </summary> [SugarColumn(ColumnName = "FRE_QTY")] public decimal? FreQty { get; set; } /// <summary> /// åºæ£æ°é /// </summary> [SugarColumn(ColumnName = "CHECK_QYT")] public decimal? CheckQyt { get; set; } /// <summary> /// æ£éªç»æ /// </summary> [SugarColumn(ColumnName = "FCHECK_RESU")] public string? FcheckResu { get; set; } /// <summary> /// æ£éªé¡¹ç®æè¿° /// </summary> [SugarColumn(ColumnName = "FCHECK_ITEM_DESC")] public string? FcheckItemDesc { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "FUNIT")] public string? Funit { get; set; } /// <summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "MEOM")] public string? Meom { get; set; } /// <summary> /// å·¥å /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// å ¬å¸ /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// å·²æ£æ°é /// </summary> [SugarColumn(ColumnName = "FENTER_QTY")] public int? FenterQty { get; set; } /// <summary> /// ä¸è¯æ°é /// </summary> [SugarColumn(ColumnName = "FNG_QTY")] public int? FngQty { get; set; } /// <summary> /// ACæ°ï¼æ¥æ¶æ°éï¼ /// </summary> [SugarColumn(ColumnName = "FAC_QTY")] public int? FacQty { get; set; } /// <summary> /// å ç©´å·ï¼è¶ ææ£éªä¸ä½¿ç¨ï¼ /// </summary> [SugarColumn(IsIgnore = true)] public string? Dnum { get; set; } /// <summary> /// ä¸åæ ¼æ°ï¼éæ°æ®åºåæ®µï¼ /// </summary> [SugarColumn(IsIgnore = true)] public int? Unqualified { get; set; } } StandardInterface/MES.Service/Modes/MesQsImage.cs
@@ -36,11 +36,11 @@ public byte[]? ImageData { get; set; } /// <summary> /// 1ä¸ºé¦æ£ï¼2为巡æ£ï¼3ä¸ºå ¥åºæ£ /// 1ä¸ºé¦æ£ï¼2为巡æ£ï¼3ä¸ºå ¥åºæ£ï¼4ä¸ºæ¥ææ£éªï¼5ä¸ºè¶ ææ£éª /// </summary> [Column("QS_TYPE")] [SugarColumn(ColumnName = "QS_TYPE")] //ç¨äºSqlSugar [StringLength(1, ErrorMessage = "1ä¸ºé¦æ£ï¼2为巡æ£ï¼3ä¸ºå ¥åºæ£é¿åº¦ä¸è½è¶ åº1")] [StringLength(1, ErrorMessage = "æ£éªç±»åé¿åº¦ä¸è½è¶ åº1")] public string? QsType { get; set; } /// <summary> StandardInterface/MES.Service/service/QC/CqjService.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,577 @@ using System.Data; using MES.Service.DB; using MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.util; using SqlSugar; namespace MES.Service.service.QC; public class CqjService { /// <summary> /// è·åè¶ ææ£éªå表ï¼åé¡µï¼ /// </summary> /// <param name="queryObj">æ¥è¯¢å¯¹è±¡</param> /// <returns>åé¡µæ°æ®</returns> public (List<LtsCqj> item, int TotalCount) GetPage(XJPageResult queryObj) { if (string.IsNullOrEmpty(queryObj.createUser)) return ([], 0); var db = SqlSugarHelper.GetInstance(); var id = Convert.ToDecimal(queryObj.id); int totalCount = 0; // æ¥è¯¢è¶ ææ£éªå表 var pageList = db.Queryable<LtsCqj>() .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && "æªå®æ".Equals(queryObj.result), a => a.FcheckResu == null) .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && !"æªå®æ".Equals(queryObj.result), a => a.FcheckResu != null) .WhereIF(id > 0, a => a.Id == id) // æç´¢æ¡ä»¶ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 1, // ç©æç¼å·æç´¢ a => a.ItemNo != null && a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 2, // ç©æåç§°æç´¢ a => a.ItemName != null && a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 3, // éæ£æ¹æ¬¡æç´¢ a => a.LotNo != null && a.LotNo.ToLower().Contains(queryObj.SearchValue.ToLower())) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 4, // 鿣åå·æç´¢ a => a.DeclarationNo != null && a.DeclarationNo.ToLower().Contains(queryObj.SearchValue.ToLower())) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 5, // æ£éªåå·æç´¢ a => a.ReleaseNo != null && a.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower())) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 6, // ç©æè§æ ¼æç´¢ a => a.ItemModel != null && a.ItemModel.ToLower().Contains(queryObj.SearchValue.ToLower())) .Select(a => new LtsCqj { Id = a.Id, ReleaseNo = a.ReleaseNo, ItemId = a.ItemId, ItemNo = a.ItemNo, ItemName = a.ItemName, ItemModel = a.ItemModel, LotNo = a.LotNo, Fsubmit = a.Fsubmit, CreateDate = a.CreateDate, Cjr = a.Cjr, FcheckResu = a.FcheckResu, LotNo1 = a.LotNo1, FngDesc = a.FngDesc, FbatchQty = a.FbatchQty, Tjr = a.Tjr, Fnumber = a.Fnumber, Sjr = a.Sjr, DeclarationNo = a.DeclarationNo }) .OrderBy(a => a.CreateDate, OrderByType.Desc) .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); // æ¹éè·åæ£éªé¡¹ç®æ°é if (pageList.Any()) { var releaseNos = pageList.Select(x => x.ReleaseNo).Distinct().ToList(); foreach (var item in pageList) { var count = db.Queryable<MesCqItemsDetectDetail5>() .Where(x => x.ReleaseNo == item.ReleaseNo) .Count(); item.InspectionItemCount = count; } } // è®¡ç®æ»æ° int allDataQuery = db.Queryable<LtsCqj>() .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && "æªå®æ".Equals(queryObj.result), a => a.FcheckResu == null) .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && !"æªå®æ".Equals(queryObj.result), a => a.FcheckResu != null) .WhereIF(id > 0, a => a.Id == id) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 1, a => a.ItemNo != null && a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 2, a => a.ItemName != null && a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 3, a => a.LotNo != null && a.LotNo.ToLower().Contains(queryObj.SearchValue.ToLower())) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 4, a => a.DeclarationNo != null && a.DeclarationNo.ToLower().Contains(queryObj.SearchValue.ToLower())) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 5, a => a.ReleaseNo != null && a.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower())) .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 6, a => a.ItemModel != null && a.ItemModel.ToLower().Contains(queryObj.SearchValue.ToLower())) .Select(a => a.ReleaseNo) .Distinct() .Count(); return (pageList, allDataQuery); } /// <summary> /// è°ç¨åå¨è¿ç¨ï¼éæ°è·åæ£éªé¡¹ç® /// </summary> /// <param name="itemNo">ç©æç¼å·</param> /// <param name="quantity">æ°é</param> /// <param name="releaseNo">æ£éªåå·</param> /// <returns>æ§è¡ç»æ</returns> public string[] SetItems(decimal itemNo, decimal quantity, string releaseNo) { // å®ä¹è¾åºåæ° var outputResult = new SugarParameter("PO_RESULT", null, System.Data.DbType.Int32, ParameterDirection.Output, 4000); var outputMessage = new SugarParameter("PO_TEXT", null, System.Data.DbType.String, ParameterDirection.Output, 4000); // å®ä¹è¾å ¥åæ° var parameters = new List<SugarParameter> { new("P_RELEASE_NO", releaseNo, System.Data.DbType.String, ParameterDirection.Input), new("P_ITEM_ID", itemNo, System.Data.DbType.Decimal, ParameterDirection.Input), outputResult, outputMessage }; var db = SqlSugarHelper.GetInstance(); // ä½¿ç¨ SqlSugar æ§è¡åå¨è¿ç¨ db.Ado.ExecuteCommand( "BEGIN PRC_CQ_ITEM_INSERT_BTN(:P_RELEASE_NO, :P_ITEM_ID, :PO_RESULT, :PO_TEXT); END;", parameters.ToArray()); // è·åè¾åºåæ°çå¼ var resultValue = outputResult.Value?.ToString(); var messageValue = outputMessage.Value?.ToString(); string[] msg = new string[2]; msg[0] = resultValue; msg[1] = messageValue; return msg; } /// <summary> /// è·åæ£éªé¡¹ç®å表 /// </summary> /// <param name="releaseNo">æ£éªåå·</param> /// <param name="id">项ç®ID</param> /// <returns>æ£éªé¡¹ç®å表</returns> public List<MesCqItemsDetectDetail5> GetItems(string? releaseNo, decimal? id) { var db = SqlSugarHelper.GetInstance(); return db.Queryable<MesCqItemsDetectDetail5, MesCqItemsDetectDetail12>( (a, b) => new JoinQueryInfos(JoinType.Left, a.Id == b.MainId)) .Where((a, b) => a.ReleaseNo == releaseNo) .GroupBy((a, b) => new { a.Id, a.ReleaseNo, a.FacLevel, a.FcheckItem, a.FcheckTool, a.FdownAllow, a.FcheckLevel, a.Fstand, a.FupAllow, a.SampleSizeNo, a.FspecRequ, a.FreQty, a.CheckQyt, a.FcheckResu, a.FcheckItemDesc, a.Funit, a.Meom, a.FngQty, // æ·»å ä¸åæ ¼æ° a.FacQty // æ·»å ACæ° }).Select((a, b) => new MesCqItemsDetectDetail5 { Id = a.Id, ReleaseNo = a.ReleaseNo, CheckQyt = a.CheckQyt, FacLevel = a.FacLevel, FcheckItem = a.FcheckItem, FcheckTool = a.FcheckTool, FdownAllow = a.FdownAllow, FcheckLevel = a.FcheckLevel, Fstand = a.Fstand, FupAllow = a.FupAllow, SampleSizeNo = a.SampleSizeNo, FspecRequ = a.FspecRequ, FreQty = a.FreQty, Factory = "1000", Company = "1000", FenterQty = SqlFunc.AggregateCount(b.Id), // å·²å½å ¥æ°é FngQty = a.FngQty, // ä¸åæ ¼æ°ï¼ä»æ°æ®åºè¯»åï¼ç± updateDetail5 æ´æ°ï¼ FacQty = a.FacQty, // ACæ° FcheckResu = a.FcheckResu, FcheckItemDesc = a.FspecRequ, Funit = a.Funit, Meom = a.Meom }) .OrderBy(a => SqlFunc.IIF(a.Fstand != null, 0, 1)) .OrderBy(a => a.FcheckItem, OrderByType.Desc) .ToList(); } /// <summary> /// å é¤è¶ ææ£éªå /// </summary> /// <param name="releaseNo">æ£éªåå·</param> /// <returns>å½±åè¡æ°</returns> public int RemoveCqj(string? releaseNo) { var withOracle = SqlSugarHelper.UseTransactionWithOracle(db => { var commit = 0; // å é¤ä¸»è¡¨ commit += db.Deleteable<MesCqItemsDetect01>() .Where(s => s.ReleaseNo == releaseNo) .ExecuteCommand(); // å é¤å表 commit += db.Deleteable<MesCqItemsDetectDetail5>() .Where(s => s.ReleaseNo == releaseNo) .ExecuteCommand(); // å é¤å表 commit += db.Deleteable<MesCqItemsDetectDetail12>() .Where(s => s.ReleaseNo == releaseNo) .ExecuteCommand(); return commit; }); return withOracle; } /// <summary> /// ä¿åä¸è¯æè¿°å°ä¸»è¡¨ /// </summary> /// <param name="gid">主表ID</param> /// <param name="releaseNo">æ£éªåå·</param> /// <param name="fngDesc">ä¸è¯æè¿°</param> /// <returns>å½±åè¡æ°</returns> public int SaveRemarksGid(decimal gid, string? releaseNo, string? fngDesc) { var db = SqlSugarHelper.GetInstance(); return db.Updateable<MesCqItemsDetect01>() .SetColumns(it => new MesCqItemsDetect01 { FngDesc = fngDesc // 使ç¨FNG_DESCåæ®µåå¨ä¸è¯æè¿° }) .Where(it => it.Id == gid && it.ReleaseNo == releaseNo) .ExecuteCommand(); } /// <summary> /// ä¿å夿³¨å°ä¸»è¡¨ /// </summary> /// <param name="gid">主表ID</param> /// <param name="releaseNo">æ£éªåå·</param> /// <param name="lotNo1">夿³¨å 容</param> /// <returns>å½±åè¡æ°</returns> public int SaveLotNo1(decimal gid, string? releaseNo, string? lotNo1) { var db = SqlSugarHelper.GetInstance(); return db.Updateable<MesCqItemsDetect01>() .SetColumns(it => new MesCqItemsDetect01 { LotNo1 = lotNo1 // 使ç¨LOT_NO1åæ®µåå¨å¤æ³¨ }) .Where(it => it.Id == gid && it.ReleaseNo == releaseNo) .ExecuteCommand(); } /// <summary> /// ä¿åä¸è¯æè¿°å°å表 /// </summary> /// <param name="pid">å表ID</param> /// <param name="funit">ä¸è¯æè¿°</param> /// <returns>å½±åè¡æ°</returns> public int SaveRemarksPid(decimal pid, string? funit) { var db = SqlSugarHelper.GetInstance(); return db.Updateable<MesCqItemsDetectDetail5>() .SetColumns(it => new MesCqItemsDetectDetail5 { Funit = funit }) .Where(it => it.Id == pid) .ExecuteCommand(); } /// <summary> /// ä¿å夿³¨å°å表 /// </summary> /// <param name="pid">å表ID</param> /// <param name="meom">夿³¨</param> /// <returns>å½±åè¡æ°</returns> public int SaveMeom(decimal pid, string? meom) { var db = SqlSugarHelper.GetInstance(); return db.Updateable<MesCqItemsDetectDetail5>() .SetColumns(it => new MesCqItemsDetectDetail5 { Meom = meom }) .Where(it => it.Id == pid) .ExecuteCommand(); } /// <summary> /// æ°å¢æ£éªè¯¦æ è®°å½ï¼æ¹éï¼ /// </summary> /// <param name="detail">æ£éªè¯¦æ 对象</param> /// <returns>å½±åè¡æ°</returns> public int SetQSItemDetail(MesCqItemsDetectDetail12 detail) { var dbd = SqlSugarHelper.GetInstance(); var oracle = SqlSugarHelper.UseTransactionWithOracle(db => { List<MesCqItemsDetectDetail12> result = new(); for (var i = 0; i < detail.count; i++) { var item = new MesCqItemsDetectDetail12(); item.MainId = detail.MainId; item.ReleaseNo = detail.ReleaseNo; item.Fstand = detail.Fstand; item.FcheckResu = detail.FcheckResu; item.CreateBy = detail.LastupdateBy; item.CreateDate = DateTime.Now; item.Factory = "1000"; item.Company = "1000"; result.Add(item); } return db.Insertable(result).ExecuteCommand(); }); detail.CreateBy = detail.LastupdateBy; updateDetail5(detail); autoResult(detail); return oracle; } //æ´æ°æ£éªæç»å·²æ£ãä¸åæ ¼æ°é private int updateDetail5(MesCqItemsDetectDetail12 detail) { var db = SqlSugarHelper.GetInstance(); //æ¥è¯¢è¿ä¸ªæ£éªé¡¹ç®ä¸çæ£éªæ°é var count = db.Queryable<MesCqItemsDetectDetail12>() .Where(s => s.MainId == detail.MainId).Count(); //è·åä¸åæ ¼æ° var countNo = db.Queryable<MesCqItemsDetectDetail12>() .Where(s => s.MainId == detail.MainId && s.Fstand == "Ã").Count(); //æ´æ°æ£éªæç»å·²æ£æ°é var withOracle = SqlSugarHelper.UseTransactionWithOracle(db => { return db.Updateable<MesCqItemsDetectDetail5>() .SetColumns(s => s.FenterQty == count) .SetColumns(s => s.FngQty == countNo) .Where(s => s.Id == detail.MainId) .ExecuteCommand(); }); return withOracle; } private int autoResult(MesCqItemsDetectDetail12 detail) { var db = SqlSugarHelper.GetInstance(); // Single æ²¡ææ¥è¯¢å°ç»ææ¶è¿åNullï¼å¦æç»æå¤§äº1æ¡ä¼æåºé误 var QsItemOqcItem = db.Queryable<MesCqItemsDetectDetail5>() .Single(s => s.Id == detail.MainId); if (QsItemOqcItem == null) return 0; //æ¥è¯¢è¿ä¸ªæ£éªé¡¹ç®ä¸çæ£éªç»æ var count = db.Queryable<MesCqItemsDetectDetail12>() .Where(s => s.MainId == detail.MainId).Count(); updateDetail5(detail); var result = ""; //æ£éªå®é ç»æä¸çäºåºè¯¥æ£éªçä¸ªæ°æ¶ç´æ¥éåº if (QsItemOqcItem.CheckQyt != count) return 0; //åæ ¼çæå¤å°ä¸ª var passCount = db.Queryable<MesCqItemsDetectDetail12>() .Where(s => s.MainId == detail.MainId && s.Fstand == "â").Count(); //ä¸åæ ¼çæå¤å°ä¸ª var noCount = db.Queryable<MesCqItemsDetectDetail12>() .Where(s => s.MainId == detail.MainId && s.Fstand == "Ã").Count(); if (count == passCount) result = "åæ ¼"; else if (noCount >= QsItemOqcItem.FreQty) result = "ä¸åæ ¼"; var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle( db => { var commit = 0; commit += db.Updateable<MesCqItemsDetectDetail5>() .SetColumns(s => s.FcheckResu == result) .SetColumns(s => s.FenterQty == count) .Where(s => s.Id == detail.MainId) .ExecuteCommand(); return commit; }); return useTransactionWithOracle; } /// <summary> /// è·åæ£éªè¯¦æ è®°å½å表 /// </summary> /// <param name="id">主æ£éªé¡¹ç®ID</param> /// <param name="releaseNo">æ£éªåå·</param> /// <returns>æ£éªè¯¦æ å表</returns> public List<MesCqItemsDetectDetail12> GetQSItemDetail(decimal id, string? releaseNo) { var db = SqlSugarHelper.GetInstance(); return db.Queryable<MesCqItemsDetectDetail12>() .Where(x => x.MainId == id && x.ReleaseNo == releaseNo) .OrderBy(x => x.CreateDate, OrderByType.Asc) .Select(x => new MesCqItemsDetectDetail12 { Id = x.Id, MainId = x.MainId, ReleaseNo = x.ReleaseNo, Fstand = x.Fstand, FcheckResu = x.FcheckResu, CreateBy = x.CreateBy, CreateDate = x.CreateDate, LastupdateBy = x.LastupdateBy, Factory = x.Factory, Company = x.Company // ä¸å å« LastupdateDate åæ®µ }) .ToList(); } /// <summary> /// æ´æ°æ£éªè¯¦æ è®°å½ /// </summary> /// <param name="id">详æ è®°å½ID</param> /// <param name="mainId">主æ£éªé¡¹ç®ID</param> /// <param name="releaseNo">æ£éªåå·</param> /// <param name="fstand">æ£éªæ å</param> /// <param name="fcheckResu">æ£éªç»æ</param> /// <param name="updateBy">æ´æ°äºº</param> /// <returns>å½±åè¡æ°</returns> public int UpdateQSItemDetail(decimal id, decimal mainId, string? releaseNo, string? fstand, string? fcheckResu, string? updateBy) { var db = SqlSugarHelper.GetInstance(); // å æ´æ°æ£éªè¯¦æ è®°å½ var updateResult = db.Updateable<MesCqItemsDetectDetail12>() .SetColumns(it => new MesCqItemsDetectDetail12 { Fstand = fstand, FcheckResu = fcheckResu, LastupdateBy = updateBy // ä¸è®¾ç½® LastupdateDateï¼å ä¸ºæ°æ®åºä¸ä¸å卿¤å段 }) .Where(it => it.Id == id && it.MainId == mainId && it.ReleaseNo == releaseNo) .ExecuteCommand(); // æé detail 对象ç¨äºè°ç¨ autoResult var detail = new MesCqItemsDetectDetail12 { Id = id, MainId = mainId, ReleaseNo = releaseNo, Fstand = fstand, FcheckResu = fcheckResu, LastupdateBy = updateBy, CreateBy = updateBy }; // æ´æ°å·²æ£æ°éåä¸åæ ¼æ°éï¼å¨æ´æ°è®°å½ä¹åæ§è¡ï¼ç¡®ä¿è½æ¥è¯¢å°ææ°ç Fstandï¼ updateDetail5(detail); // èªå¨å¤å®æ£éªç»æ autoResult(detail); return updateResult; } /// <summary> /// æ£éªæäº¤ /// </summary> /// <param name="userNo">ç¨æ·è´¦å·</param> /// <param name="releaseNo">æ£éªåå·</param> /// <returns>æ§è¡ç»æ</returns> public string[] SubmitInspection(string? userNo, string? releaseNo) { try { var db = SqlSugarHelper.GetInstance(); // è·åæ£éªåä¿¡æ¯ï¼åªæ¥è¯¢éè¦çåæ®µï¼é¿å å®ä½æ å°éè¯¯ï¼ var fngDesc = db.Queryable<MesCqItemsDetect01>() .Where(x => x.ReleaseNo == releaseNo) .Select(x => x.FngDesc) .First(); // æ£æ¥æ£éªåæ¯å¦åå¨ var exists = db.Queryable<MesCqItemsDetect01>() .Where(x => x.ReleaseNo == releaseNo) .Any(); if (!exists) { return new[] { "1", "æ£éªåä¸åå¨" }; } // å®ä¹è¾åºåæ° var outputResult = new SugarParameter("o_Result", null, System.Data.DbType.Int32, ParameterDirection.Output, 4000); var outputMessage = new SugarParameter("o_Msg", null, System.Data.DbType.String, ParameterDirection.Output, 4000); // å®ä¹è¾å ¥åæ°ï¼åæ°é¡ºåºå¿ é¡»ä¸åå¨è¿ç¨å®ä¹å®å ¨ä¸è´ï¼ var parameters = new List<SugarParameter> { new("PI_FACTORY", "1000", System.Data.DbType.String, ParameterDirection.Input, 50), new("PI_COMPANY", "1000", System.Data.DbType.String, ParameterDirection.Input, 50), new("p_Release_No", releaseNo ?? "", System.Data.DbType.String, ParameterDirection.Input, 50), new("p_badReason", "", System.Data.DbType.String, ParameterDirection.Input, 200), // 空å符串èéNULL new("p_iqcStatus", "", System.Data.DbType.String, ParameterDirection.Input, 200), // 空å符串èéNULL new("p_workShop", "", System.Data.DbType.String, ParameterDirection.Input, 200), // 空å符串èéNULL new("p_remark", fngDesc ?? "", System.Data.DbType.String, ParameterDirection.Input, 4000), // ä¸è¯æè¿° new("p_User", userNo ?? "", System.Data.DbType.String, ParameterDirection.Input, 50), outputResult, outputMessage }; // è°ç¨åå¨è¿ç¨ db.Ado.ExecuteCommand( "BEGIN Prc_Mes_CQJ_Qa_Submit(:PI_FACTORY, :PI_COMPANY, :p_Release_No, :p_badReason, :p_iqcStatus, :p_workShop, :p_remark, :p_User, :o_Result, :o_Msg); END;", parameters.ToArray()); // è·åè¾åºåæ°çå¼ var resultValue = outputResult.Value?.ToString() ?? "1"; var messageValue = outputMessage.Value?.ToString() ?? "æäº¤å¤±è´¥"; return new[] { resultValue, messageValue }; } catch (Exception ex) { return new[] { "1", $"æäº¤å¼å¸¸ï¼{ex.Message}" }; } } } StandardInterface/MESApplication/Controllers/QC/CqjController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,400 @@ using System.Dynamic; using MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.service.QC; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers.QC; /// <summary> /// è¶ ææ£éªæ§å¶å¨ /// </summary> [Route("api/[controller]")] [ApiController] public class CqjController : ControllerBase { /// <summary> /// è·åè¶ ææ£éªå表ï¼åé¡µï¼ /// </summary> /// <param name="queryObj">æ¥è¯¢åæ°</param> /// <returns>åé¡µæ°æ®</returns> [HttpPost("getPage")] public ResponseResult getPage([FromBody] XJPageResult queryObj) { try { dynamic resultInfos = new ExpandoObject(); var (item, totalCount) = new CqjService().GetPage(queryObj); resultInfos.tbBillList = item; return new ResponseResult { status = 0, message = "OK", data = resultInfos, TotalCount = totalCount }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// è°ç¨åå¨è¿ç¨ï¼è·åæ£éªé¡¹ç® /// </summary> /// <param name="data">å å«itemNoãquantityãreleaseNo</param> /// <returns>æ§è¡ç»æ</returns> [HttpPost("setJYItem")] public ResponseResult setJYItem([FromBody] JObject data) { var itemNo = Convert.ToDecimal(data["itemNo"].ToString()); var quantity = Convert.ToDecimal(data["quantity"].ToString()); var releaseNo = data["releaseNo"].ToString(); try { dynamic resultInfos = new ExpandoObject(); var result = new CqjService().SetItems(itemNo, quantity, releaseNo); resultInfos.tbBillList = result; // æ ¹æ®åå¨è¿ç¨è¿åç»æå¤ææ¯å¦æå var resultCode = result[0]; var resultMessage = result[1]; if (resultCode == "0") { return new ResponseResult { status = 0, message = resultMessage, data = resultInfos }; } else { return new ResponseResult { status = 1, message = resultMessage, data = resultInfos }; } } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// è·åæ£éªé¡¹ç®å表 /// </summary> /// <param name="data">å å«releaseNoãid</param> /// <returns>æ£éªé¡¹ç®å表</returns> [HttpPost("getJYItem")] public ResponseResult getJYItem([FromBody] JObject data) { var id = data["id"]?.ToString(); var releaseNo = data["releaseNo"]?.ToString(); try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new CqjService().GetItems(releaseNo, string.IsNullOrEmpty(id) ? null : Convert.ToDecimal(id)); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// å é¤è¶ ææ£éªå /// </summary> /// <param name="data">å å«releaseNo</param> /// <returns>æ§è¡ç»æ</returns> [HttpPost("removeCqj")] public ResponseResult removeCqj([FromBody] JObject data) { var releaseNo = data["releaseNo"]?.ToString(); try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new CqjService().RemoveCqj(releaseNo); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// ä¿åä¸è¯æè¿°å°ä¸»è¡¨ /// </summary> /// <param name="data">å å«gidãreleaseNoãfngDesc</param> /// <returns>æ§è¡ç»æ</returns> [HttpPost("saveRemarksGid")] public ResponseResult saveRemarksGid([FromBody] JObject data) { var gid = Convert.ToDecimal(data["gid"].ToString()); var releaseNo = data["releaseNo"]?.ToString(); var fngDesc = data["fngDesc"]?.ToString(); try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new CqjService().SaveRemarksGid(gid, releaseNo, fngDesc); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// ä¿å夿³¨å°ä¸»è¡¨ /// </summary> /// <param name="data">å å«gidãreleaseNoãlotNo1</param> /// <returns>æ§è¡ç»æ</returns> [HttpPost("saveLotNo1")] public ResponseResult saveLotNo1([FromBody] JObject data) { var gid = Convert.ToDecimal(data["gid"].ToString()); var releaseNo = data["releaseNo"]?.ToString(); var lotNo1 = data["lotNo1"]?.ToString(); try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new CqjService().SaveLotNo1(gid, releaseNo, lotNo1); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// ä¿åä¸è¯æè¿°å°å表 /// </summary> /// <param name="data">å å«pidãfunit</param> /// <returns>æ§è¡ç»æ</returns> [HttpPost("saveRemarksPid")] public ResponseResult saveRemarksPid([FromBody] JObject data) { var pid = Convert.ToDecimal(data["pid"].ToString()); var funit = data["funit"]?.ToString(); try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new CqjService().SaveRemarksPid(pid, funit); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// ä¿å夿³¨å°å表 /// </summary> /// <param name="data">å å«pidãmeom</param> /// <returns>æ§è¡ç»æ</returns> [HttpPost("saveMeom")] public ResponseResult saveMeom([FromBody] JObject data) { var pid = Convert.ToDecimal(data["pid"].ToString()); var meom = data["meom"]?.ToString(); try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new CqjService().SaveMeom(pid, meom); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ°å¢/æ¥è¯¢æ£éªè¯¦æ è®°å½ /// </summary> /// <param name="data">å å«mainIdãreleaseNoãfstandãfcheckResuãLastupdateByãcountï¼æ°å¢æ¶ï¼æidãreleaseNoï¼æ¥è¯¢æ¶ï¼</param> /// <returns>æ§è¡ç»æ</returns> [HttpPost("SetQSItemDetail")] public ResponseResult SetQSItemDetail([FromBody] JObject data) { try { dynamic resultInfos = new ExpandoObject(); // å¤ææ¯æ°å¢è¿æ¯æ¥è¯¢ if (data.ContainsKey("fcheckResu") && data["fcheckResu"] != null) { // æ°å¢æä½ - æç §LLJ模å¼ï¼ä½¿ç¨å¯¹è±¡æ¥æ¶åæ° var detail = new MesCqItemsDetectDetail12 { MainId = Convert.ToDecimal(data["mainId"].ToString()), ReleaseNo = data["releaseNo"]?.ToString(), Fstand = data["fstand"]?.ToString(), FcheckResu = data["fcheckResu"]?.ToString(), LastupdateBy = data["LastupdateBy"]?.ToString(), // 使ç¨LastupdateByèä¸createBy count = data.ContainsKey("count") && data["count"] != null ? Convert.ToInt32(data["count"].ToString()) : 1 // é»è®¤ä¸º1 }; var tbBillList = new CqjService().SetQSItemDetail(detail); resultInfos.tbBillList = tbBillList; } else { // æ¥è¯¢æä½ var id = Convert.ToDecimal(data["id"].ToString()); var releaseNo = data["releaseNo"]?.ToString(); var tbBillList = new CqjService().GetQSItemDetail(id, releaseNo); resultInfos.tbBillList = tbBillList; } return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ´æ°æ£éªè¯¦æ è®°å½ /// </summary> /// <param name="data">å å«idãmainIdãreleaseNoãfstandãfcheckResuãupdateBy</param> /// <returns>æ§è¡ç»æ</returns> [HttpPost("UpdateQSItemDetail")] public ResponseResult UpdateQSItemDetail([FromBody] JObject data) { var id = Convert.ToDecimal(data["id"].ToString()); var mainId = Convert.ToDecimal(data["mainId"].ToString()); var releaseNo = data["releaseNo"]?.ToString(); var fstand = data["fstand"]?.ToString(); var fcheckResu = data["fcheckResu"]?.ToString(); var updateBy = data["updateBy"]?.ToString(); try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new CqjService().UpdateQSItemDetail(id, mainId, releaseNo, fstand, fcheckResu, updateBy); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ£éªæäº¤ /// </summary> /// <param name="data">å å«userNoãreleaseNo</param> /// <returns>æ§è¡ç»æ</returns> [HttpPost("submitInspection")] public ResponseResult submitInspection([FromBody] JObject data) { var userNo = data["userNo"]?.ToString(); var releaseNo = data["releaseNo"]?.ToString(); try { dynamic resultInfos = new ExpandoObject(); var result = new CqjService().SubmitInspection(userNo, releaseNo); resultInfos.tbBillList = result; // æ ¹æ®åå¨è¿ç¨è¿åç»æå¤ææ¯å¦æå var resultCode = result[0]; var resultMessage = result[1]; if (resultCode == "0") { return new ResponseResult { status = 0, message = resultMessage, data = resultInfos }; } else { return new ResponseResult { status = 1, message = resultMessage, data = resultInfos }; } } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// å¤çOPTIONS请æ±ï¼ç¨äºè·¨å颿£ï¼ /// </summary> [HttpOptions("{**any}")] public IActionResult HandleOptions() { return Ok(); } } StandardInterface/MESApplication/appsettings.json
@@ -10,6 +10,6 @@ "AppSettings": { "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.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = hm_prd; Password=hmprd" "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd" } }