|
|
@@ -1,6 +1,6 @@
|
|
|
<?php
|
|
|
-namespace bizGhs\stock\classes;
|
|
|
|
|
|
+namespace bizGhs\stock\classes;
|
|
|
|
|
|
use bizGhs\base\classes\BaseClass;
|
|
|
use bizGhs\order\traits\OrderTrait;
|
|
|
@@ -23,20 +23,17 @@ class StockRecordClass extends BaseClass
|
|
|
const STOCK_RECORD_TYPE_WASTAGE = 9;// 报损
|
|
|
const STOCK_RECORD_TYPE_REFUND = 10;// 退款退货
|
|
|
|
|
|
-
|
|
|
-
|
|
|
public static $typeMap = [
|
|
|
- self::STOCK_RECORD_TYPE_PURCHASE=>'采购入库',
|
|
|
- self::STOCK_RECORD_TYPE_IN_STOCK=>'调拨入库',
|
|
|
- self::STOCK_RECORD_TYPE_OUT_STOCK=>'调拨出库',
|
|
|
- self::STOCK_RECORD_TYPE_CHECK_STOCK=>'盘点',
|
|
|
- self::STOCK_RECORD_TYPE_SELL_STOCK=>'开单',
|
|
|
- self::STOCK_RECORD_TYPE_OUT_STOCK_CANCEL=>'取消入库',
|
|
|
- self::STOCK_RECORD_TYPE_IN_STOCK_CANCEL=>'取消出库',
|
|
|
- self::STOCK_RECORD_TYPE_SELL_STOCK_CANCEL=>'取消开单',
|
|
|
- self::STOCK_RECORD_TYPE_WASTAGE=>'报损',
|
|
|
- self::STOCK_RECORD_TYPE_REFUND=>'退货',
|
|
|
-
|
|
|
+ self::STOCK_RECORD_TYPE_PURCHASE => '采购入库',
|
|
|
+ self::STOCK_RECORD_TYPE_IN_STOCK => '调拨入库',
|
|
|
+ self::STOCK_RECORD_TYPE_OUT_STOCK => '调拨出库',
|
|
|
+ self::STOCK_RECORD_TYPE_CHECK_STOCK => '盘点',
|
|
|
+ self::STOCK_RECORD_TYPE_SELL_STOCK => '开单',
|
|
|
+ self::STOCK_RECORD_TYPE_OUT_STOCK_CANCEL => '取消入库',
|
|
|
+ self::STOCK_RECORD_TYPE_IN_STOCK_CANCEL => '取消出库',
|
|
|
+ self::STOCK_RECORD_TYPE_SELL_STOCK_CANCEL => '取消开单',
|
|
|
+ self::STOCK_RECORD_TYPE_WASTAGE => '报损',
|
|
|
+ self::STOCK_RECORD_TYPE_REFUND => '退货',
|
|
|
];
|
|
|
|
|
|
public static function getRecordList($where)
|
|
|
@@ -46,12 +43,12 @@ class StockRecordClass extends BaseClass
|
|
|
if (empty($list)) {
|
|
|
return $data;
|
|
|
}
|
|
|
- $itemIds = array_column($list,'itemId');
|
|
|
+ $itemIds = array_column($list, 'itemId');
|
|
|
$itemIdsUnitNum = xhItemService::getItemUnitNums($itemIds);
|
|
|
- foreach ($list as $k=>$v){
|
|
|
- $unitNum = $itemIdsUnitNum[$v['itemId']]??0;
|
|
|
- $stock = ProductClass::formatStock($v['newStock'],$unitNum);
|
|
|
- $orderNums = ProductClass::formatStock($v['itemNum'],$unitNum);
|
|
|
+ foreach ($list as $k => $v) {
|
|
|
+ $unitNum = $itemIdsUnitNum[$v['itemId']] ?? 0;
|
|
|
+ $stock = ProductClass::formatStock($v['newStock'], $unitNum);
|
|
|
+ $orderNums = ProductClass::formatStock($v['itemNum'], $unitNum);
|
|
|
$list[$k]['bigNumOrder'] = $orderNums['bigNum'];
|
|
|
$list[$k]['smallNumOrder'] = $orderNums['smallNum'];
|
|
|
$list[$k]['bigNumStock'] = $stock['bigNum'];
|
|
|
@@ -64,8 +61,9 @@ class StockRecordClass extends BaseClass
|
|
|
|
|
|
public static function getTypeName($type)
|
|
|
{
|
|
|
- return self::$typeMap[$type]??'';
|
|
|
+ return self::$typeMap[$type] ?? '';
|
|
|
}
|
|
|
+
|
|
|
public static function addRecord($data)
|
|
|
{
|
|
|
return self::add($data);
|
|
|
@@ -74,23 +72,23 @@ class StockRecordClass extends BaseClass
|
|
|
//根据order 记录流水
|
|
|
// sjId,shopId,orderSn
|
|
|
//itemInfo = [{productId:1,itemId:1,itemNum:操作的花材数据,oldStock(itemStock):当时库存,newStock:变化后的库存}]
|
|
|
- public static function addRecordByOrder($orderData,$type)
|
|
|
+ public static function addRecordByOrder($orderData, $type)
|
|
|
{
|
|
|
$itemInfo = $orderData['itemInfo'];
|
|
|
$productData = self::getProductMapData($itemInfo);
|
|
|
- foreach ($itemInfo as $v){
|
|
|
+ foreach ($itemInfo as $v) {
|
|
|
$itemId = $v['itemId'];
|
|
|
$productId = $v['productId'];
|
|
|
$record = [];
|
|
|
- $unitNum = $productData[$productId]['ratio']??0;
|
|
|
- $itemNum = ProductClass::mergeItemNum($v['bigNum'],$v['smallNum'],$unitNum);
|
|
|
+ $unitNum = $productData[$productId]['ratio'] ?? 0;
|
|
|
+ $itemNum = ProductClass::mergeItemNum($v['bigNum'], $v['smallNum'], $unitNum);
|
|
|
$record['sjId'] = $orderData['sjId'];
|
|
|
$record['shopId'] = $orderData['shopId'];
|
|
|
$record['orderSn'] = $orderData['orderSn'];
|
|
|
$record['itemId'] = $itemId;
|
|
|
$record['itemNum'] = $itemNum;
|
|
|
$record['oldStock'] = $v['itemStock']; //当时库存
|
|
|
- $record['recordType'] =$type;
|
|
|
+ $record['recordType'] = $type;
|
|
|
$record['productId'] = $productId;
|
|
|
$record['newStock'] = $v['newStock'];// 最新库存
|
|
|
// switch ($type){
|
|
|
@@ -109,9 +107,7 @@ class StockRecordClass extends BaseClass
|
|
|
// }
|
|
|
//记录流水
|
|
|
StockRecordService::add($record);
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //
|
|
|
}
|