From efe6984c4e0e91b16b2704e174d610e180045dc5 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期一, 19 八月 2024 09:01:56 +0800
Subject: [PATCH] 合并上格-8.19
---
MESApplication/MESApplication.csproj | 8
MES.Service/Dto/service/OutItemDto.cs | 2
MESApplication/Controllers/Base/LoginController.cs | 8
MESApplication/Filter/ErrorLog.cs | 111
MES.Service/service/QC/SJService.cs | 2
MES.Service/service/Warehouse/MesInvItemMovesManager.cs | 38
MES.Service/Dto/service/SJPageResult.cs | 40
MES.Service/Modes/MesInvItemBarcodes.cs | 592 ++++----
MES.Service/Modes/MesInvItemInCItems.cs | 184 +-
MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs | 12
MES.Service/Modes/Purdhb.cs | 352 ++--
MES.Service/Modes/MesInvItemArn.cs | 304 ++--
MESApplication/Filter/ActionFilter.cs | 289 ++--
MES.Service/Modes/Purdka.cs | 160 +-
MES.Service/Modes/MesInvItemMoves.cs | 224 +-
MES.Service/Modes/Womdaa.cs | 96 +
MES.Service/service/QC/SuspendService.cs | 26
MES.Service/service/QC/XJService.cs | 110
MES.Service/Modes/MesQaItemsDetect01.cs | 422 +++---
MES.Service/service/QC/RKJService.cs | 12
MES.Service/Modes/MesInvBusiness2.cs | 288 ++--
MES.Service/Modes/MesQaItemsDetectDetail5.cs | 216 +-
/dev/null | 355 -----
MESApplication/Startup.cs | 16
MESApplication/Controllers/QC/XJController.cs | 9
MESApplication/Controllers/Base/DemoController.cs | 1
MES.Service/Modes/MesLine.cs | 291 +--
MES.Service/Dto/service/MovesDto.cs | 6
28 files changed, 1,886 insertions(+), 2,288 deletions(-)
diff --git a/MES.Service/Dto/service/MovesDto.cs b/MES.Service/Dto/service/MovesDto.cs
index 55141e9..a36d0d2 100644
--- a/MES.Service/Dto/service/MovesDto.cs
+++ b/MES.Service/Dto/service/MovesDto.cs
@@ -8,8 +8,8 @@
public List<MesInvItemMoves>? FromList { get; set; }
public List<MesInvItemOutItems>? OutItems { get; set; }
public List<MesInvItemMovesCDetails>? BarcodeList { get; set; }
-
+
//鍏ュ簱鍗�
- public bool? InAudit{ get; set; }
- public MesInvItemBarcodes? BarcodesInfo{ get; set; }
+ public bool? InAudit { get; set; }
+ public MesInvItemBarcodes? BarcodesInfo { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/OutItemDto.cs b/MES.Service/Dto/service/OutItemDto.cs
index 53f1187..14bc886 100644
--- a/MES.Service/Dto/service/OutItemDto.cs
+++ b/MES.Service/Dto/service/OutItemDto.cs
@@ -7,7 +7,7 @@
public MesInvItemOuts? Form { get; set; }
public List<MesInvItemOutItems>? SaveItems { get; set; }
public List<MESInvItemOutItems>? SelectItems { get; set; }
-
+
public string? ItemNo { get; set; }
public decimal? Quantity { get; set; }
diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
index fb35a4c..0064430 100644
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ b/MES.Service/Dto/service/SJPageResult.cs
@@ -1,4 +1,4 @@
-锘縰sing MES.Service.Dto.@base;
+using MES.Service.Dto.@base;
using SqlSugar;
namespace MES.Service.Dto.service;
@@ -57,37 +57,29 @@
[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; }
- //BOARD_MODEL
- [SugarColumn(ColumnName = "BOARD_MODEL")]
- public string? BoardModel { get; set; }
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DAA003")]
+ public string? Daa003 { get; set; }
- [SugarColumn(ColumnName = "PLAN_QTY")] public decimal? PlanQty { get; set; }
+ /// <summary>
+ /// 浜у搧瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "DAA004")]
+ public string? Daa004 { get; set; }
- [SugarColumn(ColumnName = "MOCODE")] public string? Mocode { get; set; }
-
- [SugarColumn(ColumnName = "BOARD_STYLE")]
- public string? BoardStyle { 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>
- /// 姝f瀬閰嶆柟鐢ㄩ噺
- /// </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>
- /// 鐜繚浠g爜
- /// </summary>
- [Column("ROHSE_CODE")]
- [SugarColumn(ColumnName = "ROHSE_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鐜繚浠g爜闀垮害涓嶈兘瓒呭嚭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/MesInvBusiness2.cs b/MES.Service/Modes/MesInvBusiness2.cs
index b702a24..6c1ba20 100644
--- a/MES.Service/Modes/MesInvBusiness2.cs
+++ b/MES.Service/Modes/MesInvBusiness2.cs
@@ -8,221 +8,221 @@
[SugarTable("MES_INV_BUSINESS2")]
public class MesInvBusiness2
{
- /// <summary>
- /// ID(seq_inv_id)
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID",
+ /// <summary>
+ /// ID(seq_inv_id)
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID",
IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 鐘舵�亅0-鏈氦鏄�1-宸蹭氦鏄�
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
+ /// <summary>
+ /// 鐘舵�亅0-鏈氦鏄�1-宸蹭氦鏄�
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
public decimal? Status { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_TYPE_ID")]
public decimal? BillTypeId { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_CODE")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_CODE")]
public string TransactionCode { get; set; }
- /// <summary>
- /// 浜ゆ槗绫诲瀷|1-鍏ュ簱0-杞簱-1鍑哄簱
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_TYPE")]
+ /// <summary>
+ /// 浜ゆ槗绫诲瀷|1-鍏ュ簱0-杞簱-1鍑哄簱
+ /// </summary>
+ [SugarColumn(ColumnName = "BUSINESS_TYPE")]
public decimal? BusinessType { get; set; }
- /// <summary>
- /// 鍗曟嵁ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_ID")]
+ /// <summary>
+ /// 鍗曟嵁ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_ID")]
public decimal? BillId { get; set; }
- /// <summary>
- /// 鍗曟嵁缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
+ /// <summary>
+ /// 鍗曟嵁缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
public string BillNo { get; set; }
- /// <summary>
- /// 鐢熶骇璁㈠崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
+ /// <summary>
+ /// 鐢熶骇璁㈠崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "TASK_NO")]
public string TaskNo { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_NO")]
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_NO")]
public string CustomerNo { get; set; }
- /// <summary>
- /// 鍗曟嵁琛孖D
- /// </summary>
- [SugarColumn(ColumnName = "BILL_LINE_ID")]
+ /// <summary>
+ /// 鍗曟嵁琛孖D
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_LINE_ID")]
public decimal? BillLineId { get; set; }
- /// <summary>
- /// 鐗╂枡鏉$爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE")]
+ /// <summary>
+ /// 鐗╂枡鏉$爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE")]
public string ItemBarcode { get; set; }
- /// <summary>
- /// 鏈徃鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
+ /// <summary>
+ /// 鏈徃鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "C_ITEM_CODE")]
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "C_ITEM_CODE")]
public string CItemCode { get; set; }
- /// <summary>
- /// 鍘傚鎵规
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO")]
+ /// <summary>
+ /// 鍘傚鎵规
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
public string LotNo { get; set; }
- /// <summary>
- /// 鏄惁鐜繚(0:鍚�,1:鏄�)
- /// </summary>
- [SugarColumn(ColumnName = "EP_FLAG")]
+ /// <summary>
+ /// 鏄惁鐜繚(0:鍚�,1:鏄�)
+ /// </summary>
+ [SugarColumn(ColumnName = "EP_FLAG")]
public short? EpFlag { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "QUANTITY")]
public decimal? Quantity { get; set; }
- /// <summary>
- /// 婧愬瓙搴揅ODE
- /// </summary>
- [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
+ /// <summary>
+ /// 婧愬瓙搴揅ODE
+ /// </summary>
+ [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
public string FromInvDepotsCode { get; set; }
- /// <summary>
- /// 婧愯揣浣岰ODE
- /// </summary>
- [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
+ /// <summary>
+ /// 婧愯揣浣岰ODE
+ /// </summary>
+ [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
public string FromInvDepotSectionsCode { get; set; }
- /// <summary>
- /// 鐩殑瀛愬簱CODE
- /// </summary>
- [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")]
+ /// <summary>
+ /// 鐩殑瀛愬簱CODE
+ /// </summary>
+ [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")]
public string ToInvDepotsCode { get; set; }
- /// <summary>
- /// 鐩殑璐т綅CODE
- /// </summary>
- [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")]
+ /// <summary>
+ /// 鐩殑璐т綅CODE
+ /// </summary>
+ [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")]
public string ToInvDepotSectionsCode { get; set; }
- /// <summary>
- /// 浜ゆ槗寮傚父淇℃伅
- /// </summary>
- [SugarColumn(ColumnName = "DESCRIPTION")]
+ /// <summary>
+ /// 浜ゆ槗寮傚父淇℃伅
+ /// </summary>
+ [SugarColumn(ColumnName = "DESCRIPTION")]
public string Description { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 瓒呮崯缁熻鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")]
+ /// <summary>
+ /// 瓒呮崯缁熻鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")]
public short? UllageStatFlag { get; set; }
- /// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// 鍒嗗巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 鍏徃浠g爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠g爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// 绠卞彿鏉$爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE2")]
+ /// <summary>
+ /// 绠卞彿鏉$爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE2")]
public string ItemBarcode2 { get; set; }
- /// <summary>
- /// 鍗℃澘鏉$爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE3")]
+ /// <summary>
+ /// 鍗℃澘鏉$爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE3")]
public string ItemBarcode3 { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
public string WorkNo { get; set; }
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
+ /// <summary>
+ /// 浠诲姟鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_LINE")]
public decimal? WorkLine { get; set; }
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
- /// <summary>
- /// 鐢熶骇绾�
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NO")]
+ /// <summary>
+ /// 鐢熶骇绾�
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_NO")]
public string LineNo { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
+ /// <summary>
+ /// 閲囪喘璁㈠崟id
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_K3ID")]
public decimal? EbelnK3id { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟琛宨d
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛宨d
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_K3ID")]
public decimal? LineK3id { get; set; }
/// <summary>
diff --git a/MES.Service/Modes/MesInvItemArn.cs b/MES.Service/Modes/MesInvItemArn.cs
index bf0d207..518f09f 100644
--- a/MES.Service/Modes/MesInvItemArn.cs
+++ b/MES.Service/Modes/MesInvItemArn.cs
@@ -8,232 +8,232 @@
[SugarTable("MES_INV_ITEM_ARN")]
public class MesInvItemArn
{
- /// <summary>
- /// ID(SEQ_INV_ID)
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// ID(SEQ_INV_ID)
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
public string BillNo { get; set; }
- /// <summary>
- /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
+ /// <summary>
+ /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
public short? Status { get; set; }
- /// <summary>
- /// 鍘熷洜
- /// </summary>
- [SugarColumn(ColumnName = "REASON")]
+ /// <summary>
+ /// 鍘熷洜
+ /// </summary>
+ [SugarColumn(ColumnName = "REASON")]
public string Reason { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_TYPE_ID")]
public decimal? BillTypeId { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_ID")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_ID")]
public decimal? TransactionId { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
public string Remark { get; set; }
- /// <summary>
- /// 閫佽揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "PAPER_BILL_NO")]
+ /// <summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_BILL_NO")]
public string PaperBillNo { get; set; }
- /// <summary>
- /// 閫�鏂欎汉宸ュ彿
- /// </summary>
- [SugarColumn(ColumnName = "USER_NO_BACK")]
+ /// <summary>
+ /// 閫�鏂欎汉宸ュ彿
+ /// </summary>
+ [SugarColumn(ColumnName = "USER_NO_BACK")]
public string UserNoBack { get; set; }
- /// <summary>
- /// 鎻愪氦浜�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_USER")]
+ /// <summary>
+ /// 鎻愪氦浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_USER")]
public string CheckUser { get; set; }
- /// <summary>
- /// 鎻愪氦鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_DATE")]
+ /// <summary>
+ /// 鎻愪氦鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_DATE")]
public DateTime? CheckDate { get; set; }
- /// <summary>
- /// 鍏ュ簱鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "INS_DATE")]
+ /// <summary>
+ /// 鍏ュ簱鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "INS_DATE")]
public DateTime? InsDate { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_RES")]
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_RES")]
public string CheckRes { get; set; }
- /// <summary>
- /// 宸叉崱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_QTY")]
+ /// <summary>
+ /// 宸叉崱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QTY")]
public decimal? CheckQty { get; set; }
- /// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPOTS_CODE")]
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOTS_CODE")]
public string DepotsCode { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TRANSCTION_NO")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSCTION_NO")]
public string TransctionNo { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
- /// <summary>
- /// 鎻愪氦鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FSTATUS")]
+ /// <summary>
+ /// 鎻愪氦鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTATUS")]
public short? Fstatus { get; set; }
- /// <summary>
- /// 宸ュ巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// 宸ュ巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 鏄惁宸插洖鍐橲AP
- /// </summary>
- [SugarColumn(ColumnName = "SAPSTATUS")]
+ /// <summary>
+ /// 鏄惁宸插洖鍐橲AP
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPSTATUS")]
public short? Sapstatus { get; set; }
- /// <summary>
- /// 纭鍏ュ簱鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "INS_DATE")]
+ /// <summary>
+ /// 纭鍏ュ簱鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "INS_DATE")]
public DateTime? Insdate { get; set; }
- /// <summary>
- /// 鏄惁妫�楠�
- /// </summary>
- [SugarColumn(ColumnName = "ISCHECK")]
+ /// <summary>
+ /// 鏄惁妫�楠�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISCHECK")]
public decimal? Ischeck { get; set; }
- /// <summary>
- /// 瀹℃牳鍏ュ簱浜�
- /// </summary>
- [SugarColumn(ColumnName = "INSBY")]
+ /// <summary>
+ /// 瀹℃牳鍏ュ簱浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "INSBY")]
public string Insby { get; set; }
- /// <summary>
- /// 鍏徃浠g爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠g爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// 鎬ユ枡鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "URGENT_FLAG")]
+ /// <summary>
+ /// 鎬ユ枡鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "URGENT_FLAG")]
public short? UrgentFlag { get; set; }
- /// <summary>
- /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "MTTRANSCTION_NO")]
+ /// <summary>
+ /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "MTTRANSCTION_NO")]
public decimal? MttransctionNo { get; set; }
- /// <summary>
- /// IQC妫�楠屽崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "IQC_RELEASE_NO")]
+ /// <summary>
+ /// IQC妫�楠屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "IQC_RELEASE_NO")]
public string IqcReleaseNo { get; set; }
- /// <summary>
- /// 鏄惁鏄剧ず
- /// </summary>
- [SugarColumn(ColumnName = "IS_VISUAL")]
+ /// <summary>
+ /// 鏄惁鏄剧ず
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_VISUAL")]
public decimal? IsVisual { get; set; }
- /// <summary>
- /// 0=閲囪喘锛�1=濮斿
- /// </summary>
- [SugarColumn(ColumnName = "F_TYPE")]
+ /// <summary>
+ /// 0=閲囪喘锛�1=濮斿
+ /// </summary>
+ [SugarColumn(ColumnName = "F_TYPE")]
public decimal? FType { get; set; }
- /// <summary>
- /// ERP鍒拌揣鍗旾D
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
+ /// <summary>
+ /// ERP鍒拌揣鍗旾D
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_K3ID")]
public string EbelnK3id { get; set; }
- /// <summary>
- /// 鏉$爜鏉″嵃杩涘害
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_RATIO")]
+ /// <summary>
+ /// 鏉$爜鏉″嵃杩涘害
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_RATIO")]
public decimal? BarcodeRatio { get; set; }
- /// <summary>
- /// ERP鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "ERPNO")]
+ /// <summary>
+ /// ERP鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPNO")]
public string Erpno { get; set; }
- /// <summary>
- /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
- /// </summary>
- [SugarColumn(ColumnName = "THSTATUS")]
+ /// <summary>
+ /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
+ /// </summary>
+ [SugarColumn(ColumnName = "THSTATUS")]
public short? Thstatus { get; set; }
- /// <summary>
- /// ERP閫�璐у崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "ERPTHNO")]
+ /// <summary>
+ /// ERP閫�璐у崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPTHNO")]
public string Erpthno { get; set; }
diff --git a/MES.Service/Modes/MesInvItemBarcodes.cs b/MES.Service/Modes/MesInvItemBarcodes.cs
index 49b29a2..65ea0c0 100644
--- a/MES.Service/Modes/MesInvItemBarcodes.cs
+++ b/MES.Service/Modes/MesInvItemBarcodes.cs
@@ -8,448 +8,448 @@
[SugarTable("MES_INV_ITEM_BARCODES")]
public class MesInvItemBarcodes
{
- /// <summary>
- /// SEQ_BARCODE_PSN_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// SEQ_BARCODE_PSN_ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 鐗╂枡鏉$爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE")]
+ /// <summary>
+ /// 鐗╂枡鏉$爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE")]
public string ItemBarcode { get; set; }
- /// <summary>
- /// 瀹㈡埛鎴愬搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "C_PRODUCT_CODE")]
+ /// <summary>
+ /// 瀹㈡埛鎴愬搧缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "C_PRODUCT_CODE")]
public string CProductCode { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡鏉$爜
- /// </summary>
- [SugarColumn(ColumnName = "C_ITEM_BARCODE")]
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鏉$爜
+ /// </summary>
+ [SugarColumn(ColumnName = "C_ITEM_BARCODE")]
public string CItemBarcode { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "C_ITEM_CODE")]
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "C_ITEM_CODE")]
public string CItemCode { get; set; }
- /// <summary>
- /// 鏈徃鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
+ /// <summary>
+ /// 鏈徃鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
- /// <summary>
- /// 鍘傚鎵规
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO")]
+ /// <summary>
+ /// 鍘傚鎵规
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
public string LotNo { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "QUANTITY")]
public decimal? Quantity { get; set; }
- /// <summary>
- /// 鏄惁鐜繚(0:鍚�,1:鏄�)
- /// </summary>
- [SugarColumn(ColumnName = "EP_FLAG")]
+ /// <summary>
+ /// 鏄惁鐜繚(0:鍚�,1:鏄�)
+ /// </summary>
+ [SugarColumn(ColumnName = "EP_FLAG")]
public short? EpFlag { get; set; }
- /// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ /// </summary>
+ [SugarColumn(ColumnName = "TASK_NO")]
public string TaskNo { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "CUST_NO")]
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_NO")]
public string CustNo { get; set; }
- /// <summary>
- /// 鐗╂枡鏉$爜娉ㄩ噴琛孾鍐椾綑锛屾潯鐮侀噸鎵撲娇鐢╙
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE_TEXT")]
+ /// <summary>
+ /// 鐗╂枡鏉$爜娉ㄩ噴琛孾鍐椾綑锛屾潯鐮侀噸鎵撲娇鐢╙
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE_TEXT")]
public string ItemBarcodeText { get; set; }
- /// <summary>
- /// 鍘烶SN鐗╂枡鏉$爜
- /// </summary>
- [SugarColumn(ColumnName = "OLD_ITEM_BARCODE")]
+ /// <summary>
+ /// 鍘烶SN鐗╂枡鏉$爜
+ /// </summary>
+ [SugarColumn(ColumnName = "OLD_ITEM_BARCODE")]
public string OldItemBarcode { get; set; }
- /// <summary>
- /// SAP鏀惰揣鐗╂枡鍑瘉鍙� --閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "MBLNR")]
+ /// <summary>
+ /// SAP鏀惰揣鐗╂枡鍑瘉鍙� --閲囪喘鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "MBLNR")]
public string Mblnr { get; set; }
- /// <summary>
- /// SAP鏀惰揣鐗╂枡鍑瘉琛屽彿 --閲囪喘鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "ZEILE")]
+ /// <summary>
+ /// SAP鏀惰揣鐗╂枡鍑瘉琛屽彿 --閲囪喘鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "ZEILE")]
public decimal? Zeile { get; set; }
- /// <summary>
- /// 鏀舵枡琛↖D
- /// </summary>
- [SugarColumn(ColumnName = "ROH_IN_ID")]
+ /// <summary>
+ /// 鏀舵枡琛↖D
+ /// </summary>
+ [SugarColumn(ColumnName = "ROH_IN_ID")]
public decimal? RohInId { get; set; }
- /// <summary>
- /// 0涓烘湁鏁堟潯鐮侊紱1涓烘棤鏁堟潯鐮�
- /// </summary>
- [SugarColumn(ColumnName = "BARCODESTATUS")]
+ /// <summary>
+ /// 0涓烘湁鏁堟潯鐮侊紱1涓烘棤鏁堟潯鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODESTATUS")]
public short? Barcodestatus { get; set; }
- /// <summary>
- /// 鍘熷鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "OLDQTY")]
+ /// <summary>
+ /// 鍘熷鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "OLDQTY")]
public decimal? Oldqty { get; set; }
- /// <summary>
- /// 浣跨敤鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "USEQTY")]
+ /// <summary>
+ /// 浣跨敤鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "USEQTY")]
public decimal? Useqty { get; set; }
- /// <summary>
- /// 0鍦ㄥ簱锛�1鍦ㄧ嚎锛�2浣滃簾
- /// </summary>
- [SugarColumn(ColumnName = "LOCATION")]
+ /// <summary>
+ /// 0鍦ㄥ簱锛�1鍦ㄧ嚎锛�2浣滃簾
+ /// </summary>
+ [SugarColumn(ColumnName = "LOCATION")]
public short? Location { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "UNIT")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "UNIT")]
public string Unit { get; set; }
- /// <summary>
- /// 閲嶉噺锛堝崟浣嶏細鍏枻锛�
- /// </summary>
- [SugarColumn(ColumnName = "WEIGHT_UNIT")]
+ /// <summary>
+ /// 閲嶉噺锛堝崟浣嶏細鍏枻锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "WEIGHT_UNIT")]
public decimal? WeightUnit { get; set; }
- /// <summary>
- /// 鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "PRICE")]
+ /// <summary>
+ /// 鍗曚环
+ /// </summary>
+ [SugarColumn(ColumnName = "PRICE")]
public decimal? Price { get; set; }
- /// <summary>
- /// 鍘熸潯鐮佹暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "OLD_BAR_QUANTITY")]
+ /// <summary>
+ /// 鍘熸潯鐮佹暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "OLD_BAR_QUANTITY")]
public decimal? OldBarQuantity { get; set; }
- /// <summary>
- /// 姹囨�绘潯鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SUM_BARCODE")]
+ /// <summary>
+ /// 姹囨�绘潯鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUM_BARCODE")]
public string SumBarcode { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "LOT_DATE")]
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_DATE")]
public string LotDate { get; set; }
- /// <summary>
- /// 妯″彿
- /// </summary>
- [SugarColumn(ColumnName = "MOCODE")]
+ /// <summary>
+ /// 妯″彿
+ /// </summary>
+ [SugarColumn(ColumnName = "MOCODE")]
public string Mocode { get; set; }
- /// <summary>
- /// 鏉ユ簮
- /// </summary>
- [SugarColumn(ColumnName = "MEMO")]
+ /// <summary>
+ /// 鏉ユ簮
+ /// </summary>
+ [SugarColumn(ColumnName = "MEMO")]
public string Memo { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
- /// <summary>
- /// 妗d綅浣庡��
- /// </summary>
- [SugarColumn(ColumnName = "SPOSTION")]
+ /// <summary>
+ /// 妗d綅浣庡��
+ /// </summary>
+ [SugarColumn(ColumnName = "SPOSTION")]
public string Spostion { get; set; }
- /// <summary>
- /// 妗d綅楂樺��
- /// </summary>
- [SugarColumn(ColumnName = "EPOSTION")]
+ /// <summary>
+ /// 妗d綅楂樺��
+ /// </summary>
+ [SugarColumn(ColumnName = "EPOSTION")]
public string Epostion { get; set; }
- /// <summary>
- /// 鐗╂枡绠�绉�
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_SNAME")]
+ /// <summary>
+ /// 鐗╂枡绠�绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_SNAME")]
public string ItemSname { get; set; }
- /// <summary>
- /// 鏄惁宸插喕缁�,1鍐荤粨
- /// </summary>
- [SugarColumn(ColumnName = "VISABLE")]
+ /// <summary>
+ /// 鏄惁宸插喕缁�,1鍐荤粨
+ /// </summary>
+ [SugarColumn(ColumnName = "VISABLE")]
public short? Visable { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗘壒娆�
- /// </summary>
- [SugarColumn(ColumnName = "TR_LOTNO")]
+ /// <summary>
+ /// 渚涘簲鍟嗘壒娆�
+ /// </summary>
+ [SugarColumn(ColumnName = "TR_LOTNO")]
public string TrLotno { get; set; }
- /// <summary>
- /// 鍐荤粨鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "FLEZZ_DATE")]
+ /// <summary>
+ /// 鍐荤粨鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "FLEZZ_DATE")]
public DateTime? FlezzDate { get; set; }
- /// <summary>
- /// 鍐荤粨鍘熷洜
- /// </summary>
- [SugarColumn(ColumnName = "FLEZZ_REASON")]
+ /// <summary>
+ /// 鍐荤粨鍘熷洜
+ /// </summary>
+ [SugarColumn(ColumnName = "FLEZZ_REASON")]
public string FlezzReason { get; set; }
- /// <summary>
- /// 鍐荤粨浜�
- /// </summary>
- [SugarColumn(ColumnName = "FLEZZ_BY")]
+ /// <summary>
+ /// 鍐荤粨浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "FLEZZ_BY")]
public string FlezzBy { get; set; }
- /// <summary>
- /// 寤堕暱淇濊川鏈�
- /// </summary>
- [SugarColumn(ColumnName = "DELANY_MONTH")]
+ /// <summary>
+ /// 寤堕暱淇濊川鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "DELANY_MONTH")]
public decimal? DelanyMonth { get; set; }
- /// <summary>
- /// 鏈�灏忓寘瑁呮爣璇�
- /// </summary>
- [SugarColumn(ColumnName = "MINPACK_FLAG")]
+ /// <summary>
+ /// 鏈�灏忓寘瑁呮爣璇�
+ /// </summary>
+ [SugarColumn(ColumnName = "MINPACK_FLAG")]
public short? MinpackFlag { get; set; }
- /// <summary>
- /// 鎵撳嵃ID锛岀敤鏉ュ尯鍒嗘墦鍗版鏁�
- /// </summary>
- [SugarColumn(ColumnName = "PRINT_ID")]
+ /// <summary>
+ /// 鎵撳嵃ID锛岀敤鏉ュ尯鍒嗘墦鍗版鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "PRINT_ID")]
public string PrintId { get; set; }
- /// <summary>
- /// 鐜繚椤圭洰
- /// </summary>
- [SugarColumn(ColumnName = "EP_ITEM")]
+ /// <summary>
+ /// 鐜繚椤圭洰
+ /// </summary>
+ [SugarColumn(ColumnName = "EP_ITEM")]
public string EpItem { get; set; }
- /// <summary>
- /// 宸ュ巶缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// 宸ュ巶缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 鍏徃缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// 鍗℃澘缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "CB_NO")]
+ /// <summary>
+ /// 鍗℃澘缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "CB_NO")]
public string CbNo { get; set; }
- /// <summary>
- /// 鍘傚鐢熶骇绾�
- /// </summary>
- [SugarColumn(ColumnName = "LINFLINE")]
+ /// <summary>
+ /// 鍘傚鐢熶骇绾�
+ /// </summary>
+ [SugarColumn(ColumnName = "LINFLINE")]
public string Linfline { get; set; }
- /// <summary>
- /// 鏈夋晥鏈�
- /// </summary>
- [SugarColumn(ColumnName = "VALID_TIME")]
+ /// <summary>
+ /// 鏈夋晥鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "VALID_TIME")]
public DateTime? ValidTime { get; set; }
- /// <summary>
- /// 璐ㄦ缁撴灉
- /// </summary>
- [SugarColumn(ColumnName = "IQC_STATUS")]
+ /// <summary>
+ /// 璐ㄦ缁撴灉
+ /// </summary>
+ [SugarColumn(ColumnName = "IQC_STATUS")]
public string IqcStatus { get; set; }
- /// <summary>
- /// 灏忚溅鏉$爜
- /// </summary>
- [SugarColumn(ColumnName = "FCAR")]
+ /// <summary>
+ /// 灏忚溅鏉$爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FCAR")]
public string Fcar { get; set; }
- /// <summary>
- /// 姣涢噸
- /// </summary>
- [SugarColumn(ColumnName = "GWEIGHT")]
+ /// <summary>
+ /// 姣涢噸
+ /// </summary>
+ [SugarColumn(ColumnName = "GWEIGHT")]
public string Gweight { get; set; }
- /// <summary>
- /// 鍑�閲�
- /// </summary>
- [SugarColumn(ColumnName = "NWEIGHT")]
+ /// <summary>
+ /// 鍑�閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "NWEIGHT")]
public string Nweight { get; set; }
- /// <summary>
- /// 淇濊川鏈�
- /// </summary>
- [SugarColumn(ColumnName = "EXT_DATE")]
+ /// <summary>
+ /// 淇濊川鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "EXT_DATE")]
public decimal? ExtDate { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗐�佽禒鍝併�佸渚涙枡銆佸澶�
- /// </summary>
- [SugarColumn(ColumnName = "BARCODETYPE")]
+ /// <summary>
+ /// 渚涘簲鍟嗐�佽禒鍝併�佸渚涙枡銆佸澶�
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODETYPE")]
public string Barcodetype { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NAME")]
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NAME")]
public string SuppName { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿/鍏ュ簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
+ /// <summary>
+ /// 鍒拌揣鍗曞彿/鍏ュ簱鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
public string BillNo { get; set; }
- /// <summary>
- /// 鎬ユ枡鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "URGENT_FLAG")]
+ /// <summary>
+ /// 鎬ユ枡鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "URGENT_FLAG")]
public short? UrgentFlag { get; set; }
- /// <summary>
- /// 棰滆壊
- /// </summary>
- [SugarColumn(ColumnName = "COLOR_NAME")]
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ [SugarColumn(ColumnName = "COLOR_NAME")]
public string ColorName { get; set; }
- /// <summary>
- /// 浜у搧鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_STYLE")]
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_STYLE")]
public string BoardStyle { get; set; }
- /// <summary>
- /// 鏉ユ枡鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "INS_DATE")]
+ /// <summary>
+ /// 鏉ユ枡鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "INS_DATE")]
public DateTime? InsDate { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
+ /// <summary>
+ /// 鍒拌揣鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_LINE")]
public decimal? WorkLine { get; set; }
- /// <summary>
- /// 涓嶈壇鍘熷洜
- /// </summary>
- [SugarColumn(ColumnName = "MEMO_BAD")]
+ /// <summary>
+ /// 涓嶈壇鍘熷洜
+ /// </summary>
+ [SugarColumn(ColumnName = "MEMO_BAD")]
public string MemoBad { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
public string WorkNo { get; set; }
- /// <summary>
- /// 鏉$爜鏉ユ簮鏍囪瘑锛�0-鍒濇湡鐗╂枡,1-閲囪喘鍏ュ簱锛�2銆佺敓浜ч��鏂欙紝3銆佸叾瀹冨叆搴擄紝4-瀹緵鏂�,5-鍦ㄥ簱鍒嗘枡锛�6-鍒剁▼鏉$爜
- /// </summary>
- [SugarColumn(ColumnName = "COME_FLG")]
+ /// <summary>
+ /// 鏉$爜鏉ユ簮鏍囪瘑锛�0-鍒濇湡鐗╂枡,1-閲囪喘鍏ュ簱锛�2銆佺敓浜ч��鏂欙紝3銆佸叾瀹冨叆搴擄紝4-瀹緵鏂�,5-鍦ㄥ簱鍒嗘枡锛�6-鍒剁▼鏉$爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COME_FLG")]
public short? ComeFlg { get; set; }
- /// <summary>
- /// 鐢熶骇绾夸綋
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NO")]
+ /// <summary>
+ /// 鐢熶骇绾夸綋
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_NO")]
public string LineNo { get; set; }
- /// <summary>
- /// 涓濆嵃娆℃暟
- /// </summary>
- [SugarColumn(ColumnName = "SILK_PQTY")]
+ /// <summary>
+ /// 涓濆嵃娆℃暟
+ /// </summary>
+ [SugarColumn(ColumnName = "SILK_PQTY")]
public decimal? SilkPqty { get; set; }
- /// <summary>
- /// 涓濆嵃娆℃暟姣�
- /// </summary>
- [SugarColumn(ColumnName = "SILK")]
+ /// <summary>
+ /// 涓濆嵃娆℃暟姣�
+ /// </summary>
+ [SugarColumn(ColumnName = "SILK")]
public string Silk { get; set; }
- /// <summary>
- /// 涓濆嵃娲惧伐浠庤〃ID
- /// </summary>
- [SugarColumn(ColumnName = "SILK_ID")]
+ /// <summary>
+ /// 涓濆嵃娲惧伐浠庤〃ID
+ /// </summary>
+ [SugarColumn(ColumnName = "SILK_ID")]
public decimal? SilkId { get; set; }
- /// <summary>
- /// 宸叉姤宸ユ爣璇�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_FLG")]
+ /// <summary>
+ /// 宸叉姤宸ユ爣璇�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_FLG")]
public decimal? WorkFlg { get; set; }
- /// <summary>
- /// 鏈�鍚庡伐搴�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LAST")]
+ /// <summary>
+ /// 鏈�鍚庡伐搴�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_LAST")]
public decimal? WorkLast { get; set; }
- /// <summary>
- /// 0-鏈悎骞舵墦鍗帮紝1-鍚堝苟鎵撳嵃
- /// </summary>
- [SugarColumn(ColumnName = "HBDY")]
+ /// <summary>
+ /// 0-鏈悎骞舵墦鍗帮紝1-鍚堝苟鎵撳嵃
+ /// </summary>
+ [SugarColumn(ColumnName = "HBDY")]
public decimal? Hbdy { get; set; }
- /// <summary>
- /// 0-鏈夋晥鏉$爜锛�1-鍚堝苟鎷嗗垎鐨勬潯鐮侊紝鏃犳晥
- /// </summary>
- [SugarColumn(ColumnName = "HBDYTM")]
+ /// <summary>
+ /// 0-鏈夋晥鏉$爜锛�1-鍚堝苟鎷嗗垎鐨勬潯鐮侊紝鏃犳晥
+ /// </summary>
+ [SugarColumn(ColumnName = "HBDYTM")]
public decimal? Hbdytm { get; set; }
/// <summary>
diff --git a/MES.Service/Modes/MesInvItemInCItems.cs b/MES.Service/Modes/MesInvItemInCItems.cs
index d42b236..6cf9fb0 100644
--- a/MES.Service/Modes/MesInvItemInCItems.cs
+++ b/MES.Service/Modes/MesInvItemInCItems.cs
@@ -8,142 +8,142 @@
[SugarTable("MES_INV_ITEM_IN_C_ITEMS")]
public class MesInvItemInCItems
{
- /// <summary>
- /// SEQ_OUT
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// SEQ_OUT
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗昳d
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// 鍏ュ簱鍗昳d
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)]
public decimal ItemInId { get; set; }
- /// <summary>
- /// 楠屾敹鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
+ /// <summary>
+ /// 楠屾敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "QUANTITY")]
public decimal? Quantity { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
- /// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
public string DepotCode { get; set; }
- /// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
+ /// <summary>
+ /// 璐т綅缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
public string DepotSectionCode { get; set; }
- /// <summary>
- /// 鐗硅浜嬮」
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
+ /// <summary>
+ /// 鐗硅浜嬮」
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
public string Remark { get; set; }
- /// <summary>
- /// 鐗╂枡绠�绉�
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_SNAME")]
+ /// <summary>
+ /// 鐗╂枡绠�绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_SNAME")]
public string ItemSname { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "UNIT")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "UNIT")]
public string Unit { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟
- /// </summary>
- [SugarColumn(ColumnName = "EBELN")]
+ /// <summary>
+ /// 閲囪喘璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN")]
public string Ebeln { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
public string BillNo { get; set; }
- /// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// 鍒嗗巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 鍏徃浠g爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠g爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
public string WorkNo { get; set; }
- /// <summary>
- /// 琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_LINE_NO")]
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_LINE_NO")]
public decimal? EbelnLineNo { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CBILL_NO")]
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CBILL_NO")]
public string CbillNo { get; set; }
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
+ /// <summary>
+ /// 浠诲姟鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_LINE")]
public decimal? WorkLine { get; set; }
- /// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ /// </summary>
+ [SugarColumn(ColumnName = "TASK_NO")]
public string TaskNo { get; set; }
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
/// <summary>
diff --git a/MES.Service/Modes/MesInvItemMoves.cs b/MES.Service/Modes/MesInvItemMoves.cs
index 07b4ba6..b65928e 100644
--- a/MES.Service/Modes/MesInvItemMoves.cs
+++ b/MES.Service/Modes/MesInvItemMoves.cs
@@ -8,171 +8,171 @@
[SugarTable("MES_INV_ITEM_MOVES")]
public class MesInvItemMoves
{
- /// <summary>
- /// SEQ_INV_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// SEQ_INV_ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 绉诲簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
+ /// <summary>
+ /// 绉诲簱鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
public string BillNo { get; set; }
- /// <summary>
- /// 绉诲叆瀛愬簱id
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOTS_ID")]
+ /// <summary>
+ /// 绉诲叆瀛愬簱id
+ /// </summary>
+ [SugarColumn(ColumnName = "INV_DEPOTS_ID")]
public decimal? InvDepotsId { get; set; }
- /// <summary>
- /// 绉诲叆璐т綅id
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")]
+ /// <summary>
+ /// 绉诲叆璐т綅id
+ /// </summary>
+ [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")]
public decimal? InvDepotSectionsId { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鐘舵�亅0-鍒跺崟1-杩囪处
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
+ /// <summary>
+ /// 鐘舵�亅0-鍒跺崟1-杩囪处
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
public decimal? Status { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
public string Remark { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_TYPE_ID")]
public decimal? BillTypeId { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_ID")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_ID")]
public decimal? TransactionId { get; set; }
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "CHECKUSER")]
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECKUSER")]
public string Checkuser { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CHECKDATE")]
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECKDATE")]
public DateTime? Checkdate { get; set; }
- /// <summary>
- /// 绉诲叆瀛愬簱code
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOTS_CODE")]
+ /// <summary>
+ /// 绉诲叆瀛愬簱code
+ /// </summary>
+ [SugarColumn(ColumnName = "INV_DEPOTS_CODE")]
public string InvDepotsCode { get; set; }
- /// <summary>
- /// 绉诲叆璐т綅code
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")]
+ /// <summary>
+ /// 绉诲叆璐т綅code
+ /// </summary>
+ [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")]
public string InvDepotSectionsCode { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_NO")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_NO")]
public decimal? TransactionNo { get; set; }
- /// <summary>
- /// 绉诲嚭瀛愬簱code
- /// </summary>
- [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")]
+ /// <summary>
+ /// 绉诲嚭瀛愬簱code
+ /// </summary>
+ [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")]
public string FromDepotsCode { get; set; }
- /// <summary>
- /// 宸ュ巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY_CODE")]
+ /// <summary>
+ /// 宸ュ巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY_CODE")]
public string FactoryCode { get; set; }
- /// <summary>
- /// SAP杩斿洖鍗曟嵁
- /// </summary>
- [SugarColumn(ColumnName = "SAPNO")]
+ /// <summary>
+ /// SAP杩斿洖鍗曟嵁
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPNO")]
public string Sapno { get; set; }
- /// <summary>
- /// 宸插洖鍐橲AP
- /// </summary>
- [SugarColumn(ColumnName = "SAPSTATUS")]
+ /// <summary>
+ /// 宸插洖鍐橲AP
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPSTATUS")]
public short? Sapstatus { get; set; }
- /// <summary>
- /// SAP杩斿洖骞翠唤
- /// </summary>
- [SugarColumn(ColumnName = "SAPYEAR")]
+ /// <summary>
+ /// SAP杩斿洖骞翠唤
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPYEAR")]
public short? Sapyear { get; set; }
- /// <summary>
- /// SAP杩斿洖淇℃伅
- /// </summary>
- [SugarColumn(ColumnName = "SAPTEXT")]
+ /// <summary>
+ /// SAP杩斿洖淇℃伅
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPTEXT")]
public string Saptext { get; set; }
- /// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// 鍒嗗巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 鍏徃浠g爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠g爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// 鍙嶅鏍镐簨鍔$被鍨嬬紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "MTRANSACTION_NO")]
+ /// <summary>
+ /// 鍙嶅鏍镐簨鍔$被鍨嬬紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "MTRANSACTION_NO")]
public decimal? MtransactionNo { get; set; }
- /// <summary>
- /// 鑷姩淇濆瓨瀛楁
- /// </summary>
- [SugarColumn(ColumnName = "ZD_NUM")]
+ /// <summary>
+ /// 鑷姩淇濆瓨瀛楁
+ /// </summary>
+ [SugarColumn(ColumnName = "ZD_NUM")]
public decimal? ZdNum { get; set; }
- /// <summary>
- /// 鏄惁鎺ㄩ�丒RP1-鏄紝2-鍚�
- /// </summary>
- [SugarColumn(ColumnName = "TS")]
+ /// <summary>
+ /// 鏄惁鎺ㄩ�丒RP1-鏄紝2-鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "TS")]
public decimal? Ts { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesLine.cs b/MES.Service/Modes/MesLine.cs
index a1e3718..b1d8449 100644
--- a/MES.Service/Modes/MesLine.cs
+++ b/MES.Service/Modes/MesLine.cs
@@ -1,258 +1,167 @@
-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
+[SugarTable("MES_LINE")]
public class MesLine
{
/// <summary>
/// 涓婚敭
/// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
+ [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; }
+ [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; }
+ [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; }
+ [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>
- [Column("CHECK_STATUS")]
- [SugarColumn(ColumnName = "CHECK_STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? CheckStatus { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
+ [SugarColumn(ColumnName = "MEMO")]
+ public string Memo { get; set; }
/// <summary>
/// 鍒涘缓浜�
/// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�30")]
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃ユ湡
/// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [Column("DEPARTMENTCODE")]
- [SugarColumn(ColumnName = "DEPARTMENTCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "閮ㄩ棬缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string Departmentcode { 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("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Factory闀垮害涓嶈兘瓒呭嚭20")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 鏍囩鏄剧ず鍊�
- /// </summary>
- [Column("LABEL")]
- [SugarColumn(ColumnName = "LABEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏍囩鏄剧ず鍊奸暱搴︿笉鑳借秴鍑�100")]
- public string Label { get; set; }
/// <summary>
/// 鏈�鍚庝慨鏀逛汉
/// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鏈�鍚庝慨鏀逛汉闀垮害涓嶈兘瓒呭嚭30")]
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庝慨鏀规棩鏈�
/// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 缁勯暱缂栧彿
+ /// 鍗℃澘鍒嗙被
/// </summary>
- [Column("L_CODE")]
- [SugarColumn(ColumnName = "L_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "缁勯暱缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string LCode { get; set; }
+ [SugarColumn(ColumnName = "BK01")]
+ public string Bk01 { get; set; }
/// <summary>
- /// 绾跨畝鐮�
+ /// 鏍囩鏄剧ず鍊�
/// </summary>
- [Column("LINEJM")]
- [SugarColumn(ColumnName = "LINEJM")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "绾跨畝鐮侀暱搴︿笉鑳借秴鍑�20")]
- public string Linejm { get; set; }
-
- /// <summary>
- /// 绾夸綋鍚嶇О
- /// </summary>
- [Column("LINE_NAME")]
- [SugarColumn(ColumnName = "LINE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(64, ErrorMessage = "绾夸綋鍚嶇О闀垮害涓嶈兘瓒呭嚭64")]
- public string LineName { get; set; }
-
- /// <summary>
- /// 绾夸綋缂栧彿
- /// </summary>
- [Column("LINE_NO")]
- [SugarColumn(ColumnName = "LINE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "绾夸綋缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string LineNo { get; set; }
-
- /// <summary>
- /// 浜х嚎绫诲埆
- /// </summary>
- [Column("LINE_STYLE")]
- [SugarColumn(ColumnName = "LINE_STYLE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "浜х嚎绫诲埆闀垮害涓嶈兘瓒呭嚭32")]
- public string LineStyle { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(1000, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭1000")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 鎵�灞炲伐搴�
- /// </summary>
- [Column("PROC_NO")]
- [SugarColumn(ColumnName = "PROC_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鎵�灞炲伐搴忛暱搴︿笉鑳借秴鍑�32")]
- public string ProcNo { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("SHOW_INDEX")]
- [SugarColumn(ColumnName = "SHOW_INDEX")] //鐢ㄤ簬SqlSugar
- public decimal? ShowIndex { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("SIMPLENAME")]
- [SugarColumn(ColumnName = "SIMPLENAME")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Simplename闀垮害涓嶈兘瓒呭嚭20")]
- public string Simplename { get; set; }
-
- /// <summary>
- /// 鏍囧噯宸ユ椂
- /// </summary>
- [Column("STAND_TIME")]
- [SugarColumn(ColumnName = "STAND_TIME")] //鐢ㄤ簬SqlSugar
- public decimal? StandTime { 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; }
+ [SugarColumn(ColumnName = "LABEL")]
+ public string Label { get; set; }
/// <summary>
/// 杞﹂棿绠�鐮�
/// </summary>
- [Column("WORKHOMEJM")]
- [SugarColumn(ColumnName = "WORKHOMEJM")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "杞﹂棿绠�鐮侀暱搴︿笉鑳借秴鍑�20")]
+ [SugarColumn(ColumnName = "WORKHOMEJM")]
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; }
+ [SugarColumn(ColumnName = "LINEJM")]
+ public string Linejm { get; set; }
/// <summary>
- /// 鎶ュ伐鏂瑰紡锛�0銆佺鏁f姤宸ワ紝1銆佹暣绾挎姤宸ワ級
+ /// 鏉$爜绫诲瀷
/// </summary>
- [Column("WORK_TYPE")]
- [SugarColumn(ColumnName = "WORK_TYPE")] //鐢ㄤ簬SqlSugar
- public decimal? WorkType { get; set; }
+ [SugarColumn(ColumnName = "BARTYPE")]
+ public string Bartype { get; set; }
/// <summary>
/// 寰俊鏄剧ず鍊�
/// </summary>
- [Column("WX_LABLE")]
- [SugarColumn(ColumnName = "WX_LABLE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "寰俊鏄剧ず鍊奸暱搴︿笉鑳借秴鍑�50")]
+ [SugarColumn(ColumnName = "WX_LABLE")]
public string WxLable { get; set; }
+
+ /// <summary>
+ /// 鍖哄垎閿傞敯閿備簹
+ /// </summary>
+ [SugarColumn(ColumnName = "WORKCENTERTYPE")]
+ public string Workcentertype { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "SIMPLENAME")]
+ public string Simplename { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "SHOW_INDEX")]
+ public decimal? ShowIndex { 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 = "DEPOT_CODE")]
+ public string DepotCode { get; set; }
+
+ /// <summary>
+ /// 榛樿搴撲綅
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
+ public string DepotSectionCode { get; set; }
+
+ /// <summary>
+ /// 鎶ュ伐鏂瑰紡锛�0銆佺鏁f姤宸ワ紝1銆佹暣绾挎姤宸ワ級
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_TYPE")]
+ public decimal? WorkType { get; set; }
+
+ /// <summary>
+ /// 閮ㄩ棬缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPARTMENTCODE")]
+ public string Departmentcode { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炲伐搴�
+ /// </summary>
+ [SugarColumn(ColumnName = "PROC_NO")]
+ public string ProcNo { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_STYLE")]
+ public string LineStyle { 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/MesQaItemsDetect01.cs b/MES.Service/Modes/MesQaItemsDetect01.cs
index 6cf4f77..d703155 100644
--- a/MES.Service/Modes/MesQaItemsDetect01.cs
+++ b/MES.Service/Modes/MesQaItemsDetect01.cs
@@ -8,325 +8,325 @@
[SugarTable("MES_QA_ITEMS_DETECT_01")]
public class MesQaItemsDetect01
{
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 妫�楠屽崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
+ /// <summary>
+ /// 妫�楠屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "RELEASE_NO")]
public string ReleaseNo { get; set; }
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_DATE")]
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_DATE")]
public DateTime? FcheckDate { get; set; }
- /// <summary>
- /// 妫�楠屼汉鍛�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_BY")]
+ /// <summary>
+ /// 妫�楠屼汉鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_BY")]
public string FcheckBy { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
- /// <summary>
- /// 鏉ユ枡鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FBATCH_QTY")]
+ /// <summary>
+ /// 鏉ユ枡鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FBATCH_QTY")]
public decimal? FbatchQty { get; set; }
- /// <summary>
- /// 鍒ゅ畾缁撴灉
- /// </summary>
- [SugarColumn(ColumnName = "FRECE_QTY")]
+ /// <summary>
+ /// 鍒ゅ畾缁撴灉
+ /// </summary>
+ [SugarColumn(ColumnName = "FRECE_QTY")]
public string FreceQty { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FNG_DESC")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_DESC")]
public string FngDesc { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_RESU")]
public string FcheckResu { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FREVIEW")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FREVIEW")]
public string Freview { get; set; }
- /// <summary>
- /// 妫�楠屾按鍑�
- /// </summary>
- [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
+ /// <summary>
+ /// 妫�楠屾按鍑�
+ /// </summary>
+ [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
public string SampleSizeNo { get; set; }
- /// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_LEVEL")]
+ /// <summary>
+ /// 妫�楠屾按骞�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_LEVEL")]
public string FcheckLevel { get; set; }
- /// <summary>
- /// 鎷掓敹姘村钩
- /// </summary>
- [SugarColumn(ColumnName = "FAC_LEVEL")]
+ /// <summary>
+ /// 鎷掓敹姘村钩
+ /// </summary>
+ [SugarColumn(ColumnName = "FAC_LEVEL")]
public string FacLevel { get; set; }
- /// <summary>
- /// 鎶芥鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_QTY")]
+ /// <summary>
+ /// 鎶芥鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QTY")]
public string CheckQty { get; set; }
- /// <summary>
- /// 鎵规鍙� --鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO")]
+ /// <summary>
+ /// 鎵规鍙� --鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
public string LotNo { get; set; }
- /// <summary>
- /// 鏄惁鎺ㄩ��
- /// </summary>
- [SugarColumn(ColumnName = "FMOVE")]
+ /// <summary>
+ /// 鏄惁鎺ㄩ��
+ /// </summary>
+ [SugarColumn(ColumnName = "FMOVE")]
public string Fmove { get; set; }
- /// <summary>
- /// 鏄惁澶勭悊
- /// </summary>
- [SugarColumn(ColumnName = "FHANDLE")]
+ /// <summary>
+ /// 鏄惁澶勭悊
+ /// </summary>
+ [SugarColumn(ColumnName = "FHANDLE")]
public string Fhandle { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏇存柊浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏇存柊鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏇存柊鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鏄惁瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_FLAG")]
+ /// <summary>
+ /// 鏄惁瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_FLAG")]
public decimal? Modify1Flag { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_BY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_BY")]
public string Modify1By { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_DATE")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_DATE")]
public DateTime? Modify1Date { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// XRF娴嬭瘯鎶ュ憡缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_REPNO")]
+ /// <summary>
+ /// XRF娴嬭瘯鎶ュ憡缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_REPNO")]
public string FcheckRepno { get; set; }
- /// <summary>
- /// 绗笁鏂规姤鍛�
- /// </summary>
- [SugarColumn(ColumnName = "FTHIRD_REP")]
+ /// <summary>
+ /// 绗笁鏂规姤鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FTHIRD_REP")]
public string FthirdRep { get; set; }
- /// <summary>
- /// 鏄惁浣滃簾
- /// </summary>
- [SugarColumn(ColumnName = "FCANCEL")]
+ /// <summary>
+ /// 鏄惁浣滃簾
+ /// </summary>
+ [SugarColumn(ColumnName = "FCANCEL")]
public decimal? Fcancel { get; set; }
- /// <summary>
- /// 鎻愪氦鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "FSUBMIT")]
+ /// <summary>
+ /// 鎻愪氦鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "FSUBMIT")]
public decimal? Fsubmit { get; set; }
- /// <summary>
- /// 妫�楠屼緷鎹�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_ACCORD")]
+ /// <summary>
+ /// 妫�楠屼緷鎹�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_ACCORD")]
public string FcheckAccord { get; set; }
- /// <summary>
- /// 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱)
- /// </summary>
- [SugarColumn(ColumnName = "FTYPE")]
+ /// <summary>
+ /// 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱)
+ /// </summary>
+ [SugarColumn(ColumnName = "FTYPE")]
public short? Ftype { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_UNIT")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_UNIT")]
public string ItemUnit { get; set; }
- /// <summary>
- /// 鍑鸿揣鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "OUT_DATE")]
+ /// <summary>
+ /// 鍑鸿揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_DATE")]
public string OutDate { get; set; }
- /// <summary>
- /// 鏄惁鍏嶆
- /// </summary>
- [SugarColumn(ColumnName = "FEXEMPTION")]
+ /// <summary>
+ /// 鏄惁鍏嶆
+ /// </summary>
+ [SugarColumn(ColumnName = "FEXEMPTION")]
public decimal? Fexemption { get; set; }
- /// <summary>
- /// 妗d綅鏍囧噯
- /// </summary>
- [SugarColumn(ColumnName = "FGEAR_STAND")]
+ /// <summary>
+ /// 妗d綅鏍囧噯
+ /// </summary>
+ [SugarColumn(ColumnName = "FGEAR_STAND")]
public string FgearStand { get; set; }
- /// <summary>
- /// 涓嶈壇澶勭悊鏂规硶
- /// </summary>
- [SugarColumn(ColumnName = "FNG_HANDLE")]
+ /// <summary>
+ /// 涓嶈壇澶勭悊鏂规硶
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_HANDLE")]
public string FngHandle { get; set; }
- /// <summary>
- /// 绠$悊缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FMANAGE_NO")]
+ /// <summary>
+ /// 绠$悊缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "FMANAGE_NO")]
public string FmanageNo { get; set; }
- /// <summary>
- /// 杞崲鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FCOVERT_QTY")]
+ /// <summary>
+ /// 杞崲鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FCOVERT_QTY")]
public string FcovertQty { get; set; }
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- [SugarColumn(ColumnName = "FVERSION")]
+ /// <summary>
+ /// 鐗堟湰
+ /// </summary>
+ [SugarColumn(ColumnName = "FVERSION")]
public decimal? Fversion { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FSECOND_RESU")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FSECOND_RESU")]
public string FsecondResu { get; set; }
- /// <summary>
- /// 鏈�澶ф娊妫�鏁�
- /// </summary>
- [SugarColumn(ColumnName = "MAX_CHECK_QTY")]
+ /// <summary>
+ /// 鏈�澶ф娊妫�鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "MAX_CHECK_QTY")]
public decimal? MaxCheckQty { get; set; }
- /// <summary>
- /// 鐗瑰畾淇敼鏄惁瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_FLAG1")]
+ /// <summary>
+ /// 鐗瑰畾淇敼鏄惁瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_FLAG1")]
public decimal? Modify1Flag1 { get; set; }
- /// <summary>
- /// 鐗瑰畾淇敼瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_BY1")]
+ /// <summary>
+ /// 鐗瑰畾淇敼瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_BY1")]
public string Modify1By1 { get; set; }
- /// <summary>
- /// 鐗瑰畾淇敼瀹℃牳鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_DATE1")]
+ /// <summary>
+ /// 鐗瑰畾淇敼瀹℃牳鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_DATE1")]
public DateTime? Modify1Date1 { get; set; }
- /// <summary>
- /// 灏忔壒娆″彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO1")]
+ /// <summary>
+ /// 灏忔壒娆″彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO1")]
public string LotNo1 { get; set; }
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO2")]
+ /// <summary>
+ /// 閲囪喘鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO2")]
public string LotNo2 { get; set; }
- /// <summary>
- /// 浜у搧鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_STYLE")]
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_STYLE")]
public string BoardStyle { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
public string WorkNo { get; set; }
- /// <summary>
- /// 鍒拌揣鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DHA018")]
+ /// <summary>
+ /// 鍒拌揣鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHA018")]
public string Dha018 { get; set; }
- /// <summary>
- /// 琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB002")]
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB002")]
public decimal? Dhb002 { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB001")]
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB001")]
public string Dhb001 { get; set; }
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "LIFNR")]
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "LIFNR")]
public string Lifnr { get; set; }
- /// <summary>
- /// 閫�鏂欐柟寮�
- /// </summary>
- [SugarColumn(ColumnName = "FMRMODE")]
+ /// <summary>
+ /// 閫�鏂欐柟寮�
+ /// </summary>
+ [SugarColumn(ColumnName = "FMRMODE")]
public string Fmrmode { get; set; }
/// <summary>
diff --git a/MES.Service/Modes/MesQaItemsDetectDetail5.cs b/MES.Service/Modes/MesQaItemsDetectDetail5.cs
index 68ee666..d6159cc 100644
--- a/MES.Service/Modes/MesQaItemsDetectDetail5.cs
+++ b/MES.Service/Modes/MesQaItemsDetectDetail5.cs
@@ -8,167 +8,167 @@
[SugarTable("MES_QA_ITEMS_DETECT_DETAIL5")]
public class MesQaItemsDetectDetail5
{
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 鏍囧噯鍊肩被鍨�
- /// </summary>
- [SugarColumn(ColumnName = "FTEXT_TYPE")]
+ /// <summary>
+ /// 鏍囧噯鍊肩被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "FTEXT_TYPE")]
public string FtextType { get; set; }
- /// <summary>
- /// 鏍囧噯鍊�
- /// </summary>
- [SugarColumn(ColumnName = "FSTAND")]
+ /// <summary>
+ /// 鏍囧噯鍊�
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTAND")]
public decimal? Fstand { get; set; }
- /// <summary>
- /// 涓婂叕宸�
- /// </summary>
- [SugarColumn(ColumnName = "FUP_ALLOW")]
+ /// <summary>
+ /// 涓婂叕宸�
+ /// </summary>
+ [SugarColumn(ColumnName = "FUP_ALLOW")]
public string FupAllow { get; set; }
- /// <summary>
- /// 涓嬪叕宸�
- /// </summary>
- [SugarColumn(ColumnName = "FDOWN_ALLOW")]
+ /// <summary>
+ /// 涓嬪叕宸�
+ /// </summary>
+ [SugarColumn(ColumnName = "FDOWN_ALLOW")]
public string FdownAllow { get; set; }
- /// <summary>
- /// 妫�楠屾按鍑�
- /// </summary>
- [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
+ /// <summary>
+ /// 妫�楠屾按鍑�
+ /// </summary>
+ [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
public string SampleSizeNo { get; set; }
- /// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_LEVEL")]
+ /// <summary>
+ /// 妫�楠屾按骞�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_LEVEL")]
public string FcheckLevel { get; set; }
- /// <summary>
- /// 鎷掓敹姘村钩
- /// </summary>
- [SugarColumn(ColumnName = "FAC_LEVEL")]
+ /// <summary>
+ /// 鎷掓敹姘村钩
+ /// </summary>
+ [SugarColumn(ColumnName = "FAC_LEVEL")]
public string FacLevel { get; set; }
- /// <summary>
- /// 妫�楠岄」鐩�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM")]
+ /// <summary>
+ /// 妫�楠岄」鐩�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_ITEM")]
public string FcheckItem { get; set; }
- /// <summary>
- /// 瑙勬牸瑕佹眰
- /// </summary>
- [SugarColumn(ColumnName = "FSPEC_REQU")]
+ /// <summary>
+ /// 瑙勬牸瑕佹眰
+ /// </summary>
+ [SugarColumn(ColumnName = "FSPEC_REQU")]
public string FspecRequ { get; set; }
- /// <summary>
- /// 鎶芥鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_QYT")]
+ /// <summary>
+ /// 鎶芥鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QYT")]
public decimal? CheckQyt { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_RESU")]
public string FcheckResu { get; set; }
- /// <summary>
- /// AC鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FAC_QTY")]
+ /// <summary>
+ /// AC鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FAC_QTY")]
public decimal? FacQty { get; set; }
- /// <summary>
- /// RE鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FRE_QTY")]
+ /// <summary>
+ /// RE鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FRE_QTY")]
public decimal? FreQty { get; set; }
- /// <summary>
- /// 涓嶅悎鏍兼暟
- /// </summary>
- [SugarColumn(ColumnName = "FNG_QTY")]
+ /// <summary>
+ /// 涓嶅悎鏍兼暟
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_QTY")]
public decimal? FngQty { get; set; }
- /// <summary>
- /// 涓嶈壇鐜�
- /// </summary>
- [SugarColumn(ColumnName = "FNG_RATE")]
+ /// <summary>
+ /// 涓嶈壇鐜�
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_RATE")]
public decimal? FngRate { get; set; }
- /// <summary>
- /// 宸插綍鍏ユ暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "FENTER_QTY")]
+ /// <summary>
+ /// 宸插綍鍏ユ暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "FENTER_QTY")]
public decimal? FenterQty { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "RELEASE_NO")]
public string ReleaseNo { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 妫�楠岄」鐩弿杩�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM_DESC")]
+ /// <summary>
+ /// 妫�楠岄」鐩弿杩�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_ITEM_DESC")]
public string FcheckItemDesc { get; set; }
- /// <summary>
- /// 宸ュ簭鍙�
- /// </summary>
- [SugarColumn(ColumnName = "PROC_NO")]
+ /// <summary>
+ /// 宸ュ簭鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "PROC_NO")]
public string ProcNo { get; set; }
- /// <summary>
- /// 宸ヤ綔涓績缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
+ /// <summary>
+ /// 宸ヤ綔涓績缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
public string WorkshopCenterCode { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FUNIT")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "FUNIT")]
public string Funit { get; set; }
- /// <summary>
- /// 鐗瑰畾淇敼
- /// </summary>
- [SugarColumn(ColumnName = "GIVEN_MODIFY")]
+ /// <summary>
+ /// 鐗瑰畾淇敼
+ /// </summary>
+ [SugarColumn(ColumnName = "GIVEN_MODIFY")]
public short? GivenModify { get; set; }
- /// <summary>
- /// 妫�楠屽伐鍏�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_TOOL")]
+ /// <summary>
+ /// 妫�楠屽伐鍏�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_TOOL")]
public string FcheckTool { get; set; }
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ /// <summary>
+ /// 鏇存柊浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { 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>
- /// 鍏徃浠g爜
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍏徃浠g爜闀垮害涓嶈兘瓒呭嚭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/Purdhb.cs b/MES.Service/Modes/Purdhb.cs
index b8de0cc..7fff6ee 100644
--- a/MES.Service/Modes/Purdhb.cs
+++ b/MES.Service/Modes/Purdhb.cs
@@ -8,267 +8,267 @@
[SugarTable("PURDHB")]
public class Purdhb
{
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB001")]
+ /// <summary>
+ /// 鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB001")]
public string Dhb001 { get; set; }
- /// <summary>
- /// 搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB002")]
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB002")]
public string Dhb002 { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DHB003")]
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB003")]
public string Dhb003 { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DHB004")]
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB004")]
public string Dhb004 { get; set; }
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "DHB005")]
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB005")]
public string Dhb005 { get; set; }
- /// <summary>
- /// 浜よ揣鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB006")]
+ /// <summary>
+ /// 浜よ揣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB006")]
public decimal? Dhb006 { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "DHB007")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB007")]
public string Dhb007 { get; set; }
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DHB008")]
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB008")]
public string Dhb008 { get; set; }
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DHB009")]
+ /// <summary>
+ /// 浠撳簱鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB009")]
public string Dhb009 { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB010")]
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB010")]
public string Dhb010 { get; set; }
- /// <summary>
- /// 鏉ユ簮鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB011")]
+ /// <summary>
+ /// 鏉ユ簮鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB011")]
public string Dhb011 { get; set; }
- /// <summary>
- /// 鏉ユ簮搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB012")]
+ /// <summary>
+ /// 鏉ユ簮搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB012")]
public decimal? Dhb012 { get; set; }
- /// <summary>
- /// 娓呯偣鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB013")]
+ /// <summary>
+ /// 娓呯偣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB013")]
public decimal? Dhb013 { get; set; }
- /// <summary>
- /// 鍒板巶鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DHB014")]
+ /// <summary>
+ /// 鍒板巶鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB014")]
public string Dhb014 { get; set; }
- /// <summary>
- /// 楠屾敹鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB015")]
+ /// <summary>
+ /// 楠屾敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB015")]
public decimal? Dhb015 { get; set; }
- /// <summary>
- /// 楠岄��鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB016")]
+ /// <summary>
+ /// 楠岄��鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB016")]
public decimal? Dhb016 { get; set; }
- /// <summary>
- /// 杩涜揣鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "DHB017")]
+ /// <summary>
+ /// 杩涜揣鍗曚环
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB017")]
public decimal? Dhb017 { get; set; }
- /// <summary>
- /// 杩涜揣閲戦
- /// </summary>
- [SugarColumn(ColumnName = "DHB018")]
+ /// <summary>
+ /// 杩涜揣閲戦
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB018")]
public decimal? Dhb018 { get; set; }
- /// <summary>
- /// 瀹㈡埛鏂欏彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB019")]
+ /// <summary>
+ /// 瀹㈡埛鏂欏彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB019")]
public string Dhb019 { get; set; }
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB020")]
+ /// <summary>
+ /// 閮ㄩ棬缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB020")]
public string Dhb020 { get; set; }
- /// <summary>
- /// 璧犲搧鏁�
- /// </summary>
- [SugarColumn(ColumnName = "DHB021")]
+ /// <summary>
+ /// 璧犲搧鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB021")]
public decimal? Dhb021 { get; set; }
- /// <summary>
- /// 鏇存柊ERP
- /// </summary>
- [SugarColumn(ColumnName = "DHB022")]
+ /// <summary>
+ /// 鏇存柊ERP
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB022")]
public string Dhb022 { get; set; }
- /// <summary>
- /// 妫�楠岀姸鎬�
- /// </summary>
- [SugarColumn(ColumnName = "DHB023")]
+ /// <summary>
+ /// 妫�楠岀姸鎬�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB023")]
public string Dhb023 { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "DHB024")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB024")]
public string Dhb024 { get; set; }
- /// <summary>
- /// 瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "AUDITING")]
+ /// <summary>
+ /// 瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "AUDITING")]
public decimal? Auditing { get; set; }
- /// <summary>
- /// ERP閲囪喘鍗曞彿ID
- /// </summary>
- [SugarColumn(ColumnName = "DHB026")]
+ /// <summary>
+ /// ERP閲囪喘鍗曞彿ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB026")]
public decimal? Dhb026 { get; set; }
- /// <summary>
- /// ERP閲囪喘搴忓彿ID
- /// </summary>
- [SugarColumn(ColumnName = "DHB027")]
+ /// <summary>
+ /// ERP閲囪喘搴忓彿ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB027")]
public decimal? Dhb027 { get; set; }
- /// <summary>
- /// ERP鐗╂枡ID
- /// </summary>
- [SugarColumn(ColumnName = "DHB028")]
+ /// <summary>
+ /// ERP鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB028")]
public decimal? Dhb028 { get; set; }
- /// <summary>
- /// 寰呮鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB029")]
+ /// <summary>
+ /// 寰呮鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB029")]
public decimal? Dhb029 { get; set; }
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "DHB030")]
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB030")]
public string Dhb030 { get; set; }
- /// <summary>
- /// 妫�楠屽憳
- /// </summary>
- [SugarColumn(ColumnName = "DHB031")]
+ /// <summary>
+ /// 妫�楠屽憳
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB031")]
public string Dhb031 { get; set; }
- /// <summary>
- /// 鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB032")]
+ /// <summary>
+ /// 鍏ュ簱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB032")]
public decimal? Dhb032 { get; set; }
- /// <summary>
- /// 鍏ュ簱浜�
- /// </summary>
- [SugarColumn(ColumnName = "DHB033")]
+ /// <summary>
+ /// 鍏ュ簱浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB033")]
public string Dhb033 { get; set; }
- /// <summary>
- /// 鍏ュ簱鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DHB034")]
+ /// <summary>
+ /// 鍏ュ簱鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB034")]
public string Dhb034 { get; set; }
- /// <summary>
- /// 閫�璐ф暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "DHB035")]
+ /// <summary>
+ /// 閫�璐ф暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB035")]
public decimal? Dhb035 { get; set; }
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "DHB037")]
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB037")]
public decimal? Dhb037 { get; set; }
- /// <summary>
- /// 閫�璐т汉
- /// </summary>
- [SugarColumn(ColumnName = "DHB036")]
+ /// <summary>
+ /// 閫�璐т汉
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB036")]
public string Dhb036 { get; set; }
- /// <summary>
- /// ERP鍘熷垎褰曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB038")]
+ /// <summary>
+ /// ERP鍘熷垎褰曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB038")]
public decimal? Dhb038 { get; set; }
- /// <summary>
- /// ERP婧愬崟鍐呯爜
- /// </summary>
- [SugarColumn(ColumnName = "DHB039")]
+ /// <summary>
+ /// ERP婧愬崟鍐呯爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB039")]
public decimal? Dhb039 { get; set; }
- /// <summary>
- /// ERP婧愬崟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "DHB040")]
+ /// <summary>
+ /// ERP婧愬崟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB040")]
public decimal? Dhb040 { get; set; }
- /// <summary>
- /// ERP璁㈠崟鍐呯爜
- /// </summary>
- [SugarColumn(ColumnName = "DHB041")]
+ /// <summary>
+ /// ERP璁㈠崟鍐呯爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB041")]
public decimal? Dhb041 { get; set; }
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "ID")]
+ /// <summary>
+ /// 鑷鍒�
+ /// </summary>
+ [SugarColumn(ColumnName = "ID")]
public decimal? Id { get; set; }
- /// <summary>
- /// 鏄惁妫�楠岋紝1涓哄凡妫�
- /// </summary>
- [SugarColumn(ColumnName = "ISCHECK")]
+ /// <summary>
+ /// 鏄惁妫�楠岋紝1涓哄凡妫�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISCHECK")]
public decimal? Ischeck { get; set; }
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DHB042")]
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB042")]
public string Dhb042 { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Purdka.cs b/MES.Service/Modes/Purdka.cs
index 4330c13..1c3ea40 100644
--- a/MES.Service/Modes/Purdka.cs
+++ b/MES.Service/Modes/Purdka.cs
@@ -8,123 +8,123 @@
[SugarTable("PURDKA")]
public class Purdka
{
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "ID")]
+ /// <summary>
+ /// 鑷鍒�
+ /// </summary>
+ [SugarColumn(ColumnName = "ID")]
public decimal? Id { get; set; }
- /// <summary>
- /// 鍒涘缓浜哄憳
- /// </summary>
- [SugarColumn(ColumnName = "CREATEUSER")]
+ /// <summary>
+ /// 鍒涘缓浜哄憳
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATEUSER")]
public string Createuser { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATETIME")]
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATETIME")]
public string Createtime { get; set; }
- /// <summary>
- /// 淇敼鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "MODIFYTIME")]
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFYTIME")]
public string Modifytime { get; set; }
- /// <summary>
- /// 淇敼浜哄憳
- /// </summary>
- [SugarColumn(ColumnName = "MODIFYUSER")]
+ /// <summary>
+ /// 淇敼浜哄憳
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFYUSER")]
public string Modifyuser { get; set; }
- /// <summary>
- /// 瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "AUDITING")]
+ /// <summary>
+ /// 瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "AUDITING")]
public string Auditing { get; set; }
- /// <summary>
- /// 閫�璐у崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DKA001")]
+ /// <summary>
+ /// 閫�璐у崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA001")]
public string Dka001 { get; set; }
- /// <summary>
- /// 閫�璐х被鍨�
- /// </summary>
- [SugarColumn(ColumnName = "DKA002")]
+ /// <summary>
+ /// 閫�璐х被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA002")]
public string Dka002 { get; set; }
- /// <summary>
- /// 閫�璐ф棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "DKA003")]
+ /// <summary>
+ /// 閫�璐ф棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA003")]
public string Dka003 { get; set; }
- /// <summary>
- /// 閫�璐ф椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "DKA004")]
+ /// <summary>
+ /// 閫�璐ф椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA004")]
public string Dka004 { get; set; }
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "DKA005")]
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA005")]
public string Dka005 { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "DKA006")]
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA006")]
public string Dka006 { get; set; }
- /// <summary>
- /// 閮ㄩ棬
- /// </summary>
- [SugarColumn(ColumnName = "DKA007")]
+ /// <summary>
+ /// 閮ㄩ棬
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA007")]
public string Dka007 { get; set; }
- /// <summary>
- /// 瀹℃牳鑰�
- /// </summary>
- [SugarColumn(ColumnName = "DKA008")]
+ /// <summary>
+ /// 瀹℃牳鑰�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA008")]
public string Dka008 { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DKA009")]
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA009")]
public string Dka009 { get; set; }
- /// <summary>
- /// 閫�璐х姸鎬侊紝0鎴栫┖涓烘湭閫�璐э紝1涓哄凡閫�瀹�
- /// </summary>
- [SugarColumn(ColumnName = "DKA010")]
+ /// <summary>
+ /// 閫�璐х姸鎬侊紝0鎴栫┖涓烘湭閫�璐э紝1涓哄凡閫�瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA010")]
public string Dka010 { get; set; }
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERPID")]
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPID")]
public decimal? Erpid { get; set; }
- /// <summary>
- /// 淇濈鍛樼紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "DKA011")]
+ /// <summary>
+ /// 淇濈鍛樼紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA011")]
public string Dka011 { get; set; }
- /// <summary>
- /// 楠屾敹鍛樼紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "DKA012")]
+ /// <summary>
+ /// 楠屾敹鍛樼紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA012")]
public string Dka012 { get; set; }
- /// <summary>
- /// 鏄惁鎺ㄩ�佺孩瀛楀叆搴�1-鎺ㄩ�侊紝0-鏈帹閫�
- /// </summary>
- [SugarColumn(ColumnName = "DKA013")]
+ /// <summary>
+ /// 鏄惁鎺ㄩ�佺孩瀛楀叆搴�1-鎺ㄩ�侊紝0-鏈帹閫�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA013")]
public decimal? Dka013 { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womdaa.cs b/MES.Service/Modes/Womdaa.cs
index 8f613a1..1f81fa9 100644
--- a/MES.Service/Modes/Womdaa.cs
+++ b/MES.Service/Modes/Womdaa.cs
@@ -11,11 +11,11 @@
/// <summary>
/// 鑷鍒�
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, IsIdentity = true)]
- public decimal Id { get; set; }
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public decimal? Id { get; set; }
/// <summary>
- /// PID
+ /// 鎺掍骇ID
/// </summary>
[SugarColumn(ColumnName = "PID")]
public decimal? Pid { get; set; }
@@ -27,7 +27,7 @@
public string? Daa001 { get; set; }
/// <summary>
- /// 浜у搧缂栫爜
+ /// 浜у搧ID
/// </summary>
[SugarColumn(ColumnName = "DAA002")]
public string? Daa002 { get; set; }
@@ -51,13 +51,13 @@
public string? Daa005 { get; set; }
/// <summary>
- /// 棰勮寮�宸ユ椂闂�
+ /// ERP棰勮寮�宸ユ椂闂�
/// </summary>
[SugarColumn(ColumnName = "DAA006")]
public DateTime? Daa006 { get; set; }
/// <summary>
- /// 棰勮瀹屽伐鏃堕棿
+ /// ERP棰勮瀹屽伐鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "DAA007")]
public DateTime? Daa007 { get; set; }
@@ -229,4 +229,88 @@
/// </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..ce48de9 100644
--- a/MES.Service/service/QC/SuspendService.cs
+++ b/MES.Service/service/QC/SuspendService.cs
@@ -6,20 +6,21 @@
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 +35,21 @@
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..3870859 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,
@@ -167,11 +147,7 @@
BillNo = s.BillNo,
FcheckBy = s.FcheckBy,
FcheckResu = s.FcheckResu,
- Remarks = s.Remarks,
- BoardModel = b.BoardModel,
- PlanQty = c.PlanQty
- // Mocode = a.Mocode,
- // BoardStyle = c.BoardStyle
+ Remarks = s.Remarks
}).OrderBy(s => s.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
}
diff --git a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
index ffd3aae..7f4e1df 100644
--- a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
@@ -15,12 +15,10 @@
public MovesDto ScanInBarcode(WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.sectionCode))
- {
throw new Exception("璇锋壂搴撲綅鏉$爜锛�");
- }
- int pBillTypeId = 300;
- int pTransctionNo = 301;
+ var pBillTypeId = 300;
+ var pTransctionNo = 301;
var depotQuery = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
new JoinQueryInfos(
@@ -30,9 +28,7 @@
.First();
if (depotQuery == null)
- {
throw new Exception($"002[搴撲綅缂栫爜 {query.sectionCode} 涓嶅瓨鍦紝璇风‘璁わ紒");
- }
var cDepotCode = depotQuery.DepotCode;
@@ -48,10 +44,7 @@
.Select((a, b) => new { a.Id, a.BillNo, a.InvDepotsCode })
.First();
- if (itemMoveQuery == null)
- {
- throw new Exception("鏉$爜鏈仛璋冩嫈鍑哄簱鎵爜锛岃鏍稿锛�");
- }
+ if (itemMoveQuery == null) throw new Exception("鏉$爜鏈仛璋冩嫈鍑哄簱鎵爜锛岃鏍稿锛�");
var cBillNo = itemMoveQuery.BillNo;
var iDepotCode = itemMoveQuery.InvDepotsCode;
@@ -66,14 +59,10 @@
.First();
if (depotValidationQuery == null)
- {
throw new Exception($"002[搴撲綅缂栫爜 {query.sectionCode} 涓嶅瓨鍦紝璇风‘璁わ紒");
- }
if (iDepotCode != depotValidationQuery.DepotCode)
- {
throw new Exception("瀹為檯浠撳簱涓庣敵璇疯皟鍏ヤ粨搴撲笉绗︼紝璇锋牳瀵癸紒");
- }
var barcodeCount = Db.Queryable<MesInvItemMovesCDetails>()
.Where(b =>
@@ -81,19 +70,13 @@
b.ItemMoveId == itemMoveQuery.Id && b.MoveOk == 1)
.Count();
- if (barcodeCount > 0)
- {
- throw new Exception("鏉$爜璋冩嫈宸插畬鎴愶紝璇锋牳瀵癸紒");
- }
+ if (barcodeCount > 0) throw new Exception("鏉$爜璋冩嫈宸插畬鎴愶紝璇锋牳瀵癸紒");
var barcodeInfo = Db.Queryable<MesInvItemBarcodes>()
.Where(t => t.ItemBarcode == query.barcode)
.First();
- if (barcodeInfo == null)
- {
- throw new Exception("鏉$爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
- }
+ if (barcodeInfo == null) throw new Exception("鏉$爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
var isAudit = UseTransaction(db =>
{
@@ -140,15 +123,12 @@
.Where(a => a.ItemMoveId == itemMoveQuery.Id && a.MoveOk == 1)
.Sum(a => SqlFunc.IsNull(a.Quantity, 0));
- if (totalQuantity == scannedQuantity)
- {
- return 1;
- }
+ if (totalQuantity == scannedQuantity) return 1;
return 0;
});
- MovesDto dto = new MovesDto();
+ var dto = new MovesDto();
dto.InAudit = isAudit == 1;
dto.BarcodesInfo = barcodeInfo;
return dto;
@@ -180,7 +160,7 @@
public MovesDto GetItems(WarehouseQuery query)
{
- MovesDto dto = new MovesDto();
+ var dto = new MovesDto();
dto.BarcodeList = GetItemMovesCDetails(query);
dto.OutItems = GetItemOutItems(query);
@@ -287,7 +267,7 @@
if (sumqty > quantity)
throw new Exception(
"宸叉壂鏉$爜鏁伴噺鎴栨湰娆℃壂鐮佹暟閲忥細" + sumqty + " 澶т簬鐢宠鏁伴噺锛�" + quantity + "锛岃鏍稿锛�");
-
+
UseTransaction(db =>
{
SaveMesInvItemMovesCDetails(db, query, mesInvItemMoves,
diff --git a/MESApplication/Controllers/Base/DemoController.cs b/MESApplication/Controllers/Base/DemoController.cs
index 0a28eae..67a7de0 100644
--- a/MESApplication/Controllers/Base/DemoController.cs
+++ b/MESApplication/Controllers/Base/DemoController.cs
@@ -3,6 +3,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+
namespace MESApplication.Controllers.Base;
[Route("api/[controller]")]
diff --git a/MESApplication/Controllers/Base/LoginController.cs b/MESApplication/Controllers/Base/LoginController.cs
index 02e836d..aede14c 100644
--- a/MESApplication/Controllers/Base/LoginController.cs
+++ b/MESApplication/Controllers/Base/LoginController.cs
@@ -8,14 +8,14 @@
namespace MESApplication.Controllers.Base;
/// <summary>
-/// 鐢ㄦ埛
+/// 鐢ㄦ埛
/// </summary>
[Route("api/[controller]")]
[ApiController]
public class LoginController : ControllerBase
{
/// <summary>
- /// 鐧诲綍
+ /// 鐧诲綍
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -43,7 +43,7 @@
}
/// <summary>
- /// 閲嶈瀵嗙爜
+ /// 閲嶈瀵嗙爜
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
@@ -80,7 +80,7 @@
}
/// <summary>
- /// 鐢ㄦ埛鑿滃崟
+ /// 鐢ㄦ埛鑿滃崟
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
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)
{
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs b/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
index f93f0f5..36da5ff 100644
--- a/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
+++ b/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
@@ -12,7 +12,7 @@
public class MesInvItemMovesController : ControllerBase
{
private readonly MesInvItemMovesManager m = new();
-
+
//ScanInBarcode
[HttpPost("ScanInBarcode")]
public ResponseResult ScanInBarcode(WarehouseQuery query)
@@ -33,7 +33,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
[HttpPost("Audit")]
public ResponseResult Audit(WarehouseQuery query)
{
@@ -53,7 +53,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
[HttpPost("SaveMessageCenter")]
public ResponseResult SaveMessageCenter(WarehouseQuery entity)
{
@@ -94,7 +94,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
//GetItems
[HttpPost("GetItems")]
public ResponseResult GetItems(WarehouseQuery query)
@@ -115,7 +115,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
//ScanMoveBarcode
[HttpPost("ScanMoveBarcode")]
public ResponseResult ScanMoveBarcode(WarehouseQuery query)
@@ -157,7 +157,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
/// <summary>
/// 鑾峰彇鎵�鏈�
/// </summary>
diff --git a/MESApplication/Filter/ActionFilter.cs b/MESApplication/Filter/ActionFilter.cs
index 222c03f..e44c97f 100644
--- a/MESApplication/Filter/ActionFilter.cs
+++ b/MESApplication/Filter/ActionFilter.cs
@@ -1,160 +1,163 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
+锘縰sing System.Diagnostics;
+using System.Text;
+using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters;
using Newtonsoft.Json;
-using System.Diagnostics;
-using System.Text;
-namespace MESApplication
+namespace MESApplication;
+
+/// <summary>
+/// 鏂规硶杩囨护鍣�
+/// </summary>
+public class ActionFilter : IActionFilter
{
+ private Stopwatch _stopwatch;
+
/// <summary>
- /// 鏂规硶杩囨护鍣�
+ /// 鐩戞帶鏃ュ織
/// </summary>
- public class ActionFilter : IActionFilter
+ public static ILogger LoggerMonitor { get; set; }
+
+ /// <summary>
+ /// 閿欒鏃ュ織
+ /// </summary>
+ public static ILogger LoggerError { get; set; }
+
+
+ /// <summary>
+ /// 鏂规硶鎵ц鍓�
+ /// </summary>
+ /// <param name="context"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ public async void OnActionExecuting(ActionExecutingContext context)
{
- /// <summary>
- /// 鐩戞帶鏃ュ織
- /// </summary>
- public static ILogger LoggerMonitor { get; set; }
-
- /// <summary>
- /// 閿欒鏃ュ織
- /// </summary>
- public static ILogger LoggerError { get; set; }
-
- private Stopwatch _stopwatch;
-
- /// <summary>
- /// 鍒涘缓璇锋眰鏃ュ織鏂囨湰
- /// </summary>
- /// <param name="method"></param>
- /// <param name="controllerName"></param>
- /// <param name="actionName"></param>
- /// <param name="actionArgs"></param>
- /// <returns></returns>
- private static string CreateRequestLogText(string method, string controllerName, string actionName, string requestHead, string requestBody)
+ // ErrorLog.Write("==================================================================================================================================");
+ _stopwatch = new Stopwatch();
+ _stopwatch.Start();
+ //throw new NotImplementedException();
+ if (LoggerMonitor != null)
{
- StringBuilder sb = new StringBuilder();
- sb.Append($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 璇锋眰{method}/{controllerName}/{actionName}鎺ュ彛锛岃姹侶ead锛歿requestHead}\n");
- sb.Append($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 璇锋眰{method}/{controllerName}/{actionName}鎺ュ彛锛岃姹侭ody锛歿requestBody}\n");
- return sb.ToString();
- }
-
- /// <summary>
- /// 鍒涘缓鍝嶅簲鏃ュ織鏂囨湰
- /// </summary>
- /// <param name="method"></param>
- /// <param name="controllerName"></param>
- /// <param name="actionName"></param>
- /// <param name="result"></param>
- /// <returns></returns>
- private static string CreateResponseLogText(string method, string controllerName, string actionName, object result)
- {
- StringBuilder sb = new StringBuilder();
- sb.Append($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 瀹屾垚璇锋眰{method}/{controllerName}/{actionName}鎺ュ彛锛岃繑鍥炵粨鏋滐細");
- if (result != null)
+ //璁板綍璇锋眰鍙傛暟鏃ュ織
+ var desc = context.ActionDescriptor as ControllerActionDescriptor;
+ if (desc != null)
{
- sb.Append($"{JsonConvert.SerializeObject(result)}");
- }
- else
- {
- sb.Append($"鏃�");
- }
- return sb.ToString();
- }
+ var headers = new Dictionary<string, object>();
+ var requestHeaders = context.HttpContext.Request.Headers;
+ // 璁块棶璇锋眰涓殑 header 淇℃伅
+ foreach (var header in requestHeaders)
+ headers.Add(header.Key, header.Value);
+ var requestHead = JsonConvert.SerializeObject(headers);
- /// <summary>
- /// 鏂规硶鎵ц鍓�
- /// </summary>
- /// <param name="context"></param>
- /// <exception cref="NotImplementedException"></exception>
- public async void OnActionExecuting(ActionExecutingContext context)
- {
- // ErrorLog.Write("==================================================================================================================================");
- _stopwatch = new Stopwatch();
- _stopwatch.Start();
- //throw new NotImplementedException();
- if (LoggerMonitor != null)
- {
- //璁板綍璇锋眰鍙傛暟鏃ュ織
- ControllerActionDescriptor desc = context.ActionDescriptor as ControllerActionDescriptor;
- if (desc != null)
+ var bodys = new Dictionary<string, object>();
+ var actionArguments = context.ActionArguments;
+ // 璁块棶璇锋眰涓殑鍙傛暟
+ foreach (var argument in actionArguments)
{
- Dictionary<string, object> headers = new Dictionary<string, object>();
- var requestHeaders = context.HttpContext.Request.Headers;
-
- // 璁块棶璇锋眰涓殑 header 淇℃伅
- foreach (var header in requestHeaders)
- {
- headers.Add(header.Key, header.Value);
- }
- var requestHead = JsonConvert.SerializeObject(headers);
-
- Dictionary<string, object> bodys = new Dictionary<string, object>();
- var actionArguments = context.ActionArguments;
- // 璁块棶璇锋眰涓殑鍙傛暟
- foreach (var argument in actionArguments)
- {
- //dic.Add(argument.Key, argument.Value);
- var parameter = JsonConvert.DeserializeObject<Dictionary<string, object>>(argument.Value.ToString());
- foreach (var item in parameter)
- {
- bodys.Add(item.Key, item.Value);
- }
- }
- var requestBody = JsonConvert.SerializeObject(bodys);
-
- var logText = CreateRequestLogText(context.HttpContext.Request.Method, desc.ControllerName, desc.ActionName, requestHead, requestBody);
- //LoggerMonitor.LogDebug(logText);
- //ErrorLog.Write(logText);
+ //dic.Add(argument.Key, argument.Value);
+ var parameter =
+ JsonConvert
+ .DeserializeObject<Dictionary<string, object>>(
+ argument.Value.ToString());
+ foreach (var item in parameter)
+ bodys.Add(item.Key, item.Value);
}
+
+ var requestBody = JsonConvert.SerializeObject(bodys);
+
+ var logText = CreateRequestLogText(
+ context.HttpContext.Request.Method, desc.ControllerName,
+ desc.ActionName, requestHead, requestBody);
+ //LoggerMonitor.LogDebug(logText);
+ //ErrorLog.Write(logText);
}
-
-
- }
-
- public void OnActionExecuted(ActionExecutedContext context)
- {
- //throw new NotImplementedException();
- _stopwatch.Stop();
- long elaspsedMillisedconds = _stopwatch.ElapsedMilliseconds;
- string msg = "";
- //string msg = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 鎺ュ彛鎵ц鏃堕棿锛歿elaspsedMillisedconds}姣";
- //ErrorLog.Write(msg);
-
- if (context.Exception != null)
- {
- // 璁板綍寮傚父鏃ュ織
- if (LoggerError != null)
- {
- LoggerError.LogError(context.Exception, context.Exception.Message);
-
- ErrorLog.Write($@"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 鎺ュ彛寮傚父锛歿JsonConvert.SerializeObject(context.Exception)}");
- ErrorLog.Write($@"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 寮傚父鎻愮ず淇℃伅锛歿JsonConvert.SerializeObject(context.Exception.Message)}");
- ErrorLog.Write("==================================================================================================================================");
- }
- }
-
- if (LoggerMonitor != null)
- {
- // 璁板綍璇锋眰缁撴灉鏃ュ織
- ControllerActionDescriptor desc = context.ActionDescriptor as ControllerActionDescriptor;
- if (desc != null)
- {
- ObjectResult rst = context.Result as ObjectResult;
- object rstValue = rst != null ? rst.Value : null;
- var logText = CreateResponseLogText(
- context.HttpContext.Request.Method,
- desc.ControllerName,
- desc.ActionName,
- rstValue);
- LoggerMonitor.LogDebug(logText);
- ErrorLog.Write(logText);
- }
- }
- // ErrorLog.Write(msg);
- // ErrorLog.Write("==================================================================================================================================");
}
}
-}
+
+ public void OnActionExecuted(ActionExecutedContext context)
+ {
+ //throw new NotImplementedException();
+ _stopwatch.Stop();
+ var elaspsedMillisedconds = _stopwatch.ElapsedMilliseconds;
+ var msg = "";
+ //string msg = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 鎺ュ彛鎵ц鏃堕棿锛歿elaspsedMillisedconds}姣";
+ //ErrorLog.Write(msg);
+
+ if (context.Exception != null)
+ // 璁板綍寮傚父鏃ュ織
+ if (LoggerError != null)
+ {
+ LoggerError.LogError(context.Exception,
+ context.Exception.Message);
+
+ ErrorLog.Write(
+ $@"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 鎺ュ彛寮傚父锛歿JsonConvert.SerializeObject(context.Exception)}");
+ ErrorLog.Write(
+ $@"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 寮傚父鎻愮ず淇℃伅锛歿JsonConvert.SerializeObject(context.Exception.Message)}");
+ ErrorLog.Write(
+ "==================================================================================================================================");
+ }
+
+ if (LoggerMonitor != null)
+ {
+ // 璁板綍璇锋眰缁撴灉鏃ュ織
+ var desc = context.ActionDescriptor as ControllerActionDescriptor;
+ if (desc != null)
+ {
+ var rst = context.Result as ObjectResult;
+ var rstValue = rst != null ? rst.Value : null;
+ var logText = CreateResponseLogText(
+ context.HttpContext.Request.Method,
+ desc.ControllerName,
+ desc.ActionName,
+ rstValue);
+ LoggerMonitor.LogDebug(logText);
+ ErrorLog.Write(logText);
+ }
+ }
+ // ErrorLog.Write(msg);
+ // ErrorLog.Write("==================================================================================================================================");
+ }
+
+ /// <summary>
+ /// 鍒涘缓璇锋眰鏃ュ織鏂囨湰
+ /// </summary>
+ /// <param name="method"></param>
+ /// <param name="controllerName"></param>
+ /// <param name="actionName"></param>
+ /// <param name="actionArgs"></param>
+ /// <returns></returns>
+ private static string CreateRequestLogText(string method,
+ string controllerName, string actionName, string requestHead,
+ string requestBody)
+ {
+ var sb = new StringBuilder();
+ sb.Append(
+ $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 璇锋眰{method}/{controllerName}/{actionName}鎺ュ彛锛岃姹侶ead锛歿requestHead}\n");
+ sb.Append(
+ $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 璇锋眰{method}/{controllerName}/{actionName}鎺ュ彛锛岃姹侭ody锛歿requestBody}\n");
+ return sb.ToString();
+ }
+
+ /// <summary>
+ /// 鍒涘缓鍝嶅簲鏃ュ織鏂囨湰
+ /// </summary>
+ /// <param name="method"></param>
+ /// <param name="controllerName"></param>
+ /// <param name="actionName"></param>
+ /// <param name="result"></param>
+ /// <returns></returns>
+ private static string CreateResponseLogText(string method,
+ string controllerName, string actionName, object result)
+ {
+ var sb = new StringBuilder();
+ sb.Append(
+ $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")} 瀹屾垚璇锋眰{method}/{controllerName}/{actionName}鎺ュ彛锛岃繑鍥炵粨鏋滐細");
+ if (result != null)
+ sb.Append($"{JsonConvert.SerializeObject(result)}");
+ else
+ sb.Append("鏃�");
+ return sb.ToString();
+ }
+}
\ No newline at end of file
diff --git a/MESApplication/Filter/ErrorLog.cs b/MESApplication/Filter/ErrorLog.cs
index 26fe4f6..426110e 100644
--- a/MESApplication/Filter/ErrorLog.cs
+++ b/MESApplication/Filter/ErrorLog.cs
@@ -1,70 +1,67 @@
-锘縩amespace MESApplication
+锘縩amespace MESApplication;
+
+public class ErrorLog
{
- public class ErrorLog
+ private static readonly string DirectoryPath =
+ AppDomain.CurrentDomain.BaseDirectory;
+
+ /// <summary>
+ /// 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
+ /// </summary>
+ /// <param name="moduleName">妯″潡鍚嶅瓧</param>
+ /// <param name="message">閿欒鏂囨湰淇℃伅</param>
+ /// <param name="ex">寮傚父</param>
+ public static void Write(string moduleName, string message, Exception ex)
{
+ //string directoryPath = $@"C:\鑷崇畝绉戞妧\MyDemoData\.NetCore鎺ュ彛杩囨护鍣ㄩ」鐩甛FilterText\FilterText\Logger\{DateTime.Now.ToString("yyyyMMdd")}"; // 鐩爣鐩綍璺緞
+ var directoryPath = $@"{DirectoryPath}{"log"}"; // 鐩爣鐩綍璺緞
- private static string DirectoryPath = AppDomain.CurrentDomain.BaseDirectory;
+ if (!Directory.Exists(directoryPath))
+ // 濡傛灉鐩綍涓嶅瓨鍦紝鍒欐柊寤烘枃浠跺す
+ Directory.CreateDirectory(directoryPath);
- /// <summary>
- /// 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
- /// </summary>
- /// <param name="moduleName">妯″潡鍚嶅瓧</param>
- /// <param name="message">閿欒鏂囨湰淇℃伅</param>
- /// <param name="ex">寮傚父</param>
- public static void Write(string moduleName, string message, Exception ex)
- {
- //string directoryPath = $@"C:\鑷崇畝绉戞妧\MyDemoData\.NetCore鎺ュ彛杩囨护鍣ㄩ」鐩甛FilterText\FilterText\Logger\{DateTime.Now.ToString("yyyyMMdd")}"; // 鐩爣鐩綍璺緞
- string directoryPath = $@"{DirectoryPath}{"log"}"; // 鐩爣鐩綍璺緞
+ var filePath = directoryPath +
+ $@"\{DateTime.Now.ToString("yyyyMMddHH")}.log"; // 鐩爣鏂囦欢璺緞
- if (!Directory.Exists(directoryPath))
+ if (!File.Exists(filePath))
+ // 濡傛灉鏂囦欢涓嶅瓨鍦紝鍒欏垱寤烘枃浠�
+ using (File.Create(filePath))
{
- // 濡傛灉鐩綍涓嶅瓨鍦紝鍒欐柊寤烘枃浠跺す
- Directory.CreateDirectory(directoryPath);
+ //Console.WriteLine("鏂囦欢宸插垱寤�");
}
- string filePath = directoryPath + $@"\{DateTime.Now.ToString("yyyyMMddHH")}.log"; // 鐩爣鏂囦欢璺緞
+ LogToFile(filePath, message);
+ }
- if (!File.Exists(filePath))
- {
- // 濡傛灉鏂囦欢涓嶅瓨鍦紝鍒欏垱寤烘枃浠�
- using (File.Create(filePath))
- {
- //Console.WriteLine("鏂囦欢宸插垱寤�");
- }
- }
- LogToFile(filePath, message);
- }
+ /// <summary>
+ /// 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
+ /// </summary>
+ /// <param name="moduleName">妯″潡鍚嶅瓧</param>
+ /// <param name="ex">寮傚父</param>
+ public static void Write(string moduleName, Exception ex)
+ {
+ Write(moduleName, moduleName, ex);
+ }
- /// <summary>
- /// 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
- /// </summary>
- /// <param name="moduleName">妯″潡鍚嶅瓧</param>
- /// <param name="ex">寮傚父</param>
- public static void Write(string moduleName, Exception ex)
+ /// <summary>
+ /// 鍐欏叆杩囩▼鏁版嵁鎴栬鏄庡埌鏂囦欢涓紝浠ヤ究璺熻釜
+ /// </summary>
+ /// <param name="moduleName">妯″潡鍚嶅瓧</param>
+ /// <param name="ex">寮傚父</param>
+ public static void Write(string message)
+ {
+ Write(string.Empty, message, null);
+ }
+
+ /// <summary>
+ /// 鏂囨湰鍐欏叆
+ /// </summary>
+ /// <param name="logMessage"></param>
+ private static void LogToFile(string logFilePath, string logMessage)
+ {
+ using (var sw = File.AppendText(logFilePath))
{
- Write(moduleName, moduleName, ex);
- }
-
- /// <summary>
- /// 鍐欏叆杩囩▼鏁版嵁鎴栬鏄庡埌鏂囦欢涓紝浠ヤ究璺熻釜
- /// </summary>
- /// <param name="moduleName">妯″潡鍚嶅瓧</param>
- /// <param name="ex">寮傚父</param>
- public static void Write(string message)
- {
- Write(String.Empty, message, null);
- }
-
- /// <summary>
- /// 鏂囨湰鍐欏叆
- /// </summary>
- /// <param name="logMessage"></param>
- private static void LogToFile(string logFilePath, string logMessage)
- {
- using (StreamWriter sw = File.AppendText(logFilePath))
- {
- sw.WriteLine($"{logMessage}");
- }
+ sw.WriteLine($"{logMessage}");
}
}
-}
+}
\ No newline at end of file
diff --git a/MESApplication/MESApplication.csproj b/MESApplication/MESApplication.csproj
index 3ae7129..b87eece 100644
--- a/MESApplication/MESApplication.csproj
+++ b/MESApplication/MESApplication.csproj
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -18,12 +18,12 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121" />
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+ <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121"/>
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\MES.Service\MES.Service.csproj" />
+ <ProjectReference Include="..\MES.Service\MES.Service.csproj"/>
</ItemGroup>
</Project>
diff --git a/MESApplication/Startup.cs b/MESApplication/Startup.cs
index 19d0a1d..0b7bc42 100644
--- a/MESApplication/Startup.cs
+++ b/MESApplication/Startup.cs
@@ -1,10 +1,10 @@
-锘縰sing MES.Service.Dto.@base;
+锘縰sing System.Reflection;
+using MES.Service.Dto.@base;
using MES.Service.util;
using Microsoft.OpenApi.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using Swashbuckle.AspNetCore.SwaggerUI;
-using System.Reflection;
namespace MESApplication;
@@ -36,7 +36,8 @@
c.SwaggerDoc("v1",
new OpenApiInfo
{ Title = "MESApplication.Api", Version = "v1" });
- var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+ var xmlFile =
+ $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
c.IncludeXmlComments(xmlPath, true);
});
@@ -72,11 +73,15 @@
});
#region 鎺ュ彛琛屽姩杩囨护鍣�
- services.AddControllers(options => {
+
+ services.AddControllers(options =>
+ {
options.Filters.Add(new ActionFilter());
});
var serviceProvider = services.BuildServiceProvider();
- ActionFilter.LoggerError = serviceProvider.GetRequiredService<ILogger<ActionFilter>>();
+ ActionFilter.LoggerError =
+ serviceProvider.GetRequiredService<ILogger<ActionFilter>>();
+
#endregion
}
@@ -108,6 +113,5 @@
//////////////////////////
///////////////////////////
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3