From 1498516cb98d75e8f0dcbbfe232f2a0f1ff00c9b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 29 十月 2024 12:45:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs |  262 ++++++++++++++++++++++++++--------------------------
 1 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
index 880eabc..2846cc4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
@@ -1,218 +1,218 @@
 锘縰sing System;
 using System.Collections.Generic;
-
+using System.Linq;
+ 
 namespace MES.Service.Modes
 {
     /// <summary>
-    /// </summary>
+    /// 
+    ///</summary>
+
     public class MesInvItemArn
     {
         /// <summary>
-        ///     涓婚敭
-        /// </summary>
+        /// 涓婚敭 
+        ///</summary>
+
         public Guid? Guid { get; set; }
-
         /// <summary>
-        ///     ID(SEQ_INV_ID)
-        /// </summary>
+        /// ID(SEQ_INV_ID) 
+        ///</summary>
+
         public int Id { get; set; }
-
         /// <summary>
-        ///     鍒拌揣鍗曞彿
-        /// </summary>
+        /// 鍒拌揣鍗曞彿 
+        ///</summary>
+
         public string BillNo { get; set; }
-
         /// <summary>
-        ///     鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
-        ///     榛樿鍊�: ((0))
-        /// </summary>
+        /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴 
+        /// 榛樿鍊�: ((0))
+        ///</summary>
+
         public int? Status { get; set; }
-
         /// <summary>
-        ///     鍘熷洜
-        /// </summary>
+        /// 鍘熷洜 
+        ///</summary>
+
         public string Reason { get; set; }
-
         /// <summary>
-        ///     鍒涘缓浜�
-        /// </summary>
+        /// 鍒涘缓浜� 
+        ///</summary>
+
         public string CreateBy { get; set; }
-
         /// <summary>
-        ///     鍒涘缓鏃堕棿
-        /// </summary>
+        /// 鍒涘缓鏃堕棿 
+        ///</summary>
+
         public DateTime? CreateDate { get; set; }
-
         /// <summary>
-        ///     鏈�鍚庢洿鏂颁汉
-        /// </summary>
+        /// 鏈�鍚庢洿鏂颁汉 
+        ///</summary>
+
         public string LastupdateBy { get; set; }
-
         /// <summary>
-        ///     鏈�鍚庢洿鏂版椂闂�
-        /// </summary>
+        /// 鏈�鍚庢洿鏂版椂闂� 
+        ///</summary>
+
         public DateTime? LastupdateDate { get; set; }
-
         /// <summary>
-        ///     鍗曟嵁绫诲瀷ID
-        /// </summary>
+        /// 鍗曟嵁绫诲瀷ID 
+        ///</summary>
+
         public int? BillTypeId { get; set; }
-
         /// <summary>
-        ///     浜嬪姟绫诲瀷ID
-        /// </summary>
+        /// 浜嬪姟绫诲瀷ID 
+        ///</summary>
+
         public int? TransactionId { get; set; }
-
         /// <summary>
-        ///     澶囨敞
-        /// </summary>
+        /// 澶囨敞 
+        ///</summary>
+
         public string Remark { get; set; }
-
         /// <summary>
-        ///     閫佽揣鍗曞彿
-        /// </summary>
+        /// 閫佽揣鍗曞彿 
+        ///</summary>
+
         public string PaperBillNo { get; set; }
-
         /// <summary>
-        ///     閫�鏂欎汉宸ュ彿
-        /// </summary>
+        /// 閫�鏂欎汉宸ュ彿 
+        ///</summary>
+
         public string UserNoBack { get; set; }
-
         /// <summary>
-        ///     鎻愪氦浜�
-        /// </summary>
+        /// 鎻愪氦浜� 
+        ///</summary>
+
         public string CheckUser { get; set; }
-
         /// <summary>
-        ///     鎻愪氦鏃ユ湡
-        /// </summary>
+        /// 鎻愪氦鏃ユ湡 
+        ///</summary>
+
         public DateTime? CheckDate { get; set; }
-
         /// <summary>
-        ///     鍏ュ簱鏃ユ湡
-        /// </summary>
+        /// 鍏ュ簱鏃ユ湡 
+        ///</summary>
+
         public DateTime? InsDate { get; set; }
-
         /// <summary>
-        ///     妫�楠岀粨鏋�
-        /// </summary>
+        /// 妫�楠岀粨鏋� 
+        ///</summary>
+
         public string CheckRes { get; set; }
-
         /// <summary>
-        ///     宸叉崱鏁伴噺
-        /// </summary>
+        /// 宸叉崱鏁伴噺 
+        ///</summary>
+
         public int? CheckQty { get; set; }
-
         /// <summary>
-        ///     浠撳簱缂栫爜
-        /// </summary>
+        /// 浠撳簱缂栫爜 
+        ///</summary>
+
         public string DepotsCode { get; set; }
-
         /// <summary>
-        ///     浜嬪姟绫诲瀷缂栫爜
-        /// </summary>
+        /// 浜嬪姟绫诲瀷缂栫爜 
+        ///</summary>
+
         public string TransctionNo { get; set; }
-
         /// <summary>
-        ///     渚涘簲鍟嗙紪鐮�
-        /// </summary>
+        /// 渚涘簲鍟嗙紪鐮� 
+        ///</summary>
+
         public string SuppNo { get; set; }
-
         /// <summary>
-        ///     鎻愪氦鐘舵��
-        ///     榛樿鍊�: ((0))
-        /// </summary>
+        /// 鎻愪氦鐘舵�� 
+        /// 榛樿鍊�: ((0))
+        ///</summary>
+
         public int? Fstatus { get; set; }
-
         /// <summary>
-        ///     宸ュ巶缂栫爜
-        /// </summary>
+        /// 宸ュ巶缂栫爜 
+        ///</summary>
+
         public string Factory { get; set; }
-
         /// <summary>
-        ///     鏄惁宸插洖鍐橲AP
-        ///     榛樿鍊�: ((0))
-        /// </summary>
+        /// 鏄惁宸插洖鍐橲AP 
+        /// 榛樿鍊�: ((0))
+        ///</summary>
+
         public int? Sapstatus { get; set; }
-
         /// <summary>
-        ///     纭鍏ュ簱鏃ユ湡
-        /// </summary>
-        public DateTime? Insdate { get; set; }
+        /// 鏄惁妫�楠� 
+        ///</summary>
 
+        public bool? Ischeck { get; set; }
         /// <summary>
-        ///     鏄惁妫�楠�
-        /// </summary>
-        public int? Ischeck { get; set; }
+        /// 瀹℃牳鍏ュ簱浜� 
+        ///</summary>
 
-        /// <summary>
-        ///     瀹℃牳鍏ュ簱浜�
-        /// </summary>
         public string Insby { get; set; }
-
         /// <summary>
-        ///     鍏徃浠g爜
-        /// </summary>
+        /// 鍏徃浠g爜 
+        ///</summary>
+
         public string Company { get; set; }
-
         /// <summary>
-        ///     鎬ユ枡鏍囪瘑
-        ///     榛樿鍊�: ((0))
-        /// </summary>
-        public int? UrgentFlag { get; set; }
+        /// 鎬ユ枡鏍囪瘑 
+        /// 榛樿鍊�: ((0))
+        ///</summary>
 
+        public bool? UrgentFlag { get; set; }
         /// <summary>
-        ///     鍐查攢浜嬪姟绫诲瀷缂栫爜
-        /// </summary>
+        /// 鍐查攢浜嬪姟绫诲瀷缂栫爜 
+        ///</summary>
+
         public int? MttransctionNo { get; set; }
-
         /// <summary>
-        ///     IQC妫�楠屽崟鍙�
-        /// </summary>
+        /// IQC妫�楠屽崟鍙� 
+        ///</summary>
+
         public string IqcReleaseNo { get; set; }
-
         /// <summary>
-        ///     鏄惁鏄剧ず
-        ///     榛樿鍊�: ((0))
-        /// </summary>
+        /// 鏄惁鏄剧ず 
+        /// 榛樿鍊�: ((0))
+        ///</summary>
+
         public int? IsVisual { get; set; }
-
         /// <summary>
-        ///     0=閲囪喘锛�1=濮斿
-        ///     榛樿鍊�: ((1))
-        /// </summary>
-        public int? FType { get; set; }
+        /// 0=閲囪喘锛�1=濮斿 
+        /// 榛樿鍊�: ((1))
+        ///</summary>
 
+        public bool? FType { get; set; }
         /// <summary>
-        ///     ERP鍒拌揣鍗旾D
-        /// </summary>
+        /// ERP鍒拌揣鍗旾D 
+        ///</summary>
+
         public string EbelnK3id { get; set; }
-
         /// <summary>
-        ///     鏉$爜鏉″嵃杩涘害
-        /// </summary>
+        /// 鏉$爜鏉″嵃杩涘害 
+        ///</summary>
+
         public int? BarcodeRatio { get; set; }
-
         /// <summary>
-        ///     ERP鍗曞彿
-        /// </summary>
+        /// ERP鍗曞彿 
+        ///</summary>
+
         public string Erpno { get; set; }
-
         /// <summary>
-        ///     鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
-        /// </summary>
+        /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐� 
+        ///</summary>
+
         public int? Thstatus { get; set; }
-
         /// <summary>
-        ///     ERP閫�璐у崟鍙�
-        /// </summary>
+        /// ERP閫�璐у崟鍙� 
+        ///</summary>
+
         public string Erpthno { get; set; }
-
         /// <summary>
-        ///     缁勭粐缂栫爜
-        /// </summary>
+        /// 缁勭粐缂栫爜 
+        ///</summary>
+
         public string OrganizeCode { get; set; }
 
-        public List<MesInvItemArnDetail> list { get; set; }
-    }
-}
\ No newline at end of file
+        ///
+        public List<MesInvItemArnDetail> list{get; set; }
+}
+}

--
Gitblit v1.9.3