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

Conflicts:

WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs

@@ -3158,13 +3158,13 @@ namespace Tnb.WarehouseMgr
                                 work_station = ""
                             }).Where(r => r.id == dt.carry_id).ExecuteCommandAsync();
 
-                            await QTRK2BIP(dt, db);
+                            //await QTRK2BIP(dt, db);
                             // require_code是任务单
                             //string mo_task_code = dt.require_code;
                         }
                         else if (dt.biz_type == "erp_qtrk")
                         {
-                            await QTRK2BIP(dt, db);
+                            //await QTRK2BIP(dt, db);
                         }
                         #endregion