制单

app/shop/controllers/OrderSendController.php

@@ -21,7 +21,7 @@ class OrderSendController extends BaseController
 		util::success($list);
 	}
 	
-	//打单 免填单 填单 shish 2019.12.16
+	//制单 免填单 填单 shish 2019.12.16
 	public function actionPrintOrder()
 	{
 		$post = Yii::$app->request->post();

biz/order/classes/OrderSendClass.php

@@ -18,7 +18,7 @@ class OrderSendClass extends BaseClass
 	public static $actionId = ['placeOrder' => 10, 'printOrder' => 20, 'deliver' => 30, 'reach' => 40, 'finish' => 50];
 	public static $action = [
 		10 => ['name' => '下单', 'sign' => 'placeOrder'],
-		20 => ['name' => '打单', 'sign' => 'printOrder',],
+		20 => ['name' => '制单', 'sign' => 'printOrder',],
 		30 => ['name' => '发货', 'sign' => 'deliver'],
 		40 => ['name' => '送达', 'sign' => 'reach'],
 		50 => ['name' => '完成', 'sign' => 'finish'],
@@ -41,7 +41,7 @@ class OrderSendClass extends BaseClass
 		
 		OrderClass::updateById($orderId, ['currentFlow' => 1]);
 		
-		//打单未开始
+		//制单未开始
 		$printOrderId = $actionId['printOrder'];
 		$data = ['actionId' => $printOrderId, 'orderId' => $orderId, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $printOrderId];
 		self::add($data);

biz/order/services/OrderSendService.php

@@ -23,7 +23,7 @@ class OrderSendService extends BaseService
 	
 	public static $baseFile = '\biz\order\classes\OrderSendClass';
 	
-	//打单 shish 2019.12.17
+	//制单 shish 2019.12.17
 	public static function printOrder($data)
 	{
 		$id = $data['id'];
@@ -34,7 +34,7 @@ class OrderSendService extends BaseService
 		if ($printOrderId != $currentId) {
 			util::fail('当前流程无法操作');
 		}
-		//1有配送单 2 填单打单
+		//1有配送单 2 填单制单
 		if (in_array($option, [1, 2]) == false) {
 			util::fail('操作无效');
 		}
@@ -46,7 +46,7 @@ class OrderSendService extends BaseService
 			$hasDeliver = 1;
 		}
 		if ($option == 2) {
-			//填单打单
+			//填单制单
 			$hasDeliver = 2;
 		}
 		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'currentFlow' => 2, 'printStatus' => 1, 'hasDeliver' => $hasDeliver]);