From 9ae9e3523c3c0e0e35e016e48db83cdfacd25b0b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 06 一月 2025 08:37:15 +0800
Subject: [PATCH] 采购退料

---
 entity/MesRohInData.cs                           |   80 ++--
 entity/TransferOut.cs                            |  254 +++++++++---------
 entity/MesInvItemIns.cs                          |  202 ++++++++------
 entity/MesInvItemArn.cs                          |  172 ++++++-----
 entity/MesInvItemInCDetails.cs                   |   13 
 entity/MesInvItemBarcodes.cs                     |   12 
 service/Warehouse/MesInvItemInCDetailsManager.cs |   24 +
 entity/MesRohIn.cs                               |   81 ++--
 8 files changed, 448 insertions(+), 390 deletions(-)

diff --git a/entity/MesInvItemArn.cs b/entity/MesInvItemArn.cs
index b87f1d5..b3bd8bb 100644
--- a/entity/MesInvItemArn.cs
+++ b/entity/MesInvItemArn.cs
@@ -8,240 +8,246 @@
 public class MesInvItemArn
 {
     /// <summary>
-    ///     涓婚敭
-    ///     榛樿鍊�: (newid())
-    /// </summary>
+    /// 涓婚敭 
+    /// 榛樿鍊�: (newid())
+    ///</summary>
     [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
     public Guid Guid { get; set; }
 
     /// <summary>
-    ///     鍒拌揣鍗曞彿
-    /// </summary>
+    /// 鍒拌揣鍗曞彿 
+    ///</summary>
     [SugarColumn(ColumnName = "bill_no")]
     public string? BillNo { get; set; }
 
     /// <summary>
-    ///     鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴 
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "status")]
     public int? Status { get; set; }
 
     /// <summary>
-    ///     鍘熷洜
-    /// </summary>
+    /// 鍘熷洜 
+    ///</summary>
     [SugarColumn(ColumnName = "reason")]
     public string? Reason { get; set; }
 
     /// <summary>
-    ///     鍒涘缓浜�
-    /// </summary>
+    /// 鍒涘缓浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "create_by")]
     public string? CreateBy { get; set; }
 
     /// <summary>
-    ///     鍒涘缓鏃堕棿
-    /// </summary>
+    /// 鍒涘缓鏃堕棿 
+    ///</summary>
     [SugarColumn(ColumnName = "create_date")]
     public DateTime? CreateDate { get; set; }
 
     /// <summary>
-    ///     鏈�鍚庢洿鏂颁汉
-    /// </summary>
+    /// 鏈�鍚庢洿鏂颁汉 
+    ///</summary>
     [SugarColumn(ColumnName = "lastupdate_by")]
     public string? LastupdateBy { get; set; }
 
     /// <summary>
-    ///     鏈�鍚庢洿鏂版椂闂�
-    /// </summary>
+    /// 鏈�鍚庢洿鏂版椂闂� 
+    ///</summary>
     [SugarColumn(ColumnName = "lastupdate_date")]
     public DateTime? LastupdateDate { get; set; }
 
     /// <summary>
-    ///     鍗曟嵁绫诲瀷ID
-    /// </summary>
+    /// 鍗曟嵁绫诲瀷ID 
+    ///</summary>
     [SugarColumn(ColumnName = "bill_type_id")]
     public int? BillTypeId { get; set; }
 
     /// <summary>
-    ///     浜嬪姟绫诲瀷ID
-    /// </summary>
+    /// 浜嬪姟绫诲瀷ID 
+    ///</summary>
     [SugarColumn(ColumnName = "transaction_id")]
     public int? TransactionId { get; set; }
 
     /// <summary>
-    ///     澶囨敞
-    /// </summary>
+    /// 澶囨敞 
+    ///</summary>
     [SugarColumn(ColumnName = "remark")]
     public string? Remark { get; set; }
 
     /// <summary>
-    ///     閫佽揣鍗曞彿
-    /// </summary>
+    /// 閫佽揣鍗曞彿 
+    ///</summary>
     [SugarColumn(ColumnName = "paper_bill_no")]
     public string? PaperBillNo { get; set; }
 
     /// <summary>
-    ///     閫�鏂欎汉宸ュ彿
-    /// </summary>
+    /// 閫�鏂欎汉宸ュ彿 
+    ///</summary>
     [SugarColumn(ColumnName = "user_no_back")]
     public string? UserNoBack { get; set; }
 
     /// <summary>
-    ///     鎻愪氦浜�
-    /// </summary>
+    /// 鎻愪氦浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "check_user")]
     public string? CheckUser { get; set; }
 
     /// <summary>
-    ///     鎻愪氦鏃ユ湡
-    /// </summary>
+    /// 鎻愪氦鏃ユ湡 
+    ///</summary>
     [SugarColumn(ColumnName = "check_date")]
     public DateTime? CheckDate { get; set; }
 
     /// <summary>
-    ///     鍏ュ簱鏃ユ湡
-    /// </summary>
+    /// 鍏ュ簱鏃ユ湡 
+    ///</summary>
     [SugarColumn(ColumnName = "ins_date")]
     public DateTime? InsDate { get; set; }
 
     /// <summary>
-    ///     妫�楠岀粨鏋�
-    /// </summary>
+    /// 妫�楠岀粨鏋� 
+    ///</summary>
     [SugarColumn(ColumnName = "check_res")]
     public string? CheckRes { get; set; }
 
     /// <summary>
-    ///     宸叉崱鏁伴噺
-    /// </summary>
+    /// 宸叉崱鏁伴噺 
+    ///</summary>
     [SugarColumn(ColumnName = "check_qty")]
     public int? CheckQty { get; set; }
 
     /// <summary>
-    ///     浠撳簱id
-    /// </summary>
+    /// 浠撳簱id 
+    ///</summary>
     [SugarColumn(ColumnName = "depots_id")]
     public string? DepotsId { get; set; }
 
     /// <summary>
-    ///     浜嬪姟绫诲瀷缂栫爜
-    /// </summary>
+    /// 浜嬪姟绫诲瀷缂栫爜 
+    ///</summary>
     [SugarColumn(ColumnName = "transction_no")]
     public string? TransctionNo { get; set; }
 
     /// <summary>
-    ///     渚涘簲鍟唅d
-    /// </summary>
+    /// 渚涘簲鍟唅d 
+    ///</summary>
     [SugarColumn(ColumnName = "supp_id")]
     public string? SuppId { get; set; }
 
     /// <summary>
-    ///     鎻愪氦鐘舵��
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    /// 鎻愪氦鐘舵�� 
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "fstatus")]
     public bool? Fstatus { get; set; }
 
     /// <summary>
-    ///     宸ュ巶缂栫爜
-    /// </summary>
+    /// 宸ュ巶缂栫爜 
+    ///</summary>
     [SugarColumn(ColumnName = "factory")]
     public string? Factory { get; set; }
 
     /// <summary>
-    ///     鏄惁宸插洖鍐橲AP
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    /// 鏄惁宸插洖鍐橲AP 
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "sapstatus")]
     public int? Sapstatus { get; set; }
 
     /// <summary>
-    ///     鏄惁妫�楠�
-    /// </summary>
+    /// 鏄惁妫�楠� 
+    ///</summary>
     [SugarColumn(ColumnName = "ischeck")]
     public bool? Ischeck { get; set; }
 
     /// <summary>
-    ///     瀹℃牳鍏ュ簱浜�
-    /// </summary>
+    /// 瀹℃牳鍏ュ簱浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "insby")]
     public string? Insby { get; set; }
 
     /// <summary>
-    ///     鍏徃浠ｇ爜
-    /// </summary>
+    /// 鍏徃浠ｇ爜 
+    ///</summary>
     [SugarColumn(ColumnName = "company")]
     public string? Company { get; set; }
 
     /// <summary>
-    ///     鎬ユ枡鏍囪瘑
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    /// 鎬ユ枡鏍囪瘑 
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "urgent_flag")]
     public bool? UrgentFlag { get; set; }
 
     /// <summary>
-    ///     鍐查攢浜嬪姟绫诲瀷缂栫爜
-    /// </summary>
+    /// 鍐查攢浜嬪姟绫诲瀷缂栫爜 
+    ///</summary>
     [SugarColumn(ColumnName = "mttransction_no")]
     public int? MttransctionNo { get; set; }
 
     /// <summary>
-    ///     IQC妫�楠屽崟鍙�
-    /// </summary>
+    /// IQC妫�楠屽崟鍙� 
+    ///</summary>
     [SugarColumn(ColumnName = "iqc_release_no")]
     public string? IqcReleaseNo { get; set; }
 
     /// <summary>
-    ///     鏄惁鏄剧ず
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    /// 鏄惁鏄剧ず 
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "is_visual")]
     public int? IsVisual { get; set; }
 
     /// <summary>
-    ///     0=閲囪喘锛�1=濮斿
-    ///     榛樿鍊�: ((1))
-    /// </summary>
+    /// 0=閲囪喘锛�1=濮斿 
+    /// 榛樿鍊�: ((1))
+    ///</summary>
     [SugarColumn(ColumnName = "f_type")]
     public bool? FType { get; set; }
 
     /// <summary>
-    ///     ERP鍒拌揣鍗旾D
-    /// </summary>
+    /// ERP鍒拌揣鍗旾D 
+    ///</summary>
     [SugarColumn(ColumnName = "ebeln_k3id")]
     public string? EbelnK3id { get; set; }
 
     /// <summary>
-    ///     鏉＄爜鏉″嵃杩涘害
-    /// </summary>
+    /// 鏉＄爜鏉″嵃杩涘害 
+    ///</summary>
     [SugarColumn(ColumnName = "barcode_ratio")]
     public int? BarcodeRatio { get; set; }
 
     /// <summary>
-    ///     ERP鍗曞彿
-    /// </summary>
+    /// ERP鍗曞彿 
+    ///</summary>
     [SugarColumn(ColumnName = "erpno")]
     public string? Erpno { get; set; }
 
     /// <summary>
-    ///     鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
-    /// </summary>
+    /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐� 
+    ///</summary>
     [SugarColumn(ColumnName = "thstatus")]
     public int? Thstatus { get; set; }
 
     /// <summary>
-    ///     ERP閫�璐у崟鍙�
-    /// </summary>
+    /// ERP閫�璐у崟鍙� 
+    ///</summary>
     [SugarColumn(ColumnName = "erpthno")]
     public string? Erpthno { get; set; }
 
     /// <summary>
-    ///     缁勭粐缂栫爜
-    /// </summary>
+    /// 缁勭粐缂栫爜 
+    ///</summary>
     [SugarColumn(ColumnName = "organize_code")]
     public string? OrganizeCode { get; set; }
 
+    /// <summary>
+    /// 鏀舵枡缁勭粐 
+    ///</summary>
+    [SugarColumn(ColumnName = "ReceiveOrgId")]
+    public string? ReceiveOrgId { get; set; }
+
     [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
 
     [SugarColumn(IsIgnore = true)] public string? SuppName { get; set; }
diff --git a/entity/MesInvItemBarcodes.cs b/entity/MesInvItemBarcodes.cs
index 3fb8c2d..1a79514 100644
--- a/entity/MesInvItemBarcodes.cs
+++ b/entity/MesInvItemBarcodes.cs
@@ -493,14 +493,20 @@
     public long? GxId { get; set; }
 
     /// <summary>
+    ///     渚涘簲鍟唅d
+    /// </summary>
+    [SugarColumn(ColumnName = "supp_id")]
+    public string? SuppId { get; set; }
+
+    /// <summary>
     ///     涓存椂鎵归噺guid
     /// </summary>
     [SugarColumn(ColumnName = "tmpGuid")]
     public Guid? TmpGuid { get; set; }
 
     /// <summary>
-    ///     渚涘簲鍟唅d
+    ///     鍏宠仈琛ㄧ殑guid
     /// </summary>
-    [SugarColumn(ColumnName = "supp_id")]
-    public string? SuppId { get; set; }
+    [SugarColumn(ColumnName = "ABOUT_GUID")]
+    public Guid? AboutGuid { get; set; }
 }
\ No newline at end of file
diff --git a/entity/MesInvItemInCDetails.cs b/entity/MesInvItemInCDetails.cs
index 5dff993..6d9b030 100644
--- a/entity/MesInvItemInCDetails.cs
+++ b/entity/MesInvItemInCDetails.cs
@@ -18,7 +18,7 @@
     ///     鍏ュ簱鍗昳d
     /// </summary>
     [SugarColumn(ColumnName = "ITEM_IN_ID")]
-    public Guid ItemInId { get; set; }
+    public Guid? ItemInId { get; set; }
 
     /// <summary>
     ///     鐗╂枡鏉＄爜PSN
@@ -374,7 +374,16 @@
     [SugarColumn(ColumnName = "ITEM_ID")]
     public long? ItemId { get; set; }
 
-    [SugarColumn(ColumnName = "SUPP_ID")] public string? SuppId { get; set; }
+    /// <summary>
+    /// </summary>
+    [SugarColumn(ColumnName = "SUPP_ID")]
+    public string? SuppId { get; set; }
+
+    /// <summary>
+    ///     鏀舵枡缁勭粐
+    /// </summary>
+    [SugarColumn(ColumnName = "ReceiveOrgId")]
+    public string? ReceiveOrgId { get; set; }
 
 
     // 娣诲姞鐨勫瓧娈碉紝骞朵笖瀹冧滑涓嶅睘浜庢暟鎹簱琛�
diff --git a/entity/MesInvItemIns.cs b/entity/MesInvItemIns.cs
index e08d451..0ffde9b 100644
--- a/entity/MesInvItemIns.cs
+++ b/entity/MesInvItemIns.cs
@@ -9,296 +9,324 @@
 public class MesInvItemIns
 {
     /// <summary>
-    ///     ID(SEQ_INV_ID)
-    ///     榛樿鍊�: (newid())
-    /// </summary>
+    /// ID(SEQ_INV_ID) 
+    /// 榛樿鍊�: (newid())
+    ///</summary>
     [SugarColumn(ColumnName = "GUID", IsPrimaryKey = true)]
     public Guid Guid { get; set; }
 
     /// <summary>
-    ///     鍏ュ簱鍗曞彿
-    /// </summary>
+    /// 鍏ュ簱鍗曞彿 
+    ///</summary>
     [SugarColumn(ColumnName = "BILL_NO")]
     public string? BillNo { get; set; }
 
     /// <summary>
-    ///     鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\\缁撴
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\\缁撴 
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "STATUS")]
     public byte? Status { get; set; }
 
     /// <summary>
-    ///     浠撳簱
-    /// </summary>
+    /// 浠撳簱 
+    ///</summary>
     [SugarColumn(ColumnName = "DEPOTS_ID")]
     public long? DepotsId { get; set; }
 
     /// <summary>
-    ///     鍘熷洜
-    /// </summary>
+    /// 鍘熷洜 
+    ///</summary>
     [SugarColumn(ColumnName = "REASON")]
     public string? Reason { get; set; }
 
     /// <summary>
-    ///     鍒涘缓浜�
-    /// </summary>
+    /// 鍒涘缓浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "CREATE_BY")]
     public string? CreateBy { get; set; }
 
     /// <summary>
-    ///     鍒涘缓鏃堕棿
-    /// </summary>
+    /// 鍒涘缓鏃堕棿 
+    ///</summary>
     [SugarColumn(ColumnName = "CREATE_DATE")]
     public DateTime? CreateDate { get; set; }
 
     /// <summary>
-    ///     鏈�鍚庢洿鏂颁汉
-    /// </summary>
+    /// 鏈�鍚庢洿鏂颁汉 
+    ///</summary>
     [SugarColumn(ColumnName = "LASTUPDATE_BY")]
     public string? LastupdateBy { get; set; }
 
     /// <summary>
-    ///     鏈�鍚庢洿鏂版椂闂�
-    /// </summary>
+    /// 鏈�鍚庢洿鏂版椂闂� 
+    ///</summary>
     [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
     public DateTime? LastupdateDate { get; set; }
 
     /// <summary>
-    ///     鍗曟嵁绫诲瀷ID
-    /// </summary>
+    /// 鍗曟嵁绫诲瀷ID 
+    ///</summary>
     [SugarColumn(ColumnName = "BILL_TYPE_ID")]
     public long? BillTypeId { get; set; }
 
     /// <summary>
-    ///     浜嬪姟绫诲瀷ID
-    /// </summary>
+    /// 浜嬪姟绫诲瀷ID 
+    ///</summary>
     [SugarColumn(ColumnName = "TRANSACTION_ID")]
     public long? TransactionId { get; set; }
 
     /// <summary>
-    ///     澶囨敞
-    /// </summary>
+    /// 澶囨敞 
+    ///</summary>
     [SugarColumn(ColumnName = "REMARK")]
     public string? Remark { get; set; }
 
     /// <summary>
-    ///     閫佽揣鍗曞彿
-    /// </summary>
+    /// 閫佽揣鍗曞彿 
+    ///</summary>
     [SugarColumn(ColumnName = "PAPER_BILL_NO")]
     public string? PaperBillNo { get; set; }
 
     /// <summary>
-    ///     閫�鏂欎汉宸ュ彿
-    /// </summary>
+    /// 閫�鏂欎汉宸ュ彿 
+    ///</summary>
     [SugarColumn(ColumnName = "USER_NO_BACK")]
     public string? UserNoBack { get; set; }
 
     /// <summary>
-    ///     瀹℃牳浜�
-    /// </summary>
+    /// 瀹℃牳浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "CHECK_USER")]
     public string? CheckUser { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "CHECK_DATE")]
     public DateTime? CheckDate { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "TASK_NO")]
     public string? TaskNo { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "INS_DATE")]
     public DateTime? InsDate { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "CHECK_RES")]
     public string? CheckRes { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "CHECK_QTY")]
     public long? CheckQty { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "MMLIST")]
     public string? Mmlist { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "EBELN")]
     public string? Ebeln { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "DEPOTS_CODE")]
     public string? DepotsCode { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "TRANSCTION_NO")]
     public string? TransctionNo { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "SUPP_NO")]
     public string? SuppNo { get; set; }
 
     /// <summary>
-    ///     鐘舵�� | 0-鏈鏍� 1-瀹℃牳鍏ュ簱/缁撴
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    /// 鐘舵�� | 0-鏈鏍� 1-瀹℃牳鍏ュ簱/缁撴 
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "FSTATUS")]
     public byte? Fstatus { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "FACTORY")]
     public string? Factory { get; set; }
 
     /// <summary>
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    ///  
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "SAPSTATUS")]
     public byte? Sapstatus { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "SAPNO")]
     public string? Sapno { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "SAPYEAR")]
     public short? Sapyear { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "SAPTEXT")]
     public string? Saptext { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "ISCHECK")]
     public byte? Ischeck { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "INSBY")]
     public string? Insby { get; set; }
 
     /// <summary>
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    ///  
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "IS_VISUAL")]
     public byte? IsVisual { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "COMPANY")]
     public string? Company { get; set; }
 
     /// <summary>
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    ///  
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "URGENT_FLAG")]
     public byte? UrgentFlag { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "LINE_NO")]
     public string? LineNo { get; set; }
 
     /// <summary>
-    ///     鍐查攢浜嬪姟绫诲瀷缂栫爜
-    /// </summary>
+    /// 鍐查攢浜嬪姟绫诲瀷缂栫爜 
+    ///</summary>
     [SugarColumn(ColumnName = "MTTRANSCTION_NO")]
     public long? MttransctionNo { get; set; }
 
     /// <summary>
-    ///     宸ュ崟琛屽彿
-    /// </summary>
+    /// 宸ュ崟琛屽彿 
+    ///</summary>
     [SugarColumn(ColumnName = "TASK_LINO")]
     public string? TaskLino { get; set; }
 
     /// <summary>
-    ///     鎶曟枡閫氱煡鍗曞崟鍙�
-    /// </summary>
+    /// 鎶曟枡閫氱煡鍗曞崟鍙� 
+    ///</summary>
     [SugarColumn(ColumnName = "FBILLNO")]
     public string? Fbillno { get; set; }
 
     /// <summary>
-    ///     鎶曟枡鍗曡鍙�
-    /// </summary>
+    /// 鎶曟枡鍗曡鍙� 
+    ///</summary>
     [SugarColumn(ColumnName = "FBILL_LINO")]
     public string? FbillLino { get; set; }
 
     /// <summary>
-    ///     瀹㈡埛缂栧彿
-    /// </summary>
+    /// 瀹㈡埛缂栧彿 
+    ///</summary>
     [SugarColumn(ColumnName = "CUST_NO")]
     public string? CustNo { get; set; }
 
     /// <summary>
-    ///     瀹㈡埛鍚嶇О
-    /// </summary>
+    /// 瀹㈡埛鍚嶇О 
+    ///</summary>
     [SugarColumn(ColumnName = "CUST_NAME")]
     public string? CustName { get; set; }
 
     /// <summary>
-    ///     IQC妫�楠屽崟鍙�
-    /// </summary>
+    /// IQC妫�楠屽崟鍙� 
+    ///</summary>
     [SugarColumn(ColumnName = "IQC_RELEASE_NO")]
     public string? IqcReleaseNo { get; set; }
 
     /// <summary>
-    ///     鍒拌揣鍗曞彿/鍏跺畠鍏ュ簱鍗曞彿
-    /// </summary>
+    /// 鍒拌揣鍗曞彿/鍏跺畠鍏ュ簱鍗曞彿 
+    ///</summary>
     [SugarColumn(ColumnName = "CBILL_NO")]
     public string? CbillNo { get; set; }
 
     /// <summary>
-    ///     0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇�
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    /// 0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇� 
+    /// 榛樿鍊�: ((0))
+    ///</summary>
     [SugarColumn(ColumnName = "PICK_INS")]
     public byte? PickIns { get; set; }
 
     /// <summary>
-    ///     鍏ュ簱瀹℃牳浜�
-    /// </summary>
+    /// 鍏ュ簱瀹℃牳浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "FCHECK_USER")]
     public string? FcheckUser { get; set; }
 
     /// <summary>
-    ///     鍏ュ簱瀹℃牳鏃ユ湡
-    /// </summary>
+    /// 鍏ュ簱瀹℃牳鏃ユ湡 
+    ///</summary>
     [SugarColumn(ColumnName = "FCHECK_DATE")]
     public DateTime? FcheckDate { get; set; }
 
     /// <summary>
-    ///     浠诲姟姹囨姤鍗�/宸ュ崟鍙凤紙鎴愬搧鍏ュ簱銆侀��鏂欙級
-    /// </summary>
+    /// 浠诲姟姹囨姤鍗�/宸ュ崟鍙凤紙鎴愬搧鍏ュ簱銆侀��鏂欙級 
+    ///</summary>
     [SugarColumn(ColumnName = "RBILL_NO")]
     public string? RbillNo { get; set; }
 
     /// <summary>
-    ///     鎶ュ伐浜�
-    /// </summary>
+    /// 鎶ュ伐浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "BGR")]
     public string? Bgr { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "SUPP_ID")]
     public string? SuppId { get; set; }
 
+    /// <summary>
+    /// 鏀舵枡缁勭粐 
+    ///</summary>
+    [SugarColumn(ColumnName = "ReceiveOrgId")]
+    public string? ReceiveOrgId { get; set; }
+
 
     //鍦ㄦ暟鎹簱鏌ヨ鏃跺拷鐣ヨ繖涓瓧娈�
     [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
diff --git a/entity/MesRohIn.cs b/entity/MesRohIn.cs
index 2c8fc7f..5d166b1 100644
--- a/entity/MesRohIn.cs
+++ b/entity/MesRohIn.cs
@@ -19,25 +19,25 @@
     ///     閲囪喘鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "BILL_NO")]
-    public string BillNo { get; set; }
+    public string? BillNo { get; set; }
 
     /// <summary>
     ///     鍗曟嵁鐘舵��
     /// </summary>
     [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
-    public string DocumentStatus { get; set; }
+    public string? DocumentStatus { get; set; }
 
     /// <summary>
     ///     鍗曟嵁绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "DOCUMENT_TYPE")]
-    public string DocumentType { get; set; }
+    public string? DocumentType { get; set; }
 
     /// <summary>
     ///     涓氬姟绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "BUSINESS_TYPE")]
-    public string BusinessType { get; set; }
+    public string? BusinessType { get; set; }
 
     /// <summary>
     ///     閲囪喘鏃ユ湡
@@ -49,97 +49,97 @@
     ///     渚涘簲鍟�
     /// </summary>
     [SugarColumn(ColumnName = "SUPPLIER")]
-    public string Supplier { get; set; }
+    public string? Supplier { get; set; }
 
     /// <summary>
     ///     鍏抽棴鐘舵��
     /// </summary>
     [SugarColumn(ColumnName = "CLOSE_STATUS")]
-    public string CloseStatus { get; set; }
+    public string? CloseStatus { get; set; }
 
     /// <summary>
     ///     閲囪喘缁勭粐
     /// </summary>
     [SugarColumn(ColumnName = "PURCHASE_ORG")]
-    public string PurchaseOrg { get; set; }
+    public string? PurchaseOrg { get; set; }
 
     /// <summary>
     ///     閲囪喘閮ㄩ棬
     /// </summary>
     [SugarColumn(ColumnName = "PURCHASE_DEPT")]
-    public string PurchaseDept { get; set; }
+    public string? PurchaseDept { get; set; }
 
     /// <summary>
     ///     閲囪喘缁�
     /// </summary>
     [SugarColumn(ColumnName = "PURCHASE_GROUP")]
-    public string PurchaseGroup { get; set; }
+    public string? PurchaseGroup { get; set; }
 
     /// <summary>
     ///     鏁伴噺楠屾敹
     /// </summary>
     [SugarColumn(ColumnName = "QTY_ACCEPTANCE")]
-    public string QtyAcceptance { get; set; }
+    public string? QtyAcceptance { get; set; }
 
     /// <summary>
     ///     閲囪喘鍛�
     /// </summary>
     [SugarColumn(ColumnName = "PURCHASER")]
-    public string Purchaser { get; set; }
+    public string? Purchaser { get; set; }
 
     /// <summary>
     ///     璐ㄩ噺瑕佹眰
     /// </summary>
     [SugarColumn(ColumnName = "QUALITY_REQ")]
-    public string QualityReq { get; set; }
+    public string? QualityReq { get; set; }
 
     /// <summary>
     ///     缁撶畻鏂�
     /// </summary>
     [SugarColumn(ColumnName = "SETTLEMENT_PARTY")]
-    public string SettlementParty { get; set; }
+    public string? SettlementParty { get; set; }
 
     /// <summary>
     ///     鏀舵鏂�
     /// </summary>
     [SugarColumn(ColumnName = "PAYMENT_PARTY")]
-    public string PaymentParty { get; set; }
+    public string? PaymentParty { get; set; }
 
     /// <summary>
     ///     閭
     /// </summary>
     [SugarColumn(ColumnName = "EMAIL")]
-    public string Email { get; set; }
+    public string? Email { get; set; }
 
     /// <summary>
     ///     杩愯緭鏂瑰紡
     /// </summary>
     [SugarColumn(ColumnName = "TRANSPORT_METHOD")]
-    public string TransportMethod { get; set; }
+    public string? TransportMethod { get; set; }
 
     /// <summary>
     ///     澶囨敞
     /// </summary>
     [SugarColumn(ColumnName = "REMARKS")]
-    public string Remarks { get; set; }
+    public string? Remarks { get; set; }
 
     /// <summary>
     ///     娌诲叿涓舵ā鍏峰姞宸ュ強閲囪喘
     /// </summary>
     [SugarColumn(ColumnName = "FIXTURE_MOLD_PROCUREMENT")]
-    public string FixtureMoldProcurement { get; set; }
+    public string? FixtureMoldProcurement { get; set; }
 
     /// <summary>
     ///     浣滃簾鐘舵��
     /// </summary>
     [SugarColumn(ColumnName = "CANCELLATION_STATUS")]
-    public string CancellationStatus { get; set; }
+    public string? CancellationStatus { get; set; }
 
     /// <summary>
     ///     浣滃簾浜�
     /// </summary>
     [SugarColumn(ColumnName = "CANCELLATION_PERSON")]
-    public string CancellationPerson { get; set; }
+    public string? CancellationPerson { get; set; }
 
     /// <summary>
     ///     浣滃簾鏃ユ湡
@@ -151,7 +151,7 @@
     ///     鍒涘缓浜�
     /// </summary>
     [SugarColumn(ColumnName = "CREATE_BY")]
-    public string CreateBy { get; set; }
+    public string? CreateBy { get; set; }
 
     /// <summary>
     ///     鍒涘缓鏃ユ湡
@@ -169,19 +169,19 @@
     ///     鏈�鍚庝慨鏀逛汉
     /// </summary>
     [SugarColumn(ColumnName = "LASTUPDATE_BY")]
-    public string LastupdateBy { get; set; }
+    public string? LastupdateBy { get; set; }
 
     /// <summary>
     ///     瀹℃牳浜�
     /// </summary>
     [SugarColumn(ColumnName = "ERP_CHECK_BY")]
-    public string ErpCheckBy { get; set; }
+    public string? ErpCheckBy { get; set; }
 
     /// <summary>
     ///     瀹℃牳鏃堕棿
     /// </summary>
     [SugarColumn(ColumnName = "ERP_CHECK_DATE")]
-    public string ErpCheckDate { get; set; }
+    public string? ErpCheckDate { get; set; }
 
     /// <summary>
     ///     ERP鐨処D鍙�
@@ -199,7 +199,7 @@
     ///     瀹℃牳浜�
     /// </summary>
     [SugarColumn(ColumnName = "CHECK_BY")]
-    public string CheckBy { get; set; }
+    public string? CheckBy { get; set; }
 
     /// <summary>
     ///     瀹℃牳鏍囪瘑
@@ -211,46 +211,46 @@
     ///     鎵撳嵃娆℃暟
     /// </summary>
     [SugarColumn(ColumnName = "REMARK1")]
-    public string Remark1 { get; set; }
+    public string? Remark1 { get; set; }
 
     /// <summary>
     ///     鑷畾涔夊瓧娈�2
     /// </summary>
     [SugarColumn(ColumnName = "REMARK2")]
-    public string Remark2 { get; set; }
+    public string? Remark2 { get; set; }
 
     /// <summary>
     ///     鑷畾涔夊瓧娈�3
     /// </summary>
     [SugarColumn(ColumnName = "REMARK3")]
-    public string Remark3 { get; set; }
+    public string? Remark3 { get; set; }
 
     /// <summary>
     ///     鑷畾涔夊瓧娈�4
     /// </summary>
     [SugarColumn(ColumnName = "REMARK4")]
-    public string Remark4 { get; set; }
+    public string? Remark4 { get; set; }
 
     /// <summary>
     ///     鑷畾涔夊瓧娈�5
     /// </summary>
     [SugarColumn(ColumnName = "REMARK5")]
-    public string Remark5 { get; set; }
+    public string? Remark5 { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "CHANGEREASON")]
-    public string Changereason { get; set; }
+    public string? Changereason { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "FACTORY")]
-    public string Factory { get; set; }
+    public string? Factory { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "COMPANY")]
-    public string Company { get; set; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// </summary>
@@ -258,42 +258,43 @@
     public DateTime? Prearrivaldate { get; set; }
 
     /// <summary>
+    ///     鏀舵枡缁勭粐
     /// </summary>
     [SugarColumn(ColumnName = "ReceiveOrgId")]
-    public string ReceiveOrgId { get; set; }
+    public string? ReceiveOrgId { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "Provider_Id")]
-    public string ProviderId { get; set; }
+    public string? ProviderId { get; set; }
 
     /// <summary>
     ///     鑱旂郴浜�
     /// </summary>
     [SugarColumn(ColumnName = "anred")]
-    public string Anred { get; set; }
+    public string? Anred { get; set; }
 
     /// <summary>
     ///     鐢佃瘽
     /// </summary>
     [SugarColumn(ColumnName = "telf1")]
-    public string Telf1 { get; set; }
+    public string? Telf1 { get; set; }
 
     /// <summary>
     ///     鍥哄畾鐢佃瘽
     /// </summary>
     [SugarColumn(ColumnName = "Fixed_Telephone")]
-    public string FixedTelephone { get; set; }
+    public string? FixedTelephone { get; set; }
 
     /// <summary>
     ///     閫氳鍦板潃
     /// </summary>
     [SugarColumn(ColumnName = "Address")]
-    public string Address { get; set; }
+    public string? Address { get; set; }
 
     /// <summary>
     ///     楠屾敹鏂瑰紡
     /// </summary>
     [SugarColumn(ColumnName = "Acctype")]
-    public string Acctype { get; set; }
+    public string? Acctype { get; set; }
 }
\ No newline at end of file
diff --git a/entity/MesRohInData.cs b/entity/MesRohInData.cs
index 8c801f0..ca110d8 100644
--- a/entity/MesRohInData.cs
+++ b/entity/MesRohInData.cs
@@ -18,31 +18,31 @@
     ///     閲囪喘鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "BILL_NO")]
-    public string BillNo { get; set; }
+    public string? BillNo { get; set; }
 
     /// <summary>
     ///     閿�鍞鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "SALES_ORDER_ID")]
-    public string SalesOrderId { get; set; }
+    public string? SalesOrderId { get; set; }
 
     /// <summary>
     ///     閲囪喘璁㈠崟琛屽彿
     /// </summary>
     [SugarColumn(ColumnName = "ORDER_LINE_ID")]
-    public string OrderLineId { get; set; }
+    public string? OrderLineId { get; set; }
 
     /// <summary>
     ///     鐗╂枡缂栫爜
     /// </summary>
     [SugarColumn(ColumnName = "ITEM_ID")]
-    public string ItemId { get; set; }
+    public string? ItemId { get; set; }
 
     /// <summary>
     ///     閲囪喘鍗曚綅
     /// </summary>
     [SugarColumn(ColumnName = "PURCHASE_UNIT")]
-    public string PurchaseUnit { get; set; }
+    public string? PurchaseUnit { get; set; }
 
     /// <summary>
     ///     閲囪喘鏁伴噺
@@ -54,13 +54,13 @@
     ///     搴撳瓨鍗曚綅
     /// </summary>
     [SugarColumn(ColumnName = "INVENTORY_UNIT")]
-    public string InventoryUnit { get; set; }
+    public string? InventoryUnit { get; set; }
 
     /// <summary>
     ///     璁′环鍗曚綅
     /// </summary>
     [SugarColumn(ColumnName = "PRICING_UNIT")]
-    public string PricingUnit { get; set; }
+    public string? PricingUnit { get; set; }
 
     /// <summary>
     ///     璁′环鏁伴噺
@@ -90,73 +90,73 @@
     ///     闇�姹傜粍缁�
     /// </summary>
     [SugarColumn(ColumnName = "DEMAND_ORG")]
-    public string DemandOrg { get; set; }
+    public string? DemandOrg { get; set; }
 
     /// <summary>
     ///     鏀舵枡缁勭粐
     /// </summary>
     [SugarColumn(ColumnName = "RECEIVING_ORG")]
-    public string ReceivingOrg { get; set; }
+    public string? ReceivingOrg { get; set; }
 
     /// <summary>
     ///     缁撶畻缁勭粐
     /// </summary>
     [SugarColumn(ColumnName = "SETTLEMENT_ORG")]
-    public string SettlementOrg { get; set; }
+    public string? SettlementOrg { get; set; }
 
     /// <summary>
     ///     鏄惁璧犲搧
     /// </summary>
     [SugarColumn(ColumnName = "IS_GIFT")]
-    public string IsGift { get; set; }
+    public string? IsGift { get; set; }
 
     /// <summary>
     ///     澶囨敞
     /// </summary>
     [SugarColumn(ColumnName = "REMARKS")]
-    public string Remarks { get; set; }
+    public string? Remarks { get; set; }
 
     /// <summary>
     ///     渚涘簲鍟嗙墿鏂欑紪鐮�
     /// </summary>
     [SugarColumn(ColumnName = "SUPPLIER_ITEM_CODE")]
-    public string SupplierItemCode { get; set; }
+    public string? SupplierItemCode { get; set; }
 
     /// <summary>
     ///     渚涘簲鍟嗙墿鏂欏悕绉�
     /// </summary>
     [SugarColumn(ColumnName = "SUPPLIER_ITEM_NAME")]
-    public string SupplierItemName { get; set; }
+    public string? SupplierItemName { get; set; }
 
     /// <summary>
     ///     濮斿璁㈠崟缂栧彿
     /// </summary>
     [SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")]
-    public string OutsourcingOrderId { get; set; }
+    public string? OutsourcingOrderId { get; set; }
 
     /// <summary>
     ///     鎵瑰彿
     /// </summary>
     [SugarColumn(ColumnName = "BATCH_NUMBER")]
-    public string BatchNumber { get; set; }
+    public string? BatchNumber { get; set; }
 
     /// <summary>
     ///     涓氬姟鍏抽棴
     /// </summary>
     [SugarColumn(ColumnName = "BUSINESS_CLOSE")]
-    public string BusinessClose { get; set; }
+    public string? BusinessClose { get; set; }
 
     /// <summary>
     ///     涓氬姟鍐荤粨
     /// </summary>
     [SugarColumn(ColumnName = "BUSINESS_FREEZE")]
-    public string BusinessFreeze { get; set; }
+    public string? BusinessFreeze { get; set; }
 
     /// <summary>
     ///     鍐荤粨浜�
     /// </summary>
     [SugarColumn(ColumnName = "FREEZER")]
-    public string Freezer { get; set; }
+    public string? Freezer { get; set; }
 
     /// <summary>
     ///     鍐荤粨鏃堕棿
@@ -168,13 +168,13 @@
     ///     涓氬姟缁堟
     /// </summary>
     [SugarColumn(ColumnName = "BUSINESS_TERMINATE")]
-    public string BusinessTerminate { get; set; }
+    public string? BusinessTerminate { get; set; }
 
     /// <summary>
     ///     缁堟浜�
     /// </summary>
     [SugarColumn(ColumnName = "TERMINATOR")]
-    public string Terminator { get; set; }
+    public string? Terminator { get; set; }
 
     /// <summary>
     ///     缁堟鏃堕棿
@@ -228,49 +228,49 @@
     ///     婧愬崟绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")]
-    public string SourceDocumentType { get; set; }
+    public string? SourceDocumentType { get; set; }
 
     /// <summary>
     ///     婧愬崟鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")]
-    public string SourceDocumentId { get; set; }
+    public string? SourceDocumentId { get; set; }
 
     /// <summary>
     ///     闇�姹傝窡韪彿
     /// </summary>
     [SugarColumn(ColumnName = "DEMAND_TRACKING_ID")]
-    public string DemandTrackingId { get; set; }
+    public string? DemandTrackingId { get; set; }
 
     /// <summary>
     ///     璁″垝璺熻釜鍙�
     /// </summary>
     [SugarColumn(ColumnName = "PLAN_TRACKING_ID")]
-    public string PlanTrackingId { get; set; }
+    public string? PlanTrackingId { get; set; }
 
     /// <summary>
     ///     鍙樻洿鏍囧織
     /// </summary>
     [SugarColumn(ColumnName = "CHANGE_FLAG")]
-    public string ChangeFlag { get; set; }
+    public string? ChangeFlag { get; set; }
 
     /// <summary>
     ///     闇�姹傛潵婧�
     /// </summary>
     [SugarColumn(ColumnName = "DEMAND_SOURCE")]
-    public string DemandSource { get; set; }
+    public string? DemandSource { get; set; }
 
     /// <summary>
     ///     闇�姹傚崟鎹紪鍙�
     /// </summary>
     [SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")]
-    public string DemandDocumentId { get; set; }
+    public string? DemandDocumentId { get; set; }
 
     /// <summary>
     ///     闇�姹傚崟鎹鍙�
     /// </summary>
     [SugarColumn(ColumnName = "DEMAND_DOCUMENT_LINE_ID")]
-    public string DemandDocumentLineId { get; set; }
+    public string? DemandDocumentLineId { get; set; }
 
     /// <summary>
     ///     ERP鐨処D鍙�
@@ -282,25 +282,25 @@
     ///     瀹㈡埛璐у彿
     /// </summary>
     [SugarColumn(ColumnName = "REMARK1")]
-    public string Remark1 { get; set; }
+    public string? Remark1 { get; set; }
 
     /// <summary>
     ///     鍖呰鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "REMARK2")]
-    public string Remark2 { get; set; }
+    public string? Remark2 { get; set; }
 
     /// <summary>
     ///     涓讳骇鍝�
     /// </summary>
     [SugarColumn(ColumnName = "REMARK3")]
-    public string Remark3 { get; set; }
+    public string? Remark3 { get; set; }
 
     /// <summary>
     ///     SMT澶囨敞
     /// </summary>
     [SugarColumn(ColumnName = "REMARK4")]
-    public string Remark4 { get; set; }
+    public string? Remark4 { get; set; }
 
     /// <summary>
     ///     ERP鐨勫ごID鍙�
@@ -311,22 +311,22 @@
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")]
-    public string PurchaseOrderLineNumber { get; set; }
+    public string? PurchaseOrderLineNumber { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "DEMAND")]
-    public string Demand { get; set; }
+    public string? Demand { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "RECEIVING")]
-    public string Receiving { get; set; }
+    public string? Receiving { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "SETTLEMENT")]
-    public string Settlement { get; set; }
+    public string? Settlement { get; set; }
 
     /// <summary>
     ///     erp鎺ㄦ潵鐨勫凡浜よ揣鏁伴噺
@@ -338,12 +338,12 @@
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")]
-    public string DemandDepartment { get; set; }
+    public string? DemandDepartment { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")]
-    public string ReceivingDepartment { get; set; }
+    public string? ReceivingDepartment { get; set; }
 
     /// <summary>
     /// </summary>
@@ -353,5 +353,5 @@
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")]
-    public string FdemandbillnoLine { get; set; }
+    public string? FdemandbillnoLine { get; set; }
 }
\ No newline at end of file
diff --git a/entity/TransferOut.cs b/entity/TransferOut.cs
index be97376..5a62cde 100644
--- a/entity/TransferOut.cs
+++ b/entity/TransferOut.cs
@@ -8,192 +8,192 @@
 [SugarTable("Transfer_Out")]
 public class TransferOut
 {
-   /// <summary>
- ///     涓婚敭
- ///     榛樿鍊�: (newid())
- /// </summary>
- [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+    /// <summary>
+    ///     涓婚敭
+    ///     榛樿鍊�: (newid())
+    /// </summary>
+    [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
     public Guid Guid { get; set; }
 
-   /// <summary>
- ///     鍗曟嵁绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "bill_type_id")]
+    /// <summary>
+    ///     鍗曟嵁绫诲瀷
+    /// </summary>
+    [SugarColumn(ColumnName = "bill_type_id")]
     public string BillTypeId { get; set; }
 
-   /// <summary>
- ///     璋冩嫧鏂瑰悜
- /// </summary>
- [SugarColumn(ColumnName = "transfer_direct")]
+    /// <summary>
+    ///     璋冩嫧鏂瑰悜
+    /// </summary>
+    [SugarColumn(ColumnName = "transfer_direct")]
     public string TransferDirect { get; set; }
 
-   /// <summary>
- ///     璋冩嫧绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "transfer_biz_type")]
+    /// <summary>
+    ///     璋冩嫧绫诲瀷
+    /// </summary>
+    [SugarColumn(ColumnName = "transfer_biz_type")]
     public string TransferBizType { get; set; }
 
-   /// <summary>
- ///     璋冨嚭搴撳瓨缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "stockoutorg_id")]
+    /// <summary>
+    ///     璋冨嚭搴撳瓨缁勭粐
+    /// </summary>
+    [SugarColumn(ColumnName = "stockoutorg_id")]
     public string StockoutorgId { get; set; }
 
-   /// <summary>
- ///     璋冨叆搴撳瓨缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "stockorg_id")]
+    /// <summary>
+    ///     璋冨叆搴撳瓨缁勭粐
+    /// </summary>
+    [SugarColumn(ColumnName = "stockorg_id")]
     public string StockorgId { get; set; }
 
-   /// <summary>
- ///     璋冨嚭璐т富绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "owner_type_out_id_head")]
+    /// <summary>
+    ///     璋冨嚭璐т富绫诲瀷
+    /// </summary>
+    [SugarColumn(ColumnName = "owner_type_out_id_head")]
     public string OwnerTypeOutIdHead { get; set; }
 
-   /// <summary>
- ///     璋冨嚭璐т富
- /// </summary>
- [SugarColumn(ColumnName = "owner_out_id_head")]
+    /// <summary>
+    ///     璋冨嚭璐т富
+    /// </summary>
+    [SugarColumn(ColumnName = "owner_out_id_head")]
     public string OwnerOutIdHead { get; set; }
 
-   /// <summary>
- ///     璋冨叆璐т富绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "owner_type_id_head")]
+    /// <summary>
+    ///     璋冨叆璐т富绫诲瀷
+    /// </summary>
+    [SugarColumn(ColumnName = "owner_type_id_head")]
     public string OwnerTypeIdHead { get; set; }
 
-   /// <summary>
- ///     璋冨叆璐т富
- /// </summary>
- [SugarColumn(ColumnName = "owner_id_head")]
+    /// <summary>
+    ///     璋冨叆璐т富
+    /// </summary>
+    [SugarColumn(ColumnName = "owner_id_head")]
     public string OwnerIdHead { get; set; }
 
-   /// <summary>
- ///     閿�鍞粍缁�
- /// </summary>
- [SugarColumn(ColumnName = "saleorg_id")]
+    /// <summary>
+    ///     閿�鍞粍缁�
+    /// </summary>
+    [SugarColumn(ColumnName = "saleorg_id")]
     public string SaleorgId { get; set; }
 
-   /// <summary>
- ///     鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "create_by")]
+    /// <summary>
+    ///     鍒涘缓浜�
+    /// </summary>
+    [SugarColumn(ColumnName = "create_by")]
     public string CreateBy { get; set; }
 
-   /// <summary>
- ///     鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "cteate_data")]
+    /// <summary>
+    ///     鍒涘缓鏃堕棿
+    /// </summary>
+    [SugarColumn(ColumnName = "cteate_data")]
     public DateTime? CteateData { 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 = "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>
- ///     瀹℃牳鐘舵��
- ///     榛樿鍊�: ((0))
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
+    /// <summary>
+    ///     瀹℃牳鐘舵��
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "STATUS")]
     public int? Status { get; set; }
 
-   /// <summary>
- ///     璋冩嫧绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "transferbiztype_no")]
+    /// <summary>
+    ///     璋冩嫧绫诲瀷缂栫爜
+    /// </summary>
+    [SugarColumn(ColumnName = "transferbiztype_no")]
     public string TransferbiztypeNo { get; set; }
 
-   /// <summary>
- ///     璋冩嫧鏂瑰悜缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "transferdirect_no")]
+    /// <summary>
+    ///     璋冩嫧鏂瑰悜缂栫爜
+    /// </summary>
+    [SugarColumn(ColumnName = "transferdirect_no")]
     public string TransferdirectNo { get; set; }
 
-   /// <summary>
- ///     璋冨嚭浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "inv_code")]
+    /// <summary>
+    ///     璋冨嚭浠撳簱
+    /// </summary>
+    [SugarColumn(ColumnName = "inv_code")]
     public string InvCode { get; set; }
 
-   /// <summary>
- ///     璋冨嚭浠撳簱鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "inv_name")]
+    /// <summary>
+    ///     璋冨嚭浠撳簱鍚嶇О
+    /// </summary>
+    [SugarColumn(ColumnName = "inv_name")]
     public string InvName { get; set; }
 
-   /// <summary>
- ///     璋冨叆浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "from_code")]
+    /// <summary>
+    ///     璋冨叆浠撳簱
+    /// </summary>
+    [SugarColumn(ColumnName = "from_code")]
     public string FromCode { get; set; }
 
-   /// <summary>
- ///     璋冨叆浠撳簱鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "from_name")]
+    /// <summary>
+    ///     璋冨叆浠撳簱鍚嶇О
+    /// </summary>
+    [SugarColumn(ColumnName = "from_name")]
     public string FromName { get; set; }
 
-   /// <summary>
- ///     璋冨嚭搴撳瓨缁勭粐ID
- /// </summary>
- [SugarColumn(ColumnName = "stockoutorgid_no")]
+    /// <summary>
+    ///     璋冨嚭搴撳瓨缁勭粐ID
+    /// </summary>
+    [SugarColumn(ColumnName = "stockoutorgid_no")]
     public int? StockoutorgidNo { get; set; }
 
-   /// <summary>
- ///     璋冨叆搴撳瓨缁勭粐ID
- /// </summary>
- [SugarColumn(ColumnName = "stockorgid_no")]
+    /// <summary>
+    ///     璋冨叆搴撳瓨缁勭粐ID
+    /// </summary>
+    [SugarColumn(ColumnName = "stockorgid_no")]
     public int? StockorgidNo { get; set; }
 
-   /// <summary>
- ///     璋冩嫧鐢宠鍗�
- /// </summary>
- [SugarColumn(ColumnName = "bill_no")]
+    /// <summary>
+    ///     璋冩嫧鐢宠鍗�
+    /// </summary>
+    [SugarColumn(ColumnName = "bill_no")]
     public string BillNo { get; set; }
 
-   /// <summary>
- ///     鍗曟嵁绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "billtypeid_no")]
+    /// <summary>
+    ///     鍗曟嵁绫诲瀷缂栫爜
+    /// </summary>
+    [SugarColumn(ColumnName = "billtypeid_no")]
     public string BilltypeidNo { get; set; }
 
-   /// <summary>
- ///     鍑哄簱浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "ck_depot")]
+    /// <summary>
+    ///     鍑哄簱浠撳簱
+    /// </summary>
+    [SugarColumn(ColumnName = "ck_depot")]
     public int? CkDepot { get; set; }
 
-   /// <summary>
- ///     鍏ュ簱浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "rk_depot")]
+    /// <summary>
+    ///     鍏ュ簱浠撳簱
+    /// </summary>
+    [SugarColumn(ColumnName = "rk_depot")]
     public int? RkDepot { get; set; }
 
-   /// <summary>
- ///     瀹岀粨鏍囪瘑
- ///     榛樿鍊�: ((0))
- /// </summary>
- [SugarColumn(ColumnName = "is_wc")]
+    /// <summary>
+    ///     瀹岀粨鏍囪瘑
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "is_wc")]
     public int? IsWc { get; set; }
 }
\ No newline at end of file
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 6859801..24c96d8 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -42,11 +42,15 @@
         if (inventory == null)
             throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曪紒");
 
+        // var inventoryDetails = Db.Queryable<MesInvItemArnDetail>()
+        //     .Where(it => it.ParentGuid == inventory.Guid
+        //                  && it.ItemId == itemBarcodeDetails.ItemId
+        //                  && it.EbelnLine == itemBarcodeDetails.WorkLine
+        //                  && it.Ebeln == itemBarcodeDetails.WorkNo)
+        //     .First();
+        
         var inventoryDetails = Db.Queryable<MesInvItemArnDetail>()
-            .Where(it => it.ParentGuid == inventory.Guid
-                         && it.ItemId == itemBarcodeDetails.ItemId
-                         && it.EbelnLine == itemBarcodeDetails.WorkLine
-                         && it.Ebeln == itemBarcodeDetails.WorkNo)
+            .Where(it => it.Guid == itemBarcodeDetails.AboutGuid)
             .First();
 
         if (inventoryDetails == null)
@@ -171,7 +175,8 @@
                         : (byte)0,
                     CbillNo = itemBarcodeDetails.BillNo,
                     Fstatus = 0,
-                    Status = 0
+                    Status = 0,
+                    ReceiveOrgId = inventory.ReceiveOrgId
                 }).IgnoreColumns(true).ExecuteCommand();
             }
 
@@ -287,7 +292,8 @@
                             TaskNo = detail.WorkNo,
                             EbelnK3id = detail.EbelnK3id,
                             LineK3id = detail.LineK3id,
-                            ItemId = detail.ItemId
+                            ItemId = detail.ItemId,
+                            ReceiveOrgId = inventory.ReceiveOrgId
                         }).IgnoreColumns(true).ExecuteCommand();
                     }
                     else
@@ -377,7 +383,8 @@
                             TaskNo = detail.WorkNo,
                             EbelnK3id = detail.EbelnK3id,
                             LineK3id = detail.LineK3id,
-                            ItemId = detail.ItemId
+                            ItemId = detail.ItemId,
+                            ReceiveOrgId = inventory.ReceiveOrgId
                         }).IgnoreColumns(true).ExecuteCommand();
 
                         cSyQty = 0; // Remaining quantity fulfilled
@@ -500,7 +507,8 @@
                     Ischeck = true,
                     CheckDate = inventoryDetails.CheckDate,
                     CheckRes = inventoryDetails.CheckRes,
-                    CheckStates = inventoryDetails.CheckStates
+                    CheckStates = inventoryDetails.CheckStates,
+                    ReceiveOrgId = inventory.ReceiveOrgId
                 }).IgnoreColumns(true).ExecuteCommand();
 
                 // 鎻掑叆 mes_inv_business2 琛�

--
Gitblit v1.9.3