Controllers/QC/LljController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Dto/service/LLJDto.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Dto/service/ResultClass.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Dto/service/XJPageResult.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
NewPdaSqlServer.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/LLJView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/MesQaIqc.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/MesQaItemsDetect01.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/MesQaItemsDetectDetail12.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/MesQaItemsDetectDetail5.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/QsItemOqcReq.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/QC/LljService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Controllers/QC/LljController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,276 @@ using System.Dynamic; using Microsoft.AspNetCore.Mvc; using NewPdaSqlServer.Dto.service; using NewPdaSqlServer.entity; using NewPdaSqlServer.service.QC; using NewPdaSqlServer.util; using Newtonsoft.Json.Linq; namespace NewPdaSqlServer.Controllers.QC; [Route("api/[controller]")] [ApiController] public class LljController : ControllerBase { [HttpPost("getPage")] public ResponseResult getPage([FromBody] XJPageResult queryObj) { try { dynamic resultInfos = new ExpandoObject(); var (item, totalCount) = new LljService().GetPage(queryObj); var tbBillList = resultInfos.tbBillList = item; return new ResponseResult { status = 0, message = "OK", data = resultInfos, TotalCount = totalCount }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } [HttpPost("setJYItem")] public ResponseResult setJYItem([FromBody] JObject data) { var itemNo = data["itemNo"].ToString(); var quantity = Convert.ToDecimal(data["quantity"].ToString()); var releaseNo = data["releaseNo"].ToString(); try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new LljService().SetItems(itemNo, quantity, releaseNo); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } [HttpPost("saveItem")] public ResponseResult saveItem([FromBody] LLJDto lljDto) { try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new LljService().saveItem(lljDto); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //getItems [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 LljService().GetItems(releaseNo, Convert.ToDecimal(id)); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //getXjDetail02ById [HttpPost("getXjDetail02ById")] public ResponseResult getXjDetail02ById([FromBody] JObject data) { var id = data["id"]?.ToString(); try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new LljService().getXjDetail02ById(id); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } [HttpPost("SetQSItemDetail")] public ResponseResult SetQSItemDetail( [FromBody] MesQaItemsDetectDetail12 detail) { try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new LljService(); var detail021 = tbBillList.SetQSItemDetail(detail); resultInfos.tbBillList = detail021; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } [HttpPost("UpdateQSItemDetail")] public ResponseResult UpdateQSItemDetail( [FromBody] MesQaItemsDetectDetail12 detail) { try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new LljService(); var detail021 = tbBillList.UpdateQSItemDetail(detail); resultInfos.tbBillList = detail021; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //saveRemarksGid 主表添å ä¸åæ ¼æè¿° [HttpPost("saveRemarksGid")] public ResponseResult saveRemarksGid([FromBody] LLJDto rkjDto) { try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new LljService().saveRemarksGid(rkjDto); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //saveRemarksPid å表添å ä¸åæ ¼æè¿° [HttpPost("saveRemarksPid")] public ResponseResult saveRemarksPid([FromBody] LLJDto rkjDto) { try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new LljService().saveRemarksPid(rkjDto); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //removeXJ å é¤ [HttpPost("removeXJ")] public ResponseResult removeXJ([FromBody] JObject data) { var releaseNo = data["releaseNo"]?.ToString(); try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new LljService().removeXJ(releaseNo); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //IqcQaSubmit [HttpPost("IqcQaSubmit")] public ResponseResult IqcQaSubmit(LLJDto rkjDto) { try { dynamic resultInfos = new ExpandoObject(); var tbBillList = new LljService().IqcQaSubmit(rkjDto); resultInfos.tbBillList = tbBillList; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } } Dto/service/LLJDto.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,36 @@ using NewPdaSqlServer.entity; namespace NewPdaSqlServer.Dto.service; public class LLJDto { public string? userNo { get; set; } //æ£éªåå· public string? releaseNo { get; set; } //主表id public string? gid { get; set; } //å表id public string? pid { get; set; } //å表id public string? id { get; set; } //夿³¨ public string? Remarks { get; set; } //========================================== //å·¡æ£ä¸»å表éè¦çæ°æ® public QsItemOqcReq? from { get; set; } public List<MesQaItemsDetectDetail5>? items { get; set; } //========================================== //å·¡æ£åå表éè¦çæ°æ® public MesQaItemsDetectDetail5? ItemXj01 { get; set; } public List<MesQaItemsDetectDetail12>? ItemXj02s { get; set; } } Dto/service/ResultClass.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,7 @@ namespace NewPdaSqlServer.Dto.service; public class ResultClass { public decimal FSAMPLE_SIZE_WORD { get; set; } public decimal Result { get; set; } } Dto/service/XJPageResult.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,11 @@ using NewPdaSqlServer.Dto.@base; namespace NewPdaSqlServer.Dto.service; public class XJPageResult : Page { public string? createUser { get; set; } public string? result { get; set; } public string? id { get; set; } } NewPdaSqlServer.csproj
@@ -13,8 +13,4 @@ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.0" /> </ItemGroup> <ItemGroup> <Folder Include="Dto\" /> </ItemGroup> </Project> entity/LLJView.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,157 @@ using SqlSugar; namespace NewPdaSqlServer.entity; /// <summary> /// æ°æ®æºå¯¼å ¥ /// </summary> [SugarTable("V_LLJ")] public class LLJView { /// <summary> /// ///</summary> [SugarColumn(ColumnName = "guid")] public Guid guid { get; set; } [SugarColumn(ColumnName = "fsubmit")] public int? fsubmit{ get; set; } /// <summary> /// å®¡æ ¸æ è¯ /// </summary> [SugarColumn(ColumnName = "MODIFY1_FLAG")] public decimal? Modify1Flag { get; set; } /// <summary> /// éæ£æ¹æ¬¡ /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string LotNo { get; set; } /// <summary> /// å¤çæ¹æ³ /// </summary> [SugarColumn(ColumnName = "FNG_HANDLE")] public string FngHandle { get; set; } /// <summary> /// ç©æçæ¬ /// </summary> [SugarColumn(ColumnName = "FVERSION")] public decimal? Fversion { get; set; } /// <summary> /// 夿³¨ä¿¡æ¯ /// </summary> [SugarColumn(ColumnName = "LOT_NO1")] public string LotNo1 { get; set; } /// <summary> /// è½¬æ¢æ°é /// </summary> [SugarColumn(ColumnName = "FCOVERT_QTY")] public string FcovertQty { get; set; } /// <summary> /// æ£éªç»æ /// </summary> [SugarColumn(ColumnName = "FCHECK_RESU")] public string FcheckResu { get; set; } /// <summary> /// ä¾åºåç¼ç /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> /// æ£éªåå· /// </summary> [SugarColumn(ColumnName = "RELEASE_NO")] public string ReleaseNo { get; set; } /// <summary> /// éè´æ°é /// </summary> [SugarColumn(ColumnName = "FBATCH_QTY")] public string FbatchQty { get; set; } /// <summary> /// ç©æç¼ç /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } /// <summary> /// æ£éªäººå /// </summary> [SugarColumn(ColumnName = "FCHECK_BY")] public string FcheckBy { get; set; } /// <summary> /// ä¸è¯æè¿° /// </summary> [SugarColumn(ColumnName = "FNG_DESC")] public string FngDesc { get; set; } /// <summary> /// å建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// å建æ¶é´ /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public string CreateDate { get; set; } /// <summary> /// æ¯å¦æ¥æ /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public short? UrgentFlag { get; set; } /// <summary> /// ç©æåç§° /// </summary> [SugarColumn(ColumnName = "ITEM_NAME")] public string ItemName { get; set; } /// <summary> /// æ£éªç±»å /// </summary> [SugarColumn(ColumnName = "QATYPE")] public string Qatype { get; set; } /// <summary> /// æ£éªæ¥æ /// </summary> [SugarColumn(ColumnName = "DATE_01")] public string Date01 { get; set; } /// <summary> /// ä¾åºååç§° /// </summary> [SugarColumn(ColumnName = "SUPP_NAME")] public string SuppName { get; set; } /// <summary> /// ç©æè§æ ¼ /// </summary> [SugarColumn(ColumnName = "ITEM_MODEL")] public string ItemModel { get; set; } /// <summary> /// åæ®ç¶æ /// </summary> [SugarColumn(ColumnName = "STATUS")] public string STATUS { get; set; } /// <summary> /// å§å¤æ è¯ï¼0ï¼éè´ ã1ï¼å§å¤ï¼ /// </summary> [SugarColumn(ColumnName = "F_TYPE")] public bool? Ftype { get; set; } } entity/MesQaIqc.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,91 @@ using SqlSugar; namespace NewPdaSqlServer.entity; /// <summary> /// æ°æ®æºå¯¼å ¥ /// </summary> [SugarTable("Mes_Qa_Iqc")] public class MesQaIqc { /// <summary> /// ç©æid /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public string ItemId { get; set; } /// <summary> /// ç©æç¼ç /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { 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 = "FREQUENCY")] public string FREQUENCY { 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 = "ISENABLED")] public short? ISENABLED { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "EE")] public short? EE { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FTYPE")] public string FTYPE { get; set; } } entity/MesQaItemsDetect01.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,397 @@ using SqlSugar; namespace NewPdaSqlServer.entity { /// <summary> /// ///</summary> [SugarTable("MES_QA_ITEMS_DETECT_01")] public class MesQaItemsDetect01 { /// <summary> /// /// é»è®¤å¼: (newid()) ///</summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "about_Guid")] public Guid? AboutGuid { get; set; } /// <summary> /// æ£éªåå· ///</summary> [SugarColumn(ColumnName = "release_no")] public string ReleaseNo { 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 = "item_no")] public string ItemNo { get; set; } /// <summary> /// æ¥ææ°é ///</summary> [SugarColumn(ColumnName = "fbatch_qty")] public decimal? FbatchQty { get; set; } /// <summary> /// å¤å®ç»æ ///</summary> [SugarColumn(ColumnName = "frece_qty")] public string FreceQty { get; set; } /// <summary> /// ä¾åºåID ///</summary> [SugarColumn(ColumnName = "supp_id")] public string SuppId { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "fng_desc")] public string FngDesc { get; set; } /// <summary> /// æ£éªç»æ ///</summary> [SugarColumn(ColumnName = "fcheck_resu")] public string FcheckResu { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "freview")] public string Freview { get; set; } /// <summary> /// æ£éªæ°´å ///</summary> [SugarColumn(ColumnName = "sample_size_no")] public string SampleSizeNo { get; set; } /// <summary> /// æ£éªæ°´å¹³ ///</summary> [SugarColumn(ColumnName = "fcheck_level")] public string FcheckLevel { get; set; } /// <summary> /// ææ¶æ°´å¹³ ///</summary> [SugarColumn(ColumnName = "fac_level")] public string FacLevel { get; set; } /// <summary> /// æ½æ£æ°é ///</summary> [SugarColumn(ColumnName = "check_qty")] public string CheckQty { get; set; } /// <summary> /// æ¹æ¬¡å· --å°è´§åå· ///</summary> [SugarColumn(ColumnName = "lot_no")] public string LotNo { get; set; } /// <summary> /// æ¯å¦æ¨é ///</summary> [SugarColumn(ColumnName = "fmove")] public string Fmove { get; set; } /// <summary> /// æ¯å¦å¤ç ///</summary> [SugarColumn(ColumnName = "fhandle")] public string Fhandle { 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 = "modify1_flag")] public int? Modify1Flag { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "modify1_by")] public string Modify1By { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "modify1_date")] public DateTime? Modify1Date { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "factory")] public string Factory { get; set; } /// <summary> /// XRFæµè¯æ¥åç¼å· ///</summary> [SugarColumn(ColumnName = "fcheck_repno")] public string FcheckRepno { get; set; } /// <summary> /// ç¬¬ä¸æ¹æ¥å ///</summary> [SugarColumn(ColumnName = "fthird_rep")] public string FthirdRep { get; set; } /// <summary> /// æ¯å¦ä½åº ///</summary> [SugarColumn(ColumnName = "fcancel")] public int? Fcancel { get; set; } /// <summary> /// æäº¤æ è¯ ///</summary> [SugarColumn(ColumnName = "fsubmit")] public int? Fsubmit { get; set; } /// <summary> /// æ£éªä¾æ® ///</summary> [SugarColumn(ColumnName = "fcheck_accord")] public string FcheckAccord { get; set; } /// <summary> /// ç±»å(0 æ¥æ 1 å¨åº) ///</summary> [SugarColumn(ColumnName = "ftype")] public int? Ftype { get; set; } /// <summary> /// åä½ ///</summary> [SugarColumn(ColumnName = "item_unit")] public string ItemUnit { get; set; } /// <summary> /// åºè´§æ¥æ ///</summary> [SugarColumn(ColumnName = "out_date")] public string OutDate { get; set; } /// <summary> /// æ¯å¦å æ£ ///</summary> [SugarColumn(ColumnName = "fexemption")] public int? Fexemption { get; set; } /// <summary> /// æ¡£ä½æ å ///</summary> [SugarColumn(ColumnName = "fgear_stand")] public string FgearStand { get; set; } /// <summary> /// ä¸è¯å¤çæ¹æ³ ///</summary> [SugarColumn(ColumnName = "fng_handle")] public string FngHandle { get; set; } /// <summary> /// 管çç¼å· ///</summary> [SugarColumn(ColumnName = "fmanage_no")] public string FmanageNo { get; set; } /// <summary> /// è½¬æ¢æ°é ///</summary> [SugarColumn(ColumnName = "fcovert_qty")] public string FcovertQty { get; set; } /// <summary> /// çæ¬ ///</summary> [SugarColumn(ColumnName = "fversion")] public int? Fversion { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "company")] public string Company { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "fsecond_resu")] public string FsecondResu { get; set; } /// <summary> /// æå¤§æ½æ£æ° ///</summary> [SugarColumn(ColumnName = "max_check_qty")] public int? MaxCheckQty { get; set; } /// <summary> /// ç¹å®ä¿®æ¹æ¯å¦å®¡æ ¸ ///</summary> [SugarColumn(ColumnName = "modify1_flag1")] public int? Modify1Flag1 { get; set; } /// <summary> /// ç¹å®ä¿®æ¹å®¡æ ¸äºº ///</summary> [SugarColumn(ColumnName = "modify1_by1")] public string Modify1By1 { get; set; } /// <summary> /// ç¹å®ä¿®æ¹å®¡æ ¸æ¶é´ ///</summary> [SugarColumn(ColumnName = "modify1_date1")] public DateTime? Modify1Date1 { get; set; } /// <summary> /// å°æ¹æ¬¡å· ///</summary> [SugarColumn(ColumnName = "lot_no1")] public string LotNo1 { get; set; } /// <summary> /// éè´åå· ///</summary> [SugarColumn(ColumnName = "lot_no2")] public string LotNo2 { get; set; } /// <summary> /// 产ååå· ///</summary> [SugarColumn(ColumnName = "board_style")] public string BoardStyle { get; set; } /// <summary> /// ä»»å¡åå· ///</summary> [SugarColumn(ColumnName = "work_no")] public string WorkNo { get; set; } /// <summary> /// å°è´§æ¶é´ ///</summary> [SugarColumn(ColumnName = "dha018")] public string Dha018 { get; set; } /// <summary> /// è¡å· ///</summary> [SugarColumn(ColumnName = "dhb002")] public int? Dhb002 { get; set; } /// <summary> /// å°è´§åå· ///</summary> [SugarColumn(ColumnName = "dhb001")] public string Dhb001 { get; set; } /// <summary> /// ä¾åºå ///</summary> [SugarColumn(ColumnName = "lifnr")] public string Lifnr { get; set; } /// <summary> /// éææ¹å¼ ///</summary> [SugarColumn(ColumnName = "fmrmode")] public string Fmrmode { get; set; } /// <summary> /// erpè¿åä¿¡æ¯ ///</summary> [SugarColumn(ColumnName = "msg")] public string Msg { get; set; } /// <summary> /// ç¶æ ///</summary> [SugarColumn(ColumnName = "states")] public string States { get; set; } /// <summary> /// IQCæäº¤æ¶é´ ///</summary> [SugarColumn(ColumnName = "iqc_date")] public DateTime? IqcDate { get; set; } /// <summary> /// éè´è®¢åID ///</summary> [SugarColumn(ColumnName = "ebeln_k3id")] public int? EbelnK3id { get; set; } /// <summary> /// éè´è®¢åè¡ID ///</summary> [SugarColumn(ColumnName = "line_k3id")] public int? LineK3id { get; set; } /// <summary> /// è´¨éå®¡æ ¸æ è¯ /// é»è®¤å¼: ((0)) ///</summary> [SugarColumn(ColumnName = "quality_audit")] public int? QualityAudit { get; set; } /// <summary> /// ç©æID ///</summary> [SugarColumn(ColumnName = "item_id")] public int? ItemId { get; set; } /// <summary> /// ä¸è¯æè¿° ///</summary> [SugarColumn(ColumnName = "remarks")] public string Remarks { get; set; } } } entity/MesQaItemsDetectDetail12.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,76 @@ using System; using System.Collections.Generic; using System.Linq; using SqlSugar; namespace NewPdaSqlServer.entity { /// <summary> /// ///</summary> [SugarTable("MES_QA_ITEMS_DETECT_DETAIL12")] public class MesQaItemsDetectDetail12 { /// <summary> /// ///</summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// ç¶äº²Guid ///</summary> [SugarColumn(ColumnName = "parent_guid")] public Guid? ParentGuid { get; set; } /// <summary> /// ç·ç·Guid ///</summary> [SugarColumn(ColumnName = "grandpa_guid")] public Guid? GrandpaGuid { get; set; } /// <summary> /// æ£éªç»æ ///</summary> [SugarColumn(ColumnName = "fcheck_resu")] public string? FcheckResu { get; set; } /// <summary> /// æ£éªé¡¹ç® ///</summary> [SugarColumn(ColumnName = "fcheck_item")] public string? FcheckItem { get; set; } /// <summary> /// ç©ææ¡ç ///</summary> [SugarColumn(ColumnName = "item_barcode")] public string? ItemBarcode { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "create_date")] public DateTime? CreateDate { get; set; } /// <summary> /// å¤å®æ å¿ ///</summary> [SugarColumn(ColumnName = "fstand")] public string? Fstand { get; set; } /// <summary> /// çæäºº ///</summary> [SugarColumn(ColumnName = "lastupdate_by")] public string? LastupdateBy { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "create_by")] public string? CreateBy { get; set; } [SugarColumn(IsIgnore = true)] public int? count { get; set; } } } entity/MesQaItemsDetectDetail5.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,194 @@ using SqlSugar; namespace NewPdaSqlServer.entity { /// <summary> /// ///</summary> [SugarTable("MES_QA_ITEMS_DETECT_DETAIL5")] public class MesQaItemsDetectDetail5 { /// <summary> /// ///</summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "parent_guid")] public Guid? ParentGuid { get; set; } /// <summary> /// æ åå¼ç±»å ///</summary> [SugarColumn(ColumnName = "ftext_type")] public string? FtextType { get; set; } /// <summary> /// æ åå¼ ///</summary> [SugarColumn(ColumnName = "fstand")] public int? Fstand { get; set; } /// <summary> /// ä¸å ¬å·® ///</summary> [SugarColumn(ColumnName = "fup_allow")] public string? FupAllow { get; set; } /// <summary> /// ä¸å ¬å·® ///</summary> [SugarColumn(ColumnName = "fdown_allow")] public string? FdownAllow { get; set; } /// <summary> /// æ£éªæ°´å ///</summary> [SugarColumn(ColumnName = "sample_size_no")] public string? SampleSizeNo { get; set; } /// <summary> /// æ£éªæ°´å¹³ ///</summary> [SugarColumn(ColumnName = "fcheck_level")] public string? FcheckLevel { 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 = "fspec_requ")] public string? FspecRequ { get; set; } /// <summary> /// æ½æ£æ°é ///</summary> [SugarColumn(ColumnName = "check_qyt")] public int? CheckQyt { get; set; } /// <summary> /// æ£éªç»æ ///</summary> [SugarColumn(ColumnName = "fcheck_resu")] public string? FcheckResu { get; set; } /// <summary> /// ACæ°é ///</summary> [SugarColumn(ColumnName = "fac_qty")] public int? FacQty { get; set; } /// <summary> /// REæ°é ///</summary> [SugarColumn(ColumnName = "fre_qty")] public int? FreQty { get; set; } /// <summary> /// ä¸åæ ¼æ° ///</summary> [SugarColumn(ColumnName = "fng_qty")] public int? FngQty { get; set; } /// <summary> /// ä¸è¯ç ///</summary> [SugarColumn(ColumnName = "fng_rate")] public decimal? FngRate { get; set; } /// <summary> /// å·²å½å ¥æ°é ///</summary> [SugarColumn(ColumnName = "fenter_qty")] public decimal? FenterQty { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "release_no")] public string? ReleaseNo { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "company")] public string? Company { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "factory")] public string? Factory { get; set; } /// <summary> /// æ£éªé¡¹ç®æè¿° ///</summary> [SugarColumn(ColumnName = "fcheck_item_desc")] public string? FcheckItemDesc { get; set; } /// <summary> /// å·¥åºå· ///</summary> [SugarColumn(ColumnName = "proc_no")] public string? ProcNo { get; set; } /// <summary> /// å·¥ä½ä¸å¿ç¼ç ///</summary> [SugarColumn(ColumnName = "workshop_center_code")] public string? WorkshopCenterCode { get; set; } /// <summary> /// åä½ ///</summary> [SugarColumn(ColumnName = "funit")] public string? Funit { get; set; } /// <summary> /// ç¹å®ä¿®æ¹ /// é»è®¤å¼: ((0)) ///</summary> [SugarColumn(ColumnName = "given_modify")] public int? GivenModify { get; set; } /// <summary> /// æ£éªå·¥å · ///</summary> [SugarColumn(ColumnName = "fcheck_tool")] public string? FcheckTool { 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 = "remarks")] public string? Remarks { get; set; } [SugarColumn(IsIgnore = true)] public int? Unqualified { get; set; } } } entity/QsItemOqcReq.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,105 @@ using System; using System.Collections.Generic; using System.Linq; using SqlSugar; namespace NewPdaSqlServer.entity { /// <summary> /// å ¥åºæ£æ£éªè¡¨å¤´ ///</summary> [SugarTable("QS_ITEM_OQC_REQ")] public class QsItemOqcReq { /// <summary> /// /// é»è®¤å¼: (newid()) ///</summary> [SugarColumn(ColumnName="guid" ,IsPrimaryKey = true )] public Guid Guid { get; set; } /// <summary> /// æ£éªåå· ///</summary> [SugarColumn(ColumnName="RELEASE_NO" )] public string ReleaseNo { 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="ITEM_NO" )] public string ItemNo { 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(ColumnName="LASTUPDATE_DATE" )] public DateTime? LastupdateDate { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName="MODIFY1_BY" )] public string Modify1By { get; set; } /// <summary> /// å ¥åºç³è¯·åå· ///</summary> [SugarColumn(ColumnName="BILL_NO" )] public string BillNo { get; set; } /// <summary> /// æ¨¡å ·å· ///</summary> [SugarColumn(ColumnName="MOID_NUM" )] public string MoidNum { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName="FSUBMIT_BY" )] public string FsubmitBy { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName="FSUBMIT_DATE" )] public DateTime? FsubmitDate { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName="FSUBMIT" )] public int? Fsubmit { get; set; } /// <summary> /// 夿³¨ ///</summary> [SugarColumn(ColumnName="REMARKS" )] public string Remarks { get; set; } /// <summary> /// ç©æID ///</summary> [SugarColumn(ColumnName="ITEM_ID" )] public int? ItemId { get; set; } } } service/QC/LljService.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,683 @@ using System.Data; using Microsoft.IdentityModel.Tokens; using NewPdaSqlServer.DB; using NewPdaSqlServer.Dto.service; using NewPdaSqlServer.entity; using NewPdaSqlServer.util; using SqlSugar; using DbType = System.Data.DbType; namespace NewPdaSqlServer.service.QC; public class LljService : RepositoryNoEntity { public (List<LLJView> item, int TotalCount) GetPage(XJPageResult queryObj) { var parsedGuid = Guid.Empty; if (!queryObj.id.IsNullOrEmpty()) { bool isValid = Guid.TryParse(queryObj.id, out parsedGuid); if (!isValid) throw new ApplicationException("GUID转æ¢é误"); } var totalCount = 0; var pageList = Db.Queryable<LLJView>() .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(UtilityHelper.CheckGuid(parsedGuid), a => a.guid == parsedGuid) .OrderByDescending(a => a.CreateDate) .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); return (pageList, totalCount); } //æ ¹æ®æ£éªæ åæ¥è®¡ç®æ£éªä¸ªæ° public List<MesQaItemsDetectDetail5> SetItems(string itemId, decimal quantity, string releaseNo) { var count = Db.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1 && s.ItemId == itemId && s.FTYPE == "1").Count(); if (count <= 0) return []; var mesQaIqcItem = Db .Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1 && s.ItemId == itemId && s.FTYPE == "1").Select( b => new MesQaItemsDetectDetail5 { ReleaseNo = releaseNo, FacLevel = b.FacLevel, FcheckItem = b.FcheckItem, FdownAllow = b.FdownAllow, FcheckLevel = b.FREQUENCY, Fstand = Convert.ToInt32(b.FSTAND), FupAllow = b.FupAllow, SampleSizeNo = b.SampleSizeNo, FenterQty = 0, Factory = "1000", Company = "1000", FcheckTool = b.FcheckTool, FspecRequ = b.FspecRequ }).ToList(); mesQaIqcItem.ForEach(item => { string LEV = item.FcheckLevel switch { null => "" // é»è®¤å¼ , { } s when s.Contains("S1") => "B.FLEVEL_S1", { } s when s.Contains("S2") => "B.FLEVEL_S2", { } s when s.Contains("S3") => "B.FLEVEL_S3", { } s when s.Contains("S4") => "B.FLEVEL_S4", { } s when s.Contains("(I)") => "B.FLEVEL_I", { } s when s.Contains("(II)") => "B.FLEVEL_II", { } s when s.Contains("(III)") => "B.FLEVEL_III", _ => "" }; if (string.IsNullOrEmpty(LEV)) throw new Exception(item.SampleSizeNo + "çæ£éªæ°´å¹³ä¸æ£ç¡®"); var sql = "SELECT " + LEV + " FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL2 B ON B.AQL1_ID=A.guid WHERE A.SAMPLE_SIZE_NO='" + item.SampleSizeNo + "' AND B.LOT_FROM<= " + quantity + " AND " + quantity + "<=B.LOT_TO"; var maxBillNo = Db.Ado.SqlQuerySingle<string>(sql); if (string.IsNullOrEmpty(maxBillNo)) throw new Exception(item.SampleSizeNo + "ä¸ç" + quantity + "è¿ä¸ªèå´ä¸æ²¡æå¹é å°æ£éªé¡¹ç®"); var result = ExtractSubstring(item.FacLevel, '(', ')'); if (string.IsNullOrEmpty(result)) throw new Exception(item.SampleSizeNo + "ä¸ç" + quantity + "ææ¶æ°´å¹³ä¸æ£ç¡®"); sql = "SELECT FSAMPLE_SIZE_WORD, " + result + " Result FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL3 C ON C.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO= '" + item.SampleSizeNo + "' AND SAMPLE_SIZE_WORD= '" + maxBillNo + "'"; var resultClass = Db.Ado.SqlQuerySingle<ResultClass>(sql); item.CheckQyt = (int)resultClass.FSAMPLE_SIZE_WORD; item.FreQty = (int)resultClass.Result; }); return mesQaIqcItem; } private string ExtractSubstring(string input, char startChar, char endChar) { var startIndex = input.IndexOf(startChar); var endIndex = input.IndexOf(endChar, startIndex); if (startIndex == -1 || endIndex == -1) // å¦ææªæ¾å°èµ·å§å符æç»æå符ï¼åè¿å空å符串æè æåºå¼å¸¸ï¼æ ¹æ®å®é æ åµéæ© return string.Empty; // æè æåºå¼å¸¸ // throw new ArgumentException("Start or end character not found"); // æååå符串 var length = endIndex - startIndex - 1; return input.Substring(startIndex + 1, length); } public int saveItem(LLJDto rkjDto) { var items = rkjDto.items; var userNo = rkjDto.userNo; UseTransaction(db => { foreach (var item in items) item.ReleaseNo = rkjDto.releaseNo; return db.Insertable(items).ExecuteCommand(); }); rkjDto.items = GetItems(rkjDto.releaseNo, null); rkjDto.items.ForEach(s => { if (s.FupAllow != null || s.Fstand != null || s.FdownAllow != null) return; // 没æå½å ¥åèå¼ï¼å¤ææå¤å°ä¸ªNGï¼é£ä¹å½å ¥çæ½æ£ç»æå¿ é¡»æ¯OKæè NGï¼NG代表ä¸åæ ¼ var ifck = Db.Queryable<MesQaItemsDetectDetail12>() .Where(x => x.FcheckResu == "NG" && x.ParentGuid == s.Guid) .Count(); //æ£éªæç»æ»æ° var count = Db.Queryable<MesQaItemsDetectDetail12>() .Where(x1 => x1.ParentGuid == s.Guid).Count(); if (ifck > s.FreQty && s.CheckQyt == count) s.FcheckResu = "ä¸åæ ¼"; else if (ifck < s.FreQty && s.CheckQyt == count) s.FcheckResu = "åæ ¼"; else s.FcheckResu = "æªå®æ"; var detail = new MesQaItemsDetectDetail12(); detail.ParentGuid = s.Guid; // detail.ReleaseNo = rkjDto.releaseNo; detail.Fstand = "â"; detail.FcheckResu = "OK"; detail.LastupdateBy = rkjDto.userNo; detail.count = s.CheckQyt; SetQSItemDetail(detail); }); return Convert.ToInt32(rkjDto.gid); } public List<MesQaItemsDetectDetail5> GetItems(string? releaseNo, decimal? id) { return Db.Queryable<MesQaItemsDetectDetail5, MesQaItemsDetectDetail12>( (a, b) => new JoinQueryInfos(JoinType.Left, a.Guid == b.ParentGuid)) .Where((a, b) => a.ReleaseNo == releaseNo) // .WhereIF(id > 0, (a, b) => a.Id == id) .GroupBy((a, b) => new { a.Guid, 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 }).Select((a, b) => new MesQaItemsDetectDetail5 { Guid = a.Guid, 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.Guid), FcheckResu = a.FcheckResu }).ToList(); } public int SetQSItemDetail(MesQaItemsDetectDetail12 detail) { var oracle = UseTransaction(db => { List<MesQaItemsDetectDetail12> result = new(); for (var i = 0; i < detail.count; i++) { var item = new MesQaItemsDetectDetail12(); item.ParentGuid = detail.ParentGuid; item.Fstand = detail.Fstand; item.FcheckResu = detail.FcheckResu; item.CreateBy = detail.LastupdateBy; item.CreateDate = DateTime.Now; result.Add(item); } return db.Insertable(result).ExecuteCommand(); }); detail.CreateBy = detail.LastupdateBy; autoResult(detail); return oracle; } private int autoResult(MesQaItemsDetectDetail12 detail) { // Single æ²¡ææ¥è¯¢å°ç»ææ¶è¿åNullï¼å¦æç»æå¤§äº1æ¡ä¼æåºé误 var QsItemOqcItem = Db.Queryable<MesQaItemsDetectDetail5>() .Single(s => s.Guid == detail.ParentGuid); if (QsItemOqcItem == null) return 0; //æ¥è¯¢è¿ä¸ªæ£éªé¡¹ç®ä¸çæ£éªç»æ var count = Db.Queryable<MesQaItemsDetectDetail12>() .Where(s => s.ParentGuid == detail.ParentGuid).Count(); updateDetail5(detail); var result = ""; //æ£éªå®é ç»æä¸çäºåºè¯¥æ£éªçä¸ªæ°æ¶ç´æ¥æ¨åº if (QsItemOqcItem.CheckQyt != count) return 0; //åæ ¼çæå¤å°ä¸ª var passCount = Db.Queryable<MesQaItemsDetectDetail12>() .Where(s => s.ParentGuid == detail.ParentGuid && s.Fstand == "â") .Count(); //ä¸åæ ¼çæå¤å°ä¸ª var noCount = Db.Queryable<MesQaItemsDetectDetail12>() .Where(s => s.ParentGuid == detail.ParentGuid && s.Fstand == "Ã") .Count(); if (count == passCount) result = "åæ ¼"; //else if (count - passCount < QsItemOqcItem.FreQty) // result = "ä¸åæ ¼"; else if (noCount >= QsItemOqcItem.FreQty) result = "ä¸åæ ¼"; var useTransactionWithOracle = UseTransaction( db => { var commit = 0; commit += db.Updateable<MesQaItemsDetectDetail5>() .SetColumns(s => s.FcheckResu == result) .SetColumns(s => s.FenterQty == count) .Where(s => s.Guid == detail.ParentGuid) .ExecuteCommand(); return commit; }); var isNull = Db.Queryable<MesQaItemsDetectDetail5>() .Where(s => s.Guid == detail.ParentGuid && s.FcheckResu == null) .Count(); if (isNull > 0) return 1; //è·åæ£éªåçæ£éªé¡¹ç®çä¸ªæ° var sum = Db.Queryable<MesQaItemsDetectDetail5>() .Where(s => s.Guid == detail.ParentGuid).Count(); if (sum == 0) return 1; //è·åæ£éªåä¸çåæ ¼çæ£éªé¡¹ç®ä¸ªæ° var icount = Db.Queryable<MesQaItemsDetectDetail5>() .Where(s => s.Guid == detail.ParentGuid && s.FcheckResu == "åæ ¼") .Count(); var FcheckResu = "ä¸åæ ¼"; //å®é 个æ°çäºçè®ºä¸ªæ°æ¶å¯¹æ£éªåè¿è¡å¤å® if (sum == icount) //åæ ¼çæ£éªç»æçäºæ»æ£éªæ°è§ä¸ºåæ ¼ FcheckResu = "åæ ¼"; var sysUser = Db.Queryable<SysUser>() .Where(s => s.Account == detail.CreateBy).First(); UseTransaction(db => { return db.Updateable<MesQaItemsDetect01>() .SetColumns(s => s.FcheckResu == FcheckResu) .SetColumns(s => s.FcheckDate == DateTime.Now) .SetColumns(s => s.FcheckBy == sysUser.Account) .SetColumns(s => s.LastupdateBy == detail.CreateBy) .SetColumns(s => s.LastupdateDate == DateTime.Now) .Where(s => s.Guid == detail.GrandpaGuid) .ExecuteCommand(); }); // if (FcheckResu.Equals("ä¸åæ ¼")) //èªå¨çæå ¥åºæ£å¼å¸¸å¯¹ç /// saveDetect02(detail.Id, detail.CreateBy); return useTransactionWithOracle; } /* public int saveDetect02(decimal? gid, string? createBy) { var db = SqlSugarHelper.GetInstance(); var qsItemOqcReq = db.Queryable<QsItemOqcReq>().Single(s => s.Id == gid); var mesInvItemIns = db.Queryable<MesInvItemIns>() .Single(s => s.BillNo == qsItemOqcReq.BillNo); var mesSchemeResult = db.Queryable<MesSchemeResult>() .Single(s => s.BillNo == mesInvItemIns.CbillNo); var entity = new MesQaItemsDetect02(); entity.ItemNo = mesSchemeResult.BoardItem; entity.BoardItem = mesSchemeResult.BoardItem; entity.LineNo = mesSchemeResult.LineNo; entity.Aufnr = mesSchemeResult.TaskNo; entity.ReleaseNo = qsItemOqcReq.ReleaseNo; entity.LotNo = qsItemOqcReq.BillNo; entity.FcheckDate = qsItemOqcReq.FcheckDate; entity.FcheckMemo = qsItemOqcReq.Remarks; entity.Gid = qsItemOqcReq.Id; // entity.PlanQty = qsItemOqcReq.FcheckDate; entity.FcheckResu = "ä¸åæ ¼"; entity.FcheckLevel = "严é"; entity.CreateDate = DateTime.Now; entity.Factory = "10000"; entity.Company = "1000"; entity.Ftype = "4"; entity.Fversion = 0; entity.Modify1Flag = 0; entity.IpqcStatus = 0; entity.Fsubmit = 1; entity.CreateBy = createBy; entity.FcheckBy = createBy; return SqlSugarHelper.UseTransactionWithOracle(db => db .Insertable(entity) .ExecuteCommand()); } */ public LLJDto getXjDetail02ById(string? id) { var rkjDto = new LLJDto(); bool isValid = Guid.TryParse(id, out var parsedGuid); if (!isValid) { throw new Exception("GUID转æ¢é误"); } var qsItemOqcItem = Db.Queryable<MesQaItemsDetectDetail5>() .Single(s => s.Guid == parsedGuid); /* if (qsItemOqcItem.IsPass == 0) qsItemOqcItem.Result = "ä¸åæ ¼"; else if (qsItemOqcItem.IsPass == 1) qsItemOqcItem.Result = "åæ ¼"; else qsItemOqcItem.Result = "æªå®æ"; if (qsItemOqcItem.Picture is { Length: > 0 }) qsItemOqcItem.imageData = Convert.ToBase64String(qsItemOqcItem.Picture); */ //è·åä¸åæ ¼æ° var count = Db.Queryable<MesQaItemsDetectDetail12>() .Where(s => s.Fstand == "Ã" && s.ParentGuid == parsedGuid).Count(); qsItemOqcItem.Unqualified = count; rkjDto.ItemXj01 = qsItemOqcItem; rkjDto.ItemXj02s = Db.Queryable<MesQaItemsDetectDetail12>() .Where(s => s.ParentGuid == parsedGuid) .ToList(); return rkjDto; } public int UpdateQSItemDetail(MesQaItemsDetectDetail12 detail) { var withOracle = UseTransaction(db => { return db.Updateable<MesQaItemsDetectDetail12>() .SetColumns(s => s.LastupdateBy == detail.LastupdateBy) .SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.Fstand), s => s.Fstand == detail.Fstand) .SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.FcheckResu), s => s.FcheckResu == detail.FcheckResu) .Where(s => s.ParentGuid == detail.ParentGuid && s.Guid == detail.Guid) .ExecuteCommand(); }); detail.CreateBy = detail.LastupdateBy; withOracle += autoResult(detail); return withOracle; } //æ´æ°æ£éªæç»å·²æ£ãä¸åæ ¼æ°é private int updateDetail5(MesQaItemsDetectDetail12 detail) { //æ¥è¯¢è¿ä¸ªæ£éªé¡¹ç®ä¸çæ£éªæ°é var count = Db.Queryable<MesQaItemsDetectDetail12>() .Where(s => s.ParentGuid == detail.ParentGuid).Count(); //è·åä¸åæ ¼æ° var countNo = Db.Queryable<MesQaItemsDetectDetail12>() .Where(s => s.ParentGuid == detail.ParentGuid && s.Fstand == "Ã") .Count(); //æ´æ°æ£éªæç»å·²æ£æ°é var withOracle = UseTransaction(db => { return db.Updateable<MesQaItemsDetectDetail5>() .SetColumns(s => s.FenterQty == count) .SetColumns(s => s.FngQty == countNo) .Where(s => s.Guid == detail.ParentGuid) .ExecuteCommand(); }); return withOracle; } //主表修æ¹å¤æ³¨å段 public int saveRemarksGid(LLJDto dto) { return UseTransaction(db => { return db.Updateable<MesQaItemsDetect01>() .SetColumns(it => it.Remarks == dto.Remarks) //SetColumnsæ¯å¯ä»¥å å ç å2个就2ä¸ªåæ®µèµå¼ .Where(it => it.ReleaseNo == dto.releaseNo) .ExecuteCommand(); }); } //å表修æ¹å¤æ³¨å段 public int saveRemarksPid(LLJDto dto) { bool isValid = Guid.TryParse(dto.pid, out var parsedGuid); if (isValid) { return UseTransaction(db => { return db.Updateable<MesQaItemsDetectDetail5>() .SetColumns(it => it.Remarks == dto.Remarks) .Where(it => it.Guid == parsedGuid) .ExecuteCommand(); }); } throw new Exception("GUID转æ¢é误"); } //å é¤ä¸»è¡¨å¹¶ä¸è¿çº§å é¤å表åå表 public int removeXJ(string? releaseNo) { var withOracle = UseTransaction(db => { var commit = 0; //å é¤ä¸»è¡¨ commit += db.Deleteable<MesQaItemsDetect01>() .Where(s => s.ReleaseNo == releaseNo) .ExecuteCommand(); //å é¤å表 commit += db.Deleteable<MesQaItemsDetectDetail5>() .Where(s => s.ReleaseNo == releaseNo) .ExecuteCommand(); //å é¤å表 // commit += db.Deleteable<MesQaItemsDetectDetail12>() // .Where(s => s.ReleaseNo == releaseNo) // .ExecuteCommand(); return commit; }); return withOracle; } public bool IqcQaSubmit(LLJDto dto) { //var (factory, company) = UserUtil.GetFactory(dto.userNo); var sysUser = Db.Queryable<SysUser>() .Where(s => s.Account == dto.userNo).First(); if (sysUser == null) return false; var mesQaItemsDetect01 = Db.Queryable<MesQaItemsDetect01>() .Where(s => s.ReleaseNo == dto.releaseNo).First(); if (mesQaItemsDetect01 == null) return false; if (mesQaItemsDetect01.Fsubmit == 1) throw new Exception("该æ£éªåå·²æäº¤"); if (mesQaItemsDetect01.FcheckDate == null) throw new Exception("è¯¥æ£æµåæªè¾å ¥æ£éªæ¥æï¼è¯·æ ¸å¯¹ã"); if (mesQaItemsDetect01.FcheckBy.IsNullOrEmpty()) throw new Exception("è¯¥æ£æµåæªè¾å ¥æ£éªäººåï¼è¯·æ ¸å¯¹ã"); var list = Db.Queryable<MesQaItemsDetectDetail5>() .Where(s => s.ReleaseNo == dto.releaseNo).ToList(); if (CollectionUtil.IsNullOrEmpty(list)) throw new Exception("æ½æ ·ä¿¡æ¯ä»è¡¨ä¸å 许为空,è¯·ç»´æ¤æ£éªé¡¹ç®"); foreach (var mesQaItemsDetectDetail5 in list) { mesQaItemsDetectDetail5.FenterQty ??= 0; if (mesQaItemsDetectDetail5.FenterQty == 0) { throw new Exception("æ£éªé¡¹ç®:" + mesQaItemsDetectDetail5.FcheckItem + " å·²å½å ¥æ°é为0ï¼è¯·ç¡®è®¤ã"); } } var com = UseTransaction(db => { var executeCommand = db.Updateable<MesQaItemsDetect01>() .SetColumns(s => s.Fsubmit == 1) .Where(s => s.ReleaseNo == dto.releaseNo) .ExecuteCommand(); var mesInvItemArn = db.Queryable<MesInvItemArn>() .Where(b => b.BillNo == mesQaItemsDetect01.LotNo).First(); if (mesInvItemArn == null) throw new Exception(mesQaItemsDetect01.LotNo + "å°è´§åä¸åå¨ï¼è¯·æ ¸å¯¹ã"); if ("åæ ¼".Equals(mesQaItemsDetect01.FcheckResu)) { executeCommand += db.Updateable<MesInvItemArnDetail>() .SetColumns(s => s.CheckStates == "å·²æ£") .SetColumns(s => s.CheckRes == "åæ ¼") .SetColumns(s => s.Ischeck == 1) .SetColumns(s => s.CheckDate == DateTime.Now) .Where(s => s.ParentGuid == mesInvItemArn.Guid && s.ItemId == mesQaItemsDetect01.ItemId) .ExecuteCommand(); executeCommand += db.Updateable<MesQaItemsDetect01>() .SetColumns(s => s.Modify1Flag == 1) .SetColumns(s => s.Modify1By == sysUser.Account) .SetColumns(s => s.Modify1Date == DateTime.Now) .SetColumns(s => s.FngHandle == "") .SetColumns(s => s.IqcDate == DateTime.Now) .SetColumns(s => s.FcheckDate == DateTime.Now) .SetColumns(s => s.FcheckBy == sysUser.Account) .Where(s => s.Guid == mesQaItemsDetect01.Guid) .ExecuteCommand(); //MesInvItemStocks executeCommand += db.Updateable<MesInvItemStocks>() .SetColumns(t => t.CheckDate == DateTime.Now) .SetColumns(t => t.IqcStatus == "å·²æ£") .Where(t => t.ItemId == mesQaItemsDetect01.ItemId && t.BillNo == mesQaItemsDetect01.LotNo) .ExecuteCommand(); var first = db .Queryable<MesInvItemArnDetail, MesInvItemArn>( (b, a) => new object[] { JoinType.Left, b.ParentGuid == a.Guid }) .Where((b, a) => a.BillNo == mesQaItemsDetect01.LotNo && b.ReturnFlag == 0) .Select((b, a) => new { TotalQuantity = SqlFunc.AggregateSum(b.Quantity), TotalOkRkQty = SqlFunc.AggregateSum(b.OkRkqty) }) .First(); var totalQuantity = first.TotalQuantity ?? 0; var totalOkRkQty = first.TotalOkRkQty ?? 0; if (totalQuantity == totalOkRkQty) executeCommand += db.Updateable<MesInvItemArn>() .SetColumns(s => s.Status == 1) .Where(s => s.BillNo == mesQaItemsDetect01.LotNo) .ExecuteCommand(); } else { executeCommand += db.Updateable<MesInvItemArnDetail>() .SetColumns(s => s.CheckStates == "ä¸åæ ¼å¾ å®¡æ¹") .SetColumns(s => s.Ischeck == 1) .SetColumns(s => s.CheckRes == mesQaItemsDetect01.FcheckResu) .SetColumns(s => s.CheckDate == DateTime.Now) .Where(s => s.ParentGuid == mesInvItemArn.Guid && s.ItemId == mesQaItemsDetect01.ItemId) .ExecuteCommand(); executeCommand += db.Updateable<MesQaItemsDetect01>() .SetColumns(s => s.IqcDate == DateTime.Now) .SetColumns(s => s.FcheckDate == DateTime.Now) .SetColumns(s => s.FcheckBy == sysUser.Account) .Where(s => s.Guid == mesQaItemsDetect01.Guid) .ExecuteCommand(); } if (executeCommand >=3) return executeCommand; throw new Exception("æ´æ°å¤±è´¥"); }); return com > 0; } }