github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,159 Commits
3 Branches
68 Tags
143 MiB
Commit Graph

1159 Commits (e600fde681f11ddad26cbc1f6ceed20ef77c6266)

Author SHA1 Message Date
Gauthier LO bbbf298825
Update ShippingInvoiceController.java 
cleanup convertToPdf function not deleted during merge
 2024-01-05 09:41:57 +01:00
Qiuyi LI daecbead81
Update ShippingInvoiceController.java 2024-01-04 17:12:32 +01:00
Gauthier LO fdec4d77f1 Merge remote-tracking branch 'origin/feature/creditPage' into feature/creditPage 2024-01-04 17:02:55 +01:00
Gauthier LO b59b2ba00c feature : transaction.sql updated 2024-01-04 17:02:32 +01:00
Gauthier LO b426e836ed
Merge branch 'dev' into feature/creditPage 2024-01-04 16:29:23 +01:00
Gauthier LO 67cb86e25b feature : feature : Self-service invoicing rework + Purchase Order Registration Page + ShippingFeeBillableNotificationJob 2024-01-04 15:57:15 +01:00
Gauthier LO b2a8e88559 feature : feature : (WIP)Self-service invoicing rework + Purchase Order Registration Page + SkuShippingQtyJob 2023-12-08 17:39:59 +01:00
Qiuyi LI a986295eb4 Hotfix : Update project version 2023-11-27 14:56:15 +01:00
Qiuyi LI ca7be03720 Add parcel trace translation for HL 2023-11-27 14:55:53 +01:00
Qiuyi LI be5a9694f2
Merge pull request #43 from LQYBill/release 
Release 1.8.1
 2023-11-21 15:28:22 +01:00
Qiuyi LI c494a9cd02 Update project version 2023-11-21 15:27:25 +01:00
Qiuyi LI 33b450ba28
Merge pull request #42 from LQYBill/dev 
Release 1.8.1
 2023-11-21 15:26:16 +01:00
Qiuyi LI 15d01493f2
Merge pull request #41 from LQYBill/hl_job_adaptation 
Hl job adaptation
 2023-11-21 15:23:55 +01:00
Qiuyi LI 6ac3ce6bf6 Create YPJob 2023-11-21 15:22:21 +01:00
Qiuyi LI 09bcd7938c Refactor HLJob to make it possible to change request URL 2023-11-21 15:22:01 +01:00
Gauthier LO b718a23b9c feature : confirmed clients invoicing job 2023-11-15 15:31:26 +01:00
Qiuyi LI 0419db4f72
Merge pull request #40 from LQYBill/release 
Release
 2023-11-14 15:56:31 +01:00
Qiuyi LI 171baab56e Release 1.8.0: Improve tube adding algo and 30cm tubes 2023-11-14 15:27:25 +01:00
Qiuyi LI c97b95f4e5
Merge pull request #39 from LQYBill/dev 
Merge 30cm tubes feature to release
 2023-11-14 15:13:27 +01:00
Qiuyi LI 1c0403fcf8
Merge pull request #38 from LQYBill/release 
Merge release to dev
 2023-11-14 15:12:16 +01:00
Qiuyi LI 48d783c7ba
Merge pull request #37 from LQYBill/feature/30cmPortraitTubes 
Feature/30cm portrait tubes
 2023-11-14 15:10:15 +01:00
Qiuyi LI 140997994a Replace old algo by new algo 2023-11-14 14:26:05 +01:00
Qiuyi LI 0c57d68a12 Validate tests with improvement in case of two 40cm canvases and 50cm canvases 2023-11-14 14:20:23 +01:00
Qiuyi LI a2f27094c3 Create a new method for finding adequate tubes and a main to test for regression 2023-11-13 16:10:22 +01:00
Gauthier LO 6978554075 fix2 : credit editing now correctly updates balance + allow only editing of last credit per currency 2023-10-31 14:29:19 +01:00
Gauthier LO 1efb88c7a1 feature : VipInvoicingJob + (WIP) client category 2023-10-30 15:26:36 +01:00
Qiuyi LI b05fd4445e Update project version 2023-10-25 11:40:41 +02:00
Qiuyi LI 43b31e5e9a Hotfix: Update CWJob API key and secret to retrieve parcel traces of another YDH account 2023-10-25 11:40:04 +02:00
Gauthier LO cd924ce2d1 feature : (WÏP) credit Page + balance + invoicing 2023-10-13 14:38:36 +02:00
Qiuyi LI aa382b7167
Merge pull request #36 from LQYBill/release 
Release
 2023-10-13 11:35:32 +02:00
Qiuyi LI e1d7b36c13 Release 1.7.0: Export Excel file to PDF by default after invoice generation 2023-10-13 10:09:51 +02:00
Qiuyi LI 769bd9a58a
Merge pull request #35 from LQYBill/dev 
Release 1.7.0
 2023-10-11 16:52:52 +02:00
Qiuyi LI dd6d219c3d
Merge pull request #34 from LQYBill/feature/breakdownPdf 
feature : generation of pdf for invoice during breakdown invoicing
 2023-10-10 12:14:57 +02:00
Gauthier LO a02f3dbdb4 feature : generation of pdf for invoice during breakdown invoicing 2023-10-10 12:00:55 +02:00
Gauthier LO 9d765591a9 feature : (WIP) Expenses Overview + LogisticChannelChoice job 2023-10-09 16:39:02 +02:00
Qiuyi LI afc05eed6e
Merge pull request #33 from LQYBill/release 
Release 1.6.2
 2023-09-18 12:12:31 +02:00
Qiuyi LI c42015520c Update project version 2023-09-15 11:39:10 +02:00
Qiuyi LI 63b61d3f24
Merge pull request #32 from LQYBill/dev 
Hotfixes
 2023-09-15 11:25:42 +02:00
Qiuyi LI 8b32a17a00
Merge pull request #31 from LQYBill/fix/invoiceExcelBug 
fix: Excel display bug in invoices
 2023-09-15 11:21:50 +02:00
Qiuyi LI 8228862f39
Update AbstractInvoice.java 
Cleanup comments
 2023-09-15 11:21:37 +02:00
Qiuyi LI abada459bb
Update AbstractInvoice.java 
Delete system.out.println
 2023-09-15 11:20:28 +02:00
Gauthier LO 0561f8a870 fix: Excel display bug in invoices 2023-09-15 11:02:50 +02:00
Qiuyi LI f64086699d
Merge pull request #30 from LQYBill/archive_order_job_rate_limiter 
Archive order job rate limiter
 2023-09-14 16:16:26 +02:00
Qiuyi LI a0db239994 Use ThrottlingExecutorService in ArchiveOrderJob as MabangAPI has a 300 requests per minute limit 2023-09-14 16:13:48 +02:00
Qiuyi LI bcf57915cc Add thread executor service with throttling 2023-09-14 16:12:40 +02:00
Qiuyi LI c21a8b50fe Update project version 2023-09-13 16:40:40 +02:00
Qiuyi LI 7d85e3becc
Merge pull request #29 from LQYBill/dev 
Hotfix : add tube rule for 30X40 portraits
 2023-09-13 16:39:55 +02:00
Qiuyi LI 18a8448684
Merge pull request #28 from LQYBill/update_tube_adding_job 
Add tube rule for 30X40 portraits
 2023-09-13 16:23:03 +02:00
Qiuyi LI cf2b51c0f7 Add tube rule for 30X40 portraits 2023-09-13 16:21:26 +02:00
Qiuyi LI 76c6d7a853 Merge remote-tracking branch 'origin/release' into release 2023-09-13 15:27:32 +02:00