github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: cancelInvoice

pull/6221/head
Gauthier LO 2023-08-22 15:57:29 +02:00
parent 06d405b7e0
commit f2ff97b1d3
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
View File

@ -597,8 +597,11 @@
packaging_material_fee = 0.0, packaging_material_fee = 0.0,
erp_status = erp_status =
CASE erp_status CASE erp_status
WHEN 4 THEN 3 WHEN '4' THEN '3'
END WHEN '3' THEN '3'
WHEN '1' THEN '1'
WHEN '2' THEN '2'
END
WHERE shipping_invoice_number = #{invoiceNumber}; WHERE shipping_invoice_number = #{invoiceNumber};
</update> </update>
<update id="cancelBatchInvoice"> <update id="cancelBatchInvoice">
@ -610,7 +613,10 @@
packaging_material_fee = 0.0, packaging_material_fee = 0.0,
erp_status = erp_status =
CASE erp_status CASE erp_status
WHEN 4 THEN 3 WHEN '4' THEN '3'
WHEN '3' THEN '3'
WHEN '1' THEN '1'
WHEN '2' THEN '2'
END END
WHERE shipping_invoice_number IN WHERE shipping_invoice_number IN
<foreach collection="invoiceNumbers" separator="," open="(" close=")" index="index" item="invoiceNumber"> <foreach collection="invoiceNumbers" separator="," open="(" close=")" index="index" item="invoiceNumber">

2
jeecg-module-system/jeecg-system-biz/src/main/resources/templates/breakdownInvoiceMail.ftl
View File

@ -95,4 +95,4 @@
</tbody> </tbody>
</table> </table>
</body> </body>
</html>" </html>