增加mainId

biz-ghs/order/classes/OrderClass.php

@@ -472,7 +472,7 @@ class OrderClass extends BaseClass
         return $return;
     }
 
-    //添加订单 ssh 2019.12.5
+    //修改订单 ssh 2019.12.5
     public static function updateOrder($order, $data)
     {
         $sjId = $order->sjId ?? 0;

biz-ghs/order/classes/OrderItemClass.php

@@ -60,9 +60,11 @@ class OrderItemClass extends BaseClass
         $respond = ProductClass::formatProductInfo($product, $level);
         $product = $respond['product'];
         $weight = 0;
+        $mainId = $post['mainId'] ?? 0;
         self::deleteByCondition(['orderSn' => $orderSn]);
         foreach ($product as $key => $val) {
             $val['orderSn'] = $orderSn;
+            $val['mainId'] = $mainId;
             $item = self::add($val, true);
 
             $currentId = $item->id ?? 0;

biz-hd/purchase/classes/PurchaseClass.php

@@ -404,6 +404,7 @@ class PurchaseClass extends BaseClass
             $productList[$key]['productId'] = $hdProductId;
             $productList[$key]['ghsProductId'] = $productId;
             $productList[$key]['smallPrice'] = $price;
+            $productList[$key]['mainId'] = $mainId;
 
             if ($currentBigNum > 0) {
                 $xhNum = $currentBigNum;

sql.sql

@@ -1036,4 +1036,6 @@ ALTER TABLE xhPlantCg ADD `status` TINYINT NOT NULL DEFAULT 0 COMMENT '订单状
 ALTER TABLE xhPlantCg ADD staffId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `payWay`;
 ALTER TABLE xhPlantCg ADD staffName VARCHAR(20) NOT NULL DEFAULT '' COMMENT '员工名称' AFTER `staffId`;
 ALTER TABLE xhClear ADD customShopId INT NOT NULL DEFAULT 0 COMMENT '客户门店id' AFTER `customId`;
-ALTER TABLE xhClear ADD ghsShopId INT NOT NULL DEFAULT 0 COMMENT '供货商门店id' AFTER `ghsId`;
+ALTER TABLE xhClear ADD ghsShopId INT NOT NULL DEFAULT 0 COMMENT '供货商门店id' AFTER `ghsId`;
+ALTER TABLE xhGhsOrderItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `shopId`;
+ALTER TABLE xhCgItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `itemId`;