|
|
@@ -1038,6 +1038,7 @@ class OrderClass extends BaseClass
|
|
|
'name' => $itemVal['name'] ?? '',
|
|
|
'num' => $itemVal['num'] . $unitName . '*' . $unitPrice,
|
|
|
'price' => floatval($itemVal['price']),
|
|
|
+ 'sn' => '',
|
|
|
];
|
|
|
}
|
|
|
}
|
|
|
@@ -1046,10 +1047,12 @@ class OrderClass extends BaseClass
|
|
|
foreach ($orderGoodsList as $itemKey => $itemVal) {
|
|
|
$unitName = $itemVal['unitName'] ?? '份';
|
|
|
$unitPrice = $itemVal['unitPrice'] ? floatval($itemVal['unitPrice']) : 0;
|
|
|
+ $sn = $itemVal['sn'] ?? '';
|
|
|
$printProduct[] = [
|
|
|
'name' => $itemVal['name'] ?? '',
|
|
|
'num' => $itemVal['num'] . $unitName . '*' . $unitPrice,
|
|
|
'price' => floatval($itemVal['price']),
|
|
|
+ 'sn' => $sn,
|
|
|
];
|
|
|
}
|
|
|
}
|
|
|
@@ -1086,6 +1089,9 @@ class OrderClass extends BaseClass
|
|
|
{
|
|
|
//58mm的机器,一行打印16个汉字,32个字母
|
|
|
$name = $current['name'] ?? '';
|
|
|
+ if (!empty($current['sn'])) {
|
|
|
+ $name = '#' . $current['sn'] . ' ' . $name;
|
|
|
+ }
|
|
|
$content .= $name . '<BR>';
|
|
|
$name = str_repeat(' ', 10);
|
|
|
|
|
|
@@ -1236,7 +1242,7 @@ class OrderClass extends BaseClass
|
|
|
public static function debtCount($mainId)
|
|
|
{
|
|
|
$debtAmount = 0;
|
|
|
- $orders = self::getAllByCondition(['mainId' => $mainId, 'status'=>4, 'debt' => 1], null, 'remainDebtPrice', null, true);
|
|
|
+ $orders = self::getAllByCondition(['mainId' => $mainId, 'status' => 4, 'debt' => 1], null, 'remainDebtPrice', null, true);
|
|
|
foreach ($orders as $order) {
|
|
|
$remainDebtPrice = $order->remainDebtPrice ?? 0;
|
|
|
$debtAmount = bcadd($debtAmount, $remainDebtPrice, 2);
|