Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/CheckOrderController.php

@@ -125,6 +125,14 @@ class CheckOrderController extends BaseController
         }
         //判断花材格式，是否属于当前门店
         ProductClass::valid($ghsItemInfo, $this->mainId);
+
+        foreach ($ghsItemInfo as $key => $item) {
+            //如果盘点数是99999则转为0
+            if (isset($item['bigNum']) && $item['bigNum'] == 99999) {
+                $ghsItemInfo[$key]['bigNum'] = 0;
+            }
+        }
+
         $post['itemInfo'] = $ghsItemInfo;
         if ($update === true) {
             //编辑

app-ghs/controllers/ConsoleController.php

@@ -149,14 +149,14 @@ class ConsoleController extends BaseController
             ["name" => "商城", "img" => "ghs/home/shop.png", "url" => "/admin/home/mall"],
             ["name" => "改价", "img" => "ghs/home/gj.png", "url" => "/admin/changePrice/list"],
             ["name" => "花材", "img" => "ghs/home/hcgl.png", "url" => "/admin/item/list"],
-            ["name" => "采购入库", "img" => "ghs/home/icon_caigou.png", "url" => "/pagesPurchase/order"],
+            ["name" => "采购", "img" => "ghs/home/icon_caigou.png", "url" => "/pagesPurchase/order"],
             ["name" => "报损", "img" => "ghs/home/kcyjs.png", "url" => "/admin/breakage/list"],
             ["name" => "预售", "img" => "ghs/home/kcyjs.png", "url" => "/admin/order/statBook"],
             ["name" => "调拨入库", "img" => "ghs/home/dbrk.png", "url" => "/pagesStorehouse/allot/allotPut"],
             ["name" => "调拨出库", "img" => "ghs/home/dbck.png", "url" => "/pagesStorehouse/allot/allotEx"],
             ["name" => "结账记录", "img" => "ghs/home/kcyjs.png", "url" => "/admin/clear/customList"],
             ["name" => "支出", "img" => "ghs/home/kcyjs.png", "url" => "/admin/expend/list"],
-            ["name" => "员工", "img" => "ghs/home/yggl.png", "url" => "/admin/staff/list"],
+            ["name" => "盘点", "img" => "ghs/home/pandian.png", "url" => "/pagesStorehouse/inventory/list"],
             ["name" => "库存预警", "img" => "ghs/home/kcyjs.png", "url" => "/pagesStorehouse/stockWarn/manage"],
         ];
 

app-ghs/controllers/ProductController.php

@@ -77,11 +77,10 @@ class ProductController extends BaseController
         util::complete();
     }
 
-    //今天有入库的花材 ssh 20221024
+    //取出今天有入库的花材 ssh 20221024
     public function actionStockIn()
     {
         $py = Yii::$app->request->get('py', '');
-
         $classIds = ItemClassClass::getGhsItemClassAll($this->mainId);
         $mainId = $this->mainId ?? 0;
         $where['mainId'] = $mainId;
@@ -98,12 +97,9 @@ class ProductController extends BaseController
         $ids = array_unique($ids);
         $where['id'] = ['in', $ids];
         $level = 1;
-
         $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], "*");
         $itemInfoData = ProductClass::groupProductInfo($itemInfoData, $level);
-
         $data = ProductService::assembleData($classIds, $itemInfoData, true);
-
         util::success($data);
     }
 

biz-ghs/order/classes/CheckOrderClass.php

@@ -224,7 +224,8 @@ class CheckOrderClass extends BaseClass
             $tmp['productId'] = $v['productId'];
             $unitNum = $productData[$productId]['ratio'] ?? 0;
             $tmp['itemStock'] = $productData[$productId]['stock'] ?? 0;//当时库存
-            $tmp['itemNum'] = ProductClass::mergeItemNum($v['bigNum'], $v['smallNum'], $unitNum);// 盘点数量
+            $itemNum = ProductClass::mergeItemNum($v['bigNum'], $v['smallNum'], $unitNum);
+            $tmp['itemNum'] = $itemNum;// 盘点数量
             $tmp['itemPrice'] = $productData[$productId]['price'] ?? 0; //当时售卖的价格
             $tmp['itemCost'] = $productData[$productId]['cost'] ?? 0; //当时成本的价格
             $tmp['profitLossNum'] = bcsub($tmp['itemNum'], $tmp['itemStock'], 2); //盈亏数 = 盘点数-当时库存数

biz-ghs/order/classes/OrderClass.php

@@ -1040,11 +1040,11 @@ class OrderClass extends BaseClass
         }
 
         $content .= "<BR>";
-        $content .= "<BR>";
-        $content .= "<CB>扫码买花</CB>";
-        $content .= "<BR>";
-        $host = Yii::$app->params['hdHost'];
-        $content .= "<QR>" . $host . "/#/admin/home/workbench</QR>";
+//        $content .= "<BR>";
+//        $content .= "<CB>扫码买花</CB>";
+//        $content .= "<BR>";
+//        $host = Yii::$app->params['hdHost'];
+//        $content .= "<QR>" . $host . "/#/admin/home/workbench</QR>";
         $content .= "<BR>";
         $content .= "<BR>";
 

biz/sj/classes/CashClass.php

@@ -65,6 +65,10 @@ class CashClass extends BaseClass
             if ($shopId == 1459 || $shopId == 52) {
                 return 0.003;
             }
+            //花样年华
+            if ($shopId == 1858 || $shopId == 1596) {
+                return 0.003;
+            }
             return 0.0038;
         }
         return 0.006;