销售与采购单

biz-ghs/order/services/OrderService.php

@@ -4,7 +4,6 @@ namespace bizGhs\order\services;
 
 use biz\ghs\classes\GhsClass;
 use bizGhs\base\services\BaseService;
-use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClass;
 use common\components\util;
 use bizGhs\product\classes\ProductClass;
@@ -20,7 +19,7 @@ class OrderService extends BaseService
     //添加订单
     public static function addOrder($data, $custom)
     {
-        //增加供货商的销售单
+        //供货商销售单
         $arr = OrderClass::addOrder($data);
         $return = $arr['return'];
         $product = $arr['product'];
@@ -35,7 +34,9 @@ class OrderService extends BaseService
         if (empty($ghs)) {
             util::fail('没有找到供货商');
         }
-        //待供货商和客户结构关系改完 todo shish
+        $saleId = $return['id'] ?? 0;
+
+        //零售采购单
         $purchaseData = [
             'product' => $data['product'],
             'sendTime' => date("H:i:s"),
@@ -44,9 +45,11 @@ class OrderService extends BaseService
             'ghsShopAdminName' => $ghsShopAdminName,
             'merchantId' => $customSjId,
             'shopId' => $customShopId,
+            'saleId' => $saleId,
         ];
-        //增加零售的采购单
-        PurchaseClass::addPurchase($purchaseData);
+        $purchase = PurchaseClass::addPurchase($purchaseData);
+        $purchaseId = $purchase['id'] ?? 0;
+        OrderClass::updateById($saleId, ['purchaseId' => $purchaseId]);
 
         //0正常订单 1欠款
         $debt = $data['debt'] ?? 0;
@@ -65,6 +68,7 @@ class OrderService extends BaseService
         if (isset($data['sendType']) && $data['sendType'] == OrderClass::SEND_TYPE_NO) {
             OrderClass::withoutSend($return);
         }
+        return $return;
     }
 
     //获取订单信息 ssh 2019.11.28

biz-hd/purchase/classes/PurchaseClass.php

@@ -275,8 +275,8 @@ class PurchaseClass extends BaseClass
         $ghs->save();
 
         //供货商销售单状态变化
-        $ghsOrderId = $info->ghsOrderId ?? 0;
-        $ghsOrder = OrderClass::getById($ghsOrderId, true);
+        $saleId = $info->saleId ?? 0;
+        $ghsOrder = OrderClass::getById($saleId, true);
         if (empty($ghsOrder)) {
             util::fail('没有找到对应供货商订单');
         }

biz-hd/purchase/services/PurchaseService.php

@@ -1,7 +1,6 @@
 <?php
 
 namespace bizHd\purchase\services;
-
 use biz\ghs\classes\GhsClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClass;
@@ -18,9 +17,10 @@ class PurchaseService extends BaseService
 
     public static function addPurchase($data)
     {
-        //增加零售的采购单
+        //零售采购单
         $respond = PurchaseClass::addPurchase($data);
-        //增加供货商的销售单
+
+        //供货商销售单
         $ghsId = $data['ghsId'] ?? 0;
         $ghs = GhsClass::getGhsInfo($ghsId);
         if (empty($ghs)) {
@@ -38,6 +38,7 @@ class PurchaseService extends BaseService
         $customName = $custom['name'] ?? '';
         $customNamePy = $custom['py'] ?? '';
         $customMobile = $custom['mobile'] ?? '';
+        $purchaseId = $respond['id'] ?? 0;
         $arr = [
             'product' => $product,
             'merchantId' => $currentSjId,
@@ -48,8 +49,11 @@ class PurchaseService extends BaseService
             'customName' => $customName,
             'customNamePy' => $customNamePy,
             'customMobile' => $customMobile,
+            'purchaseId' => $purchaseId,
         ];
-        OrderClass::addOrder($arr, $currentShopId);
+        $return = OrderClass::addOrder($arr, $currentShopId);
+        $saleId = $return['id'] ?? 0;
+        PurchaseClass::updateById($purchaseId, ['saleId' => $saleId]);
         return $respond;
     }
 

sql.sql

@@ -2378,4 +2378,9 @@ ALTER TABLE `xhCustom` ADD UNIQUE INDEX `custom`(`shopId`);
 ALTER TABLE `xhGhsCustom` ADD UNIQUE INDEX `custom`(`ownShopId`,`shopId`);
 ALTER TABLE `xhGhs` ADD UNIQUE INDEX `ghs`(`ownShopId`,`shopId`);
 ALTER TABLE `xhGhs` ADD customId INT NOT NULL DEFAULT 0 COMMENT 'a是b的供应商，则b是a的客户，即customId' AFTER `id`;
-ALTER TABLE `xhGhsCustom` ADD ghsId INT NOT NULL DEFAULT 0 COMMENT 'a是b的客户，则b是a的供货商，即ghsId' AFTER `id`;
+ALTER TABLE `xhGhsCustom` ADD ghsId INT NOT NULL DEFAULT 0 COMMENT 'a是b的客户，则b是a的供货商，即ghsId' AFTER `id`;
+ALTER TABLE xhPurchase MODIFY `ghsOrderId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商订单id' AFTER `id`;
+ALTER TABLE `xhPurchase` CHANGE `ghsOrderId` `saleOrderId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商的销售单id';
+ALTER TABLE xhGhsOrder CHANGE `hdOrderId` `purchaseOrderId` INT(11) NOT NULL DEFAULT '0' COMMENT '花店采购单id';
+ALTER TABLE `xhPurchase` CHANGE `saleOrderId` `saleId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商的销售单id';
+ALTER TABLE xhGhsOrder CHANGE `purchaseOrderId` `purchaseId` INT(11) NOT NULL DEFAULT '0' COMMENT '花店采购单id';