Commit Graph

151 Commits

Author SHA1 Message Date
mzl92 aa3ee8acff 调整备货单&&修改采购单 2025-09-22 18:49:18 +08:00
mzl92 419d0e9d54 采购单修改 2025-09-22 16:47:50 +08:00
root bdefd69a13 采购单处理 2025-09-22 15:50:36 +08:00
mzl92 e12d5951e4 修改计å¤备货单金额计算&&采购单编写†2025-09-22 01:55:34 +00:00
mzl92 20e3ce3b27 修改审批 2025-09-19 07:43:48 +00:00
18338781771 4b1aa90734 Merge branch 'hotfix/series' 2025-09-19 15:42:35 +08:00
18338781771 b7000b0ce7 Merge branch 'hotfix/series' into develop 2025-09-19 15:42:21 +08:00
18338781771 4b2bd0d340 港口 2025-09-19 15:42:11 +08:00
mzl92 b7b6edb06c Merge branch 'develop' 2025-09-18 15:05:57 +08:00
mzl92 9331aa2f36 修改文件路径 2025-09-18 07:04:14 +00:00
mzl92 e5441d51ae 修改审批 2025-09-18 06:46:15 +00:00
mzl92 62c32d25ff Merge branch 'develop' 2025-09-16 10:53:57 +08:00
18338781771 50fe207ef2 Merge branch 'feature/stock_next' into develop 2025-09-15 17:33:59 +08:00
18338781771 e41be712d3 1 2025-09-15 17:33:34 +08:00
18338781771 6911d2aba2 Merge branch 'feature/stock_next' into develop 2025-09-15 17:27:35 +08:00
18338781771 c24c9af1fd 1 2025-09-15 17:27:26 +08:00
18338781771 1c243ad6ab Merge branch 'feature/stock_next' into develop 2025-09-15 17:10:40 +08:00
18338781771 88bc59ed87 上传可制定名称 2025-09-15 17:10:22 +08:00
mzl92 67eaba2687 ts 2025-09-15 16:38:00 +08:00
mzl92 f152529364 消息推送增加邮箱&&增加终版保存功能 2025-09-15 15:01:19 +08:00
mzl92 7e83949ed5 移除废弃代码&&增加管理端备货单查看 2025-09-11 17:13:28 +08:00
18338781771 09576a44fe Merge branch 'feature/stock_next' into develop 2025-09-10 15:02:24 +08:00
18338781771 b120337987 文件删除 2025-09-10 15:02:11 +08:00
18338781771 726e5cf558 Merge branch 'feature/stock_next' into develop 2025-09-10 14:34:37 +08:00
18338781771 e59a690c31 文件删除 2025-09-10 14:33:12 +08:00
18338781771 cc4cf55e76 ts 2025-09-10 13:37:45 +08:00
18338781771 3873238a62 ts 2025-09-09 21:07:34 +08:00
mzl92 196f16769b Merge branch 'develop' into feature/mzl_dev 2025-09-09 18:02:53 +08:00
mzl92 eb4434c139 调整备货单&审批 2025-09-09 16:15:48 +08:00
18338781771 38062d1fb4 Merge branch 'feature/stock_next' into develop 2025-09-09 14:10:08 +08:00
18338781771 1119cc390b 文件上传 2025-09-09 14:09:57 +08:00
mzl92 f5e93f2400 Merge branch 'feature/mzl_dev' into develop
# Conflicts:
#	app/admin/service/SysDictService.php
2025-09-09 13:47:04 +08:00
mzl92 918bac19a5 审批&备货单 2025-09-09 13:42:00 +08:00
mzl92 5dd2925687 Merge branch 'develop' into feature/mzl_dev 2025-09-08 20:02:26 +08:00
mzl92 153443d20f Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev 2025-09-08 20:01:31 +08:00
mzl92 84c588496b 调整备货单 2025-09-08 20:00:12 +08:00
18338781771 50a795afb7 Merge branch 'feature/stock_next' into develop 2025-09-08 18:03:21 +08:00
18338781771 d6d421cba2 服务器文件上传 2025-09-08 18:03:09 +08:00
mzl92 8340f678d6 Merge branch 'develop' into feature/mzl_dev 2025-09-08 11:35:45 +08:00
mzl92 28368e27a7 审批&PDF生成 2025-09-08 11:34:19 +08:00
mzl92 ea38afff9a 备货单完善 2025-09-04 18:22:24 +08:00
18338781771 09502dc503 Merge branch 'feature/upload' into develop 2025-09-04 14:56:16 +08:00
mzl92 ced046aa18 增加关联关系 2025-09-04 11:52:40 +08:00
mzl92 dcabbb697a Merge branch 'develop' into feature/mzl_dev 2025-09-04 10:27:19 +08:00
mzl92 249b61ddb8 备货单&审批流程 2025-09-04 10:26:28 +08:00
18338781771 b7abe60d71 上传 2025-09-03 11:03:22 +08:00
18338781771 152ce9a75f 港口场景筛选 2025-09-02 18:04:09 +08:00
mzl92 6a1ab1f5c3 增加备货单 2025-09-02 17:22:56 +08:00
mzl92 476921e6b8 备货单 2025-09-02 09:36:37 +08:00
mzl92 b3d8029e6d Merge branch 'develop_bm' into feature/mzl_dev
# Conflicts:
#	app/controller/IndexController.php
#	config/route.php
2025-09-01 14:06:34 +08:00