Merge remote-tracking branch 'origin/dev' into dev

2024-08-28 17:19:08 +08:00
parent 1257b4e7ee 68f4b5c5af
commit a02fbb2925
16 changed files with 485 additions and 14 deletions
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
@@ -474,7 +474,7 @@
        /// <summary>
        /// ERPId(天益4厂)
        /// </summary>
-        public const string ErpUserId = "34995305856535";
+        public const string ErpUserId = "14995305856535";
        /// <summary>
        /// 盘点任务计算状态-未结算
        /// </summary>