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
+{
+ ///
+ /// 质检执行载具表
+ ///
+ [SugarTable("qc_check_exec_carry")]
+ public class QcCheckExecCarry:BaseEntity
+ {
+ public QcCheckExecCarry()
+ {
+ id = SnowflakeIdHelper.NextId();
+ }
+
+ public string org_id { get; set; }
+ ///
+ /// 质检主表id
+ ///
+ 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; }
+ ///
+ /// 状态
+ ///
+ public string status { get;set; }
+ ///
+ /// 库位
+ ///
+ public string location_id { get; set; }
+
+ public string location_code { get; set; }
+ ///
+ /// 物料id
+ ///
+ public string material_id { get;set; }
+ ///
+ /// 暂控处理单id
+ ///
+ public string temp_control_order_id { get; set; }
+ ///
+ /// 提报人
+ ///
+ public string reporter_id { get;set;}
+ ///
+ /// 处理人id
+ ///
+ 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
///
public string auxprop_xph { get; set; }
public string udi_code { get; set; }
+ ///
+ /// 物料规格
+ ///
+ 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 ?? "");