[bug fix]

vnpy/app/cta_stock/back_testing.py

@@ -1001,8 +1001,8 @@ class BackTestingEngine(object):
                 order.status = Status.CANCELLED
                 order.cancel_time = str(self.last_dt)
                 del self.active_limit_orders[vt_orderid]
-                if strategy:
-                    strategy.on_order(order)
+                if order_strategy:
+                    order_strategy.on_order(order)
 
         # 撤销本地停止单
         for stop_orderid in list(self.active_stop_orders.keys()):

vnpy/app/cta_stock/template.py

@@ -873,8 +873,8 @@ class CtaStockTemplate(CtaTemplate):
         网格逐一止损/止盈检查 (根据指数价格进行止损止盈）
         :return:
         """
-        if self.entrust != 0:
-            return
+        #if self.entrust != 0:
+        #    return
 
         if not self.trading and not self.inited:
             self.write_error(u'当前不允许交易')

vnpy/app/cta_strategy_pro/back_testing.py

@@ -983,8 +983,8 @@ class BackTestingEngine(object):
                 order.status = Status.CANCELLED
                 order.cancel_time = str(self.last_dt)
                 del self.active_limit_orders[vt_orderid]
-                if strategy:
-                    strategy.on_order(order)
+                if order_strategy:
+                    order_strategy.on_order(order)
 
         # 撤销本地停止单
         for stop_orderid in list(self.active_stop_orders.keys()):

vnpy/app/cta_strategy_pro/engine.py

@@ -1076,7 +1076,7 @@ class CtaEngine(BaseEngine):
 
         if strategy.trading:
             msg = f"{strategy_name}已经启动，请勿重复操作"
-            self.write_error(msg)
+            self.write_log(msg)
             return False, msg
 
         self.call_strategy_func(strategy, strategy.on_start)