Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Conflicts:
2024-09-19 15:13:11 +08:00
parent f104b58d82 4ec0362634
commit 91717eb7f1
11 changed files with 121 additions and 12 deletions
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
@@ -485,7 +485,7 @@
        /// <summary>
        /// 默认传给erp的用户id
        /// </summary>
-        public const string ERPUSERID = "1001A110000000003NBJ";
+        public const string ERPUSERID = "1001A1100000002QG0WU";
        /// <summary>
        /// ERPId(天益4厂)
        /// </summary>
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceD.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceD.cs
@@ -5,7 +5,7 @@ using SqlSugar;
 namespace Tnb.WarehouseMgr.Entities.Entity;

 /// <summary>
-/// 委外订单表子表
+/// 委外收货表子表
 /// </summary>
 [SugarTable("wms_outsource_d")]
 public partial class WmsOutsourceD : BaseEntity<string>