订单号问题

app/shop/controllers/PurchaseController.php

@@ -3,24 +3,28 @@
 namespace shop\controllers;
 
 use biz\purchase\classes\PurchaseClass;
+use bizGhs\product\classes\ProductClass;
+use common\components\orderSn;
 use Yii;
 use common\components\util;
 
 class PurchaseController extends BaseController
 {
 
-    //生成采购单 shish 2021.1.17
-    public function actionCreateOrder()
-    {
-        $post = Yii::$app->request->post();
-        $product = $post['product'] ?? '';
-        $arr = json_decode($product, true);
-
-        //判断product数据是不是同个供货商的
-
-        $post['product'] = $arr;
-        PurchaseClass::addPurchase($post);
-        util::complete();
-    }
+	//生成采购单 shish 2021.1.17
+	public function actionCreateOrder()
+	{
+		$post = Yii::$app->request->post();
+		$ghsShopId = $post['ghsShopId'] ?? 0;
+		$product = $post['product'] ?? '';
+		$arr = json_decode($product, true);
+		$shopId = $this->shopId;
+		$post['shopId'] = $shopId;
+		//判断product数据是不是同个供货商的
+		ProductClass::valid($ids, $ghsShopId);
+		$post['product'] = $arr;
+		PurchaseClass::addPurchase($post);
+		util::complete();
+	}
 
 }

biz-ghs/check/classes/CheckSnClass.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace bizGhs\check\classes;
+
+use bizGhs\base\classes\BaseClass;
+
+class CheckSnClass extends BaseClass
+{
+
+	public static $baseFile = '\bizGhs\check\models\CheckSn';
+
+}

biz-ghs/check/models/CheckSn.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace bizGhs\check\models;
+
+use bizGhs\base\models\Base;
+
+//盘点单号 shish 2021.1.19
+class CheckSn extends Base
+{
+	
+	public static function tableName()
+	{
+		return 'xhGhsCheckSn';
+	}
+	
+}

biz-ghs/order/classes/OrderSnClass.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizGhs\order\classes;
+
+use Yii;
+use bizGhs\base\classes\BaseClass;
+
+class OrderSnClass extends BaseClass
+{
+	
+	public static $baseFile = '\bizGhs\order\models\OrderSn';
+	
+}

biz-ghs/order/classes/PurchaseSnClass.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace bizGhs\order\classes;
+
+use bizGhs\base\classes\BaseClass;
+use bizGhs\stock\services\StockRecordService;
+use bizGhs\product\classes\ProductClass;
+use common\components\util;
+use common\services\xhItemService;
+use Yii;
+
+class PurchaseSnClass extends BaseClass
+{
+
+	public static $baseFile = '\bizGhs\order\models\PurchaseOrder';
+
+}

biz-ghs/order/models/OrderSn.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizGhs\order\models;
+use bizGhs\base\models\Base;
+
+class OrderSn extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhGhsOrderSn';
+	}
+
+}

biz-ghs/order/models/PurchaseSn.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace bizGhs\order\models;
+
+use bizGhs\base\models\Base;
+
+//采购单号 shish 2021.1.19
+class PurchaseSn extends Base
+{
+	
+	public static function tableName()
+	{
+		return 'xhGhsPurchaseSn';
+	}
+	
+}

biz-ghs/product/classes/ProductClass.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace bizGhs\product\classes;
 
 
@@ -6,218 +7,238 @@ use bizGhs\base\classes\BaseClass;
 use common\components\business;
 use common\components\util;
 use common\services\xhItemService;
+
 class ProductClass extends BaseClass
 {
-
-    public static $baseFile = '\bizGhs\product\models\Product';
-
-    //根据itemIds获取相应的花材信息
-    public static function getProductInfoByItemIds(array $itemIds)
-    {
-        $where = ['itemId'=>['in',$itemIds],'delStatus'=>0];
-        $data = self::getAllList('*',$where);
-        $data = self::groupItemBaseInfo($data);
-        return $data;
-    }
-
-    //根据花材ID，获取花材名称，图片
-    public static function groupItemBaseInfo($list)
-    {
-        //取得itemIds
-        $itemIds = array_column($list,'itemId');
-        //获取相应的图片，名称，py
-        $where = ['id'=>$itemIds];
-        $data = xhItemService::getAllByCondition($where,null,'*');
-        if(!empty($data)){
-            $data = array_column($data, NULL, 'id');
-            foreach ($list as $k=>$v){
-                $coverInfo = business::formatOrderGoodsCover($data[$v['itemId']]);
-                $unitNum = $data[$v['itemId']]['unitNum']??0;
-                $stockInfo = self::formatStock($v['stock'],$unitNum);
-                $list[$k]['cover'] = $coverInfo['coverUrl'];
-                $list[$k]['bigNum'] = $stockInfo['bigNum'];
-                $list[$k]['smallNum'] = $stockInfo['smallNum'];
-                $list[$k]['itemName'] = $data[$v['itemId']]['name']??'';
-                $list[$k]['unitCount'] = $unitNum?2:1;
-                $list[$k]['bigUnit'] = xhItemService::getUnitName($data[$v['itemId']]['bigUnit']);
-                $list[$k]['smallUnit'] =xhItemService::getUnitName($data[$v['itemId']]['smallUnit']);
-            }
-        }
-        return $list;
-    }
-
-    //根据花材ID，库存=》  计算出多少扎，多少支
-    public static function formatStockByItemId($itemId,$stock)
-    {
-        $unitNum = xhItemService::getItemUnitNum($itemId);
-        return self::formatStock($stock,$unitNum);
-    }
-
-    //花材的库存转换: 库存是小数，根据各个花材的unitNum， 计算出多少扎，多少支
-    public static function formatStock($stock,$unitNum)
-    {
-        $stockBundle = floor($stock); // 扎
-        $stockArr = explode('.',$stock);
-        $stockPiece = 0; //支
-        if(count($stockArr)===2){
-            $stockPiece = bcdiv(bcmul($stockArr[1],$unitNum,1),100);
-        }
-        return [
-            'bigNum'=>$stockBundle,
-            'smallNum'=>(int)$stockPiece,
-        ];
-    }
-
-    public static function mergeItemNumByItemId($itemNumBundle,$itemNumPiece,$itemId)
-    {
-        $unitNum = xhItemService::getItemUnitNum($itemId);
-        return self::mergeItemNum($itemNumBundle,$itemNumPiece,$unitNum);
-    }
-
-    //花材扎、支 转换  统一数
-    public static function mergeItemNum($itemNumBundle,$itemNumPiece,$unitNum)
-    {
-        $stockDecimal = 0;
-        if($unitNum > 0 ){
-            $stockDecimal = bcdiv($itemNumPiece,$unitNum,2);
-        }
-        $itemNum = bcadd($itemNumBundle,$stockDecimal,2);
-        return $itemNum;
-    }
-
-
-
-    //获取常用的itemIds
-    public static function getOftenItemIds($merchantId)
-    {
-        $data = self::getAllList("itemId",['merchantId'=>$merchantId],'actualSold desc');
-        if($data){
-            $data = array_column($data,'itemId');
-        }
-        return $data;
-    }
-
-
-
-    //加库存，允许负库存，负数数量（盘点时）
-
-    /**
-     * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
-     * @param $itemNumBundle  花材数量（扎）
-     * @param $itemNumPiece  花材数量(支)
-     * @return bool
-     */
-    public static function addStock($productId,$itemNumBundle,$itemNumPiece)
-    {
-        $productData =self::getById($productId);
-        if(!$productData){
-            util::fail("花材不存在");
-        }
-        $itemId = $productData['itemId'];
-        $unitNum = xhItemService::getItemUnitNum($itemId);
-        //转成小数，加库存
-        $itemNum = self::mergeItemNum($itemNumBundle,$itemNumPiece,$unitNum);
-        $newStock = bcadd($productData['stock'],$itemNum,2);
-        self::updateById($productId,['stock'=>$newStock]);
-        return true;
-    }
-
-    //根据数量加库存
-    public static function addStockByItemNum($productId,$itemNum)
-    {
-        $productData =self::getById($productId,true);
-        if(!$productData){
-            util::fail("花材不存在");
-        }
-        $newStock = bcadd($productData->stock,$itemNum,2);
-        $productData->stock = $newStock;
-        $productData->save();
-        return true;
-    }
-
-    //减库存,允许负库存，负数数量（盘点时）
-    /**
-     * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
-     * @param $itemNumBundle  花材数量（扎）
-     * @param $itemNumPiece  花材数量(支)
-     * @return bool
-     */
-    public static function decreaseStock($productId,$itemNumBundle,$itemNumPiece)
-    {
-        $productData =self::getById($productId,true);
-        if(!$productData){
-            util::fail("花材不存在");
-        }
-        $itemId = $productData['itemId'];
-        $unitNum = xhItemService::getItemUnitNum($itemId);
-        //转成小数，更新库存
-        $itemNum = self::mergeItemNum($itemNumBundle,$itemNumPiece,$unitNum);
-        $newStock = bcsub($productData->stock,$itemNum,2);
-        $productData->stock = $newStock;
-        $productData->save();
-        return true;
-    }
-
-
-    //根据数量加库存
-    public static function decreaseStockByItemNum($productId,$itemNum)
-    {
-        $productData =self::getById($productId);
-        if(!$productData){
-            util::fail("花材不存在");
-        }
-        $newStock = bcsub($productData['stock'],$itemNum,2);
-        self::updateById($productId,['stock'=>$newStock]);
-        return true;
-    }
-
-    //计算价格
-    /**
-     * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
-     * @param $itemNumBundle  花材数量（扎）
-     * @param $itemNumPiece  花材数量(支)
-     * @return bool
-     */
-    public static function computedPrice($productId,$itemNumBundle,$itemNumPiece)
-    {
-        //获取itemId的价格
-        $productData = self::getById($productId);
-        if(!$productData){
-            util::fail("花材不存在");
-        }
-        $price = $productData['price'];
-        $itemId = $productData['itemId'];
-        $unitNum = xhItemService::getItemUnitNum($itemId);
-        //换算出一支多少钱
-        $piecePrice = 0;
-        if($unitNum >0){
-            //有支
-            $unitPrice = bcdiv($price,$unitNum,2);
-            $piecePrice = bcmul($unitPrice,$itemNumPiece,2);
-        }
-        $bundlePrice = bcmul($price,$itemNumBundle,2);
-
-        $total = bcadd($bundlePrice,$piecePrice,2);
-        return $total;
-    }
-
-    //根据门店ID, 平台花材ID， 获取门店的花材ID
-    public static function getGhsProductId($shopId,$itemId)
-    {
-        $data = self::getGhsProductDataByItemId($shopId,$itemId);
-        if($data){
-            return $data['id'];
-        }
-        return 0;
-    }
-
-    public static function getGhsProductDataByItemId($shopId,$itemId)
-    {
-        $where = [
-            'shopId'=>$shopId,
-            'itemId'=>$itemId,
-        ];
-        $data = self::getByCondition($where);
-        return $data;
-    }
+	
+	public static $baseFile = '\bizGhs\product\models\Product';
+	
+	//根据itemIds获取相应的花材信息
+	public static function getProductInfoByItemIds(array $itemIds)
+	{
+		$where = ['itemId' => ['in', $itemIds], 'delStatus' => 0];
+		$data = self::getAllList('*', $where);
+		$data = self::groupItemBaseInfo($data);
+		return $data;
+	}
+	
+	//根据花材ID，获取花材名称，图片
+	public static function groupItemBaseInfo($list)
+	{
+		//取得itemIds
+		$itemIds = array_column($list, 'itemId');
+		//获取相应的图片，名称，py
+		$where = ['id' => $itemIds];
+		$data = xhItemService::getAllByCondition($where, null, '*');
+		if (!empty($data)) {
+			$data = array_column($data, NULL, 'id');
+			foreach ($list as $k => $v) {
+				$coverInfo = business::formatOrderGoodsCover($data[$v['itemId']]);
+				$unitNum = $data[$v['itemId']]['unitNum']??0;
+				$stockInfo = self::formatStock($v['stock'], $unitNum);
+				$list[$k]['cover'] = $coverInfo['coverUrl'];
+				$list[$k]['bigNum'] = $stockInfo['bigNum'];
+				$list[$k]['smallNum'] = $stockInfo['smallNum'];
+				$list[$k]['itemName'] = $data[$v['itemId']]['name']??'';
+				$list[$k]['unitCount'] = $unitNum ? 2 : 1;
+				$list[$k]['bigUnit'] = xhItemService::getUnitName($data[$v['itemId']]['bigUnit']);
+				$list[$k]['smallUnit'] = xhItemService::getUnitName($data[$v['itemId']]['smallUnit']);
+			}
+		}
+		return $list;
+	}
+	
+	//根据花材ID，库存=》  计算出多少扎，多少支
+	public static function formatStockByItemId($itemId, $stock)
+	{
+		$unitNum = xhItemService::getItemUnitNum($itemId);
+		return self::formatStock($stock, $unitNum);
+	}
+	
+	//花材的库存转换: 库存是小数，根据各个花材的unitNum， 计算出多少扎，多少支
+	public static function formatStock($stock, $unitNum)
+	{
+		$stockBundle = floor($stock); // 扎
+		$stockArr = explode('.', $stock);
+		$stockPiece = 0; //支
+		if (count($stockArr) === 2) {
+			$stockPiece = bcdiv(bcmul($stockArr[1], $unitNum, 1), 100);
+		}
+		return [
+			'bigNum' => $stockBundle,
+			'smallNum' => (int)$stockPiece,
+		];
+	}
+	
+	public static function mergeItemNumByItemId($itemNumBundle, $itemNumPiece, $itemId)
+	{
+		$unitNum = xhItemService::getItemUnitNum($itemId);
+		return self::mergeItemNum($itemNumBundle, $itemNumPiece, $unitNum);
+	}
+	
+	//花材扎、支 转换  统一数
+	public static function mergeItemNum($itemNumBundle, $itemNumPiece, $unitNum)
+	{
+		$stockDecimal = 0;
+		if ($unitNum > 0) {
+			$stockDecimal = bcdiv($itemNumPiece, $unitNum, 2);
+		}
+		$itemNum = bcadd($itemNumBundle, $stockDecimal, 2);
+		return $itemNum;
+	}
+	
+	
+	//获取常用的itemIds
+	public static function getOftenItemIds($merchantId)
+	{
+		$data = self::getAllList("itemId", ['merchantId' => $merchantId], 'actualSold desc');
+		if ($data) {
+			$data = array_column($data, 'itemId');
+		}
+		return $data;
+	}
+	
+	
+	
+	//加库存，允许负库存，负数数量（盘点时）
+	
+	/**
+	 * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
+	 * @param $itemNumBundle  花材数量（扎）
+	 * @param $itemNumPiece  花材数量(支)
+	 * @return bool
+	 */
+	public static function addStock($productId, $itemNumBundle, $itemNumPiece)
+	{
+		$productData = self::getById($productId);
+		if (!$productData) {
+			util::fail("花材不存在");
+		}
+		$itemId = $productData['itemId'];
+		$unitNum = xhItemService::getItemUnitNum($itemId);
+		//转成小数，加库存
+		$itemNum = self::mergeItemNum($itemNumBundle, $itemNumPiece, $unitNum);
+		$newStock = bcadd($productData['stock'], $itemNum, 2);
+		self::updateById($productId, ['stock' => $newStock]);
+		return true;
+	}
+	
+	//根据数量加库存
+	public static function addStockByItemNum($productId, $itemNum)
+	{
+		$productData = self::getById($productId, true);
+		if (!$productData) {
+			util::fail("花材不存在");
+		}
+		$newStock = bcadd($productData->stock, $itemNum, 2);
+		$productData->stock = $newStock;
+		$productData->save();
+		return true;
+	}
+	
+	//减库存,允许负库存，负数数量（盘点时）
+	
+	/**
+	 * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
+	 * @param $itemNumBundle  花材数量（扎）
+	 * @param $itemNumPiece  花材数量(支)
+	 * @return bool
+	 */
+	public static function decreaseStock($productId, $itemNumBundle, $itemNumPiece)
+	{
+		$productData = self::getById($productId, true);
+		if (!$productData) {
+			util::fail("花材不存在");
+		}
+		$itemId = $productData['itemId'];
+		$unitNum = xhItemService::getItemUnitNum($itemId);
+		//转成小数，更新库存
+		$itemNum = self::mergeItemNum($itemNumBundle, $itemNumPiece, $unitNum);
+		$newStock = bcsub($productData->stock, $itemNum, 2);
+		$productData->stock = $newStock;
+		$productData->save();
+		return true;
+	}
+	
+	
+	//根据数量加库存
+	public static function decreaseStockByItemNum($productId, $itemNum)
+	{
+		$productData = self::getById($productId);
+		if (!$productData) {
+			util::fail("花材不存在");
+		}
+		$newStock = bcsub($productData['stock'], $itemNum, 2);
+		self::updateById($productId, ['stock' => $newStock]);
+		return true;
+	}
+	
+	//计算价格
+	
+	/**
+	 * @param $productId  门店下的花材ID（xhGhsItemInfo 主键ID）
+	 * @param $itemNumBundle  花材数量（扎）
+	 * @param $itemNumPiece  花材数量(支)
+	 * @return bool
+	 */
+	public static function computedPrice($productId, $itemNumBundle, $itemNumPiece)
+	{
+		//获取itemId的价格
+		$productData = self::getById($productId);
+		if (!$productData) {
+			util::fail("花材不存在");
+		}
+		$price = $productData['price'];
+		$itemId = $productData['itemId'];
+		$unitNum = xhItemService::getItemUnitNum($itemId);
+		//换算出一支多少钱
+		$piecePrice = 0;
+		if ($unitNum > 0) {
+			//有支
+			$unitPrice = bcdiv($price, $unitNum, 2);
+			$piecePrice = bcmul($unitPrice, $itemNumPiece, 2);
+		}
+		$bundlePrice = bcmul($price, $itemNumBundle, 2);
+		
+		$total = bcadd($bundlePrice, $piecePrice, 2);
+		return $total;
+	}
+	
+	//根据门店ID, 平台花材ID， 获取门店的花材ID
+	public static function getGhsProductId($shopId, $itemId)
+	{
+		$data = self::getGhsProductDataByItemId($shopId, $itemId);
+		if ($data) {
+			return $data['id'];
+		}
+		return 0;
+	}
+	
+	public static function getGhsProductDataByItemId($shopId, $itemId)
+	{
+		$where = [
+			'shopId' => $shopId,
+			'itemId' => $itemId,
+		];
+		$data = self::getByCondition($where);
+		return $data;
+	}
+	
+	//有效花材判断，包括id有效、同个门店等 shish 2021.1.19
+	public static function valid($ids, $shopId)
+	{
+		$ids = is_numeric($ids) ? [$ids] : $ids;
+		$productList = self::getByIds($ids);
+		if (!empty($productList)) {
+			foreach ($productList as $product) {
+				if (isset($product['shopId']) == false || $product['shopId'] != $shopId) {
+					util::fail('只能选择同家的花材');
+				}
+			}
+			if (count($productList) != count($ids)) {
+				util::fail('存在无效花材');
+			}
+		}
+	}
+	
 }

biz/order/classes/OrderSnClass.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace biz\order\classes;
+
+use Yii;
+use biz\base\classes\BaseClass;
+
+class OrderSnClass extends BaseClass
+{
+
+    public static $baseFile = '\biz\order\models\OrderSn';
+
+}

biz/order/models/OrderSn.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace biz\order\models;
+
+use biz\base\models\Base;
+
+class OrderSn extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhOrderSn';
+	}
+
+}

biz/purchase/classes/PurchaseClass.php

@@ -2,6 +2,7 @@
 
 namespace biz\purchase\classes;
 
+use common\components\stringUtil;
 use Yii;
 use biz\base\classes\BaseClass;
 
@@ -15,5 +16,11 @@ class PurchaseClass extends BaseClass
     {
 
     }
+    
+    //生成订单号 shish 2021.1.19
+    public static function generateOrderNo()
+    {
+
+    }
 
 }

biz/purchase/classes/PurchaseSnClass.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace biz\purchase\classes;
+
+use common\components\stringUtil;
+use Yii;
+use biz\base\classes\BaseClass;
+
+class PurchaseSnClass extends BaseClass
+{
+	
+	public static $baseFile = '\biz\purchase\models\PurchaseSn';
+	
+}

biz/purchase/models/Purchase.php

@@ -6,5 +6,10 @@ use biz\base\models\Base;
 
 class Purchase extends Base
 {
-
+	
+	public static function tableName()
+	{
+		return 'xhPurchase';
+	}
+	
 }

biz/purchase/models/PurchaseSn.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace biz\purchase\models;
+
+use biz\base\models\Base;
+
+class PurchaseSn extends Base
+{
+	
+	public static function tableName()
+	{
+		return 'xhPurchaseSn';
+	}
+	
+}

common/components/orderSn.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace common\components;
+
+use bizGhs\check\classes\CheckSnClass;
+use bizGhs\order\classes\OrderSnClass;
+use bizGhs\order\classes\PurchaseSnClass;
+use Yii;
+use yii\imagine\Image;
+
+//订单号生成 shish 2021.1.19
+class orderSn
+{
+	
+	//供货商订单号生成 shish 2021.1.19
+	public static function getGhsOrderSn()
+	{
+		$prefix = 'KD_CS_';
+		if (getenv('YII_ENV', 'local') == 'production') {
+			$prefix = 'KD';
+		}
+		$respond = OrderSnClass::add(['id' => null]);
+		$id = $respond['id'] ?? 0;
+		if (empty($id)) {
+			util::fail('订单号没有生成');
+		}
+		return $prefix . $id;
+	}
+	
+	//零售商订单号生成 shish 2021.1.19
+	public static function getOrderSn()
+	{
+		$prefix = 'D_CS_';
+		if (getenv('YII_ENV', 'local') == 'production') {
+			$prefix = 'D';
+		}
+		$respond = \biz\order\classes\OrderSnClass::add(['id' => null]);
+		$id = $respond['id'] ?? 0;
+		if (empty($id)) {
+			util::fail('订单号没有生成');
+		}
+		return $prefix . $id;
+	}
+	
+	//供货商采购单号 shish 2021.1.19
+	public static function getGhsPurchaseSn()
+	{
+		$prefix = 'PH_CS_';
+		if (getenv('YII_ENV', 'local') == 'production') {
+			$prefix = 'PH';
+		}
+		$respond = PurchaseSnClass::add(['id' => null]);
+		$id = $respond['id'] ?? 0;
+		if (empty($id)) {
+			util::fail('采购单号没有生成');
+		}
+		return $prefix . $id;
+	}
+	
+	//供货商盘点单号 shish 2021.1.19
+	public static function getGhsCheckSn()
+	{
+		$prefix = 'PD_CS_';
+		if (getenv('YII_ENV', 'local') == 'production') {
+			$prefix = 'PD';
+		}
+		$respond = CheckSnClass::add(['id' => null]);
+		$id = $respond['id'] ?? 0;
+		if (empty($id)) {
+			util::fail('盘点单号没有生成');
+		}
+		return $prefix . $id;
+	}
+	
+	//零售商采购单号 shish 2021.1.19
+	public static function getPurchaseSn()
+	{
+		$prefix = 'CG_CS_';
+		if (getenv('YII_ENV', 'local') == 'production') {
+			$prefix = 'CG';
+		}
+		$respond = \biz\purchase\classes\PurchaseSnClass::add(['id' => null]);
+		$id = $respond['id'] ?? 0;
+		if (empty($id)) {
+			util::fail('采购单号没有生成');
+		}
+		return $prefix . $id;
+	}
+	
+}

common/components/stringUtil.php

@@ -361,12 +361,8 @@ class stringUtil
 	{
 		return "C" . date('ymdHis') . $merchantId . mt_rand(10000, 99999);
 	}
-	
-	/**
-	 * 生成用户需要使用的订单号
-	 * shish 2019.4.20
-	 * id 不小于8位的用户id
-	 */
+
+	//生成用户需要使用的订单号 shish 2019.4.20
 	public static function generateOrderNo($merchantId, $userId)
 	{
 		$userId = empty($userId) ? rand(12013120, 12536120) : $userId;

doc/开发规范.md

@@ -113,4 +113,11 @@ updateTime int 修改时间
 
 表名介绍
 
+````
+
+##### 协作规范
+
+````
+文件的头部要填写自己的名称和时候；
+如果修改别人的文件也要标注：修改内容、修改人和时间
 ````

sql.sql

@@ -671,3 +671,25 @@ CHANGE COLUMN `ghsId` `merchantId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT
 ALTER TABLE `xhGhsProduct`
 CHANGE COLUMN `ghsId` `merchantId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '供货商ID' AFTER `id`;
 
+======
+== shish 2021-1-19
+drop table if exists `xhGhsOrderSn`;
+CREATE TABLE if not exists  xhGhsOrderSn(
+id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY
+)AUTO_INCREMENT=26316718 COMMENT='供货商订单号';
+DROP TABLE IF EXISTS `xhGhsPurchaseSn`;
+CREATE TABLE IF NOT EXISTS  xhGhsPurchaseSn(
+id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY
+)AUTO_INCREMENT=26316718 COMMENT='供货商采购单号';
+DROP TABLE IF EXISTS `xhPurchaseSn`;
+CREATE TABLE IF NOT EXISTS  xhPurchaseSn(
+id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY
+)AUTO_INCREMENT=26316718 COMMENT='零售商采购单号';
+DROP TABLE IF EXISTS `xhGhsCheckSn`;
+CREATE TABLE IF NOT EXISTS  xhGhsCheckSn(
+id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY
+)AUTO_INCREMENT=26316718 COMMENT='供货商盘点单号';
+DROP TABLE IF EXISTS `xhOrderSn`;
+CREATE TABLE IF NOT EXISTS  xhOrderSn(
+id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY
+)AUTO_INCREMENT=26315618 COMMENT='零售商订单号';