From c9d9aacd884e9d730d47982e7f65ecc1bb836268 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 16 八月 2024 17:54:52 +0800
Subject: [PATCH] 修改三个检验，适配WOMDAA表
---
/dev/null | 355 --------------
MESApplication/Controllers/QC/XJController.cs | 9
MES.Service/Modes/Womdaa.cs | 472 +++++++++++--------
MES.Service/service/QC/SuspendService.cs | 24
MES.Service/service/QC/XJService.cs | 108 +--
MES.Service/Modes/MesLine.cs | 371 +++++---------
MES.Service/service/QC/SJService.cs | 2
MES.Service/service/QC/RKJService.cs | 12
MES.Service/Dto/service/SJPageResult.cs | 45 -
9 files changed, 510 insertions(+), 888 deletions(-)
diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
index fb35a4c..a2acc0c 100644
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ b/MES.Service/Dto/service/SJPageResult.cs
@@ -56,38 +56,31 @@
[SugarColumn(ColumnName = "DAA001")] //鐢ㄤ簬SqlSugar
public string? daa001 { get; set; }
-
- [SugarColumn(ColumnName = "CAT_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? catQty { get; set; }
-
- [SugarColumn(ColumnName = "DETAIL_MEM")] //鐢ㄤ簬SqlSugar
- public string? detailMem { get; set; }
-
- [SugarColumn(ColumnName = "TASK_NO")] //鐢ㄤ簬SqlSugar
- public string? taskNo { get; set; }
-
+
//LINE
[SugarColumn(ColumnName = "LINE")] //鐢ㄤ簬SqlSugar
public string? line { get; set; }
- /// <summary>
- /// 妯″叿鍙�
- /// </summary>
-
- [SugarColumn(ColumnName = "MOID_NUM")] //鐢ㄤ簬SqlSugar
- public string? MoidNum { get; set; }
[SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
public string? Remarks { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA003")]
+ public string? Daa003 { get; set; }
- //BOARD_MODEL
- [SugarColumn(ColumnName = "BOARD_MODEL")]
- public string? BoardModel { get; set; }
-
- [SugarColumn(ColumnName = "PLAN_QTY")] public decimal? PlanQty { get; set; }
-
- [SugarColumn(ColumnName = "MOCODE")] public string? Mocode { get; set; }
-
- [SugarColumn(ColumnName = "BOARD_STYLE")]
- public string? BoardStyle { get; set; }
+ /// <summary>
+ /// 浜у搧瑙勬牸
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA004")]
+ public string? Daa004 { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA008")]
+ public decimal? Daa008 { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesBoardBaseInfo.cs b/MES.Service/Modes/MesBoardBaseInfo.cs
deleted file mode 100644
index 1c8eaa0..0000000
--- a/MES.Service/Modes/MesBoardBaseInfo.cs
+++ /dev/null
@@ -1,467 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 浜у搧淇℃伅琛�
-/// </summary>
-[Table("MES_BOARD_BASE_INFO")]
-[SugarTable("MES_BOARD_BASE_INFO")] //鐢ㄤ簬SqlSugar
-public class MesBoardBaseInfo
-{
- /// <summary>
- /// ID
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鏉＄爜绫诲瀷ID
- /// </summary>
- [Column("BARCODE_TYPE_ID")]
- [SugarColumn(ColumnName = "BARCODE_TYPE_ID")] //鐢ㄤ簬SqlSugar
- public decimal? BarcodeTypeId { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [Column("BOARD_ITEM")]
- [SugarColumn(ColumnName = "BOARD_ITEM")] //鐢ㄤ簬SqlSugar
- [StringLength(64, ErrorMessage = "浜у搧缂栫爜闀垮害涓嶈兘瓒呭嚭64")]
- public string BoardItem { get; set; }
-
- /// <summary>
- /// 浜у搧鐢熶骇绾夸綋
- /// </summary>
- [Column("BOARD_LINENO")]
- [SugarColumn(ColumnName = "BOARD_LINENO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜у搧鐢熶骇绾夸綋闀垮害涓嶈兘瓒呭嚭50")]
- public string BoardLineno { get; set; }
-
- /// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
- [Column("BOARD_MODEL")]
- [SugarColumn(ColumnName = "BOARD_MODEL")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "浜у搧瑙勬牸闀垮害涓嶈兘瓒呭嚭500")]
- public string BoardModel { get; set; }
-
- /// <summary>
- /// 浜у搧鍚嶇О(鍘熷崟鏉垮悕绉�)
- /// </summary>
- [Column("BOARD_NAME")]
- [SugarColumn(ColumnName = "BOARD_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "浜у搧鍚嶇О(鍘熷崟鏉垮悕绉�)闀垮害涓嶈兘瓒呭嚭500")]
- public string BoardName { get; set; }
-
- /// <summary>
- /// 浜у搧鏈哄瀷
- /// </summary>
- [Column("BOARD_STYLE")]
- [SugarColumn(ColumnName = "BOARD_STYLE")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "浜у搧鏈哄瀷闀垮害涓嶈兘瓒呭嚭500")]
- public string BoardStyle { get; set; }
-
- /// <summary>
- /// 閫傞厤璁′欢鍨嬪彿
- /// </summary>
- [Column("BOARD_STYLE_J")]
- [SugarColumn(ColumnName = "BOARD_STYLE_J")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "閫傞厤璁′欢鍨嬪彿闀垮害涓嶈兘瓒呭嚭50")]
- public string BoardStyleJ { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [Column("BOARD_UNIT")]
- [SugarColumn(ColumnName = "BOARD_UNIT")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "鍗曚綅闀垮害涓嶈兘瓒呭嚭10")]
- public string BoardUnit { get; set; }
-
- /// <summary>
- /// 鏄惁BOM鎵佸钩鍖�
- /// </summary>
- [Column("BOM_FLAT_FLAG")]
- [SugarColumn(ColumnName = "BOM_FLAT_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? BomFlatFlag { get; set; }
-
- /// <summary>
- /// 棰滆壊
- /// </summary>
- [Column("COLOR_NAME")]
- [SugarColumn(ColumnName = "COLOR_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "棰滆壊闀垮害涓嶈兘瓒呭嚭500")]
- public string ColorName { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
-
- /// <summary>
- /// 璁板綍鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "璁板綍鍒涘缓浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 榛樿浠撳簱
- /// </summary>
- [Column("DEPOT_CODE")]
- [SugarColumn(ColumnName = "DEPOT_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "榛樿浠撳簱闀垮害涓嶈兘瓒呭嚭50")]
- public string DepotCode { get; set; }
-
- /// <summary>
- /// 榛樿搴撲綅
- /// </summary>
- [Column("DEPOT_SECTION_CODE")]
- [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "榛樿搴撲綅闀垮害涓嶈兘瓒呭嚭50")]
- public string DepotSectionCode { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("DESCRIPTION")]
- [SugarColumn(ColumnName = "DESCRIPTION")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭255")]
- public string Description { get; set; }
-
- /// <summary>
- /// 鍏冧欢鏁�
- /// </summary>
- [Column("ELEMENT_QTY")]
- [SugarColumn(ColumnName = "ELEMENT_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? ElementQty { get; set; }
-
- /// <summary>
- /// ERP鏂欏彿
- /// </summary>
- [Column("ERP_ITEM_NO")]
- [SugarColumn(ColumnName = "ERP_ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "ERP鏂欏彿闀垮害涓嶈兘瓒呭嚭50")]
- public string ErpItemNo { get; set; }
-
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "宸ュ巶闀垮害涓嶈兘瓒呭嚭10")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("FCHECKED_BY1")]
- [SugarColumn(ColumnName = "FCHECKED_BY1")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�20")]
- public string FcheckedBy1 { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("FCHECKED_BY2")]
- [SugarColumn(ColumnName = "FCHECKED_BY2")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�20")]
- public string FcheckedBy2 { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [Column("FCHECKED_DATE1")]
- [SugarColumn(ColumnName = "FCHECKED_DATE1")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckedDate1 { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [Column("FCHECKED_DATE2")]
- [SugarColumn(ColumnName = "FCHECKED_DATE2")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckedDate2 { get; set; }
-
- /// <summary>
- /// 瀹℃壒鏍囪瘑
- /// </summary>
- [Column("FCHECK_FLAG1")]
- [SugarColumn(ColumnName = "FCHECK_FLAG1")] //鐢ㄤ簬SqlSugar
- public decimal? FcheckFlag1 { get; set; }
-
- /// <summary>
- /// 瀹℃壒鏍囪瘑
- /// </summary>
- [Column("FCHECK_FLAG2")]
- [SugarColumn(ColumnName = "FCHECK_FLAG2")] //鐢ㄤ簬SqlSugar
- public decimal? FcheckFlag2 { get; set; }
-
- /// <summary>
- /// 瀹℃壒鐘舵��
- /// </summary>
- [Column("FCHECK_TYP")]
- [SugarColumn(ColumnName = "FCHECK_TYP")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "瀹℃壒鐘舵�侀暱搴︿笉鑳借秴鍑�200")]
- public string FcheckTyp { get; set; }
-
- /// <summary>
- /// 棰滆壊鏍囪瘑(1锛氬伐搴廈OM缁存姢閿欒)
- /// </summary>
- [Column("FCOLOR")]
- [SugarColumn(ColumnName = "FCOLOR")] //鐢ㄤ簬SqlSugar
- public decimal? Fcolor { get; set; }
-
- /// <summary>
- /// MRPII棣栧伐搴忓簭鍙�
- /// </summary>
- [Column("FIRST_SEQ")]
- [SugarColumn(ColumnName = "FIRST_SEQ")] //鐢ㄤ簬SqlSugar
- public decimal? FirstSeq { get; set; }
-
- /// <summary>
- /// 鏈�杩戞洿鏂颁汉
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鏈�杩戞洿鏂颁汉闀垮害涓嶈兘瓒呭嚭30")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏈�杩戞洿鏂版椂闂�
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 鏄惁绾冲叆MES绠＄悊
- /// </summary>
- [Column("MES_FLAG")]
- [SugarColumn(ColumnName = "MES_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? MesFlag { get; set; }
-
- /// <summary>
- /// 鏄惁MRPII鍗曟澘
- /// </summary>
- [Column("MRP_ITEM")]
- [SugarColumn(ColumnName = "MRP_ITEM")] //鐢ㄤ簬SqlSugar
- public decimal? MrpItem { get; set; }
-
- /// <summary>
- /// 璐熸瀬閰嶆柟鐢ㄩ噺
- /// </summary>
- [Column("NEG_QTY")]
- [SugarColumn(ColumnName = "NEG_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? NegQty { get; set; }
-
- /// <summary>
- /// 琛屼笟鏍囧噯鎻忚堪
- /// </summary>
- [Column("NORMT")]
- [SugarColumn(ColumnName = "NORMT")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "琛屼笟鏍囧噯鎻忚堪闀垮害涓嶈兘瓒呭嚭100")]
- public string Normt { get; set; }
-
- /// <summary>
- /// 缁勭粐
- /// </summary>
- [Column("ORG")]
- [SugarColumn(ColumnName = "ORG")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "缁勭粐闀垮害涓嶈兘瓒呭嚭10")]
- public string Org { get; set; }
-
- /// <summary>
- /// 姣忕鏁伴噺
- /// </summary>
- [Column("PACK_BOX_QTY")]
- [SugarColumn(ColumnName = "PACK_BOX_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PackBoxQty { get; set; }
-
- /// <summary>
- /// 姣忓崱鏉跨鏁�
- /// </summary>
- [Column("PACK_CB_QTY")]
- [SugarColumn(ColumnName = "PACK_CB_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PackCbQty { get; set; }
-
- /// <summary>
- /// 鍖呰娉ㄦ剰浜嬮」
- /// </summary>
- [Column("PACK_SHIP_MEMO")]
- [SugarColumn(ColumnName = "PACK_SHIP_MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "鍖呰娉ㄦ剰浜嬮」闀垮害涓嶈兘瓒呭嚭255")]
- public string PackShipMemo { get; set; }
-
- /// <summary>
- /// 鍑鸿揣鍖呰鏂瑰紡
- /// </summary>
- [Column("PACK_SHIP_NO")]
- [SugarColumn(ColumnName = "PACK_SHIP_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "鍑鸿揣鍖呰鏂瑰紡闀垮害涓嶈兘瓒呭嚭10")]
- public string PackShipNo { get; set; }
-
- /// <summary>
- /// 姣忕浜у搧鏁伴噺
- /// </summary>
- [Column("PACK_SHIP_QTY")]
- [SugarColumn(ColumnName = "PACK_SHIP_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PackShipQty { get; set; }
-
- /// <summary>
- /// 閰嶆柟
- /// </summary>
- [Column("PEIFANG")]
- [SugarColumn(ColumnName = "PEIFANG")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "閰嶆柟闀垮害涓嶈兘瓒呭嚭20")]
- public string Peifang { get; set; }
-
- /// <summary>
- /// 浜у搧鍥剧墖璺緞
- /// </summary>
- [Column("PIC_PATH")]
- [SugarColumn(ColumnName = "PIC_PATH")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "浜у搧鍥剧墖璺緞闀垮害涓嶈兘瓒呭嚭255")]
- public string PicPath { get; set; }
-
- /// <summary>
- /// 姝ｆ瀬閰嶆柟鐢ㄩ噺
- /// </summary>
- [Column("POS_QTY")]
- [SugarColumn(ColumnName = "POS_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PosQty { get; set; }
-
- /// <summary>
- /// 鎴愬搧2锛屽崐鎴愬搧1
- /// </summary>
- [Column("PRD_FLAG")]
- [SugarColumn(ColumnName = "PRD_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? PrdFlag { get; set; }
-
- /// <summary>
- /// 宸ヨ壓灞炴��(鏁板�煎彧鑳芥槸1,2,3)
- /// </summary>
- [Column("PROC_CAPTION")]
- [SugarColumn(ColumnName = "PROC_CAPTION")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "宸ヨ壓灞炴��(鏁板�煎彧鑳芥槸1,2,3)闀垮害涓嶈兘瓒呭嚭20")]
- public string ProcCaption { get; set; }
-
- /// <summary>
- /// 浜у搧绫诲埆
- /// </summary>
- [Column("PRODUCT_TYPE")]
- [SugarColumn(ColumnName = "PRODUCT_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "浜у搧绫诲埆闀垮害涓嶈兘瓒呭嚭20")]
- public string ProductType { get; set; }
-
- /// <summary>
- /// SAP鐗╂枡灏忕被
- /// </summary>
- [Column("PROPERTY_NO")]
- [SugarColumn(ColumnName = "PROPERTY_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "SAP鐗╂枡灏忕被闀垮害涓嶈兘瓒呭嚭50")]
- public string PropertyNo { get; set; }
-
- /// <summary>
- /// 宸ヨ壓绫诲埆缂栧彿
- /// </summary>
- [Column("PTYPE_NO")]
- [SugarColumn(ColumnName = "PTYPE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "宸ヨ壓绫诲埆缂栧彿闀垮害涓嶈兘瓒呭嚭10")]
- public string PtypeNo { get; set; }
-
- /// <summary>
- /// 妫�楠屾ā寮�(鍏ㄦ\鎶芥)
- /// </summary>
- [Column("QC_MODE")]
- [SugarColumn(ColumnName = "QC_MODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "妫�楠屾ā寮�(鍏ㄦ/鎶芥)闀垮害涓嶈兘瓒呭嚭20")]
- public string QcMode { get; set; }
-
- /// <summary>
- /// 榛樿鏀惰揣鍦板潃(瀹㈡埛鍦板潃)
- /// </summary>
- [Column("SHIP_TO")]
- [SugarColumn(ColumnName = "SHIP_TO")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "榛樿鏀惰揣鍦板潃(瀹㈡埛鍦板潃)闀垮害涓嶈兘瓒呭嚭200")]
- public string ShipTo { get; set; }
-
- /// <summary>
- /// 璐存斁鏁�
- /// </summary>
- [Column("SMT_QTY")]
- [SugarColumn(ColumnName = "SMT_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? SmtQty { get; set; }
-
- /// <summary>
- /// 杞欢鐗堟湰
- /// </summary>
- [Column("SOFTVERSION")]
- [SugarColumn(ColumnName = "SOFTVERSION")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "杞欢鐗堟湰闀垮害涓嶈兘瓒呭嚭20")]
- public string Softversion { get; set; }
-
- /// <summary>
- /// 鍋滅敤鏃ユ湡
- /// </summary>
- [Column("STOPDATE")]
- [SugarColumn(ColumnName = "STOPDATE")] //鐢ㄤ簬SqlSugar
- public DateTime? Stopdate { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鏂瑰紡
- /// </summary>
- [Column("STORE_MODE")]
- [SugarColumn(ColumnName = "STORE_MODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍏ュ簱鏂瑰紡闀垮害涓嶈兘瓒呭嚭20")]
- public string StoreMode { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("STYLE_TMP1")]
- [SugarColumn(ColumnName = "STYLE_TMP1")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "StyleTmp1闀垮害涓嶈兘瓒呭嚭500")]
- public string StyleTmp1 { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("STYLE_TMP2")]
- [SugarColumn(ColumnName = "STYLE_TMP2")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "StyleTmp2闀垮害涓嶈兘瓒呭嚭50")]
- public string StyleTmp2 { get; set; }
-
- /// <summary>
- /// 鐒婄偣鏁�
- /// </summary>
- [Column("THT_QTY")]
- [SugarColumn(ColumnName = "THT_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? ThtQty { get; set; }
-
- /// <summary>
- /// 鏈�鏂颁笅杞芥洿鏂版爣璇�
- /// </summary>
- [Column("UPDATE_FLG")]
- [SugarColumn(ColumnName = "UPDATE_FLG")] //鐢ㄤ簬SqlSugar
- public decimal? UpdateFlg { get; set; }
-
- /// <summary>
- /// 鍗曟澘鐗堟湰
- /// </summary>
- [Column("VERSION")]
- [SugarColumn(ColumnName = "VERSION")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍗曟澘鐗堟湰闀垮害涓嶈兘瓒呭嚭20")]
- public string Version { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepTask.cs b/MES.Service/Modes/MesDepTask.cs
deleted file mode 100644
index cc4dc29..0000000
--- a/MES.Service/Modes/MesDepTask.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閿�鍞鍗曡〃
-/// </summary>
-[Table("MES_DEP_TASK")]
-[SugarTable("MES_DEP_TASK")] //鐢ㄤ簬SqlSugar
-public class MesDepTask
-{
- /// <summary>
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 浠庤〃ID
- /// </summary>
- [Column("AUTOID")]
- [SugarColumn(ColumnName = "AUTOID")] //鐢ㄤ簬SqlSugar
- public decimal? Autoid { get; set; }
-
- /// <summary>
- /// 澶囨崯鏁伴噺
- /// </summary>
- [Column("BACKUP_QTY")]
- [SugarColumn(ColumnName = "BACKUP_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? BackupQty { get; set; }
-
- /// <summary>
- /// 鏉＄爜ID
- /// </summary>
- [Column("BARCODE_TYPE_ID")]
- [SugarColumn(ColumnName = "BARCODE_TYPE_ID")] //鐢ㄤ簬SqlSugar
- public decimal? BarcodeTypeId { get; set; }
-
- /// <summary>
- /// 鎴愬搧缂栧彿
- /// </summary>
- [Column("BOARD_ITEM")]
- [SugarColumn(ColumnName = "BOARD_ITEM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鎴愬搧缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string BoardItem { get; set; }
-
- /// <summary>
- /// 鎴愬搧鍚嶇О
- /// </summary>
- [Column("BOARD_NAME")]
- [SugarColumn(ColumnName = "BOARD_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "鎴愬搧鍚嶇О闀垮害涓嶈兘瓒呭嚭200")]
- public string BoardName { get; set; }
-
- /// <summary>
- /// 浜у搧鍨嬪彿
- /// </summary>
- [Column("BOARD_STYLE")]
- [SugarColumn(ColumnName = "BOARD_STYLE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜у搧鍨嬪彿闀垮害涓嶈兘瓒呭嚭50")]
- public string BoardStyle { get; set; }
-
- /// <summary>
- /// 鍏抽棴鏃ユ湡
- /// </summary>
- [Column("CLOSEDATE")]
- [SugarColumn(ColumnName = "CLOSEDATE")] //鐢ㄤ簬SqlSugar
- public DateTime? Closedate { get; set; }
-
- /// <summary>
- /// 棰滆壊
- /// </summary>
- [Column("COLOR_NAME")]
- [SugarColumn(ColumnName = "COLOR_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "棰滆壊闀垮害涓嶈兘瓒呭嚭500")]
- public string ColorName { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭50")]
- public string Company { get; set; }
-
- /// <summary>
- /// 瀹屽伐鏁伴噺
- /// </summary>
- [Column("COMPLETE_QTY")]
- [SugarColumn(ColumnName = "COMPLETE_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? CompleteQty { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鍒跺崟浜�
- /// </summary>
- [Column("CREATOR")]
- [SugarColumn(ColumnName = "CREATOR")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "鍒跺崟浜洪暱搴︿笉鑳借秴鍑�200")]
- public string Creator { get; set; }
-
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [Column("CUST_NO")]
- [SugarColumn(ColumnName = "CUST_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "瀹㈡埛缂栧彿闀垮害涓嶈兘瓒呭嚭20")]
- public string CustNo { get; set; }
-
- /// <summary>
- /// 瀹㈡埛PO
- /// </summary>
- [Column("CUST_PO")]
- [SugarColumn(ColumnName = "CUST_PO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "瀹㈡埛PO闀垮害涓嶈兘瓒呭嚭50")]
- public string CustPo { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鏈哄瀷
- /// </summary>
- [Column("CUST_STYLE")]
- [SugarColumn(ColumnName = "CUST_STYLE")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "瀹㈡埛鏈哄瀷闀垮害涓嶈兘瓒呭嚭100")]
- public string CustStyle { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("DATA_FROM")]
- [SugarColumn(ColumnName = "DATA_FROM")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "DataFrom闀垮害涓嶈兘瓒呭嚭10")]
- public string DataFrom { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("DOWN_FLAG")]
- [SugarColumn(ColumnName = "DOWN_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? DownFlag { get; set; }
-
- /// <summary>
- /// 涓嬭浇鏃堕棿
- /// </summary>
- [Column("DOWN_TIME")]
- [SugarColumn(ColumnName = "DOWN_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? DownTime { get; set; }
-
- /// <summary>
- /// ERP鐗╂枡缂栧彿
- /// </summary>
- [Column("ERP_ITEM_NO")]
- [SugarColumn(ColumnName = "ERP_ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "ERP鐗╂枡缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string ErpItemNo { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Factory闀垮害涓嶈兘瓒呭嚭20")]
- public string Factory { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FCHECK_BY")]
- [SugarColumn(ColumnName = "FCHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "FcheckBy闀垮害涓嶈兘瓒呭嚭30")]
- public string FcheckBy { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FCHECK_DATE")]
- [SugarColumn(ColumnName = "FCHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckDate { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FCHECK_STATUS")]
- [SugarColumn(ColumnName = "FCHECK_STATUS")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "FcheckStatus闀垮害涓嶈兘瓒呭嚭200")]
- public string FcheckStatus { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FIRST_ITEM_READY_TIME")]
- [SugarColumn(ColumnName = "FIRST_ITEM_READY_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? FirstItemReadyTime { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FIRST_ITEM_RECEIPT_TIME")]
- [SugarColumn(ColumnName = "FIRST_ITEM_RECEIPT_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? FirstItemReceiptTime { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FLAG")]
- [SugarColumn(ColumnName = "FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? Flag { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("ISSUE_STATUS")]
- [SugarColumn(ColumnName = "ISSUE_STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? IssueStatus { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "LastupdateBy闀垮害涓嶈兘瓒呭嚭30")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭255")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
- [Column("MOCODE")]
- [SugarColumn(ColumnName = "MOCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鐢熶骇宸ュ崟闀垮害涓嶈兘瓒呭嚭50")]
- public string Mocode { get; set; }
-
- /// <summary>
- /// 涓昏〃ID
- /// </summary>
- [Column("MOID")]
- [SugarColumn(ColumnName = "MOID")] //鐢ㄤ簬SqlSugar
- public decimal? Moid { get; set; }
-
- /// <summary>
- /// 鍖呰璇存槑
- /// </summary>
- [Column("PACK_SHIP_MEMO")]
- [SugarColumn(ColumnName = "PACK_SHIP_MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "鍖呰璇存槑闀垮害涓嶈兘瓒呭嚭255")]
- public string PackShipMemo { get; set; }
-
- /// <summary>
- /// 鍖呰绫诲瀷
- /// </summary>
- [Column("PACK_SHIP_TYPE")]
- [SugarColumn(ColumnName = "PACK_SHIP_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍖呰绫诲瀷闀垮害涓嶈兘瓒呭嚭20")]
- public string PackShipType { get; set; }
-
- /// <summary>
- /// 璁″垝寮�濮嬫椂闂�
- /// </summary>
- [Column("PLAN_BEGIN_TIME")]
- [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? PlanBeginTime { get; set; }
-
- /// <summary>
- /// 璁″垝瀹屽伐鏃堕棿
- /// </summary>
- [Column("PLAN_FINISH_TIME")]
- [SugarColumn(ColumnName = "PLAN_FINISH_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? PlanFinishTime { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [Column("PLAN_QTY")]
- [SugarColumn(ColumnName = "PLAN_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PlanQty { get; set; }
-
- /// <summary>
- /// 鎵撳嵃鍥炲畾鍊�
- /// </summary>
- [Column("PROC_PRINT_VALUE")]
- [SugarColumn(ColumnName = "PROC_PRINT_VALUE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鎵撳嵃鍥炲畾鍊奸暱搴︿笉鑳借秴鍑�50")]
- public string ProcPrintValue { get; set; }
-
- /// <summary>
- /// 宸ュ崟鐘舵��
- /// </summary>
- [Column("PRODUCE_STATE")]
- [SugarColumn(ColumnName = "PRODUCE_STATE")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "宸ュ崟鐘舵�侀暱搴︿笉鑳借秴鍑�10")]
- public string ProduceState { get; set; }
-
- /// <summary>
- /// 瀹為檯寮�濮嬫椂闂�
- /// </summary>
- [Column("REAL_BEGIN_TIME")]
- [SugarColumn(ColumnName = "REAL_BEGIN_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? RealBeginTime { get; set; }
-
- /// <summary>
- /// 瀹為檯瀹屽伐鏃堕棿
- /// </summary>
- [Column("REAL_FINISH_TIME")]
- [SugarColumn(ColumnName = "REAL_FINISH_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? RealFinishTime { get; set; }
-
- /// <summary>
- /// 鐜繚浠ｇ爜
- /// </summary>
- [Column("ROHSE_CODE")]
- [SugarColumn(ColumnName = "ROHSE_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鐜繚浠ｇ爜闀垮害涓嶈兘瓒呭嚭20")]
- public string RohseCode { get; set; }
-
- /// <summary>
- /// 鑸瑰ご鏍�
- /// </summary>
- [Column("SHIP_QTY")]
- [SugarColumn(ColumnName = "SHIP_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? ShipQty { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [Column("STATUS")]
- [SugarColumn(ColumnName = "STATUS")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "鐘舵�侀暱搴︿笉鑳借秴鍑�10")]
- public string Status { get; set; }
-
- /// <summary>
- /// 璁㈠崟缂栧彿
- /// </summary>
- [Column("TASK_NO")]
- [SugarColumn(ColumnName = "TASK_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "璁㈠崟缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 宸ュ崟绫诲瀷
- /// </summary>
- [Column("TASK_TYPE")]
- [SugarColumn(ColumnName = "TASK_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "宸ュ崟绫诲瀷闀垮害涓嶈兘瓒呭嚭20")]
- public string TaskType { get; set; }
-
- /// <summary>
- /// 鏈�鏂颁笅杞芥洿鏂版爣璇�
- /// </summary>
- [Column("UPDATE_FLG")]
- [SugarColumn(ColumnName = "UPDATE_FLG")] //鐢ㄤ簬SqlSugar
- public decimal? UpdateFlg { get; set; }
-
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- [Column("VERSION")]
- [SugarColumn(ColumnName = "VERSION")] //鐢ㄤ簬SqlSugar
- [StringLength(120, ErrorMessage = "鐗堟湰闀垮害涓嶈兘瓒呭嚭120")]
- public string Version { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- [Column("WORK_LINE")]
- [SugarColumn(ColumnName = "WORK_LINE")] //鐢ㄤ簬SqlSugar
- public decimal? WorkLine { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [Column("WORK_NO")]
- [SugarColumn(ColumnName = "WORK_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浠诲姟鍗曞彿闀垮害涓嶈兘瓒呭嚭50")]
- public string WorkNo { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesLine.cs b/MES.Service/Modes/MesLine.cs
index a1e3718..9d04286 100644
--- a/MES.Service/Modes/MesLine.cs
+++ b/MES.Service/Modes/MesLine.cs
@@ -1,258 +1,173 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
+锘縰sing SqlSugar;
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 绾夸綋
-/// </summary>
-[Table("MES_LINE")]
-[SugarTable("MES_LINE")] //鐢ㄤ簬SqlSugar
-public class MesLine
+namespace MES.Service.Modes
{
/// <summary>
- /// 涓婚敭
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
+ /// 绾夸綋
+ ///</summary>
+ [SugarTable("MES_LINE")]
+ public class MesLine
+ {
+ /// <summary>
+ /// 涓婚敭
+ ///</summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public decimal Id { get; set; }
- /// <summary>
- /// 鏉＄爜绫诲瀷
- /// </summary>
- [Column("BARTYPE")]
- [SugarColumn(ColumnName = "BARTYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鏉＄爜绫诲瀷闀垮害涓嶈兘瓒呭嚭20")]
- public string Bartype { get; set; }
+ /// <summary>
+ /// 绾夸綋缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "LINE_NO")]
+ public string LineNo { get; set; }
- /// <summary>
- /// 鍗℃澘鍒嗙被
- /// </summary>
- [Column("BK01")]
- [SugarColumn(ColumnName = "BK01")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍗℃澘鍒嗙被闀垮害涓嶈兘瓒呭嚭50")]
- public string Bk01 { get; set; }
+ /// <summary>
+ /// 绾夸綋鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "LINE_NAME")]
+ public string LineName { get; set; }
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("CHECK_BY")]
- [SugarColumn(ColumnName = "CHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CheckBy { get; set; }
+ /// <summary>
+ /// 宸ヤ綔涓績缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
+ public string WorkshopCenterCode { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [Column("CHECK_DATE")]
- [SugarColumn(ColumnName = "CHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CheckDate { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "MEMO")]
+ public string Memo { get; set; }
- /// <summary>
- /// 瀹℃牳鐘舵��
- /// </summary>
- [Column("CHECK_STATUS")]
- [SugarColumn(ColumnName = "CHECK_STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? CheckStatus { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string CreateBy { get; set; }
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CreateBy { get; set; }
+ /// <summary>
+ /// 鏈�鍚庝慨鏀逛汉
+ ///</summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ public string LastupdateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
+ /// <summary>
+ /// 鏈�鍚庝慨鏀规棩鏈�
+ ///</summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [Column("DEPARTMENTCODE")]
- [SugarColumn(ColumnName = "DEPARTMENTCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "閮ㄩ棬缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string Departmentcode { get; set; }
+ /// <summary>
+ /// 鍗℃澘鍒嗙被
+ ///</summary>
+ [SugarColumn(ColumnName = "BK01")]
+ public string Bk01 { get; set; }
- /// <summary>
- /// 绾胯竟浠撳簱
- /// </summary>
- [Column("DEPOT_CODE")]
- [SugarColumn(ColumnName = "DEPOT_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "绾胯竟浠撳簱闀垮害涓嶈兘瓒呭嚭50")]
- public string DepotCode { get; set; }
+ /// <summary>
+ /// 鏍囩鏄剧ず鍊�
+ ///</summary>
+ [SugarColumn(ColumnName = "LABEL")]
+ public string Label { get; set; }
- /// <summary>
- /// 榛樿搴撲綅
- /// </summary>
- [Column("DEPOT_SECTION_CODE")]
- [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "榛樿搴撲綅闀垮害涓嶈兘瓒呭嚭50")]
- public string DepotSectionCode { get; set; }
+ /// <summary>
+ /// 杞﹂棿绠�鐮�
+ ///</summary>
+ [SugarColumn(ColumnName = "WORKHOMEJM")]
+ public string Workhomejm { get; set; }
- /// <summary>
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Factory闀垮害涓嶈兘瓒呭嚭20")]
- public string Factory { get; set; }
+ /// <summary>
+ /// 绾跨畝鐮�
+ ///</summary>
+ [SugarColumn(ColumnName = "LINEJM")]
+ public string Linejm { get; set; }
- /// <summary>
- /// 鏍囩鏄剧ず鍊�
- /// </summary>
- [Column("LABEL")]
- [SugarColumn(ColumnName = "LABEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏍囩鏄剧ず鍊奸暱搴︿笉鑳借秴鍑�100")]
- public string Label { get; set; }
+ /// <summary>
+ /// 鏉＄爜绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "BARTYPE")]
+ public string Bartype { get; set; }
- /// <summary>
- /// 鏈�鍚庝慨鏀逛汉
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鏈�鍚庝慨鏀逛汉闀垮害涓嶈兘瓒呭嚭30")]
- public string LastupdateBy { get; set; }
+ /// <summary>
+ /// 寰俊鏄剧ず鍊�
+ ///</summary>
+ [SugarColumn(ColumnName = "WX_LABLE")]
+ public string WxLable { get; set; }
- /// <summary>
- /// 鏈�鍚庝慨鏀规棩鏈�
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
+ /// <summary>
+ /// 鍖哄垎閿傞敯閿備簹
+ ///</summary>
+ [SugarColumn(ColumnName = "WORKCENTERTYPE")]
+ public string Workcentertype { get; set; }
- /// <summary>
- /// 缁勯暱缂栧彿
- /// </summary>
- [Column("L_CODE")]
- [SugarColumn(ColumnName = "L_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "缁勯暱缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string LCode { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "SIMPLENAME")]
+ public string Simplename { get; set; }
- /// <summary>
- /// 绾跨畝鐮�
- /// </summary>
- [Column("LINEJM")]
- [SugarColumn(ColumnName = "LINEJM")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "绾跨畝鐮侀暱搴︿笉鑳借秴鍑�20")]
- public string Linejm { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "SHOW_INDEX")]
+ public decimal? ShowIndex { get; set; }
- /// <summary>
- /// 绾夸綋鍚嶇О
- /// </summary>
- [Column("LINE_NAME")]
- [SugarColumn(ColumnName = "LINE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(64, ErrorMessage = "绾夸綋鍚嶇О闀垮害涓嶈兘瓒呭嚭64")]
- public string LineName { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "COMPANY")]
+ public string Company { get; set; }
- /// <summary>
- /// 绾夸綋缂栧彿
- /// </summary>
- [Column("LINE_NO")]
- [SugarColumn(ColumnName = "LINE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "绾夸綋缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string LineNo { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "FACTORY")]
+ public string Factory { get; set; }
- /// <summary>
- /// 浜х嚎绫诲埆
- /// </summary>
- [Column("LINE_STYLE")]
- [SugarColumn(ColumnName = "LINE_STYLE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "浜х嚎绫诲埆闀垮害涓嶈兘瓒呭嚭32")]
- public string LineStyle { get; set; }
+ /// <summary>
+ /// 绾胯竟浠撳簱
+ ///</summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
+ public string DepotCode { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(1000, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭1000")]
- public string Memo { get; set; }
+ /// <summary>
+ /// 榛樿搴撲綅
+ ///</summary>
+ [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
+ public string DepotSectionCode { get; set; }
- /// <summary>
- /// 鎵�灞炲伐搴�
- /// </summary>
- [Column("PROC_NO")]
- [SugarColumn(ColumnName = "PROC_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鎵�灞炲伐搴忛暱搴︿笉鑳借秴鍑�32")]
- public string ProcNo { get; set; }
+ /// <summary>
+ /// 鎶ュ伐鏂瑰紡锛�0銆佺鏁ｆ姤宸ワ紝1銆佹暣绾挎姤宸ワ級
+ ///</summary>
+ [SugarColumn(ColumnName = "WORK_TYPE")]
+ public decimal? WorkType { get; set; }
- /// <summary>
- /// </summary>
- [Column("SHOW_INDEX")]
- [SugarColumn(ColumnName = "SHOW_INDEX")] //鐢ㄤ簬SqlSugar
- public decimal? ShowIndex { get; set; }
+ /// <summary>
+ /// 閮ㄩ棬缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "DEPARTMENTCODE")]
+ public string Departmentcode { get; set; }
- /// <summary>
- /// </summary>
- [Column("SIMPLENAME")]
- [SugarColumn(ColumnName = "SIMPLENAME")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Simplename闀垮害涓嶈兘瓒呭嚭20")]
- public string Simplename { get; set; }
+ /// <summary>
+ /// 鎵�灞炲伐搴�
+ ///</summary>
+ [SugarColumn(ColumnName = "PROC_NO")]
+ public string ProcNo { get; set; }
- /// <summary>
- /// 鏍囧噯宸ユ椂
- /// </summary>
- [Column("STAND_TIME")]
- [SugarColumn(ColumnName = "STAND_TIME")] //鐢ㄤ簬SqlSugar
- public decimal? StandTime { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "LINE_STYLE")]
+ public string LineStyle { get; set; }
- /// <summary>
- /// 缁勯暱
- /// </summary>
- [Column("USERCODE")]
- [SugarColumn(ColumnName = "USERCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "缁勯暱闀垮害涓嶈兘瓒呭嚭50")]
- public string Usercode { get; set; }
-
- /// <summary>
- /// 鍖哄垎閿傞敯閿備簹
- /// </summary>
- [Column("WORKCENTERTYPE")]
- [SugarColumn(ColumnName = "WORKCENTERTYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍖哄垎閿傞敯閿備簹闀垮害涓嶈兘瓒呭嚭50")]
- public string Workcentertype { get; set; }
-
- /// <summary>
- /// 杞﹂棿绠�鐮�
- /// </summary>
- [Column("WORKHOMEJM")]
- [SugarColumn(ColumnName = "WORKHOMEJM")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "杞﹂棿绠�鐮侀暱搴︿笉鑳借秴鍑�20")]
- public string Workhomejm { get; set; }
-
- /// <summary>
- /// 宸ヤ綔涓績缂栧彿
- /// </summary>
- [Column("WORKSHOP_CENTER_CODE")]
- [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "宸ヤ綔涓績缂栧彿闀垮害涓嶈兘瓒呭嚭20")]
- public string WorkshopCenterCode { get; set; }
-
- /// <summary>
- /// 鎶ュ伐鏂瑰紡锛�0銆佺鏁ｆ姤宸ワ紝1銆佹暣绾挎姤宸ワ級
- /// </summary>
- [Column("WORK_TYPE")]
- [SugarColumn(ColumnName = "WORK_TYPE")] //鐢ㄤ簬SqlSugar
- public decimal? WorkType { get; set; }
-
- /// <summary>
- /// 寰俊鏄剧ず鍊�
- /// </summary>
- [Column("WX_LABLE")]
- [SugarColumn(ColumnName = "WX_LABLE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "寰俊鏄剧ず鍊奸暱搴︿笉鑳借秴鍑�50")]
- public string WxLable { get; set; }
+ /// <summary>
+ /// 缁勯暱缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "L_CODE")]
+ public string LCode { get; set; }
+ }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesSchemeResult.cs b/MES.Service/Modes/MesSchemeResult.cs
deleted file mode 100644
index 78a7967..0000000
--- a/MES.Service/Modes/MesSchemeResult.cs
+++ /dev/null
@@ -1,355 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鎺掍骇缁撴灉琛�
-/// </summary>
-[Table("MES_SCHEME_RESULT")]
-[SugarTable("MES_SCHEME_RESULT")] //鐢ㄤ簬SqlSugar
-public class MesSchemeResult
-{
- /// <summary>
- /// 鍙帓鏁伴噺
- /// </summary>
- [Column("ALLOW_QTY")]
- [SugarColumn(ColumnName = "ALLOW_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? AllowQty { get; set; }
-
- /// <summary>
- /// 璁″垝缂栧彿
- /// </summary>
- [Column("BILL_NO")]
- [SugarColumn(ColumnName = "BILL_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "璁″垝缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string BillNo { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [Column("BOARD_ITEM")]
- [SugarColumn(ColumnName = "BOARD_ITEM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜у搧缂栫爜闀垮害涓嶈兘瓒呭嚭50")]
- public string BoardItem { get; set; }
-
- /// <summary>
- /// 鏉块潰
- /// </summary>
- [Column("BOARD_SIDE")]
- [SugarColumn(ColumnName = "BOARD_SIDE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鏉块潰闀垮害涓嶈兘瓒呭嚭20")]
- public string BoardSide { get; set; }
-
- /// <summary>
- /// 鏍囧噯浜ц兘
- /// </summary>
- [Column("CAT_QTY")]
- [SugarColumn(ColumnName = "CAT_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? CatQty { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("CHECK_BY")]
- [SugarColumn(ColumnName = "CHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "CheckBy闀垮害涓嶈兘瓒呭嚭20")]
- public string CheckBy { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("CHECK_DATE")]
- [SugarColumn(ColumnName = "CHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// SMT榻愬鏍囧織(鏈鏌�,涓嶉綈濂�,榻愬,鎺ュ彛琛ㄦ棤鏁版嵁)
- /// </summary>
- [Column("CHECK_FLAG")]
- [SugarColumn(ColumnName = "CHECK_FLAG")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "SMT榻愬鏍囧織(鏈鏌�,涓嶉綈濂�,榻愬,鎺ュ彛琛ㄦ棤鏁版嵁)闀垮害涓嶈兘瓒呭嚭20")]
- public string CheckFlag { get; set; }
-
- /// <summary>
- /// 鐝鍙�
- /// </summary>
- [Column("CLASS_NO")]
- [SugarColumn(ColumnName = "CLASS_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鐝鍙烽暱搴︿笉鑳借秴鍑�20")]
- public string ClassNo { get; set; }
-
- /// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍏徃浠ｇ爜闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 娲惧伐鐗╂枡澶囨敞
- /// </summary>
- [Column("DETAIL_MEM")]
- [SugarColumn(ColumnName = "DETAIL_MEM")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "娲惧伐鐗╂枡澶囨敞闀垮害涓嶈兘瓒呭嚭500")]
- public string DetailMem { get; set; }
-
- /// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍒嗗巶缂栫爜闀垮害涓嶈兘瓒呭嚭20")]
- public string Factory { get; set; }
-
- /// <summary>
- /// SEQ_MES_SCHEME_RESULT
- /// </summary>
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true,
- OracleSequenceName = "SEQ_MES_SCHEME_RESULT",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍙戝竷浜�
- /// </summary>
- [Column("ISSUED_BY")]
- [SugarColumn(ColumnName = "ISSUED_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍙戝竷浜洪暱搴︿笉鑳借秴鍑�50")]
- public string IssuedBy { get; set; }
-
- /// <summary>
- /// 鍙戝竷鏃堕棿
- /// </summary>
- [Column("ISSUED_DATE")]
- [SugarColumn(ColumnName = "ISSUED_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? IssuedDate { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鏇存柊浜洪暱搴︿笉鑳借秴鍑�30")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 绾夸綋鍙�
- /// </summary>
- [Column("LINE_NO")]
- [SugarColumn(ColumnName = "LINE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "绾夸綋鍙烽暱搴︿笉鑳借秴鍑�20")]
- public string LineNo { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭255")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
- [Column("MOCODE")]
- [SugarColumn(ColumnName = "MOCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鐢熶骇宸ュ崟闀垮害涓嶈兘瓒呭嚭50")]
- public string Mocode { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("MOCODE_LINE")]
- [SugarColumn(ColumnName = "MOCODE_LINE")] //鐢ㄤ簬SqlSugar
- [StringLength(5, ErrorMessage = "MocodeLine闀垮害涓嶈兘瓒呭嚭5")]
- public string MocodeLine { get; set; }
-
- /// <summary>
- /// 鍔犲伐椤哄簭鍙�
- /// </summary>
- [Column("ORDER_NO")]
- [SugarColumn(ColumnName = "ORDER_NO")] //鐢ㄤ簬SqlSugar
- public decimal? OrderNo { get; set; }
-
- /// <summary>
- /// 杞ㄩ亾
- /// </summary>
- [Column("PATHWAY")]
- [SugarColumn(ColumnName = "PATHWAY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "杞ㄩ亾闀垮害涓嶈兘瓒呭嚭20")]
- public string Pathway { get; set; }
-
- /// <summary>
- /// 璁″垝寮�濮嬫椂闂�
- /// </summary>
- [Column("PLAN_BEGIN_TIME")]
- [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? PlanBeginTime { get; set; }
-
- /// <summary>
- /// 璁″垝缁撴潫鏃堕棿
- /// </summary>
- [Column("PLAN_FINISH_TIME")]
- [SugarColumn(ColumnName = "PLAN_FINISH_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? PlanFinishTime { get; set; }
-
- /// <summary>
- /// 璁″垝杞嚎鏃堕棿(鍒嗛挓)
- /// </summary>
- [Column("PLAN_TURN_TIME")]
- [SugarColumn(ColumnName = "PLAN_TURN_TIME")] //鐢ㄤ簬SqlSugar
- public decimal? PlanTurnTime { get; set; }
-
- /// <summary>
- /// 杞骇鏍囪瘑
- /// </summary>
- [Column("PMOVE_MK")]
- [SugarColumn(ColumnName = "PMOVE_MK")] //鐢ㄤ簬SqlSugar
- public decimal? PmoveMk { get; set; }
-
- /// <summary>
- /// 鍙帓浜ф暟閲�
- /// </summary>
- [Column("PROCESS_QTY")]
- [SugarColumn(ColumnName = "PROCESS_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? ProcessQty { get; set; }
-
- /// <summary>
- /// 宸ュ簭鍙�
- /// </summary>
- [Column("PROC_NO")]
- [SugarColumn(ColumnName = "PROC_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "宸ュ簭鍙烽暱搴︿笉鑳借秴鍑�20")]
- public string ProcNo { get; set; }
-
- /// <summary>
- /// 宸ュ簭椤哄簭鍙�
- /// </summary>
- [Column("PROC_ORDER")]
- [SugarColumn(ColumnName = "PROC_ORDER")] //鐢ㄤ簬SqlSugar
- public decimal? ProcOrder { get; set; }
-
- /// <summary>
- /// 鐢熶骇鐘舵��
- /// </summary>
- [Column("PROC_STATUS")]
- [SugarColumn(ColumnName = "PROC_STATUS")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "鐢熶骇鐘舵�侀暱搴︿笉鑳借秴鍑�10")]
- public string ProcStatus { get; set; }
-
- /// <summary>
- /// 瀹為檯寮�宸ユ椂闂�
- /// </summary>
- [Column("REAL_BEGIN_TIME")]
- [SugarColumn(ColumnName = "REAL_BEGIN_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? RealBeginTime { get; set; }
-
- /// <summary>
- /// 瀹為檯瀹屽伐鏃堕棿
- /// </summary>
- [Column("REAL_FINISH_TIME")]
- [SugarColumn(ColumnName = "REAL_FINISH_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? RealFinishTime { get; set; }
-
- /// <summary>
- /// 瀹為檯杞嚎鏃堕棿(鍒嗛挓)
- /// </summary>
- [Column("REAL_TURN_TIME")]
- [SugarColumn(ColumnName = "REAL_TURN_TIME")] //鐢ㄤ簬SqlSugar
- public decimal? RealTurnTime { get; set; }
-
- /// <summary>
- /// 瀹屽伐鍘熷洜
- /// </summary>
- [Column("REM")]
- [SugarColumn(ColumnName = "REM")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "瀹屽伐鍘熷洜闀垮害涓嶈兘瓒呭嚭20")]
- public string Rem { get; set; }
-
- /// <summary>
- /// 鎺掍骇鏁伴噺
- /// </summary>
- [Column("SCHEME_QTY")]
- [SugarColumn(ColumnName = "SCHEME_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? SchemeQty { get; set; }
-
- /// <summary>
- /// 鐘舵��(0-鎺掍骇,10-鍙戝竷)
- /// </summary>
- [Column("STATUS")]
- [SugarColumn(ColumnName = "STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? Status { get; set; }
-
- /// <summary>
- /// 鐢熶骇璁㈠崟鍙�
- /// </summary>
- [Column("TASK_NO")]
- [SugarColumn(ColumnName = "TASK_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鐢熶骇璁㈠崟鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 鏄惁闃撮槼鏉�
- /// </summary>
- [Column("TB_FLAG")]
- [SugarColumn(ColumnName = "TB_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? TbFlag { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("WSCHEME_QTY")]
- [SugarColumn(ColumnName = "WSCHEME_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? WschemeQty { get; set; }
-
- /// <summary>
- /// 鍘熸帓璁″垝
- /// </summary>
- [Column("YBILL_NO")]
- [SugarColumn(ColumnName = "YBILL_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍘熸帓璁″垝闀垮害涓嶈兘瓒呭嚭50")]
- public string YbillNo { get; set; }
-
- /// <summary>
- /// 鍘熸帓浜х嚎
- /// </summary>
- [Column("YLINE_NO")]
- [SugarColumn(ColumnName = "YLINE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍘熸帓浜х嚎闀垮害涓嶈兘瓒呭嚭50")]
- public string YlineNo { get; set; }
-
- /// <summary>
- /// 鍘熻鍒掓暟
- /// </summary>
- [Column("YSCHEME_QTY")]
- [SugarColumn(ColumnName = "YSCHEME_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? YschemeQty { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? BoardModel { get; set; }
-
- [SugarColumn(IsIgnore = true)] public decimal? PlanQty { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? BoardStyle { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womdaa.cs b/MES.Service/Modes/Womdaa.cs
index 8f613a1..b6d9bc2 100644
--- a/MES.Service/Modes/Womdaa.cs
+++ b/MES.Service/Modes/Womdaa.cs
@@ -1,232 +1,320 @@
-锘縰sing SqlSugar;
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 宸ュ崟鎸囦护琛�
-/// </summary>
-[SugarTable("WOMDAA")]
-public class Womdaa
+namespace MES.Service.Modes
{
/// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, IsIdentity = true)]
- public decimal Id { get; set; }
+ /// 宸ュ崟鎸囦护琛�
+ ///</summary>
+ [SugarTable("WOMDAA")]
+ public class Womdaa
+ {
+ /// <summary>
+ /// 鑷鍒�
+ ///</summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public decimal? Id { get; set; }
- /// <summary>
- /// PID
- /// </summary>
- [SugarColumn(ColumnName = "PID")]
- public decimal? Pid { get; set; }
+ /// <summary>
+ /// 鎺掍骇ID
+ ///</summary>
+ [SugarColumn(ColumnName = "PID")]
+ public decimal? Pid { get; set; }
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DAA001")]
- public string? Daa001 { get; set; }
+ /// <summary>
+ /// 鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA001")]
+ public string? Daa001 { get; set; }
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DAA002")]
- public string? Daa002 { get; set; }
+ /// <summary>
+ /// 浜у搧ID
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA002")]
+ public string? Daa002 { get; set; }
- /// <summary>
- /// 浜у搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DAA003")]
- public string? Daa003 { get; set; }
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA003")]
+ public string? Daa003 { get; set; }
- /// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "DAA004")]
- public string? Daa004 { get; set; }
+ /// <summary>
+ /// 浜у搧瑙勬牸
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA004")]
+ public string? Daa004 { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "DAA005")]
- public string? Daa005 { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA005")]
+ public string? Daa005 { get; set; }
- /// <summary>
- /// 棰勮寮�宸ユ椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "DAA006")]
- public DateTime? Daa006 { get; set; }
+ /// <summary>
+ /// ERP棰勮寮�宸ユ椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA006")]
+ public DateTime? Daa006 { get; set; }
- /// <summary>
- /// 棰勮瀹屽伐鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DAA007")]
- public DateTime? Daa007 { get; set; }
+ /// <summary>
+ /// ERP棰勮瀹屽伐鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA007")]
+ public DateTime? Daa007 { get; set; }
- /// <summary>
- /// 宸ュ崟鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DAA008")]
- public decimal? Daa008 { get; set; }
+ /// <summary>
+ /// 宸ュ崟鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA008")]
+ public decimal? Daa008 { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "DAA009")]
- public string? Daa009 { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA009")]
+ public string? Daa009 { get; set; }
- /// <summary>
- /// 鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DAA010")]
- public decimal? Daa010 { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA010")]
+ public decimal? Daa010 { get; set; }
- /// <summary>
- /// 宸茬敓浜ч噺
- /// </summary>
- [SugarColumn(ColumnName = "DAA011")]
- public decimal? Daa011 { get; set; }
+ /// <summary>
+ /// 宸茬敓浜ч噺
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA011")]
+ public decimal? Daa011 { get; set; }
- /// <summary>
- /// 鎶ュ簾鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DAA012")]
- public decimal? Daa012 { get; set; }
+ /// <summary>
+ /// 鎶ュ簾鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA012")]
+ public decimal? Daa012 { get; set; }
- /// <summary>
- /// 宸ヤ綔杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "DAA013")]
- public string? Daa013 { get; set; }
+ /// <summary>
+ /// 宸ヤ綔杞﹂棿
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA013")]
+ public string? Daa013 { get; set; }
- /// <summary>
- /// 鎶曟枡鍗曞崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DAA014")]
- public string? Daa014 { get; set; }
+ /// <summary>
+ /// 鎶曟枡鍗曞崟鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA014")]
+ public string? Daa014 { get; set; }
- /// <summary>
- /// 鐢熶骇绾垮埆
- /// </summary>
- [SugarColumn(ColumnName = "DAA015")]
- public string? Daa015 { get; set; }
+ /// <summary>
+ /// 鐢熶骇绾垮埆
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA015")]
+ public string? Daa015 { get; set; }
- /// <summary>
- /// 瀹為檯寮�宸ユ棩
- /// </summary>
- [SugarColumn(ColumnName = "DAA016")]
- public DateTime? Daa016 { get; set; }
+ /// <summary>
+ /// 瀹為檯寮�宸ユ棩
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA016")]
+ public DateTime? Daa016 { get; set; }
- /// <summary>
- /// 瀹為檯瀹屽伐鏃�
- /// </summary>
- [SugarColumn(ColumnName = "DAA017")]
- public DateTime? Daa017 { get; set; }
+ /// <summary>
+ /// 瀹為檯瀹屽伐鏃�
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA017")]
+ public DateTime? Daa017 { get; set; }
- /// <summary>
- /// 宸ュ崟鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "DAA018")]
- public string? Daa018 { get; set; }
+ /// <summary>
+ /// 宸ュ崟鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA018")]
+ public string? Daa018 { get; set; }
- /// <summary>
- /// 榻愬鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "DAA019")]
- public string? Daa019 { get; set; }
+ /// <summary>
+ /// 榻愬鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA019")]
+ public string? Daa019 { get; set; }
- /// <summary>
- /// 瀹℃牳鐮�
- /// </summary>
- [SugarColumn(ColumnName = "FSTATUS")]
- public decimal? Fstatus { get; set; }
+ /// <summary>
+ /// 瀹℃牳鐮�
+ ///</summary>
+ [SugarColumn(ColumnName = "FSTATUS")]
+ public decimal? Fstatus { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_DATE")]
- public DateTime? CheckDate { get; set; }
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "CHECK_DATE")]
+ public DateTime? CheckDate { get; set; }
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_USER")]
- public string? CheckUser { get; set; }
+ /// <summary>
+ /// 瀹℃牳浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "CHECK_USER")]
+ public string? CheckUser { get; set; }
- /// <summary>
- /// 绾垮埆缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DAA020")]
- public string? Daa020 { get; set; }
+ /// <summary>
+ /// 绾垮埆缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA020")]
+ public string? Daa020 { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DAA021")]
- public string? Daa021 { get; set; }
+ /// <summary>
+ /// 浠诲姟鍗曞崟鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA021")]
+ public string? Daa021 { get; set; }
- /// <summary>
- /// 閫氱煡澶囨枡锛�0-鏈�氱煡锛�1-閫氱煡
- /// </summary>
- [SugarColumn(ColumnName = "DAA022")]
- public decimal? Daa022 { get; set; }
+ /// <summary>
+ /// 閫氱煡澶囨枡锛�0-鏈�氱煡锛�1-閫氱煡
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA022")]
+ public decimal? Daa022 { get; set; }
- /// <summary>
- /// 鐢熶骇搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "DAA023")]
- public decimal? Daa023 { get; set; }
+ /// <summary>
+ /// 鐢熶骇搴忓彿
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA023")]
+ public decimal? Daa023 { get; set; }
- /// <summary>
- /// 鎺掍骇鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DAA024")]
- public string? Daa024 { get; set; }
+ /// <summary>
+ /// 鎺掍骇鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA024")]
+ public string? Daa024 { get; set; }
- /// <summary>
- /// 棣栦欢鏄惁妫�楠�1-妫�楠岋紝0鏈楠�
- /// </summary>
- [SugarColumn(ColumnName = "DAA025")]
- public string? Daa025 { get; set; }
+ /// <summary>
+ /// 棣栦欢鏄惁妫�楠�1-妫�楠岋紝0鏈楠�
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA025")]
+ public string? Daa025 { get; set; }
- /// <summary>
- /// 棣栦欢妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "DAA026")]
- public string? Daa026 { get; set; }
+ /// <summary>
+ /// 棣栦欢妫�楠岀粨鏋�
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA026")]
+ public string? Daa026 { get; set; }
- /// <summary>
- /// 宸叉姤妫�锛�0-鏈姤妫�锛�1-宸叉姤妫�
- /// </summary>
- [SugarColumn(ColumnName = "IS_REPORTCHECK")]
- public decimal? IsReportcheck { get; set; }
+ /// <summary>
+ /// 宸叉姤妫�锛�0-鏈姤妫�锛�1-宸叉姤妫�
+ ///</summary>
+ [SugarColumn(ColumnName = "IS_REPORTCHECK")]
+ public decimal? IsReportcheck { get; set; }
- /// <summary>
- /// 鎶ユ浜�
- /// </summary>
- [SugarColumn(ColumnName = "USNAME")]
- public string? Usname { get; set; }
+ /// <summary>
+ /// 鎶ユ浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "USNAME")]
+ public string? Usname { get; set; }
- /// <summary>
- /// 鎶ユ鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "REPORTTIME")]
- public DateTime? Reporttime { get; set; }
+ /// <summary>
+ /// 鎶ユ鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "REPORTTIME")]
+ public DateTime? Reporttime { get; set; }
- /// <summary>
- /// 鏈哄彴缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "MACHINE_NO")]
- public string? MachineNo { get; set; }
+ /// <summary>
+ /// 鏈哄彴缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "MACHINE_NO")]
+ public string? MachineNo { get; set; }
- /// <summary>
- /// 澶囨枡瀹屾垚1-瀹屾垚锛�0鏈畬鎴�
- /// </summary>
- [SugarColumn(ColumnName = "DAA027")]
- public decimal? Daa027 { get; set; }
+ /// <summary>
+ /// 澶囨枡瀹屾垚1-瀹屾垚锛�0鏈畬鎴�
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA027")]
+ public decimal? Daa027 { get; set; }
- /// <summary>
- /// 澶囨枡瀹屾垚鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DAA028")]
- public string? Daa028 { get; set; }
+ /// <summary>
+ /// 澶囨枡瀹屾垚鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA028")]
+ public string? Daa028 { get; set; }
+
+ /// <summary>
+ /// 鏍囧噯宸ユ椂
+ ///</summary>
+ [SugarColumn(ColumnName = "PROD_HOUR")]
+ public decimal? ProdHour { get; set; }
+
+ /// <summary>
+ /// 鍗曚汉灏忔椂浜ц兘
+ ///</summary>
+ [SugarColumn(ColumnName = "PERSON_HOUR_CAPACITY")]
+ public decimal? PersonHourCapacity { get; set; }
+
+ /// <summary>
+ /// 鐞嗚鏍囦骇
+ ///</summary>
+ [SugarColumn(ColumnName = "THE_CAPACITY")]
+ public decimal? TheCapacity { get; set; }
+
+ /// <summary>
+ /// 璁″垝鐢ㄤ汉鏁�
+ ///</summary>
+ [SugarColumn(ColumnName = "PLAN_PERSONNEL")]
+ public decimal? PlanPersonnel { get; set; }
+
+ /// <summary>
+ /// 璁″垝鏍囧噯浜ц兘
+ ///</summary>
+ [SugarColumn(ColumnName = "PLAN_CAPACITY")]
+ public decimal? PlanCapacity { get; set; }
+
+ /// <summary>
+ /// 鐞嗚鐢ㄦ椂/M
+ ///</summary>
+ [SugarColumn(ColumnName = "THE_MIN")]
+ public decimal? TheMin { get; set; }
+
+ /// <summary>
+ /// 鐞嗚鐢ㄦ椂/H
+ ///</summary>
+ [SugarColumn(ColumnName = "THE_HOUR")]
+ public decimal? TheHour { get; set; }
+
+ /// <summary>
+ /// 绾夸綋绫诲埆
+ ///</summary>
+ [SugarColumn(ColumnName = "LINE_TYPE")]
+ public string? LineType { get; set; }
+
+ /// <summary>
+ /// 鏍囧噯浜烘暟
+ ///</summary>
+ [SugarColumn(ColumnName = "PERSONNEL")]
+ public decimal? Personnel { get; set; }
+
+ /// <summary>
+ /// 鎹㈢嚎鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "CHANGE_LINE_TIME")]
+ public decimal? ChangeLineTime { get; set; }
+
+ /// <summary>
+ /// 浼戞伅鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "REST_TIME")]
+ public decimal? RestTime { get; set; }
+
+ /// <summary>
+ /// 鎺掍骇搴忓彿
+ ///</summary>
+ [SugarColumn(ColumnName = "SCHEDULE_ORDER")]
+ public decimal? ScheduleOrder { get; set; }
+
+ /// <summary>
+ /// MES棰勮寮�宸ユ椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "MES_START_PROD")]
+ public DateTime? MesStartProd { get; set; }
+
+ /// <summary>
+ /// MES棰勮瀹屽伐鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "MES_END_PROD")]
+ public DateTime? MesEndProd { get; set; }
+ }
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 4963929..aeca6d4 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -418,14 +418,14 @@
var mesInvItemIns = db.Queryable<MesInvItemIns>()
.Single(s => s.BillNo == qsItemOqcReq.BillNo);
- var mesSchemeResult = db.Queryable<MesSchemeResult>()
- .Single(s => s.BillNo == mesInvItemIns.CbillNo);
+ var mesSchemeResult = db.Queryable<Womdaa>()
+ .Single(s => s.Daa001 == mesInvItemIns.CbillNo);
var entity = new MesQaItemsDetect02();
- entity.ItemNo = mesSchemeResult.BoardItem;
- entity.BoardItem = mesSchemeResult.BoardItem;
- entity.LineNo = mesSchemeResult.LineNo;
- entity.Aufnr = mesSchemeResult.TaskNo;
+ // entity.ItemNo = mesSchemeResult.BoardItem;
+ // entity.BoardItem = mesSchemeResult.BoardItem;
+ entity.LineNo = mesSchemeResult.Daa015;
+ // entity.Aufnr = mesSchemeResult.TaskNo;
entity.ReleaseNo = qsItemOqcReq.ReleaseNo;
entity.LotNo = qsItemOqcReq.BillNo;
entity.FcheckDate = qsItemOqcReq.FcheckDate;
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index b88c92d..db188ef 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -99,7 +99,7 @@
var count = db.Queryable<MesQa>().Where(s => s.QsType == "1"
&& s.ItemNo == itemNo && s.Fsubmit == 1).Count();
- if (count <= 0) return new List<QsItemIpiItem>();
+ if (count <= 0) return [];
return db
.Queryable<MesQualityStandard>()
diff --git a/MES.Service/service/QC/SuspendService.cs b/MES.Service/service/QC/SuspendService.cs
index bc6fbef..b1db17d 100644
--- a/MES.Service/service/QC/SuspendService.cs
+++ b/MES.Service/service/QC/SuspendService.cs
@@ -6,20 +6,20 @@
public class SuspendService
{
- private readonly string[] statusArray = ["鐢熶骇", "寰呬骇", "鏆傚仠"];
+ private readonly string[] statusArray = ["寮�宸�", "寰呭紑宸�"];
public List<SysDepartment> getDept()
{
var db = SqlSugarHelper.GetInstance();
//return db.Queryable<SysDepartment>().ToList();
return db
- .Queryable<MesSchemeResult, MesLine, QsQaItemXj, SysDepartment>(
+ .Queryable<Womdaa, MesLine, QsQaItemXj, SysDepartment>(
(a, b, c, d) =>
- new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo,
- JoinType.Inner, a.BillNo == c.BillNo,
+ new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(),
+ JoinType.Inner, a.Daa001 == c.BillNo,
JoinType.Left, b.Departmentcode == d.Departmentcode))
- .Where((a, b, c, d) => a.PmoveMk == 0 && b.LineName != null &&
- statusArray.Contains(a.ProcStatus))
+ .Where((a, b, c, d) => b.LineName != null &&
+ statusArray.Contains(a.Daa018))
.GroupBy((a, b, c, d) => new
{
b.Departmentcode, d.Departmentname
@@ -34,20 +34,20 @@
public List<MesLine> GetLines(string deptCode)
{
var db = SqlSugarHelper.GetInstance();
- var mesLines = db.Queryable<MesSchemeResult, MesLine, QsQaItemXj>(
+ var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>(
(a, b, c) =>
- new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo,
- JoinType.Inner, a.BillNo == c.BillNo))
+ new JoinQueryInfos(JoinType.Left, a.Daa002 == b.Id.ToString(),
+ JoinType.Inner, a.Daa001 == c.BillNo))
.Where((a, b, c) => b.LineName != null &&
- statusArray.Contains(a.ProcStatus)
+ statusArray.Contains(a.Daa018)
&& b.Departmentcode == deptCode)
.GroupBy((a, b, c) => new
{
- a.LineNo, b.LineName
+ b.LineNo, b.LineName
})
.Select((a, b, c) => new MesLine
{
- LineNo = a.LineNo,
+ LineNo = b.LineNo,
LineName = b.LineName
}).ToList();
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 7c35c43..ad76d93 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -13,7 +13,7 @@
private readonly BaseService _baseService = new();
- private readonly string[] statusArray = ["鐢熶骇", "寰呬骇"];
+ private readonly string[] statusArray = ["寮�宸�", "寰呭紑宸�"];
//鐢熸垚鏈�鏂扮殑妫�楠屽崟鍙�
public string getMaxReleaseNo()
@@ -38,35 +38,16 @@
return "XJN" + date + number;
}
- public List<MesSchemeResult> getItem(string daa001)
+ public List<Womdaa> getItem(string daa001)
{
var db = SqlSugarHelper.GetInstance();
//in鐨勫啓娉� https://www.donet5.com/Home/Doc?typeId=1187
- return db.Queryable<MesSchemeResult, MesDepTask, MesBoardBaseInfo>(
- (a, c, b) =>
- new JoinQueryInfos(
- JoinType.Left, a.TaskNo == c.TaskNo,
- JoinType.Left, c.BoardItem == b.BoardItem
- )
- )
- .Where(a => a.PmoveMk == 0 &&
- a.BillNo == daa001 &&
- statusArray.Contains(a.ProcStatus))
- .Select((a, c, b) => new MesSchemeResult
- {
- BillNo = a.BillNo,
- CatQty = a.CatQty,
- DetailMem = a.DetailMem,
- TaskNo = a.TaskNo,
- BoardItem = a.BoardItem,
- BoardModel = b.BoardModel,
- PlanQty = c.PlanQty,
- Mocode = a.Mocode,
- // BoardStyle = c.BoardStyle,
- Id = a.Id
- })
+ return db.Queryable<Womdaa>()
+ .Where(a =>
+ a.Daa001 == daa001 &&
+ statusArray.Contains(a.Daa018))
.ToList();
}
@@ -74,50 +55,52 @@
{
var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesSchemeResult, MesLine>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo))
- .Where((a, b) => a.PmoveMk == 0 && b.LineName != null &&
- statusArray.Contains(a.ProcStatus))
- .Where("BOARD_ITEM like @BoardItem", new { BoardItem = "20%" })
+ return db.Queryable<Womdaa, MesLine>((a, b) =>
+ new JoinQueryInfos(JoinType.Left, a.Daa015 == b.LineNo))
+ .Where((a, b) => b.LineName != null &&
+ statusArray.Contains(a.Daa018))
.GroupBy((a, b) => new
{
- a.LineNo, b.LineName
+ b.LineNo, b.LineName
})
.Select((a, b) => new MesLine
{
- LineNo = a.LineNo,
+ LineNo = b.LineNo,
LineName = b.LineName
- }).OrderBy("a.LINE_NO").ToList();
+ }).OrderBy("b.LINE_NO").ToList();
}
- public List<MesSchemeResult> getDaa001(string daa020, string item)
+ public List<Womdaa> getDaa001(string daa020, string item)
{
var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesSchemeResult>().Where(a =>
- a.PmoveMk == 0 && a.LineNo == daa020 && a.BillNo != null &&
- a.BoardItem == item &&
- statusArray.Contains(a.ProcStatus))
- .Select<MesSchemeResult>(a => new MesSchemeResult
+ return db.Queryable<Womdaa, MesItems>((a, b) =>
+ new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
+ .Where((a, b) =>
+ a.Daa015 == daa020 &&
+ b.ItemNo == item &&
+ statusArray.Contains(a.Daa018))
+ .Select<Womdaa>(a => new Womdaa
{
- BillNo = a.BillNo,
- DetailMem = a.DetailMem
+ Id = a.Id,
+ Daa001 = a.Daa001,
+ Daa003 = a.Daa003
}).ToList();
}
- public List<MesSchemeResult> getBoardItem(string lineNo)
+ public List<MesItems> getBoardItem(string lineNo)
{
var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesSchemeResult>()
- .Where(a =>
- a.PmoveMk == 0 && statusArray.Contains(a.ProcStatus) &&
- a.LineNo == lineNo)
- .Where("BOARD_ITEM like @BoardItem", new { BoardItem = "20%" })
- .Select<MesSchemeResult>(a =>
- new MesSchemeResult
+ return db.Queryable<Womdaa, MesItems>((a, b) =>
+ new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
+ .Where((a, b) => statusArray.Contains(a.Daa018) &&
+ a.Daa015 == lineNo)
+ .OrderBy((a, b) => b.ItemName)
+ .Select<MesItems>((a, b) =>
+ new MesItems
{
- BoardItem = a.BoardItem,
- DetailMem = a.DetailMem
- }).OrderBy(a => a.BoardItem).ToList();
+ ItemNo = b.ItemNo,
+ ItemName = b.ItemName
+ }).ToList();
}
public List<QsQaItemXj> getPage(XJPageResult queryObj)
@@ -132,16 +115,16 @@
lineNo = _baseService.getUserLineNo(queryObj.createUser);
return db
- .Queryable<QsQaItemXj, MesSchemeResult, MesDepTask,
- MesBoardBaseInfo>((s, a, c, b) =>
+ .Queryable<QsQaItemXj, Womdaa, MesLine,
+ MesItems>((s, a, c, b) =>
new JoinQueryInfos(
- JoinType.Inner, s.BillNo == a.BillNo,
- JoinType.Left, a.TaskNo == c.TaskNo,
- JoinType.Left, c.BoardItem == b.BoardItem
+ JoinType.Inner, s.BillNo == a.Daa001,
+ JoinType.Left, a.Daa015 == c.LineNo,
+ JoinType.Left, s.ItemNo == b.ItemNo
)
)
.WhereIF(lineNo != null && lineNo.Length > 0,
- (s, a, c, b) => lineNo.Contains(a.LineNo))
+ (s, a, c, b) => lineNo.Contains(c.LineNo))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
@@ -153,11 +136,8 @@
.WhereIF(id > 0, (s, a, c, b) => s.Id == id)
.Select((s, a, c, b) => new QsQaItemXj
{
- CatQty = a.CatQty,
MoidNum = s.MoidNum,
- Daa020 = a.LineNo,
- // DetailMem = a.DetailMem,
- TaskNo = a.TaskNo,
+ Daa020 = c.LineNo,
Id = s.Id,
CreateBy = s.CreateBy,
CreateDate = s.CreateDate,
@@ -168,10 +148,6 @@
FcheckBy = s.FcheckBy,
FcheckResu = s.FcheckResu,
Remarks = s.Remarks,
- BoardModel = b.BoardModel,
- PlanQty = c.PlanQty
- // Mocode = a.Mocode,
- // BoardStyle = c.BoardStyle
}).OrderBy(s => s.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
}
diff --git a/MESApplication/Controllers/QC/XJController.cs b/MESApplication/Controllers/QC/XJController.cs
index e43cb9f..ef25d6b 100644
--- a/MESApplication/Controllers/QC/XJController.cs
+++ b/MESApplication/Controllers/QC/XJController.cs
@@ -82,7 +82,9 @@
}
- //getDaa001
+ /// <summary>
+ /// 鑾峰彇宸ュ崟
+ /// </summary>
[HttpPost("getDaa001")]
public ResponseResult getDaa001([FromBody] JObject data)
{
@@ -107,7 +109,10 @@
}
}
- //getBoardItem
+ /// <summary>
+ /// 鏍规嵁浜х嚎鑾峰彇鐗╂枡缂栫爜 lineNo
+ /// </summary>
+ /// <returns></returns>
[HttpPost("getBoardItem")]
public ResponseResult getBoardItem([FromBody] JObject data)
{
--
Gitblit v1.9.3