feat: refs #7644 Added item reference
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2024-07-26 13:52:18 +02:00
parent 2505adf87f
commit b876d1c278
6 changed files with 20 additions and 14 deletions

View File

@ -29,7 +29,7 @@ module.exports = Self => {
SELECT COUNT(*) > 0 isCustomer SELECT COUNT(*) > 0 isCustomer
FROM salix.Account A FROM salix.Account A
JOIN salix.Role r ON r.id = A.roleFK JOIN salix.Role r ON r.id = A.roleFK
WHERE r.name = 'customer' WHERE r.name IN ('customer', 'supplier')
AND A.id IN (?)`; AND A.id IN (?)`;
const [result] = await Self.rawSql(query, [id], myOptions); const [result] = await Self.rawSql(query, [id], myOptions);
const {isCustomer} = result; const {isCustomer} = result;

View File

@ -33,9 +33,6 @@ span {
.barcode { .barcode {
text-align: center; text-align: center;
} }
#variant { .one-third {
width: 314px; width: 314px;
} }
#producer {
width: 471px;
}

View File

@ -4,7 +4,7 @@
<tbody> <tbody>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div id="variant" class="cell"> <div class="cell one-third">
<span class="lbl">{{$t('variety')}}</span> <span class="lbl">{{$t('variety')}}</span>
{{buy.name}} {{buy.name}}
</div> </div>
@ -63,18 +63,24 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="3"> <td colspan="2">
<div id="producer" class="cell"> <div class="cell one-third">
<span class="lbl">{{$t('producer')}}</span> <span class="lbl">{{$t('producer')}}</span>
{{buy.producer}} {{buy.producer}}
</div> </div>
</td> </td>
<td>
<div class="cell">
<span class="lbl">{{$t('control')}}</span>
{{`${weekNum} / ${dayNum}`}}
</div>
</td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div class="cell"> <div class="cell one-third">
<span class="lbl">{{$t('control')}}</span> <span class="lbl">{{$t('reference')}}</span>
{{`${weekNum} / ${dayNum}`}} {{buy.comment}}
</div> </div>
</td> </td>
<td> <td>

View File

@ -10,3 +10,4 @@ unitSale: Un. sale
producer: Producer producer: Producer
control: Control control: Control
boxNum: Box no. boxNum: Box no.
reference: Reference

View File

@ -10,3 +10,4 @@ saleUnit: Sale un.
producer: Productor producer: Productor
control: Control control: Control
boxNum: Caja nº boxNum: Caja nº
reference: Referencia

View File

@ -20,7 +20,8 @@ SELECT ROW_NUMBER() OVER(ORDER BY b.id, num.n) labelNum,
i.stems, i.stems,
b.id, b.id,
b.itemFk, b.itemFk,
p.name producer p.name producer,
i.comment
FROM buy b FROM buy b
JOIN item i ON i.id = b.itemFk JOIN item i ON i.id = b.itemFk
LEFT JOIN producer p ON p.id = i.producerFk LEFT JOIN producer p ON p.id = i.producerFk