Merge branch 'master' into ls

app-ghs/controllers/OrderClearController.php

@@ -132,7 +132,11 @@ class OrderClearController extends BaseController
 
         $staff = $this->shopAdmin;
         if (!isset($staff->finance) || $staff->finance == 0) {
-            util::fail('没有财务权限，不能销单哦');
+            $speShopList = [4608];
+            //杭州斗南鲜花员工，没有财务权限也要能销单
+            if (!in_array($this->shopId, $speShopList)) {
+                util::fail('没有财务权限，不能销单哦');
+            }
         }
 
         //避免网络延迟，造成重复操作

biz-ghs/order/classes/StockOutOrderClass.php

@@ -18,6 +18,7 @@ class StockOutOrderClass extends BaseClass
 {
 
     use OrderTrait;
+
     const STATUS_WAIT = 1; //待出库
     const STATUS_COMPLETE = 2; //已出库
     const STATUS_CANCEL = 3; //取消出库
@@ -53,7 +54,7 @@ class StockOutOrderClass extends BaseClass
         $order = self::add($data, true);
         //先减库存，若取消出库则加回来
         foreach ($ghsItemInfo as $k => $v) {
-            $stockInfo = ProductClass::decreaseStock($v['productId'], $v['bigNum'], $v['smallNum'], true);
+            $stockInfo = ProductClass::decreaseStock($v['productId'], $v['bigNum'], $v['smallNum'], true, false);
             $ghsItemInfo[$k]['oldStock'] = $stockInfo['oldStock'];
             $ghsItemInfo[$k]['newStock'] = $stockInfo['newStock'];
         }
@@ -299,12 +300,12 @@ class StockOutOrderClass extends BaseClass
     {
         $orderSn = $out->orderSn;
         $returnList = StockOutOrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*');
-        if(empty($returnList)){
+        if (empty($returnList)) {
             return false;
         }
-        $arr = array_chunk($returnList,50);
+        $arr = array_chunk($returnList, 50);
         $totalPage = count($arr);
-        foreach($arr as $key => $itemList){
+        foreach ($arr as $key => $itemList) {
 
             $sjName = $shop->merchantName ?? '';
             $shopName = $shop->shopName ?? '';
@@ -315,8 +316,8 @@ class StockOutOrderClass extends BaseClass
             $content .= "<CB>出库单</CB><BR><BR>";
             $content .= '<CB>' . $orderSn . '</CB><BR><BR>';
             $content .= '<CB>' . date("m-d H:i", strtotime($out->outTime)) . '</CB><BR>';
-            if($totalPage>1){
-                $currentPage = bcadd($key,1);
+            if ($totalPage > 1) {
+                $currentPage = bcadd($key, 1);
                 $content .= "<CB>第{$currentPage}页，共{$totalPage}页</CB><BR>";
             }
             $content .= '<BR>';

biz-ghs/order/classes/StockWastageOrderClass.php

@@ -21,6 +21,7 @@ use bizGhs\base\classes\BaseClass;
 class StockWastageOrderClass extends BaseClass
 {
     use OrderTrait;
+
     public static $baseFile = '\bizGhs\order\models\StockWastageOrder';
     const STATUS_COMPLETE = 1; //已完成
 
@@ -109,7 +110,7 @@ class StockWastageOrderClass extends BaseClass
         //写入订单表
         $order = self::add($data, true);
         foreach ($ghsItemInfo as $k => $v) {
-            $stockInfo = ProductClass::decreaseStock($v['productId'], $v['bigNum'], $v['smallNum'], true);
+            $stockInfo = ProductClass::decreaseStock($v['productId'], $v['bigNum'], $v['smallNum'], true, false);
             $ghsItemInfo[$k]['oldStock'] = $stockInfo['oldStock'];
             $ghsItemInfo[$k]['newStock'] = $stockInfo['newStock'];
         }

biz-ghs/part/classes/PartClass.php

@@ -69,7 +69,7 @@ class PartClass extends BaseClass
         //写入订单表
         $order = self::add($data, true);
         foreach ($productInfoList as $k => $v) {
-            $stockInfo = ProductClass::decreaseStock($v['productId'], $v['bigNum'], $v['smallNum'], true);
+            $stockInfo = ProductClass::decreaseStock($v['productId'], $v['bigNum'], $v['smallNum'], true, false);
             $productInfoList[$k]['oldStock'] = $stockInfo['oldStock'];
             $productInfoList[$k]['newStock'] = $stockInfo['newStock'];
         }

biz-ghs/product/classes/ProductClass.php

@@ -928,7 +928,8 @@ class ProductClass extends BaseClass
 
     //减库存,允许负库存，负数数量（盘点时）
     //checkStock boolean 是否需要判断库存
-    public static function decreaseStock($productId, $itemNumBundle, $itemNumPiece, $checkStock = false)
+    //addSold boolean 是否增加销量，报损和拆散不要增加销量
+    public static function decreaseStock($productId, $itemNumBundle, $itemNumPiece, $checkStock = false, $addSold = true)
     {
 
         //小单位库存不再考虑 ssh 20230303
@@ -957,10 +958,13 @@ class ProductClass extends BaseClass
             util::fail("{$currentName} 只剩{$currentRemainStock}{$productData->bigUnit}");
         }
         self::updateStockById($productId, $newStock);
-        //减库存，加销量 2021.6.21 lqh
-        $actualSold = $productData->actualSold;
-        $newActualSold = bcadd($actualSold, $itemNum, 2);
-        self::updateActualSoldById($productId, $newActualSold);
+
+        if ($addSold) {
+            //减库存，加销量 2021.6.21 lqh
+            $actualSold = $productData->actualSold;
+            $newActualSold = bcadd($actualSold, $itemNum, 2);
+            self::updateActualSoldById($productId, $newActualSold);
+        }
 
         //库存=0 下架商品 lqh 2021.7.9
         if ($newStock <= 0) {

biz-hd/part/classes/PartClass.php

@@ -67,7 +67,7 @@ class PartClass extends BaseClass
         //写入订单表
         $order = self::add($data, true);
         foreach ($productInfoList as $k => $v) {
-            $stockInfo = ProductClass::decreaseStock($v['productId'], $v['bigNum'], $v['smallNum'], true);
+            $stockInfo = ProductClass::decreaseStock($v['productId'], $v['bigNum'], $v['smallNum'], true, false);
             $productInfoList[$k]['oldStock'] = $stockInfo['oldStock'];
             $productInfoList[$k]['newStock'] = $stockInfo['newStock'];
         }