调拨功能

app-ghs/controllers/StockInController.php

@@ -42,8 +42,8 @@ class StockInController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
             StockInOrderClass::confirmOrder($orderSn, $this->shopId, $this->adminId);
-            util::complete("入库成功");
             $transaction->commit();
+            util::complete("入库成功");
         } catch (\Exception $exception) {
             Yii::info("确认入库报错：" . $exception->getMessage());
             $transaction->rollBack();

app-ghs/controllers/StockOutController.php

@@ -30,10 +30,10 @@ class StockOutController extends BaseController
     //新增出库 lqh 2021.1.23
     public function actionCreateOrder()
     {
-
         $post = Yii::$app->request->post();
         $post['sjId'] = $this->sjId;
         $post['outShopId'] = $this->shopId;
+        $post['outMainId'] = $this->mainId;
         $post['adminId'] = $this->adminId;
         $inShopId = $post['inShopId'] ?? 0;
         $now = date('Y-m-d H:i:s');
@@ -64,6 +64,7 @@ class StockOutController extends BaseController
             util::fail('没有找到门店');
         }
         ShopClass::valid($inShop, $this->sjId);
+        $post['inMainId'] = $inShop->mainId ?? 0;
 
         ProductClass::valid($ghsItemInfo, $this->mainId);
         //判断花材里的信息

biz-ghs/order/classes/StockInOrderClass.php

@@ -65,8 +65,10 @@ class StockInOrderClass extends BaseClass
         $orderSn = orderSn::getGhsStockInSn();
         $data['orderSn'] = $orderSn;
         $data['sjId'] = $outOrderData['sjId'];
-        $data['outShopId'] = $outOrderData['outShopId'];
+        $data['outShopId'] = $outOrderData['outShopId'] ?? 0;
+        $data['outMainId'] = $outOrderData['outMainId'] ?? 0;
         $data['inShopId'] = $outOrderData['inShopId'];
+        $data['inMainId'] = $outOrderData['inMainId'] ?? 0;
         $data['outOrderSn'] = $outOrderData['orderSn'];
         $data['adminId'] = $outOrderData['adminId'];
         $data['bigNum'] = $outOrderData['bigNum'];
@@ -74,9 +76,10 @@ class StockInOrderClass extends BaseClass
         $data['price'] = $outOrderData['price'];
         $data['remark'] = $outOrderData['remark'];
         $ghsItemInfo = $outOrderData['itemInfo'];
-        $shopId = $data['inShopId'];
+        $shopId = $outOrderData['inShopId'] ?? 0;
+        $mainId = $outOrderData['inMainId'] ?? 0;
         //入库： 需要将itemId 转换成对应的productId，若没有对应的productId,则需要新增
-        ProductClass::complementProduct($data['sjId'], $shopId, $ghsItemInfo);
+        ProductClass::complementProduct($data['sjId'], $mainId, $shopId, $ghsItemInfo);
         $itemIds = array_column($ghsItemInfo, "itemId");
         $productData = ProductClass::getGhsProductDataByItemIds($shopId, $itemIds);
         $itemData = array_column($productData, null, 'itemId');
@@ -119,6 +122,8 @@ class StockInOrderClass extends BaseClass
                     'smallUnit' => $v['smallUnit'],
                 ];
                 $tmp['itemInfo'] = json_encode($itemInfo);
+                $tmp['shopId'] = $outOrderData['inShopId'] ?? 0;
+                $tmp['mainId'] = $outOrderData['inMainId'] ?? 0;
                 $batchData[] = $tmp;
             }
             StockInOrderItemClass::batchAddOrderItem($batchData);

biz-ghs/order/classes/StockOutOrderClass.php

@@ -44,6 +44,9 @@ class StockOutOrderClass extends BaseClass
         $data['bigNum'] = $sumNum['bigNum'];// 总的大单位数量 总共多少扎
         $data['smallNum'] = $sumNum['smallNum']; //总的小单位数量 总共多少支
 
+        $outShopId = $data['outShopId'] ?? 0;
+        $outMainId = $data['outMainId'] ?? 0;
+
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
 
@@ -58,10 +61,15 @@ class StockOutOrderClass extends BaseClass
 
             //写入详情表
             $batchData = self::groupOrderItem($ghsItemInfo, $orderSn);
+            foreach ($batchData as $outKey => $outVal) {
+                $batchData[$outKey]['mainId'] = $outMainId;
+                $batchData[$outKey]['shopId'] = $outShopId;
+            }
             StockOutOrderItemClass::batchAddOrderItem($batchData);
 
             $orderData = self::getOrderDetail($orderSn, $data['outShopId']);
-            $orderData['shopId'] = $data['outShopId'];
+            $orderData['shopId'] = $outShopId;
+            $orderData['mainId'] = $outMainId;
             $itemInfo = $orderData['itemInfo'] ?? [];
             if (empty($itemInfo)) {
                 $transaction->rollBack();
@@ -114,7 +122,6 @@ class StockOutOrderClass extends BaseClass
                 util::fail("订单异常");
             }
             $orderData['shopId'] = $shopId;
-
             //写入一条数据到入库门店的入库订单表（生成入库订单号
             $inOrderData = StockInOrderClass::addOrder($orderData);
             $inOrderSn = $inOrderData['orderSn'];

biz-ghs/product/classes/ProductClass.php

@@ -466,7 +466,7 @@ class ProductClass extends BaseClass
     }
 
     //补全itemId (针对入库时 当前门店下无对应的花材 itemId)  lqh 2021.1.24
-    public static function complementProduct($sjId, $shopId, $itemInfo)
+    public static function complementProduct($sjId, $mainId, $shopId, $itemInfo)
     {
         $itemIds = array_column($itemInfo, "itemId");
         $itemData = array_column($itemInfo, null, "itemId");
@@ -482,9 +482,11 @@ class ProductClass extends BaseClass
                     $addData = [];
                     $addData['sjId'] = $sjId;
                     $addData['shopId'] = $shopId;
+                    $addData['mainId'] = $mainId;
                     $addData['itemId'] = $v;
-                    $addData['price'] = $itemData[$v]['itemPrice'] ?? 0;
-                    self::add($addData);
+                    $addData['price'] = $itemData[$v]['price'] ?? 0;
+                    $addData['classId'] = 0;
+                    self::addProduct($addData);
                 }
             }
         }

sql.sql

@@ -1018,4 +1018,12 @@ ALTER TABLE xhShopCapital MODIFY `fromType` TINYINT(4) NOT NULL DEFAULT '1' COMM
 ALTER TABLE xhShopYeChange MODIFY `fromType` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '来源 查看dict.php';
 ALTER TABLE xhOrder MODIFY `fromType` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '来源 查看dict.php';
 ALTER TABLE xhGhsOrder MODIFY `fromType` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '来源 查看dict.php';
-ALTER TABLE xhGhsStockRecord ADD `ptStyle` TINYINT NOT NULL DEFAULT 1 COMMENT '平台类型' AFTER `mainId`;
+ALTER TABLE xhGhsStockRecord ADD `ptStyle` TINYINT NOT NULL DEFAULT 1 COMMENT '平台类型' AFTER `mainId`;
+ALTER TABLE xhGhsStockOutOrder ADD outMainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `outShopId`;
+ALTER TABLE xhGhsStockOutOrder ADD inMainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `inShopId`;
+ALTER TABLE xhGhsStockOutOrderItem ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER `productId`;
+ALTER TABLE xhGhsStockOutOrderItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
+ALTER TABLE xhGhsStockInOrder ADD outMainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `outShopId`;
+ALTER TABLE xhGhsStockInOrder ADD inMainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `inShopId`;
+ALTER TABLE xhGhsStockInOrderItem ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER `productId`;
+ALTER TABLE xhGhsStockInOrderItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;