Bläddra i källkod

花店零售单的库存

shish 4 år sedan
förälder
incheckning
ab419adde0

+ 11 - 0
biz-ghs/stock/classes/StockRecordClass.php

@@ -12,6 +12,7 @@ class StockRecordClass extends BaseClass
 {
     use OrderTrait;
     public static $baseFile = '\bizGhs\stock\models\StockRecord';
+
     const STOCK_RECORD_TYPE_PURCHASE = 1; //采购
     const STOCK_RECORD_TYPE_OUT_STOCK = 2; //出库
     const STOCK_RECORD_TYPE_IN_STOCK = 3; //入库
@@ -22,6 +23,7 @@ class StockRecordClass extends BaseClass
     const STOCK_RECORD_TYPE_SELL_STOCK_CANCEL = 8;// 取消订单
     const STOCK_RECORD_TYPE_WASTAGE = 9;// 报损
     const STOCK_RECORD_TYPE_REFUND = 10;// 退款退货
+    const STOCK_RECORD_TYPE_HD_ORDER = 11;//花店销售单
 
     public static $typeMap = [
         self::STOCK_RECORD_TYPE_PURCHASE => '采购入库',
@@ -34,6 +36,7 @@ class StockRecordClass extends BaseClass
         self::STOCK_RECORD_TYPE_SELL_STOCK_CANCEL => '取消订单',
         self::STOCK_RECORD_TYPE_WASTAGE => '报损',
         self::STOCK_RECORD_TYPE_REFUND => '退货',
+        self::STOCK_RECORD_TYPE_HD_ORDER => '开单',
     ];
 
     public static function getRecordList($where)
@@ -118,6 +121,7 @@ class StockRecordClass extends BaseClass
         $data['recordType'] = self::STOCK_RECORD_TYPE_CHECK_STOCK;
         return self::addRecord($data);
     }
+
     //出库订单流水记录
     public static function addOutStockOrderRecord($data)
     {
@@ -160,4 +164,11 @@ class StockRecordClass extends BaseClass
         return self::addRecord($data);
     }
 
+    //零售花店开单 shish 20220318
+    public static function hdKdAddRecord($data)
+    {
+        $data['recordType'] = self::STOCK_RECORD_TYPE_HD_ORDER;
+        return self::addRecord($data);
+    }
+
 }

+ 35 - 0
biz-hd/order/classes/OrderGoodsClass.php

@@ -2,6 +2,8 @@
 
 namespace bizHd\order\classes;
 
+use bizGhs\product\classes\ProductClass;
+use bizGhs\stock\classes\StockRecordClass;
 use common\components\business;
 use Yii;
 use bizHd\base\classes\BaseClass;
@@ -13,6 +15,39 @@ class OrderGoodsClass extends BaseClass
 
     public static function addData($data)
     {
+
+        //库存变化
+//        $sjId = $data['sjId'] ?? 0;
+//        $shopId = $data['shopId'] ?? 0;
+//        $goodsId = $data['goodsId'] ?? 0;
+//        $unitType = $data['unitType'] ?? 0;
+//        $num = $data['num'] ?? 0;
+//        $ratio = $data['ratio'] ?? 0;
+//        $orderSn = $data['orderSn'] ?? '';
+//        $mainId = $data['mainId'] ?? 0;
+//        $customName = $custom['name'] ?? '';
+//        $bigNum = 0;
+//        $smallNum = 0;
+//        if ($unitType == dict::getDict('unitType', 'big')) {
+//            $bigNum = $num;
+//        } else {
+//            $smallNum = $num;
+//        }
+//        //库存减少
+//        $stockInfo = ProductClass::decreaseStock($goodsId, $bigNum, $smallNum, true);
+//        $recordData = [];
+//        $recordData['sjId'] = $sjId;
+//        $recordData['shopId'] = $shopId;
+//        $recordData['mainId'] = $mainId;
+//        $recordData['itemId'] = 0;
+//        $recordData['itemNum'] = ProductClass::mergeItemNum($bigNum, $smallNum, $ratio);
+//        $recordData['oldStock'] = $stockInfo['oldStock'];
+//        $recordData['newStock'] = $stockInfo['newStock'];
+//        $recordData['productId'] = $goodsId;
+//        $recordData['orderSn'] = $orderSn;
+//        $recordData['relateName'] = $customName;
+//        StockRecordClass::hdKdAddRecord($recordData);
+
         return self::add($data);
     }
 

+ 38 - 2
biz-hd/order/classes/OrderItemClass.php

@@ -2,7 +2,9 @@
 
 namespace bizHd\order\classes;
 
-use common\components\business;
+use bizGhs\product\classes\ProductClass;
+use bizGhs\stock\classes\StockRecordClass;
+use common\components\dict;
 use Yii;
 use bizHd\base\classes\BaseClass;
 
@@ -12,8 +14,42 @@ class OrderItemClass extends BaseClass
     public static $baseFile = '\bizHd\order\models\OrderItem';
 
     //添加记录
-    public static function addData($data)
+    public static function addData($data, $custom)
     {
+
+        //库存变化
+        $sjId = $data['sjId'] ?? 0;
+        $shopId = $data['shopId'] ?? 0;
+        $itemId = $data['itemId'] ?? 0;
+        $unitType = $data['unitType'] ?? 0;
+        $num = $data['num'] ?? 0;
+        $ptItemId = $data['ptItemId'] ?? 0;
+        $ratio = $data['ratio'] ?? 0;
+        $orderSn = $data['orderSn'] ?? '';
+        $mainId = $data['mainId'] ?? 0;
+        $customName = $custom['name'] ?? '';
+        $bigNum = 0;
+        $smallNum = 0;
+        if ($unitType == dict::getDict('unitType', 'big')) {
+            $bigNum = $num;
+        } else {
+            $smallNum = $num;
+        }
+        //库存减少
+        $stockInfo = ProductClass::decreaseStock($itemId, $bigNum, $smallNum, true);
+        $recordData = [];
+        $recordData['sjId'] = $sjId;
+        $recordData['shopId'] = $shopId;
+        $recordData['mainId'] = $mainId;
+        $recordData['itemId'] = $ptItemId;
+        $recordData['itemNum'] = ProductClass::mergeItemNum($bigNum, $smallNum, $ratio);
+        $recordData['oldStock'] = $stockInfo['oldStock'];
+        $recordData['newStock'] = $stockInfo['newStock'];
+        $recordData['productId'] = $itemId;
+        $recordData['orderSn'] = $orderSn;
+        $recordData['relateName'] = $customName;
+        StockRecordClass::hdKdAddRecord($recordData);
+
         return self::add($data);
     }
 

+ 1 - 1
biz-hd/order/services/OrderService.php

@@ -193,7 +193,7 @@ class OrderService extends BaseService
                     'mainId' => $mainId,
                 ];
                 //库存变化在这里
-                OrderItemClass::addData($currentItemData);
+                OrderItemClass::addData($currentItemData, $custom);
 
                 $groupItemData[] = [
                     'name' => $name,

+ 2 - 1
sql.txt

@@ -421,4 +421,5 @@ ALTER TABLE xhStatIncome DROP INDEX `shop`;
 ALTER TABLE xhStatIncome ADD INDEX idx_mainId(`mainId`,`time`);
 ALTER TABLE xhStatIncomeMonth ADD INDEX idx_mainId(`mainId`,`time`);
 
-UPDATE xhGoods SET stock=0 WHERE stock=-100000
+UPDATE xhGoods SET stock=0 WHERE stock=-100000;
+ALTER TABLE xhGhsStockRecord MODIFY `itemId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '平台花材ID';