Commit Graph

1039 Commits

Author SHA1 Message Date
mzl92 7e90b05dde Merge branch 'develop' into feature/mzl_dev 2025-11-04 13:11:44 +08:00
mzl92 29dd6a2954 Finish sku_crawl 2025-11-04 13:11:34 +08:00
mzl92 f73bad8082 Merge branch 'develop' into feature/sku_crawl 2025-11-04 13:11:27 +08:00
mzl92 be4dcb4dd4 删除增加过滤 2025-11-04 13:10:46 +08:00
mzl92 1eccabb806 Finish mzl_dev 2025-11-04 10:33:40 +08:00
mzl92 013fc83362 Merge branch 'develop' into feature/mzl_dev 2025-11-04 10:32:22 +08:00
mzl92 42bf32a9a5 修正编辑后的备货单绕过文件上传 2025-11-04 10:31:45 +08:00
mzl92 2f8f7dccf9 调整备货单功能 2025-11-03 18:07:56 +08:00
18338781771 49e7709ae3 Merge branch 'feature/fin' into develop 2025-11-01 14:59:46 +08:00
18338781771 5b77b8ed83 待入账 2025-11-01 14:59:41 +08:00
18338781771 a98769fb4c Merge branch 'feature/fin' into develop 2025-11-01 14:44:58 +08:00
18338781771 56ad551707 收汇凭证倒计时 2025-11-01 14:44:47 +08:00
18338781771 2711ed8f6a Merge branch 'feature/fin' into develop 2025-11-01 14:14:01 +08:00
18338781771 f1d5fae122 入账记录汇率 2025-11-01 14:13:55 +08:00
18338781771 4f965f8b5f Merge branch 'feature/fin' into develop 2025-11-01 14:02:21 +08:00
18338781771 4dbd72acce 待入账与入账实际汇率 2025-11-01 14:02:15 +08:00
18338781771 0c789b7a1a Merge branch 'feature/fin' into develop
# Conflicts:
#	app/common/service/FinReceiptService.php
2025-11-01 13:37:39 +08:00
18338781771 8674063e6e 付款记录作废 2025-11-01 13:36:18 +08:00
18338781771 1094bc406f Revert "作废"
This reverts commit 139d3509f4.
2025-11-01 13:22:45 +08:00
18338781771 596313ed5a Merge branch 'feature/fin' into develop 2025-11-01 13:20:38 +08:00
18338781771 74ac8941ea 统计 2025-11-01 13:20:33 +08:00
18338781771 6493bdebb1 待入账 2025-11-01 11:34:49 +08:00
18338781771 07a3d66079 Merge branch 'feature/fin' into develop 2025-11-01 11:32:16 +08:00
18338781771 18eb3e7c5d 统计 2025-11-01 11:32:10 +08:00
18338781771 262add20f8 Merge branch 'feature/fin' into develop
# Conflicts:
#	app/common/service/FinReceiptService.php
2025-11-01 09:47:56 +08:00
18338781771 139d3509f4 作废 2025-11-01 09:45:41 +08:00
18338781771 f7faf79809 待入账列表 2025-11-01 08:56:48 +08:00
18338781771 29ba35f9b6 收付款统计 2025-10-31 16:22:28 +08:00
18338781771 0e38f0f9bb Merge branch 'feature/fin' into develop 2025-10-31 10:17:52 +08:00
18338781771 43fe263df1 备货单编号 2025-10-31 10:17:41 +08:00
mzl92 58a38d1463 Finish mzl_dev 2025-10-31 09:47:58 +08:00
mzl92 821f455e47 Merge branch 'develop' into feature/mzl_dev 2025-10-31 09:47:48 +08:00
mzl92 24805257c7 调整内勤仪表盘曲线查询 2025-10-31 09:46:57 +08:00
18338781771 b4ce4fe672 Merge branch 'feature/fin' into develop 2025-10-30 18:49:33 +08:00
18338781771 206eff87e2 附件 2025-10-30 18:49:28 +08:00
18338781771 2e85b46a3d Merge branch 'feature/fin' into develop 2025-10-30 18:37:46 +08:00
18338781771 72fa638cf5 排序优化 2025-10-30 18:37:40 +08:00
18338781771 5f25ac9895 Merge branch 'feature/fin' into develop 2025-10-30 18:12:34 +08:00
18338781771 ad67a88d0f 水单多文件 2025-10-30 18:11:50 +08:00
mzl92 4c3f8c9cf7 Finish mzl_dev 2025-10-30 17:55:32 +08:00
mzl92 3f8dbf97e4 Merge branch 'develop' into feature/mzl_dev 2025-10-30 17:55:27 +08:00
mzl92 e9636513ec 临时处理仪表盘显示 2025-10-30 17:55:08 +08:00
18338781771 9f167ad526 Merge branch 'feature/fin' into develop 2025-10-30 17:54:43 +08:00
18338781771 d737281283 水单多文件 2025-10-30 17:54:38 +08:00
18338781771 695c398962 Merge branch 'feature/fin' into develop 2025-10-30 17:38:46 +08:00
18338781771 0110e393ce 付款单关联备货单优化 2025-10-30 17:38:40 +08:00
18338781771 ea0d5b14bc Merge branch 'feature/fin' into develop 2025-10-30 17:21:20 +08:00
18338781771 a3819bcba7 入账资料附件格式处理 2025-10-30 17:21:10 +08:00
mzl92 3d6aa5f365 Finish mzl_dev 2025-10-30 17:10:06 +08:00
mzl92 79d0ae2cbd Merge branch 'develop' into feature/mzl_dev 2025-10-30 17:10:00 +08:00