|
|
@@ -46,9 +46,8 @@ class StatSaleClass extends BaseClass
|
|
|
$stockOut = StatStockOutClass::getSum($where);
|
|
|
|
|
|
//采购入库
|
|
|
- //$cg = StatCgClass::getSum($where);
|
|
|
$cgWhere = ['mainId' => $mainId, 'status' => 4];
|
|
|
- $cgWhere['addTime'] = ['between', [$currentStartTime, $currentEndTime]];
|
|
|
+ $cgWhere['entryTime'] = ['between', [$currentStartTime, $currentEndTime]];
|
|
|
$cgList = PurchaseOrderClass::getAllByCondition($cgWhere, null, '*');
|
|
|
$cg = 0;
|
|
|
if (!empty($cgList)) {
|
|
|
@@ -140,7 +139,7 @@ class StatSaleClass extends BaseClass
|
|
|
['name' => '美团手续费', 'id' => 'mtFee', 'amount' => floatval($lsServiceFee)],
|
|
|
['name' => '采购', 'id' => 'cg', 'amount' => floatval($cg)],
|
|
|
['name' => '调拨入库', 'id' => 'allot', 'amount' => floatval($stockIn)],
|
|
|
- ['name' => '员工工资', 'id'=>'salary', 'amount' => floatval($salary)],
|
|
|
+ ['name' => '员工工资', 'id' => 'salary', 'amount' => floatval($salary)],
|
|
|
];
|
|
|
if (!empty($expendAmount)) {
|
|
|
foreach ($expendAmount as $it) {
|
shish