From e7ceaef0a067bf68d6891d3dbda357712fa2c434 Mon Sep 17 00:00:00 2001
From: chenwenkai <1084072318@qq.com>
Date: Wed, 13 Nov 2024 17:53:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E8=B0=83=E6=8B=A8=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entity/QcCheckExecCarry.cs                | 71 +++++++++++++++++++
 .../Entity/WmsTransferInstockD .cs            |  4 ++
 .../Tnb.WarehouseMgr/ErpToWmsService.cs       |  6 +-
 .../Tnb.WarehouseMgr/WmsPurchaseDService.cs   |  2 +-
 4 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecCarry.cs

diff --git a/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecCarry.cs b/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecCarry.cs
new file mode 100644
index 00000000..4093a225
--- /dev/null
+++ b/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecCarry.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.QcMgr.Entities.Entity
+{
+    /// <summary>
+    /// 质检执行载具表
+    /// </summary>
+    [SugarTable("qc_check_exec_carry")]
+    public class QcCheckExecCarry:BaseEntity<string>
+    {
+        public QcCheckExecCarry()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+
+        public string org_id { get; set; }
+        /// <summary>
+        /// 质检主表id
+        /// </summary>
+        public string qc_check_exec_id { get;set; }
+
+        public string carry_id { get; set; }
+
+        public string carry_code { get; set; }
+
+        public string warehouse_id { get; set; }
+
+        public string qty { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get;set; }
+        /// <summary>
+        /// 库位
+        /// </summary>
+        public string location_id { get; set; }
+
+        public string location_code { get; set; }
+        /// <summary>
+        /// 物料id
+        /// </summary>
+        public string material_id { get;set; }
+        /// <summary>
+        /// 暂控处理单id
+        /// </summary>
+        public string temp_control_order_id { get; set; }
+        /// <summary>
+        /// 提报人
+        /// </summary>
+        public string reporter_id { get;set;}
+        /// <summary>
+        /// 处理人id
+        /// </summary>
+        public string processer_id { get;set; }
+
+        public string create_id { get;set ; }
+
+        public DateTime? create_time { get;set; }
+
+        public string modify_id { get;set; }
+
+        public DateTime? modify_time { get;set; }
+    }
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs
index 1314c35b..df851d59 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs
@@ -136,5 +136,9 @@ public partial class WmsTransferInstockD : BaseEntity<string>
     /// </summary>
     public string auxprop_xph { get; set; }
     public string udi_code { get; set; }
+    /// <summary>
+    /// 物料规格
+    /// </summary>
+    public string material_specificatior { get; set; }
 }
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
index 9a16f561..3cdd6408 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
@@ -1865,7 +1865,8 @@ namespace Tnb.WarehouseMgr
                                 {
                                     wmsTransferInstockD.material_id = material.id;
                                     wmsTransferInstockD.material_code = material.code;
-                                    wmsTransferInstockD.material_desc = material.material_specification;
+                                    wmsTransferInstockD.material_specificatior = material.material_specification;
+                                    wmsTransferInstockD.material_desc = material.material_standard;
                                 }
                                 wmsTransferInstockD.auxprop = detail.auxprop;
 
@@ -1951,7 +1952,8 @@ namespace Tnb.WarehouseMgr
                                 {
                                     wmsTransferInstockD.material_id = material.id;
                                     wmsTransferInstockD.material_code = material.code;
-                                    wmsTransferInstockD.material_desc = material.material_specification;
+                                    wmsTransferInstockD.material_specificatior = material.material_specification;
+                                    wmsTransferInstockD.material_desc = material.material_standard;
                                 }
 
                                 wmsTransferInstockDs.Add(wmsTransferInstockD);
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
index 22f135a2..de3b30bb 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
@@ -210,7 +210,7 @@ namespace Tnb.WarehouseMgr
                     erpRequestData.Add("pk_org", erpOrg.pk_org);
                     erpRequestData.Add("pk_org_v", erpOrg.pk_org_v);
                     erpRequestData.Add("pk_group", erpOrg.pk_group);
-                    erpRequestData.Add("vbillcode", wmsPurchaseH.bill_code);
+                    erpRequestData.Add("vbillcode", wmsPurchaseH.erp_bill_code);
                     erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? "");
                     erpRequestData.Add("csourcebillhid", wmsPurchaseH?.erp_arriveorder_pk ?? "");
                     erpRequestData.Add("vdef3", wmsPurchaseH?.service_num ?? "");