cf_cloud/erp
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: #10000 打印测试限制取消

Browse Source
This commit is contained in:
赵世界 2023-08-09 17:45:20 +08:00
parent b457428d7f
commit 2d93ba12f5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Business/BusinessOrderController.php
View File

@ -200,7 +200,10 @@ class BusinessOrderController extends Controller
$data = []; $data = [];
foreach ($documents as &$document) { foreach ($documents as &$document) {
$documentID = $document['documentID']; $documentID = $document['documentID'];
unset($document['documentID']); foreach ($document['items'] as $item) {
$documentData['data']['list'][0]['text'] .= $item['name'] . ' ' . $item['count'] . '件;';
}
unset($document['documentID'], $document['items'], $document['order_id']);
$data[] = [ $data[] = [
'documentID' => $documentID, 'documentID' => $documentID,
'contents' => [ 'contents' => [

2
app/Services/Ship/WayBillService.php
View File

@ -93,7 +93,7 @@ class WayBillService
$hasIds = array_merge($hasIds, $docIds); $hasIds = array_merge($hasIds, $docIds);
foreach ($docIds as $docId) { foreach ($docIds as $docId) {
$orderIds[] = $contents[$docId]['order_id']; $orderIds[] = $contents[$docId]['order_id'];
unset($contents[$docId]['items'], $contents[$docId]['order_id']); // unset($contents[$docId]['items'], $contents[$docId]['order_id']);
$documents[] = $contents[$docId]; $documents[] = $contents[$docId];
} }
} }