From 049c1891f1dcede1fe81320992e61c34f661898b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 21 九月 2024 18:33:47 +0800
Subject: [PATCH] 成品入库检调整,消息中心的后台重写

---
 MES.Service/Modes/MesDepTaskInfo.cs                               |  448 +++---
 MES.Service/Modes/MesQaItemsDetectDetail12.cs                     |   74 
 MESApplication/Controllers/MesRfPrnbarcodeController.cs           |  301 ++--
 MES.Service/Modes/MesBarcodeType.cs                               |  320 ++--
 MES.Service/Modes/MesInvItemInCItems.cs                           |  184 +-
 MES.Service/Dto/service/RKJDaa001.cs                              |    5 
 MES.Service/Modes/Purdhb.cs                                       |  352 ++--
 MES.Service/Modes/MessageCenter.cs                                |    5 
 MES.Service/Modes/MesInvItemInCDetails2.cs                        |  358 +++++
 MES.Service/Modes/MesInvItemArn.cs                                |  304 ++--
 MES.Service/Modes/QsItemOqcReq.cs                                 |    6 
 MESApplication/Controllers/Base/MessageCenterController.cs        |   46 
 MES.Service/Modes/Purdka.cs                                       |  160 +-
 MES.Service/Modes/QsItemOqcItemDetail.cs                          |    2 
 MES.Service/Modes/MesQaIqc.cs                                     |   98 
 MES.Service/Modes/MesInvItemMoves.cs                              |  224 +-
 MES.Service/Modes/MesInvTransaction.cs                            |   96 
 MESApplication/Controllers/BasicData/ProductionOrderController.cs |    4 
 MES.Service/Modes/MesQaItemsDetect01.cs                           |  430 +++---
 MES.Service/service/QC/RKJService.cs                              |   32 
 MES.Service/Modes/MesQaItemsDetectDetail5.cs                      |  224 +-
 MES.Service/Modes/MesRfPrnbarcode.cs                              |    2 
 MES.Service/service/MessageCenterManager.cs                       |   39 
 MES.Service/service/MesRfPrnbarcodeManager.cs                     |   94 
 MES.Service/service/Warehouse/MesInvItemInCDetails2Manager.cs     |   10 
 MES.Service/Modes/LtsLlj.cs                                       |  198 +-
 MESApplication/Controllers/QC/RKJController.cs                    |    2 
 27 files changed, 2,240 insertions(+), 1,778 deletions(-)

diff --git a/MES.Service/Dto/service/RKJDaa001.cs b/MES.Service/Dto/service/RKJDaa001.cs
index b9cef94..9a33653 100644
--- a/MES.Service/Dto/service/RKJDaa001.cs
+++ b/MES.Service/Dto/service/RKJDaa001.cs
@@ -17,9 +17,8 @@
 
     [SugarColumn(ColumnName = "ITEM_SNAME")]
     public string? ItemName { get; set; }
-    
-    [SugarColumn(ColumnName = "LOT_NO")]
-    public string? LotNo { get; set; }
+
+    [SugarColumn(ColumnName = "LOT_NO")] public string? LotNo { get; set; }
 
     // 璁㈠崟鏁伴噺
     [SugarColumn(ColumnName = "QUANTITY")]
diff --git a/MES.Service/Modes/LtsLlj.cs b/MES.Service/Modes/LtsLlj.cs
index af75fde..03bf259 100644
--- a/MES.Service/Modes/LtsLlj.cs
+++ b/MES.Service/Modes/LtsLlj.cs
@@ -8,152 +8,152 @@
 [SugarTable("LTS_LLJ")]
 public class LtsLlj
 {
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "Id")]
+   /// <summary>
+   /// </summary>
+   [SugarColumn(ColumnName = "Id")]
     public decimal? Id { get; set; }
 
- /// <summary>
- ///     瀹℃牳鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_FLAG")]
+   /// <summary>
+   ///     瀹℃牳鏍囪瘑
+   /// </summary>
+   [SugarColumn(ColumnName = "MODIFY1_FLAG")]
     public decimal? Modify1Flag { get; set; }
 
- /// <summary>
- ///     閫佹鎵规
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO")]
+   /// <summary>
+   ///     閫佹鎵规
+   /// </summary>
+   [SugarColumn(ColumnName = "LOT_NO")]
     public string LotNo { get; set; }
 
- /// <summary>
- ///     澶勭悊鏂规硶
- /// </summary>
- [SugarColumn(ColumnName = "FNG_HANDLE")]
+   /// <summary>
+   ///     澶勭悊鏂规硶
+   /// </summary>
+   [SugarColumn(ColumnName = "FNG_HANDLE")]
     public string FngHandle { get; set; }
 
- /// <summary>
- ///     鐗╂枡鐗堟湰
- /// </summary>
- [SugarColumn(ColumnName = "FVERSION")]
+   /// <summary>
+   ///     鐗╂枡鐗堟湰
+   /// </summary>
+   [SugarColumn(ColumnName = "FVERSION")]
     public decimal? Fversion { get; set; }
 
- /// <summary>
- ///     澶囨敞淇℃伅
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO1")]
+   /// <summary>
+   ///     澶囨敞淇℃伅
+   /// </summary>
+   [SugarColumn(ColumnName = "LOT_NO1")]
     public string LotNo1 { get; set; }
 
- /// <summary>
- ///     杞崲鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FCOVERT_QTY")]
+   /// <summary>
+   ///     杞崲鏁伴噺
+   /// </summary>
+   [SugarColumn(ColumnName = "FCOVERT_QTY")]
     public string FcovertQty { get; set; }
 
- /// <summary>
- ///     妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
+   /// <summary>
+   ///     妫�楠岀粨鏋�
+   /// </summary>
+   [SugarColumn(ColumnName = "FCHECK_RESU")]
     public string FcheckResu { get; set; }
 
- /// <summary>
- ///     渚涘簲鍟嗙紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
+   /// <summary>
+   ///     渚涘簲鍟嗙紪鐮�
+   /// </summary>
+   [SugarColumn(ColumnName = "SUPP_NO")]
     public string SuppNo { get; set; }
 
- /// <summary>
- ///     妫�楠屽崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
+   /// <summary>
+   ///     妫�楠屽崟鍙�
+   /// </summary>
+   [SugarColumn(ColumnName = "RELEASE_NO")]
     public string ReleaseNo { get; set; }
 
- /// <summary>
- ///     閲囪喘鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FBATCH_QTY")]
+   /// <summary>
+   ///     閲囪喘鏁伴噺
+   /// </summary>
+   [SugarColumn(ColumnName = "FBATCH_QTY")]
     public string FbatchQty { get; set; }
 
- /// <summary>
- ///     鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
+   /// <summary>
+   ///     鐗╂枡缂栫爜
+   /// </summary>
+   [SugarColumn(ColumnName = "ITEM_NO")]
     public string ItemNo { get; set; }
 
- /// <summary>
- ///     妫�楠屼汉鍛�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_BY")]
+   /// <summary>
+   ///     妫�楠屼汉鍛�
+   /// </summary>
+   [SugarColumn(ColumnName = "FCHECK_BY")]
     public string FcheckBy { get; set; }
 
- /// <summary>
- ///     涓嶈壇鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "FNG_DESC")]
+   /// <summary>
+   ///     涓嶈壇鎻忚堪
+   /// </summary>
+   [SugarColumn(ColumnName = "FNG_DESC")]
     public string FngDesc { 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 string CreateDate { get; set; }
 
- /// <summary>
- ///     鏄惁鎬ユ枡
- /// </summary>
- [SugarColumn(ColumnName = "URGENT_FLAG")]
+   /// <summary>
+   ///     鏄惁鎬ユ枡
+   /// </summary>
+   [SugarColumn(ColumnName = "URGENT_FLAG")]
     public short? UrgentFlag { get; set; }
 
- /// <summary>
- ///     鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NAME")]
+   /// <summary>
+   ///     鐗╂枡鍚嶇О
+   /// </summary>
+   [SugarColumn(ColumnName = "ITEM_NAME")]
     public string ItemName { get; set; }
 
- /// <summary>
- ///     妫�楠岀被鍨�
- /// </summary>
- [SugarColumn(ColumnName = "QATYPE")]
+   /// <summary>
+   ///     妫�楠岀被鍨�
+   /// </summary>
+   [SugarColumn(ColumnName = "QATYPE")]
     public string Qatype { get; set; }
 
- /// <summary>
- ///     妫�楠屾棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "DATE_01")]
+   /// <summary>
+   ///     妫�楠屾棩鏈�
+   /// </summary>
+   [SugarColumn(ColumnName = "DATE_01")]
     public string Date01 { get; set; }
 
- /// <summary>
- ///     渚涘簲鍟嗗悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NAME")]
+   /// <summary>
+   ///     渚涘簲鍟嗗悕绉�
+   /// </summary>
+   [SugarColumn(ColumnName = "SUPP_NAME")]
     public string SuppName { get; set; }
 
- /// <summary>
- ///     鐗╂枡瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_MODEL")]
+   /// <summary>
+   ///     鐗╂枡瑙勬牸
+   /// </summary>
+   [SugarColumn(ColumnName = "ITEM_MODEL")]
     public string ItemModel { get; set; }
 
- /// <summary>
- ///     搴撳瓨鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "KC_QTY")]
+   /// <summary>
+   ///     搴撳瓨鏁伴噺
+   /// </summary>
+   [SugarColumn(ColumnName = "KC_QTY")]
     public decimal? KcQty { get; set; }
 
- /// <summary>
- ///     鍗曟嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
+   /// <summary>
+   ///     鍗曟嵁鐘舵��
+   /// </summary>
+   [SugarColumn(ColumnName = "STATUS")]
     public string STATUS { get; set; }
 
- /// <summary>
- ///     濮斿鏍囪瘑锛�0锛氶噰璐� 銆�1锛氬澶栵級
- /// </summary>
- [SugarColumn(ColumnName = "F_TYPE")]
+   /// <summary>
+   ///     濮斿鏍囪瘑锛�0锛氶噰璐� 銆�1锛氬澶栵級
+   /// </summary>
+   [SugarColumn(ColumnName = "F_TYPE")]
     public int Ftype { get; set; }
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/MesBarcodeType.cs b/MES.Service/Modes/MesBarcodeType.cs
index a48ca15..2a8c96a 100644
--- a/MES.Service/Modes/MesBarcodeType.cs
+++ b/MES.Service/Modes/MesBarcodeType.cs
@@ -8,243 +8,243 @@
 [SugarTable("MES_BARCODE_TYPE")]
 public class MesBarcodeType
 {
-   /// <summary>
-   ///     鏉$爜绫诲瀷ID(seq_me_id)
-   /// </summary>
-   [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ ///     鏉$爜绫诲瀷ID(seq_me_id)
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
     public decimal Id { get; set; }
 
-   /// <summary>
-   ///     浣跨敤鍦烘墍
-   /// </summary>
-   [SugarColumn(ColumnName = "USE_SITE")]
+ /// <summary>
+ ///     浣跨敤鍦烘墍
+ /// </summary>
+ [SugarColumn(ColumnName = "USE_SITE")]
     public string UseSite { get; set; }
 
-   /// <summary>
-   ///     鏉$爜绫诲瀷鍚嶇О
-   /// </summary>
-   [SugarColumn(ColumnName = "BARCODE_TYPE_NAME")]
+ /// <summary>
+ ///     鏉$爜绫诲瀷鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_TYPE_NAME")]
     public string BarcodeTypeName { get; set; }
 
-   /// <summary>
-   ///     鐮佸埗
-   /// </summary>
-   [SugarColumn(ColumnName = "CODE")]
+ /// <summary>
+ ///     鐮佸埗
+ /// </summary>
+ [SugarColumn(ColumnName = "CODE")]
     public string Code { get; set; }
 
-   /// <summary>
-   ///     鏉$爜绾稿
-   /// </summary>
-   [SugarColumn(ColumnName = "PAPER_WIDTH")]
+ /// <summary>
+ ///     鏉$爜绾稿
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_WIDTH")]
     public decimal? PaperWidth { get; set; }
 
-   /// <summary>
-   ///     鏉$爜绾搁珮
-   /// </summary>
-   [SugarColumn(ColumnName = "PAPER_HEIGHT")]
+ /// <summary>
+ ///     鏉$爜绾搁珮
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_HEIGHT")]
     public decimal? PaperHeight { get; set; }
 
-   /// <summary>
-   ///     鏉$爜寮�濮嬩綅缃甔
-   /// </summary>
-   [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_X")]
+ /// <summary>
+ ///     鏉$爜寮�濮嬩綅缃甔
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_X")]
     public decimal? BarcodeBeginPositionX { get; set; }
 
-   /// <summary>
-   ///     鏉$爜寮�濮嬩綅缃甕
-   /// </summary>
-   [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_Y")]
+ /// <summary>
+ ///     鏉$爜寮�濮嬩綅缃甕
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_Y")]
     public decimal? BarcodeBeginPositionY { get; set; }
 
-   /// <summary>
-   ///     涓�寮犳潯鐮佺焊涓婃潯鐮佷釜鏁�
-   /// </summary>
-   [SugarColumn(ColumnName = "PAPER_NUM")]
+ /// <summary>
+ ///     涓�寮犳潯鐮佺焊涓婃潯鐮佷釜鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_NUM")]
     public decimal? PaperNum { get; set; }
 
-   /// <summary>
-   ///     涓�寮犳潯鐮佺焊涓婃瘡琛屾潯鐮佷釜鏁�
-   /// </summary>
-   [SugarColumn(ColumnName = "PAPER_ROW_NUM")]
+ /// <summary>
+ ///     涓�寮犳潯鐮佺焊涓婃瘡琛屾潯鐮佷釜鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_ROW_NUM")]
     public decimal? PaperRowNum { get; set; }
 
-   /// <summary>
-   ///     涓�寮犳潯鐮佺焊涓婃潯鐮佸垪鏁�
-   /// </summary>
-   [SugarColumn(ColumnName = "PAPER_COLUMN_NUM")]
+ /// <summary>
+ ///     涓�寮犳潯鐮佺焊涓婃潯鐮佸垪鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_COLUMN_NUM")]
     public decimal? PaperColumnNum { get; set; }
 
-   /// <summary>
-   ///     鏉$爜娴佹按鍙峰惊鐜被鍨�(鎺у埗鏉$爜娴佹按鍙�)
-   /// </summary>
-   [SugarColumn(ColumnName = "CYCLE_TYPE")]
+ /// <summary>
+ ///     鏉$爜娴佹按鍙峰惊鐜被鍨�(鎺у埗鏉$爜娴佹按鍙�)
+ /// </summary>
+ [SugarColumn(ColumnName = "CYCLE_TYPE")]
     public string CycleType { get; set; }
 
-   /// <summary>
-   ///     鏄惁鏈夋晥(0-鏃犳晥,1-鏈夋晥)
-   /// </summary>
-   [SugarColumn(ColumnName = "AVAILABLE_FLAG")]
+ /// <summary>
+ ///     鏄惁鏈夋晥(0-鏃犳晥,1-鏈夋晥)
+ /// </summary>
+ [SugarColumn(ColumnName = "AVAILABLE_FLAG")]
     public decimal? AvailableFlag { get; set; }
 
-   /// <summary>
-   ///     鏉$爜楂樺害
-   /// </summary>
-   [SugarColumn(ColumnName = "BARCODE_HEIGHT")]
+ /// <summary>
+ ///     鏉$爜楂樺害
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_HEIGHT")]
     public decimal? BarcodeHeight { get; set; }
 
-   /// <summary>
-   ///     鏉$爜瀛椾綋鏂瑰悜
-   /// </summary>
-   [SugarColumn(ColumnName = "BARCODE_ORIENTATION")]
+ /// <summary>
+ ///     鏉$爜瀛椾綋鏂瑰悜
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_ORIENTATION")]
     public string BarcodeOrientation { get; set; }
 
-   /// <summary>
-   ///     鏉$爜鎵撳嵃娉ㄩ噴琛�(1-鎵撳嵃锛�0-涓嶆墦鍗�)
-   /// </summary>
-   [SugarColumn(ColumnName = "BARCODE_INTERPRETATION")]
+ /// <summary>
+ ///     鏉$爜鎵撳嵃娉ㄩ噴琛�(1-鎵撳嵃锛�0-涓嶆墦鍗�)
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_INTERPRETATION")]
     public decimal? BarcodeInterpretation { get; set; }
 
-   /// <summary>
-   ///     鏉$爜鎵撳嵃娉ㄩ噴琛屾墦鍦ㄦ潯鐮佷笂鏂�(1-鎵撳嵃鍦ㄦ潯鐮佷笂鏂癸紝0-涓嶆墦鍗板湪鏉$爜涓婃柟)
-   /// </summary>
-   [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ABOVE")]
+ /// <summary>
+ ///     鏉$爜鎵撳嵃娉ㄩ噴琛屾墦鍦ㄦ潯鐮佷笂鏂�(1-鎵撳嵃鍦ㄦ潯鐮佷笂鏂癸紝0-涓嶆墦鍗板湪鏉$爜涓婃柟)
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ABOVE")]
     public decimal? BarcodeInterpretationAbove { 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 = "BARCODE_WIDTH")]
+ /// <summary>
+ ///     鏉$爜瀹藉害
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_WIDTH")]
     public decimal? BarcodeWidth { get; set; }
 
-   /// <summary>
-   ///     [鏀瑰彉鏉$爜榛樿鍙傛暟]妯″潡锛堢獎鏉★級瀹�
-   /// </summary>
-   [SugarColumn(ColumnName = "BY_W")]
+ /// <summary>
+ ///     [鏀瑰彉鏉$爜榛樿鍙傛暟]妯″潡锛堢獎鏉★級瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "BY_W")]
     public decimal? ByW { get; set; }
 
-   /// <summary>
-   ///     [鏀瑰彉鏉$爜榛樿鍙傛暟]瀹芥潯涓庣獎鏉$殑姣斾緥
-   /// </summary>
-   [SugarColumn(ColumnName = "BY_R")]
+ /// <summary>
+ ///     [鏀瑰彉鏉$爜榛樿鍙傛暟]瀹芥潯涓庣獎鏉$殑姣斾緥
+ /// </summary>
+ [SugarColumn(ColumnName = "BY_R")]
     public decimal? ByR { get; set; }
 
-   /// <summary>
-   ///     [鏀瑰彉鏉$爜榛樿鍙傛暟]鏉$爜楂樺害
-   /// </summary>
-   [SugarColumn(ColumnName = "BY_H")]
+ /// <summary>
+ ///     [鏀瑰彉鏉$爜榛樿鍙傛暟]鏉$爜楂樺害
+ /// </summary>
+ [SugarColumn(ColumnName = "BY_H")]
     public decimal? ByH { get; set; }
 
-   /// <summary>
-   ///     鐐规暟/姣背
-   /// </summary>
-   [SugarColumn(ColumnName = "JM")]
+ /// <summary>
+ ///     鐐规暟/姣背
+ /// </summary>
+ [SugarColumn(ColumnName = "JM")]
     public string Jm { get; set; }
 
-   /// <summary>
-   ///     铏氭嫙鏁版嵁鏍囧織(1-鏄紝0锛嶅惁)
-   /// </summary>
-   [SugarColumn(ColumnName = "JVM_DATA_FLAG")]
+ /// <summary>
+ ///     铏氭嫙鏁版嵁鏍囧織(1-鏄紝0锛嶅惁)
+ /// </summary>
+ [SugarColumn(ColumnName = "JVM_DATA_FLAG")]
     public decimal? JvmDataFlag { get; set; }
 
-   /// <summary>
-   ///     铏氭嫙鏁版嵁娴佹按鍙蜂綅鏁�
-   /// </summary>
-   [SugarColumn(ColumnName = "JVM_SERIAL_DIGIT")]
+ /// <summary>
+ ///     铏氭嫙鏁版嵁娴佹按鍙蜂綅鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "JVM_SERIAL_DIGIT")]
     public decimal? JvmSerialDigit { get; set; }
 
-   /// <summary>
-   ///     铏氭嫙鏁版嵁鏉$爜闀垮害
-   /// </summary>
-   [SugarColumn(ColumnName = "JVM_BARCODE_LENGTH")]
+ /// <summary>
+ ///     铏氭嫙鏁版嵁鏉$爜闀垮害
+ /// </summary>
+ [SugarColumn(ColumnName = "JVM_BARCODE_LENGTH")]
     public decimal? JvmBarcodeLength { get; set; }
 
-   /// <summary>
-   ///     鎵撳嵃鍛戒护
-   /// </summary>
-   [SugarColumn(ColumnName = "PRINT_COMMAND")]
+ /// <summary>
+ ///     鎵撳嵃鍛戒护
+ /// </summary>
+ [SugarColumn(ColumnName = "PRINT_COMMAND")]
     public string PrintCommand { get; set; }
 
-   /// <summary>
-   ///     鎵撳嵃鍛戒护寮�濮�
-   /// </summary>
-   [SugarColumn(ColumnName = "PRINT_COMMAND_BEGIN")]
+ /// <summary>
+ ///     鎵撳嵃鍛戒护寮�濮�
+ /// </summary>
+ [SugarColumn(ColumnName = "PRINT_COMMAND_BEGIN")]
     public string PrintCommandBegin { get; set; }
 
-   /// <summary>
-   ///     鎵撳嵃鍛戒护缁撴潫
-   /// </summary>
-   [SugarColumn(ColumnName = "PRINT_COMMAND_END")]
+ /// <summary>
+ ///     鎵撳嵃鍛戒护缁撴潫
+ /// </summary>
+ [SugarColumn(ColumnName = "PRINT_COMMAND_END")]
     public string PrintCommandEnd { get; set; }
 
-   /// <summary>
-   ///     鏉$爜娉ㄩ噴琛屾暟
-   /// </summary>
-   [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ROW")]
+ /// <summary>
+ ///     鏉$爜娉ㄩ噴琛屾暟
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ROW")]
     public decimal? BarcodeInterpretationRow { get; set; }
 
-   /// <summary>
-   ///     鏉$爜鍊煎甫鐗╂枡缂栫爜
-   /// </summary>
-   [SugarColumn(ColumnName = "BARCODE_ITEM")]
+ /// <summary>
+ ///     鏉$爜鍊煎甫鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_ITEM")]
     public decimal? BarcodeItem { get; set; }
 
-   /// <summary>
-   ///     鏉$爜绫诲瀷缂栫爜
-   /// </summary>
-   [SugarColumn(ColumnName = "TYPE_CODE")]
+ /// <summary>
+ ///     鏉$爜绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TYPE_CODE")]
     public decimal TypeCode { get; set; }
 
-   /// <summary>
-   ///     鏄惁浣跨敤
-   /// </summary>
-   [SugarColumn(ColumnName = "ISUSED")]
+ /// <summary>
+ ///     鏄惁浣跨敤
+ /// </summary>
+ [SugarColumn(ColumnName = "ISUSED")]
     public short? Isused { get; set; }
 
-   /// <summary>
-   ///     鎵撳嵃妯℃澘
-   /// </summary>
-   [SugarColumn(ColumnName = "MBTYPE")]
+ /// <summary>
+ ///     鎵撳嵃妯℃澘
+ /// </summary>
+ [SugarColumn(ColumnName = "MBTYPE")]
     public decimal? Mbtype { 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 = "ORDER_NUM")]
+ /// <summary>
+ ///     娴佹按鍙蜂綅鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "ORDER_NUM")]
     public decimal? OrderNum { get; set; }
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepTaskInfo.cs b/MES.Service/Modes/MesDepTaskInfo.cs
index f082e04..49b445b 100644
--- a/MES.Service/Modes/MesDepTaskInfo.cs
+++ b/MES.Service/Modes/MesDepTaskInfo.cs
@@ -8,339 +8,339 @@
 [SugarTable("MES_DEP_TASK_INFO")]
 public class MesDepTaskInfo
 {
-   /// <summary>
-   ///     閮ㄩ棬鐢熶骇璁㈠崟ID
-   /// </summary>
-   [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ ///     閮ㄩ棬鐢熶骇璁㈠崟ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
     public decimal Id { get; set; }
 
-   /// <summary>
-   ///     璁㈠崟缂栧彿
-   /// </summary>
-   [SugarColumn(ColumnName = "TASK_NO")]
+ /// <summary>
+ ///     璁㈠崟缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "TASK_NO")]
     public string TaskNo { get; set; }
 
-   /// <summary>
-   ///     ERP鐗╂枡缂栧彿
-   /// </summary>
-   [SugarColumn(ColumnName = "ERP_ITEM_NO")]
+ /// <summary>
+ ///     ERP鐗╂枡缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ITEM_NO")]
     public string ErpItemNo { get; set; }
 
-   /// <summary>
-   ///     宸ュ崟鏁伴噺
-   /// </summary>
-   [SugarColumn(ColumnName = "PLAN_QTY")]
+ /// <summary>
+ ///     宸ュ崟鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_QTY")]
     public decimal? PlanQty { get; set; }
 
-   /// <summary>
-   ///     宸茬敓浜ч噺
-   /// </summary>
-   [SugarColumn(ColumnName = "COMPLETE_QTY")]
+ /// <summary>
+ ///     宸茬敓浜ч噺
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPLETE_QTY")]
     public decimal? CompleteQty { get; set; }
 
-   /// <summary>
-   ///     澶囨崯鏁伴噺
-   /// </summary>
-   [SugarColumn(ColumnName = "BACKUP_QTY")]
+ /// <summary>
+ ///     澶囨崯鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "BACKUP_QTY")]
     public decimal? BackupQty { get; set; }
 
-   /// <summary>
-   ///     涓嬭浇鏃堕棿
-   /// </summary>
-   [SugarColumn(ColumnName = "DOWN_TIME")]
+ /// <summary>
+ ///     涓嬭浇鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "DOWN_TIME")]
     public DateTime? DownTime { get; set; }
 
-   /// <summary>
-   ///     璁″垝寮�濮嬫椂闂�
-   /// </summary>
-   [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")]
+ /// <summary>
+ ///     璁″垝寮�濮嬫椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")]
     public DateTime? PlanBeginTime { get; set; }
 
-   /// <summary>
-   ///     璁″垝缁撴潫鏃堕棿
-   /// </summary>
-   [SugarColumn(ColumnName = "PLAN_FINISH_TIME")]
+ /// <summary>
+ ///     璁″垝缁撴潫鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_FINISH_TIME")]
     public DateTime? PlanFinishTime { get; set; }
 
-   /// <summary>
-   ///     瀹為檯瀹屽伐鏃堕棿
-   /// </summary>
-   [SugarColumn(ColumnName = "REAL_FINISH_TIME")]
+ /// <summary>
+ ///     瀹為檯瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "REAL_FINISH_TIME")]
     public DateTime? RealFinishTime { get; set; }
 
-   /// <summary>
-   ///     鐢熶骇鐘舵��(寰呬骇\鐢熶骇\鎸傝捣\瀹屽伐)
-   /// </summary>
-   [SugarColumn(ColumnName = "PRODUCE_STATE")]
+ /// <summary>
+ ///     鐢熶骇鐘舵��(寰呬骇\鐢熶骇\鎸傝捣\瀹屽伐)
+ /// </summary>
+ [SugarColumn(ColumnName = "PRODUCE_STATE")]
     public string ProduceState { get; set; }
 
-   /// <summary>
-   ///     瀹為檯寮�宸ユ椂闂�
-   /// </summary>
-   [SugarColumn(ColumnName = "REAL_BEGIN_TIME")]
+ /// <summary>
+ ///     瀹為檯寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "REAL_BEGIN_TIME")]
     public DateTime? RealBeginTime { get; set; }
 
-   /// <summary>
-   ///     鏄惁鎸傝捣
-   /// </summary>
-   [SugarColumn(ColumnName = "HANG_UP")]
+ /// <summary>
+ ///     鏄惁鎸傝捣
+ /// </summary>
+ [SugarColumn(ColumnName = "HANG_UP")]
     public string HangUp { get; set; }
 
-   /// <summary>
-   ///     浠撳簱缂栧彿
-   /// </summary>
-   [SugarColumn(ColumnName = "DEPOT_CODE")]
+ /// <summary>
+ ///     浠撳簱缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
     public string DepotCode { get; set; }
 
-   /// <summary>
-   ///     鎶ュ簾鏁伴噺
-   /// </summary>
-   [SugarColumn(ColumnName = "DISCARD_QTY")]
+ /// <summary>
+ ///     鎶ュ簾鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DISCARD_QTY")]
     public decimal? DiscardQty { get; set; }
 
-   /// <summary>
-   ///     濮嬫敹鏂欐椂闂�
-   /// </summary>
-   [SugarColumn(ColumnName = "FIRST_ITEM_RECEIPT_TIME")]
+ /// <summary>
+ ///     濮嬫敹鏂欐椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "FIRST_ITEM_RECEIPT_TIME")]
     public DateTime? FirstItemReceiptTime { get; set; }
 
-   /// <summary>
-   ///     濮嬮綈鏂欐椂闂�
-   /// </summary>
-   [SugarColumn(ColumnName = "FIRST_ITEM_READY_TIME")]
+ /// <summary>
+ ///     濮嬮綈鏂欐椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "FIRST_ITEM_READY_TIME")]
     public DateTime? FirstItemReadyTime { get; set; }
 
-   /// <summary>
-   ///     瀹㈡埛缂栧彿
-   /// </summary>
-   [SugarColumn(ColumnName = "CUST_NO")]
+ /// <summary>
+ ///     瀹㈡埛缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_NO")]
     public string CustNo { get; set; }
 
-   /// <summary>
-   ///     鍑鸿揣鍖呰鏂瑰紡
-   /// </summary>
-   [SugarColumn(ColumnName = "PACK_SHIP_TYPE")]
+ /// <summary>
+ ///     鍑鸿揣鍖呰鏂瑰紡
+ /// </summary>
+ [SugarColumn(ColumnName = "PACK_SHIP_TYPE")]
     public string PackShipType { get; set; }
 
-   /// <summary>
-   ///     鍖呰娉ㄦ剰浜嬮」
-   /// </summary>
-   [SugarColumn(ColumnName = "PACK_SHIP_MEMO")]
+ /// <summary>
+ ///     鍖呰娉ㄦ剰浜嬮」
+ /// </summary>
+ [SugarColumn(ColumnName = "PACK_SHIP_MEMO")]
     public string PackShipMemo { get; set; }
 
-   /// <summary>
-   ///     鏄惁宸叉帓浜�
-   /// </summary>
-   [SugarColumn(ColumnName = "ISSCHEME")]
+ /// <summary>
+ ///     鏄惁宸叉帓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSCHEME")]
     public short? Isscheme { get; set; }
 
-   /// <summary>
-   ///     鏉$爜绫诲瀷ID
-   /// </summary>
-   [SugarColumn(ColumnName = "BARCODE_TYPE_ID")]
+ /// <summary>
+ ///     鏉$爜绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_TYPE_ID")]
     public decimal? BarcodeTypeId { get; set; }
 
-   /// <summary>
-   ///     鍙戝竷鐘舵��
-   /// </summary>
-   [SugarColumn(ColumnName = "ISSUE_STATUS")]
+ /// <summary>
+ ///     鍙戝竷鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSUE_STATUS")]
     public short? IssueStatus { get; set; }
 
-   /// <summary>
-   ///     鐘舵�侊紙0=鎺掍骇鏈彂甯冦��1=鎺掍骇宸插彂甯冦��2=宸查鏂欍��3=宸茬敓浜с��4=鏆傚仠銆�8=宸插畬宸ャ��9=寮傚父锛�
-   /// </summary>
-   [SugarColumn(ColumnName = "FLAG")]
+ /// <summary>
+ ///     鐘舵�侊紙0=鎺掍骇鏈彂甯冦��1=鎺掍骇宸插彂甯冦��2=宸查鏂欍��3=宸茬敓浜с��4=鏆傚仠銆�8=宸插畬宸ャ��9=寮傚父锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FLAG")]
     public short? Flag { get; set; }
 
-   /// <summary>
-   ///     棰嗘枡鏃堕棿
-   /// </summary>
-   [SugarColumn(ColumnName = "MAT_DATE")]
+ /// <summary>
+ ///     棰嗘枡鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "MAT_DATE")]
     public DateTime? MatDate { get; set; }
 
-   /// <summary>
-   ///     宸ヤ綔涓績
-   /// </summary>
-   [SugarColumn(ColumnName = "WORKCENTER_NO")]
+ /// <summary>
+ ///     宸ヤ綔涓績
+ /// </summary>
+ [SugarColumn(ColumnName = "WORKCENTER_NO")]
     public string WorkcenterNo { get; set; }
 
-   /// <summary>
-   ///     宸蹭笅杞借鍗曟爣璇哬-宸蹭笅杞�,N-鏈笅杞�
-   /// </summary>
-   [SugarColumn(ColumnName = "DOWN_FLAG")]
+ /// <summary>
+ ///     宸蹭笅杞借鍗曟爣璇哬-宸蹭笅杞�,N-鏈笅杞�
+ /// </summary>
+ [SugarColumn(ColumnName = "DOWN_FLAG")]
     public short? DownFlag { get; set; }
 
-   /// <summary>
-   ///     鐜繚浠g爜
-   /// </summary>
-   [SugarColumn(ColumnName = "ROHSE_CODE")]
+ /// <summary>
+ ///     鐜繚浠g爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ROHSE_CODE")]
     public string RohseCode { get; set; }
 
-   /// <summary>
-   ///     瀹㈡埛PO
-   /// </summary>
-   [SugarColumn(ColumnName = "CUST_PO")]
+ /// <summary>
+ ///     瀹㈡埛PO
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_PO")]
     public string CustPo { get; set; }
 
-   /// <summary>
-   ///     瀹㈡埛鍨嬪彿
-   /// </summary>
-   [SugarColumn(ColumnName = "CUST_STYLE")]
+ /// <summary>
+ ///     瀹㈡埛鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_STYLE")]
     public string CustStyle { get; set; }
 
-   /// <summary>
-   ///     浜у搧鎵撳嵃鍥哄畾鍊�
-   /// </summary>
-   [SugarColumn(ColumnName = "PROC_PRINT_VALUE")]
+ /// <summary>
+ ///     浜у搧鎵撳嵃鍥哄畾鍊�
+ /// </summary>
+ [SugarColumn(ColumnName = "PROC_PRINT_VALUE")]
     public string ProcPrintValue { 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 = "MEMO")]
+ /// <summary>
+ ///     澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "MEMO")]
     public string Memo { get; set; }
 
-   /// <summary>
-   ///     瀹℃壒鐘舵��
-   /// </summary>
-   [SugarColumn(ColumnName = "FCHECK_STATUS")]
+ /// <summary>
+ ///     瀹℃壒鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_STATUS")]
     public string FcheckStatus { get; set; }
 
-   /// <summary>
-   ///     瀹℃牳浜�
-   /// </summary>
-   [SugarColumn(ColumnName = "FCHECK_BY")]
+ /// <summary>
+ ///     瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_BY")]
     public string FcheckBy { get; set; }
 
-   /// <summary>
-   ///     瀹℃牳鏃ユ湡
-   /// </summary>
-   [SugarColumn(ColumnName = "FCHECK_DATE")]
+ /// <summary>
+ ///     瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_DATE")]
     public DateTime? FcheckDate { 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 = "DATA_FROM")]
+ /// <summary>
+ ///     鏁版嵁鏉ユ簮
+ /// </summary>
+ [SugarColumn(ColumnName = "DATA_FROM")]
     public string DataFrom { get; set; }
 
-   /// <summary>
-   ///     鐢熶骇璁㈠崟琛ㄥごID
-   /// </summary>
-   [SugarColumn(ColumnName = "MOID")]
+ /// <summary>
+ ///     鐢熶骇璁㈠崟琛ㄥごID
+ /// </summary>
+ [SugarColumn(ColumnName = "MOID")]
     public decimal? Moid { get; set; }
 
-   /// <summary>
-   ///     鐗╂枡ID
-   /// </summary>
-   [SugarColumn(ColumnName = "PARTID")]
+ /// <summary>
+ ///     鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "PARTID")]
     public decimal? Partid { get; set; }
 
-   /// <summary>
-   ///     ERP宸ュ崟鐘舵�� 鐘舵�侊紙NA-寮�绔�/FM-閿佸畾/OP-瀹℃牳/CL-鍏抽棴锛�
-   /// </summary>
-   [SugarColumn(ColumnName = "STATUS")]
+ /// <summary>
+ ///     ERP宸ュ崟鐘舵�� 鐘舵�侊紙NA-寮�绔�/FM-閿佸畾/OP-瀹℃牳/CL-鍏抽棴锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
     public string Status { get; set; }
 
-   /// <summary>
-   ///     鐢熶骇宸ュ崟
-   /// </summary>
-   [SugarColumn(ColumnName = "MOCODE")]
+ /// <summary>
+ ///     鐢熶骇宸ュ崟
+ /// </summary>
+ [SugarColumn(ColumnName = "MOCODE")]
     public string Mocode { get; set; }
 
-   /// <summary>
-   ///     鍒涘缓鏃ユ湡
-   /// </summary>
-   [SugarColumn(ColumnName = "CREATEDATE")]
+ /// <summary>
+ ///     鍒涘缓鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATEDATE")]
     public DateTime? Createdate { get; set; }
 
-   /// <summary>
-   ///     棰滆壊
-   /// </summary>
-   [SugarColumn(ColumnName = "COLOR_NAME")]
+ /// <summary>
+ ///     棰滆壊
+ /// </summary>
+ [SugarColumn(ColumnName = "COLOR_NAME")]
     public string ColorName { get; set; }
 
-   /// <summary>
-   ///     鍏抽棴鏃堕棿
-   /// </summary>
-   [SugarColumn(ColumnName = "CLOSETIME")]
+ /// <summary>
+ ///     鍏抽棴鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSETIME")]
     public DateTime? Closetime { get; set; }
 
-   /// <summary>
-   ///     鐗╂枡缂栧彿
-   /// </summary>
-   [SugarColumn(ColumnName = "ITEM_NO")]
+ /// <summary>
+ ///     鐗╂枡缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
     public string ItemNo { get; set; }
 
-   /// <summary>
-   ///     浠庤〃ID
-   /// </summary>
-   [SugarColumn(ColumnName = "MODID")]
+ /// <summary>
+ ///     浠庤〃ID
+ /// </summary>
+ [SugarColumn(ColumnName = "MODID")]
     public decimal? Modid { get; set; }
 
-   /// <summary>
-   ///     鏈�鏂颁笅杞芥洿鏂版爣璇�
-   /// </summary>
-   [SugarColumn(ColumnName = "UPDATE_FLG")]
+ /// <summary>
+ ///     鏈�鏂颁笅杞芥洿鏂版爣璇�
+ /// </summary>
+ [SugarColumn(ColumnName = "UPDATE_FLG")]
     public decimal? UpdateFlg { get; set; }
 
-   /// <summary>
-   ///     鐢熶骇宸ュ崟琛屽彿
-   /// </summary>
-   [SugarColumn(ColumnName = "MOCODE_LINE")]
+ /// <summary>
+ ///     鐢熶骇宸ュ崟琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "MOCODE_LINE")]
     public decimal? MocodeLine { get; set; }
 
-   /// <summary>
-   ///     涓濆嵃鎬绘暟
-   /// </summary>
-   [SugarColumn(ColumnName = "SILK_QTY")]
+ /// <summary>
+ ///     涓濆嵃鎬绘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "SILK_QTY")]
     public decimal? SilkQty { get; set; }
 
-   /// <summary>
-   ///     涓濆嵃鍗曚环
-   /// </summary>
-   [SugarColumn(ColumnName = "SILK_PRICE")]
+ /// <summary>
+ ///     涓濆嵃鍗曚环
+ /// </summary>
+ [SugarColumn(ColumnName = "SILK_PRICE")]
     public decimal? SilkPrice { get; set; }
 
-   /// <summary>
-   ///     鐗╂枡ID
-   /// </summary>
-   [SugarColumn(ColumnName = "ITEM_ID")]
+ /// <summary>
+ ///     鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
     public decimal? ItemId { get; set; }
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemArn.cs b/MES.Service/Modes/MesInvItemArn.cs
index 518f09f..bf0d207 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/MesInvItemInCDetails2.cs b/MES.Service/Modes/MesInvItemInCDetails2.cs
new file mode 100644
index 0000000..885ec20
--- /dev/null
+++ b/MES.Service/Modes/MesInvItemInCDetails2.cs
@@ -0,0 +1,358 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+///     鐗╂枡鎴愬搧鍏ュ簱鐢宠鏉$爜鏄庣粏
+/// </summary>
+[SugarTable("MES_INV_ITEM_IN_C_DETAILS2")]
+public class MesInvItemInCDetails2
+{
+ /// <summary>
+ ///     SEQ_OUT
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+    public decimal Id { get; set; }
+
+ /// <summary>
+ ///     鍏ュ簱鍗昳d
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)]
+    public decimal ItemInId { get; set; }
+
+ /// <summary>
+ ///     鐗╂枡鏉$爜PSN
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE")]
+    public string ItemBarcode { get; set; }
+
+ /// <summary>
+ ///     瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級
+ /// </summary>
+ [SugarColumn(ColumnName = "C_ITEM_CODE")]
+    public string CItemCode { get; set; }
+
+ /// <summary>
+ ///     瀹㈡埛鐗╂枡鏉$爜
+ /// </summary>
+ [SugarColumn(ColumnName = "C_ITEM_BARCODE")]
+    public string CItemBarcode { get; set; }
+
+ /// <summary>
+ ///     楠屾敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "QUANTITY")]
+    public decimal? Quantity { get; set; }
+
+ /// <summary>
+ ///     鍏ュ簱鏂瑰紡(1:鏈夋潯鐮�,0:鏃犳潯鐮�)
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_FLAG")]
+    public short? BarcodeFlag { get; set; }
+
+ /// <summary>
+ ///     鐜繚鏍囧織锛�0-闈炵幆淇�,1-鐜繚.鏃犳潯鐮佹墜宸ュ綍鍏ワ紝鏈夋潯鐮佷负鍐椾綑瀛楁锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "EP_FLAG")]
+    public short? EpFlag { get; set; }
+
+ /// <summary>
+ ///     鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
+    public string CreateBy { get; set; }
+
+ /// <summary>
+ ///     鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+    public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ ///     鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+    public string LastupdateBy { get; set; }
+
+ /// <summary>
+ ///     鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+    public DateTime? LastupdateDate { get; set; }
+
+ /// <summary>
+ ///     浣滀笟鏂瑰紡0-鏈夌嚎鏉$爜鏋�1-鏃犵嚎鏉$爜鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_TYPE")]
+    public decimal? WorkType { get; set; }
+
+ /// <summary>
+ ///     鏈徃鐗╂枡缂栫爜锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+    public string ItemNo { get; set; }
+
+ /// <summary>
+ ///     鍘傚鎵规
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
+    public string LotNo { get; set; }
+
+ /// <summary>
+ ///     鏄惁鍏辩鐗╂枡(0:鍚︼紝1:鏄�)
+ /// </summary>
+ [SugarColumn(ColumnName = "COMANAGEMENT_FLAG")]
+    public short? ComanagementFlag { get; set; }
+
+ /// <summary>
+ ///     瀹㈡埛缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_NO")]
+    public string CustNo { get; set; }
+
+ /// <summary>
+ ///     妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_RES")]
+    public string CheckRes { get; set; }
+
+ /// <summary>
+ ///     杩涜揣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QTY")]
+    public decimal? CheckQty { get; set; }
+
+ /// <summary>
+ ///     妫�楠岀姸鎬�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_STATES")]
+    public string CheckStates { get; set; }
+
+ /// <summary>
+ ///     寮哄埗鍏ュ簱鏍囪0鏃狅紝1-寮哄埗鍏ュ簱  閫�鏂欏崟浣跨敤
+ /// </summary>
+ [SugarColumn(ColumnName = "FORCE_IN_FLAG")]
+    public short? ForceInFlag { 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>
+ ///     鐗硅浜嬮」
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
+    public string Remark { get; set; }
+
+ /// <summary>
+ ///     鐗╂枡鏉$爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE2")]
+    public string ItemBarcode2 { get; set; }
+
+ /// <summary>
+ ///     鏂版潯鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE3")]
+    public string ItemBarcode3 { get; set; }
+
+ /// <summary>
+ ///     浣跨敤鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "USE_QTY")]
+    public decimal? UseQty { get; set; }
+
+ /// <summary>
+ ///     棰嗘枡鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_QTY")]
+    public decimal? OutQty { get; set; }
+
+ /// <summary>
+ ///     鐗╂枡绠�绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_SNAME")]
+    public string ItemSname { get; set; }
+
+ /// <summary>
+ ///     妗d綅浣庡��
+ /// </summary>
+ [SugarColumn(ColumnName = "SPOSTION")]
+    public decimal? Spostion { get; set; }
+
+ /// <summary>
+ ///     妗d綅楂樺��
+ /// </summary>
+ [SugarColumn(ColumnName = "EPOSTION")]
+    public decimal? Epostion { get; set; }
+
+ /// <summary>
+ ///     妫�楠屾棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_DATE")]
+    public DateTime? CheckDate { get; set; }
+
+ /// <summary>
+ ///     鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "UNIT")]
+    public string Unit { get; set; }
+
+ /// <summary>
+ ///     鏄惁妫�楠�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISCHECK")]
+    public decimal? Ischeck { get; set; }
+
+ /// <summary>
+ ///     閲囪喘璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN")]
+    public string Ebeln { get; set; }
+
+ /// <summary>
+ ///     鐢熶骇鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_DATE")]
+    public string LotDate { get; set; }
+
+ /// <summary>
+ ///     鍏ュ簱鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+    public string BillNo { get; set; }
+
+ /// <summary>
+ ///     鍏ュ簱瀹℃牳鏍囧織
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCK_OK")]
+    public short? StockOk { get; set; }
+
+ /// <summary>
+ ///     鍒嗗巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
+    public string Factory { get; set; }
+
+ /// <summary>
+ ///     鍏徃浠g爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
+    public string Company { get; set; }
+
+ /// <summary>
+ ///     鍗℃澘缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "CB_NO")]
+    public string CbNo { get; set; }
+
+ /// <summary>
+ ///     绠卞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BOX_NO")]
+    public string BoxNo { get; set; }
+
+ /// <summary>
+ ///     浠撳簱ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_ID")]
+    public decimal? DepotId { get; set; }
+
+ /// <summary>
+ ///     璐т綅ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_SECTION_ID")]
+    public decimal? DepotSectionId { get; set; }
+
+ /// <summary>
+ ///     琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_NUM")]
+    public string LineNum { get; set; }
+
+ /// <summary>
+ ///     鎵爜鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "SM_QTY")]
+    public decimal? SmQty { get; set; }
+
+ /// <summary>
+ ///     閿�鍞鍗�
+ /// </summary>
+ [SugarColumn(ColumnName = "VGBEL")]
+    public string Vgbel { get; set; }
+
+ /// <summary>
+ ///     閿�鍞鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "KDPOS")]
+    public decimal? Kdpos { get; set; }
+
+ /// <summary>
+ ///     浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
+    public string WorkNo { get; set; }
+
+ /// <summary>
+ ///     琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_LINE_NO")]
+    public decimal? EbelnLineNo { get; set; }
+
+ /// <summary>
+ ///     鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CBILL_NO")]
+    public string CbillNo { get; set; }
+
+ /// <summary>
+ ///     鎬ユ枡鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "URGENT_FLAG")]
+    public decimal? UrgentFlag { get; set; }
+
+ /// <summary>
+ ///     浜у搧鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_STYLE")]
+    public string BoardStyle { get; set; }
+
+ /// <summary>
+ ///     浠诲姟鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_LINE")]
+    public decimal? WorkLine { get; set; }
+
+ /// <summary>
+ ///     鐢熶骇宸ュ崟
+ /// </summary>
+ [SugarColumn(ColumnName = "TASK_NO")]
+    public string TaskNo { get; set; }
+
+ /// <summary>
+ ///     渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
+    public string SuppNo { get; set; }
+
+ /// <summary>
+ ///     浠诲姟姹囨姤鍗�
+ /// </summary>
+ [SugarColumn(ColumnName = "RBILL_NO")]
+    public string RbillNo { get; set; }
+
+ /// <summary>
+ ///     鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+    public decimal? ItemId { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemInCItems.cs b/MES.Service/Modes/MesInvItemInCItems.cs
index 05e3293..9c3eb27 100644
--- a/MES.Service/Modes/MesInvItemInCItems.cs
+++ b/MES.Service/Modes/MesInvItemInCItems.cs
@@ -8,141 +8,141 @@
 [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; }
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemMoves.cs b/MES.Service/Modes/MesInvItemMoves.cs
index b65928e..07b4ba6 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/MesInvTransaction.cs b/MES.Service/Modes/MesInvTransaction.cs
index 6b3aeae..635c014 100644
--- a/MES.Service/Modes/MesInvTransaction.cs
+++ b/MES.Service/Modes/MesInvTransaction.cs
@@ -8,75 +8,75 @@
 [SugarTable("MES_INV_TRANSACTION")]
 public class MesInvTransaction
 {
-   /// <summary>
-   ///     ID
-   /// </summary>
-   [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ ///     ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
     public decimal Id { get; set; }
 
-   /// <summary>
-   ///     浜嬪姟绫诲瀷
-   /// </summary>
-   [SugarColumn(ColumnName = "TRANSACTION_NAME")]
+ /// <summary>
+ ///     浜嬪姟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_NAME")]
     public string TransactionName { get; set; }
 
-   /// <summary>
-   ///     澶囨敞
-   /// </summary>
-   [SugarColumn(ColumnName = "REMARK")]
+ /// <summary>
+ ///     澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
     public string Remark { 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 = "BUSINESS_ID")]
+ /// <summary>
+ ///     鍗曟嵁ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BUSINESS_ID")]
     public decimal? BusinessId { 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>
-   ///     浜嬪姟缂栫爜
-   /// </summary>
-   [SugarColumn(ColumnName = "TRANSACTION_NO")]
+ /// <summary>
+ ///     浜嬪姟缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_NO")]
     public decimal? TransactionNo { 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; }
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaIqc.cs b/MES.Service/Modes/MesQaIqc.cs
index ea15cee..ec5db13 100644
--- a/MES.Service/Modes/MesQaIqc.cs
+++ b/MES.Service/Modes/MesQaIqc.cs
@@ -8,78 +8,78 @@
 [SugarTable("Mes_Qa_Iqc")]
 public class MesQaIqc
 {
- /// <summary>
- ///     鎺ユ敹姘村钩
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
+   /// <summary>
+   ///     鎺ユ敹姘村钩
+   /// </summary>
+   [SugarColumn(ColumnName = "ITEM_NO")]
     public string ItemNo { 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 = "FCHECK_TOOL")]
+   /// <summary>
+   ///     妫�楠屽伐鍏�
+   /// </summary>
+   [SugarColumn(ColumnName = "FCHECK_TOOL")]
     public string FcheckTool { get; set; }
 
- /// <summary>
- ///     涓嬮檺
- /// </summary>
- [SugarColumn(ColumnName = "FDOWN_ALLOW")]
+   /// <summary>
+   ///     涓嬮檺
+   /// </summary>
+   [SugarColumn(ColumnName = "FDOWN_ALLOW")]
     public string FdownAllow { get; set; }
 
- /// <summary>
- ///     妫�楠屾按骞�
- /// </summary>
- [SugarColumn(ColumnName = "FREQUENCY")]
+   /// <summary>
+   ///     妫�楠屾按骞�
+   /// </summary>
+   [SugarColumn(ColumnName = "FREQUENCY")]
     public string FREQUENCY { get; set; }
 
- /// <summary>
- ///     鏍囧噯
- /// </summary>
- [SugarColumn(ColumnName = "FSTAND")]
+   /// <summary>
+   ///     鏍囧噯
+   /// </summary>
+   [SugarColumn(ColumnName = "FSTAND")]
     public string FSTAND { get; set; }
 
- /// <summary>
- ///     涓婇檺
- /// </summary>
- [SugarColumn(ColumnName = "FUP_ALLOW")]
+   /// <summary>
+   ///     涓婇檺
+   /// </summary>
+   [SugarColumn(ColumnName = "FUP_ALLOW")]
     public string FupAllow { 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 = "FSPEC_REQU")]
+   /// <summary>
+   ///     瑙勬牸瑕佹眰
+   /// </summary>
+   [SugarColumn(ColumnName = "FSPEC_REQU")]
     public string FspecRequ { get; set; }
 
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ISENABLED")]
+   /// <summary>
+   /// </summary>
+   [SugarColumn(ColumnName = "ISENABLED")]
     public short? ISENABLED { get; set; }
 
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "EE")]
+   /// <summary>
+   /// </summary>
+   [SugarColumn(ColumnName = "EE")]
     public short? EE { get; set; }
 
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FTYPE")]
+   /// <summary>
+   /// </summary>
+   [SugarColumn(ColumnName = "FTYPE")]
     public string FTYPE { get; set; }
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaItemsDetect01.cs b/MES.Service/Modes/MesQaItemsDetect01.cs
index 4a0b0f4..5b71b9b 100644
--- a/MES.Service/Modes/MesQaItemsDetect01.cs
+++ b/MES.Service/Modes/MesQaItemsDetect01.cs
@@ -8,330 +8,330 @@
 [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>
- ///     涓嶈壇鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "Remarks")]
+   /// <summary>
+   ///     涓嶈壇鎻忚堪
+   /// </summary>
+   [SugarColumn(ColumnName = "Remarks")]
     public string Remarks { get; set; }
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaItemsDetectDetail12.cs b/MES.Service/Modes/MesQaItemsDetectDetail12.cs
index 9632891..fd3eb0f 100644
--- a/MES.Service/Modes/MesQaItemsDetectDetail12.cs
+++ b/MES.Service/Modes/MesQaItemsDetectDetail12.cs
@@ -8,64 +8,64 @@
 [SugarTable("MES_QA_ITEMS_DETECT_DETAIL12")]
 public class MesQaItemsDetectDetail12
 {
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_QM_ID",
+   /// <summary>
+   /// </summary>
+   [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_QM_ID",
         IsPrimaryKey = true)]
     public decimal Id { get; set; }
 
- /// <summary>
- ///     妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
+   /// <summary>
+   ///     妫�楠岀粨鏋�
+   /// </summary>
+   [SugarColumn(ColumnName = "FCHECK_RESU")]
     public string? FcheckResu { get; set; }
 
- /// <summary>
- ///     妫�楠岄」鐩�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM")]
+   /// <summary>
+   ///     妫�楠岄」鐩�
+   /// </summary>
+   [SugarColumn(ColumnName = "FCHECK_ITEM")]
     public string? FcheckItem { get; set; }
 
- /// <summary>
- ///     妫�楠屽崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
+   /// <summary>
+   ///     妫�楠屽崟鍙�
+   /// </summary>
+   [SugarColumn(ColumnName = "RELEASE_NO")]
     public string? ReleaseNo { get; set; }
 
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "MAIN_ID")]
+   /// <summary>
+   /// </summary>
+   [SugarColumn(ColumnName = "MAIN_ID")]
     public decimal? MainId { get; set; }
 
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+   /// <summary>
+   /// </summary>
+   [SugarColumn(ColumnName = "CREATE_DATE")]
     public DateTime? CreateDate { 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 = "FSTAND")]
+   /// <summary>
+   /// </summary>
+   [SugarColumn(ColumnName = "FSTAND")]
     public string? Fstand { get; set; }
 
- /// <summary>
- ///     鐢熸垚浜�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+   /// <summary>
+   ///     鐢熸垚浜�
+   /// </summary>
+   [SugarColumn(ColumnName = "LASTUPDATE_BY")]
     public string? LastupdateBy { get; set; }
 
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
+   /// <summary>
+   /// </summary>
+   [SugarColumn(ColumnName = "CREATE_BY")]
     public string? CreateBy { get; set; }
 
     [SugarColumn(IsIgnore = true)] public int? count { get; set; }
diff --git a/MES.Service/Modes/MesQaItemsDetectDetail5.cs b/MES.Service/Modes/MesQaItemsDetectDetail5.cs
index 0aa4263..0d62d6b 100644
--- a/MES.Service/Modes/MesQaItemsDetectDetail5.cs
+++ b/MES.Service/Modes/MesQaItemsDetectDetail5.cs
@@ -9,176 +9,176 @@
 [SugarTable("MES_QA_ITEMS_DETECT_DETAIL5")]
 public class MesQaItemsDetectDetail5
 {
- /// <summary>
- /// </summary>
- [Column("ID")]
+   /// <summary>
+   /// </summary>
+   [Column("ID")]
     [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_QM_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 string? 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; }
 
- /// <summary>
- ///     涓嶈壇鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
+   /// <summary>
+   ///     涓嶈壇鎻忚堪
+   /// </summary>
+   [SugarColumn(ColumnName = "REMARKS")]
     public string? Remarks { get; set; }
 
     [SugarColumn(IsIgnore = true)] public int? Unqualified { get; set; }
diff --git a/MES.Service/Modes/MesRfPrnbarcode.cs b/MES.Service/Modes/MesRfPrnbarcode.cs
index 5ccb354..f443bd1 100644
--- a/MES.Service/Modes/MesRfPrnbarcode.cs
+++ b/MES.Service/Modes/MesRfPrnbarcode.cs
@@ -11,7 +11,7 @@
     /// <summary>
     ///     ID
     /// </summary>
-    [SugarColumn(ColumnName = "ID",IsPrimaryKey = true)]
+    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
     public decimal? Id { get; set; }
 
     /// <summary>
diff --git a/MES.Service/Modes/MessageCenter.cs b/MES.Service/Modes/MessageCenter.cs
index de26f7e..ba99ad6 100644
--- a/MES.Service/Modes/MessageCenter.cs
+++ b/MES.Service/Modes/MessageCenter.cs
@@ -1,11 +1,12 @@
-锘縰sing SqlSugar;
+锘縰sing MES.Service.Dto.@base;
+using SqlSugar;
 
 namespace MES.Service.Modes;
 
 /// <summary>
 /// </summary>
 [SugarTable("MESSAGE_CENTER")]
-public class MessageCenter
+public class MessageCenter : Page
 {
     /// <summary>
     ///     瀵瑰簲搴忓垪SEQ_MSG
diff --git a/MES.Service/Modes/Purdhb.cs b/MES.Service/Modes/Purdhb.cs
index 7fff6ee..b8de0cc 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 1c3ea40..4330c13 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/QsItemOqcItemDetail.cs b/MES.Service/Modes/QsItemOqcItemDetail.cs
index c0e169d..b661544 100644
--- a/MES.Service/Modes/QsItemOqcItemDetail.cs
+++ b/MES.Service/Modes/QsItemOqcItemDetail.cs
@@ -84,4 +84,6 @@
     public string? Remarks { get; set; }
 
     [SugarColumn(IsIgnore = true)] public int? count { get; set; }
+
+    [SugarColumn(IsIgnore = true)] public decimal? ItemInId { get; set; }
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/QsItemOqcReq.cs b/MES.Service/Modes/QsItemOqcReq.cs
index b1fb7b6..bcab676 100644
--- a/MES.Service/Modes/QsItemOqcReq.cs
+++ b/MES.Service/Modes/QsItemOqcReq.cs
@@ -124,10 +124,6 @@
 
     [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
 
-    [SugarColumn(IsIgnore = true)] public string? TaskNo { get; set; }
-
-    [SugarColumn(IsIgnore = true)] public string? CbillNo { get; set; }
-
     [SugarColumn(IsIgnore = true)] public string? Dab001 { get; set; }
 
     [SugarColumn(IsIgnore = true)] public string? Daa015 { get; set; }
@@ -135,4 +131,6 @@
     [SugarColumn(IsIgnore = true)] public string? LineNo { get; set; }
 
     [SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; }
+
+    [SugarColumn(IsIgnore = true)] public decimal? ItemInId { get; set; }
 }
\ No newline at end of file
diff --git a/MES.Service/service/MesRfPrnbarcodeManager.cs b/MES.Service/service/MesRfPrnbarcodeManager.cs
index c88a84e..986a814 100644
--- a/MES.Service/service/MesRfPrnbarcodeManager.cs
+++ b/MES.Service/service/MesRfPrnbarcodeManager.cs
@@ -1,78 +1,78 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
 using MES.Service.Modes;
+using SqlSugar;
 
-namespace MES.Service.service
-{
+namespace MES.Service.service;
+
 public class MesRfPrnbarcodeManager : Repository<MesRfPrnbarcode>
 {
- 
     //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
 
     //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesRfPrnbarcodeManager.cs
 
 
     #region 鏁欏鏂规硶
+
     /// <summary>
-    /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠g爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
+    ///     浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠g爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
     /// </summary>
     public void Study()
     {
-	     
-	   /*********鏌ヨ*********/
+        /*********鏌ヨ*********/
 
-        var data1 = base.GetById(1);//鏍规嵁ID鏌ヨ
-        var data2 = base.GetList();//鏌ヨ鎵�鏈�
-        var data3 = base.GetList(it => 1 == 1);  //鏍规嵁鏉′欢鏌ヨ  
+        var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
+        var data2 = base.GetList(); //鏌ヨ鎵�鏈�
+        var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ  
         //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
 
-        var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 鍒嗛〉鏌ヨ
+        var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
         var data5 = base.GetPageList(it => 1 == 1, p);
-        Console.Write(p.TotalCount);//杩斿洖鎬绘暟
+        Console.Write(p.TotalCount); //杩斿洖鎬绘暟
 
-        var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 鍒嗛〉鏌ヨ鍔犳帓搴�
-        Console.Write(p.TotalCount);//杩斿洖鎬绘暟
-     
-        List<IConditionalModel> conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
-        conModels.Add(new ConditionalModel() { FieldName= typeof(MesRfPrnbarcode).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
-        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
+        var data6 =
+            base.GetPageList(it => 1 == 1, p,
+                it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
+        Console.Write(p.TotalCount); //杩斿洖鎬绘暟
 
-        base.AsQueryable().Where(x => 1 == 1).ToList();//鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+        var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
+        conModels.Add(new ConditionalModel
+        {
+            FieldName = typeof(MesRfPrnbarcode).GetProperties()[0].Name,
+            ConditionalType = ConditionalType.Equal, FieldValue = "1"
+        }); //id=1
+        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
 
- 
+        AsQueryable().Where(x => 1 == 1)
+            .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+
 
         /*********鎻掑叆*********/
-        var insertData = new MesRfPrnbarcode() { };//娴嬭瘯鍙傛暟
-        var insertArray = new MesRfPrnbarcode[] { insertData };
-        base.Insert(insertData);//鎻掑叆
-        base.InsertRange(insertArray);//鎵归噺鎻掑叆
-        var id = base.InsertReturnIdentity(insertData);//鎻掑叆杩斿洖鑷鍒�
-        base.AsInsertable(insertData).ExecuteCommand();//鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
+        var insertData = new MesRfPrnbarcode(); //娴嬭瘯鍙傛暟
+        var insertArray = new[] { insertData };
+        base.Insert(insertData); //鎻掑叆
+        base.InsertRange(insertArray); //鎵归噺鎻掑叆
+        var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
+        AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
 
 
-
-		/*********鏇存柊*********/
-	    var updateData = new MesRfPrnbarcode() {  };//娴嬭瘯鍙傛暟
-        var updateArray = new MesRfPrnbarcode[] { updateData };//娴嬭瘯鍙傛暟
-        base.Update(updateData);//鏍规嵁瀹炰綋鏇存柊
-        base.UpdateRange(updateArray);//鎵归噺鏇存柊
+        /*********鏇存柊*********/
+        var updateData = new MesRfPrnbarcode(); //娴嬭瘯鍙傛暟
+        var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
+        base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
+        base.UpdateRange(updateArray); //鎵归噺鏇存柊
         //base.Update(it => new MesRfPrnbarcode() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
-        base.AsUpdateable(updateData).ExecuteCommand();  //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+        AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
 
 
+        /*********鍒犻櫎*********/
+        var deldata = new MesRfPrnbarcode(); //娴嬭瘯鍙傛暟
+        base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
+        base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
+        base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
+        base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
+        AsDeleteable().Where(it => 1 == 2)
+            .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+    }
 
-		/*********鍒犻櫎*********/
-	    var deldata = new MesRfPrnbarcode() {  };//娴嬭瘯鍙傛暟
-        base.Delete(deldata);//鏍规嵁瀹炰綋鍒犻櫎
-        base.DeleteById(1);//鏍规嵁涓婚敭鍒犻櫎
-        base.DeleteById(new int[] { 1,2});//鏍规嵁涓婚敭鏁扮粍鍒犻櫎
-        base.Delete(it=>1==2);//鏍规嵁鏉′欢鍒犻櫎
-        base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
-    } 
     #endregion
-
- 
- }
 }
\ No newline at end of file
diff --git a/MES.Service/service/MessageCenterManager.cs b/MES.Service/service/MessageCenterManager.cs
index b377f2d..6f322c6 100644
--- a/MES.Service/service/MessageCenterManager.cs
+++ b/MES.Service/service/MessageCenterManager.cs
@@ -8,17 +8,50 @@
 {
     //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
 
-    public List<MessageCenter> GetPushFailedPage(MessageCenter query)
+    public (List<MessageCenter> item, int TotalCount) GetPushFailedPage(
+        MessageCenter query)
+    {
+        var totalCount = IsShow(query);
+
+        //璁$畻鍒嗛〉鍙傛暟
+        var startRow = (query.PageIndex - 1) * query.Limit + 1;
+        var endRow = query.PageIndex * query.Limit;
+
+        var sql = string.Format(
+            "SELECT * FROM (SELECT \"ID\",\"TABLE_NAME\",\"URL\",\"METHOD\",\"DATA\",\"RESULT\",\"RESULT_DATA\",\"STATUS\",\"CREATE_BY\",\"CREATE_DATE\",\"TITLE\",\"PAGE_NAME\",\"DEAL_WITH\",\"PID\",\"SEQ\",\"ROUTE\",\"CONTENT_TYPE\",\"IS_MESSAGE\",\"UPDATE_BY\",\"UPDATE_DATE\", ROW_NUMBER() OVER (ORDER BY DEAL_WITH) AS RowIndex\n      FROM (SELECT \"ID\",\"TABLE_NAME\",\"URL\",\"METHOD\",\"DATA\",\"RESULT\",\"RESULT_DATA\",\"STATUS\",\"CREATE_BY\",\"CREATE_DATE\",\"TITLE\",\"PAGE_NAME\",\"DEAL_WITH\",\"PID\",\"SEQ\",\"ROUTE\",\"CONTENT_TYPE\",\"IS_MESSAGE\",\"UPDATE_BY\",\"UPDATE_DATE\" FROM MESSAGE_CENTER WHERE RESULT = 0 AND SEQ = 1 AND TITLE IS NOT NULL ORDER BY CREATE_DATE DESC)) T WHERE RowIndex BETWEEN {0} AND {1} ",
+            startRow, endRow);
+
+        var messageCenters =
+            Db.Ado.SqlQuery<MessageCenter>(sql);
+
+        return (messageCenters, totalCount);
+    }
+
+    //鏌ョ湅鏄惁鏈夋湭澶勭悊鐨勬秷鎭�
+    public int IsShow(MessageCenter query)
     {
         return Context.Queryable<MessageCenter>()
             .Where(it =>
                 it.Result == 0 && it.Status == 1 &&
                 it.Seq == 1 && it.Title != null)
             .WhereIF(query.isShow == 1, it => it.DealWith == 0)
-            .OrderByDescending(it => it.CreateDate)
-            .ToPageList(1, 20);
+            .Count();
     }
 
+
+    //灏嗘秷鎭缃负宸茶鐨�
+    public int UpdateRead(MessageCenter query)
+    {
+        return Db.Updateable<MessageCenter>()
+            .SetColumns(s => s.DealWith == 1)
+            .SetColumns(s => s.UpdateBy == query.UpdateBy)
+            .SetColumns(s =>
+                s.UpdateDate == DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))
+            .Where(s => s.Id == query.Id)
+            .ExecuteCommand();
+    }
+
+
     public int save(MessageCenter entity)
     {
         entity.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 3f2b5b6..b77c146 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -132,6 +132,8 @@
                     break;
             }
 
+            if (string.IsNullOrEmpty(LEV)) throw new Exception("妫�楠屾按骞崇淮鎶ょ殑涓嶆纭�");
+
             var sql =
                 "SELECT " + LEV +
                 " FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL2 B ON B.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO='" +
@@ -140,9 +142,13 @@
 
             var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
 
+            if (string.IsNullOrEmpty(maxBillNo))
+                throw new Exception("娌℃湁" + quantity + "杩欎釜鑼冨洿鐨勬娊鏍峰熀鍑�");
 
             var result = ExtractSubstring(item.FacLevel, '(', ')');
 
+            if (string.IsNullOrEmpty(result))
+                throw new Exception("缁存姢鐨勬帴鏀舵按骞充笉姝g‘锛屽簲璇ユ槸0.010---(AQL_0_0010)鍍忚繖鏍风殑");
 
             sql = "SELECT FSAMPLE_SIZE_WORD, " + result +
                   " Result FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL3 C ON C.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO= '" +
@@ -402,9 +408,9 @@
                 .ExecuteCommand();
         });
 
-        if (FcheckResu.Equals("涓嶅悎鏍�"))
-            //鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥
-            saveDetect02(detail.Gid, detail.CreateBy);
+        // if (FcheckResu.Equals("涓嶅悎鏍�"))
+        //     //鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥
+        //     saveDetect02(detail.Gid, detail.CreateBy);
 
         return useTransactionWithOracle;
     }
@@ -454,11 +460,12 @@
     }
 
 
-    public (List<QsItemOqcReq> items, int TotalCount) getPage(XJPageResult queryObj)
+    public (List<QsItemOqcReq> items, int TotalCount) getPage(
+        XJPageResult queryObj)
     {
         var db = SqlSugarHelper.GetInstance();
-        
-        int totalCount = 0;
+
+        var totalCount = 0;
 
         var qsItemOqcReqs = db
             .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
@@ -498,12 +505,13 @@
                 ItemName = b.ItemName,
                 ItemModel = b.ItemModel,
                 Dab001 = m.LotNo,
+                ItemInId = m.ItemInId,
                 Daa015 = da.Daa015,
                 LineNo = c.LineNo,
                 Quantity = m.Quantity
             })
             .OrderBy(a => a.CreateDate, OrderByType.Desc)
-            .ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
+            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
 
         return (qsItemOqcReqs, totalCount);
     }
@@ -568,6 +576,8 @@
 
     public int UpdateQSItemDetail(QsItemOqcItemDetail detail)
     {
+        if (isRk(detail.ItemInId)) throw new Exception("宸叉湁鏉$爜鍏ュ簱锛屼笉鍏佽淇敼妫�楠岀粨鏋�");
+
         var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
         {
             return db.Updateable<QsItemOqcItemDetail>()
@@ -588,6 +598,14 @@
         return withOracle;
     }
 
+    //淇敼缁撴灉鍓嶉獙璇佹槸鍚﹀叆搴�
+    private bool isRk(decimal? ItemInId)
+    {
+        var db = SqlSugarHelper.GetInstance();
+        return db.Queryable<MesInvItemInCDetails>()
+            .Where(s => s.ItemInId == ItemInId).Count() > 0;
+    }
+
 
     //涓昏〃淇敼澶囨敞瀛楁
     public int saveRemarksGid(RKJDto dto)
diff --git a/MES.Service/service/Warehouse/MesInvItemInCDetails2Manager.cs b/MES.Service/service/Warehouse/MesInvItemInCDetails2Manager.cs
new file mode 100644
index 0000000..248aee9
--- /dev/null
+++ b/MES.Service/service/Warehouse/MesInvItemInCDetails2Manager.cs
@@ -0,0 +1,10 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Modes;
+
+namespace MES.Service.service.Warehouse;
+
+public class
+    MesInvItemInCDetails2Manager : Repository<MesInvItemInCDetails2>
+{
+    //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Base/MessageCenterController.cs b/MESApplication/Controllers/Base/MessageCenterController.cs
index 529df7f..3b2e28a 100644
--- a/MESApplication/Controllers/Base/MessageCenterController.cs
+++ b/MESApplication/Controllers/Base/MessageCenterController.cs
@@ -109,7 +109,51 @@
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            resultInfos.tbBillList = m.GetPushFailedPage(query);
+            var (item, totalCount) = m.GetPushFailedPage(query);
+            resultInfos.tbBillList = item;
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos,
+                TotalCount = totalCount
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+    //IsShow
+    [HttpPost("IsShow")]
+    public ResponseResult IsShow(MessageCenter query)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.IsShow(query);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+    //UpdateRead
+    [HttpPost("UpdateRead")]
+    public ResponseResult UpdateRead(MessageCenter query)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.UpdateRead(query);
             return new ResponseResult
             {
                 status = 0,
diff --git a/MESApplication/Controllers/BasicData/ProductionOrderController.cs b/MESApplication/Controllers/BasicData/ProductionOrderController.cs
index 1fc9e5b..88aa88f 100644
--- a/MESApplication/Controllers/BasicData/ProductionOrderController.cs
+++ b/MESApplication/Controllers/BasicData/ProductionOrderController.cs
@@ -15,14 +15,14 @@
 {
     private readonly MessageCenterManager _manager = new();
 
+    private readonly ProductionOrderManager m = new();
+
     private readonly string METHOD = "POST";
 
     private readonly string TableName = "PRODUCTION_ORDER";
 
     private readonly string URL =
         "http://localhost:10054/api/PRODUCTION_ORDER/";
-
-    private readonly ProductionOrderManager m = new();
 
     //
     [HttpPost("Save")]
diff --git a/MESApplication/Controllers/MesRfPrnbarcodeController.cs b/MESApplication/Controllers/MesRfPrnbarcodeController.cs
index 6079721..3fca51a 100644
--- a/MESApplication/Controllers/MesRfPrnbarcodeController.cs
+++ b/MESApplication/Controllers/MesRfPrnbarcodeController.cs
@@ -1,163 +1,162 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using System.Dynamic;
+锘縰sing System.Dynamic;
 using MES.Service.Modes;
 using MES.Service.service;
 using MES.Service.util;
+using Microsoft.AspNetCore.Mvc;
 
-namespace MESApplication.Controllers
+namespace MESApplication.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+public class MesRfPrnbarcodeController : ControllerBase
 {
-    [ApiController]
-    [Route("api/[controller]")]
-    public class MesRfPrnbarcodeController : ControllerBase
+    private readonly MesRfPrnbarcodeManager m = new();
+
+
+    /***杩涘叆妯$増绠$悊鍙互淇敼妯$増***/
+
+    /// <summary>
+    ///     鑾峰彇鎵�鏈�
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("GetList")]
+    public ResponseResult GetList()
     {
-        
-        private MesRfPrnbarcodeManager m = new MesRfPrnbarcodeManager();
-
-
-        /***杩涘叆妯$増绠$悊鍙互淇敼妯$増***/
-
-        /// <summary>
-        /// 鑾峰彇鎵�鏈�
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("GetList")]
-        public ResponseResult GetList()
+        try
         {
-            try
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.GetList();
+            return new ResponseResult
             {
-                dynamic resultInfos = new ExpandoObject();
-                resultInfos.tbBillList = m.GetList();
-                return new ResponseResult
-                {
-                    status = 0,
-                    message = "OK",
-                    data = resultInfos
-                };
-            }
-            catch (Exception ex)
-            {
-                return ResponseResult.ResponseError(ex);
-            }
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
         }
-
-
-        /// <summary>
-        /// 鏍规嵁涓婚敭鑾峰彇
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("GetById")]
-        public ResponseResult GetById(int id)
+        catch (Exception ex)
         {
-            try
-            {
-                dynamic resultInfos = new ExpandoObject();
-                resultInfos.tbBillList = m.GetById(id);
-                return new ResponseResult
-                {
-                    status = 0,
-                    message = "OK",
-                    data = resultInfos
-                };
-            }
-            catch (Exception ex)
-            {
-                return ResponseResult.ResponseError(ex);
-            }
-        }
-
-        /// <summary>
-        /// 鏍规嵁涓婚敭鍒犻櫎
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("DeleteByIds")]
-        public ResponseResult DeleteByIds([FromBody] object[] ids)
-        {
-            try
-            {
-                dynamic resultInfos = new ExpandoObject();
-                resultInfos.tbBillList = m.DeleteByIds(ids);
-                return new ResponseResult
-                {
-                    status = 0,
-                    message = "OK",
-                    data = resultInfos
-                };
-            }
-            catch (Exception ex)
-            {
-                return ResponseResult.ResponseError(ex);
-            }
-        }
-
-        /// <summary>
-        /// 娣诲姞 
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("Insert")]
-        public ResponseResult Add([FromBody] MesRfPrnbarcode data)
-        {
-            try
-            {
-                dynamic resultInfos = new ExpandoObject();
-                resultInfos.tbBillList = m.Insert(data);
-                return new ResponseResult
-                {
-                    status = 0,
-                    message = "OK",
-                    data = resultInfos
-                };
-            }
-            catch (Exception ex)
-            {
-                return ResponseResult.ResponseError(ex);
-            }
-        }
-        /// <summary>
-        /// 娣诲姞杩斿洖鑷
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("InsertReturnIdentity")]
-        public ResponseResult InsertReturnIdentity([FromBody] MesRfPrnbarcode data)
-        {
-            try
-            {
-                dynamic resultInfos = new ExpandoObject();
-                resultInfos.tbBillList = m.InsertReturnIdentity(data);
-                return new ResponseResult
-                {
-                    status = 0,
-                    message = "OK",
-                    data = resultInfos
-                };
-            }
-            catch (Exception ex)
-            {
-                return ResponseResult.ResponseError(ex);
-            }
-        }
-
-        /// <summary>
-        /// 淇敼
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("Update")]
-        public ResponseResult Update([FromBody] MesRfPrnbarcode data)
-        {
-            try
-            {
-                dynamic resultInfos = new ExpandoObject();
-                resultInfos.tbBillList = m.Update(data);
-                return new ResponseResult
-                {
-                    status = 0,
-                    message = "OK",
-                    data = resultInfos
-                };
-            }
-            catch (Exception ex)
-            {
-                return ResponseResult.ResponseError(ex);
-            }
+            return ResponseResult.ResponseError(ex);
         }
     }
-}
+
+
+    /// <summary>
+    ///     鏍规嵁涓婚敭鑾峰彇
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("GetById")]
+    public ResponseResult GetById(int id)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.GetById(id);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+    /// <summary>
+    ///     鏍规嵁涓婚敭鍒犻櫎
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("DeleteByIds")]
+    public ResponseResult DeleteByIds([FromBody] object[] ids)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.DeleteByIds(ids);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+    /// <summary>
+    ///     娣诲姞
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("Insert")]
+    public ResponseResult Add([FromBody] MesRfPrnbarcode data)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.Insert(data);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+    /// <summary>
+    ///     娣诲姞杩斿洖鑷
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("InsertReturnIdentity")]
+    public ResponseResult InsertReturnIdentity([FromBody] MesRfPrnbarcode data)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.InsertReturnIdentity(data);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+    /// <summary>
+    ///     淇敼
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("Update")]
+    public ResponseResult Update([FromBody] MesRfPrnbarcode data)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.Update(data);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/RKJController.cs b/MESApplication/Controllers/QC/RKJController.cs
index dd683f6..a78c7e8 100644
--- a/MESApplication/Controllers/QC/RKJController.cs
+++ b/MESApplication/Controllers/QC/RKJController.cs
@@ -136,7 +136,7 @@
         {
             dynamic resultInfos = new ExpandoObject();
             var (items, totalCount) = new RKJService().getPage(queryObj);
-            var tbBillList =items;
+            var tbBillList = items;
             resultInfos.tbBillList = tbBillList;
             return new ResponseResult
             {

--
Gitblit v1.9.3