配送管理

biz-ghs/order/classes/OrderClass.php

@@ -56,6 +56,14 @@ class OrderClass extends BaseClass
     //待付款，待确认
     const ORDER_STATUS_UN_PAY = 1;
 
+    //出车
+    const SEND_TYPE_CAR_GET = 0;
+    //到店自取
+    const SEND_TYPE_SHOP_GET = 1;
+    //发快递
+    const SEND_TYPE_THIRD_SEND = 2;
+
+
     //未确认
     const SEND_TYPE_UNKNOWN = 1;
     //自取

biz-ghs/order/services/OrderService.php

@@ -183,8 +183,8 @@ class OrderService extends BaseService
             $payWay = dict::getDict('payWay', 'debtPay');
         }
         //销售单的自取还是配送字段 与 采购单的转换
-        $sendType = $data['sendType'] ?? OrderClass::SEND_TYPE_MYSELF;
-        $getType = $sendType == OrderClass::SEND_TYPE_NO ? PurchaseClass::GET_TYPE_SELF_GET : PurchaseClass::GET_TYPE_SEND;
+        $sendType = $data['sendType'] ?? OrderClass::SEND_TYPE_CAR_GET;
+        $getType = $sendType == OrderClass::SEND_TYPE_THIRD_SEND ? PurchaseClass::GET_TYPE_SEND : PurchaseClass::GET_TYPE_SELF_GET;
 
         //零售采购单时没有传price字段，供货商可以改价会传price字段，这里转成userPrice以便采购单识别使用改的价还是花材原价！
         $currentProduct = $data['product'];
@@ -222,6 +222,7 @@ class OrderService extends BaseService
             'cgStyle' => dict::getDict('cgStyle', 'ghs'),
             'debt' => $purchaseDebt,
             'getType' => $getType,
+            'sendType' => $sendType,
             'remark' => $remark,
             'xj' => $xj,
             'discount' => 1,