|
|
5a00d7a858
|
Merge pull request '修改预订单出库' (#559) from dev into main
Reviewed-on: #559
|
2025-03-26 10:19:06 +08:00 |
|
|
|
4585c57609
|
修改预订单出库
|
2025-03-25 14:46:58 +08:00 |
|
|
|
53faf6751c
|
Merge pull request '采购资金添加详情' (#558) from dev into main
Reviewed-on: #558
|
2025-03-24 14:30:16 +08:00 |
|
|
|
6e8b34f301
|
采购资金添加详情
|
2025-03-24 14:16:23 +08:00 |
|
|
|
d06d71b167
|
Merge pull request '添加复制到仓库' (#557) from dev into main
Reviewed-on: #557
|
2025-03-23 09:24:41 +08:00 |
|
|
|
0fc761e915
|
添加复制到仓库
|
2025-03-22 11:45:20 +08:00 |
|
|
|
5bc0836fea
|
Merge pull request 'dev' (#556) from dev into main
Reviewed-on: #556
|
2025-03-21 17:45:03 +08:00 |
|
|
|
fcef927257
|
调试财务溯源
|
2025-03-21 17:36:00 +08:00 |
|
|
|
b4e8f188ab
|
调试财务溯源
|
2025-03-21 17:15:38 +08:00 |
|
|
|
0863b55846
|
Merge pull request 'dev' (#555) from dev into main
Reviewed-on: #555
|
2025-03-21 09:17:28 +08:00 |
|
|
|
0ddfd9c483
|
调试财务溯源
|
2025-03-20 15:58:38 +08:00 |
|
|
|
e2b47ab17b
|
调试财务溯源
|
2025-03-20 15:29:55 +08:00 |
|
|
|
7f843c5698
|
调试财务溯源
|
2025-03-20 15:20:44 +08:00 |
|
|
|
09a6c25259
|
调试财务溯源
|
2025-03-20 15:04:32 +08:00 |
|
|
|
ccfd1f3556
|
调试财务溯源
|
2025-03-20 14:16:00 +08:00 |
|
|
|
a20a7eb8b4
|
Merge pull request 'dev' (#554) from dev into main
Reviewed-on: #554
|
2025-03-18 16:15:08 +08:00 |
|
|
|
0eb1586076
|
修改预订单列表查询
|
2025-03-18 16:07:45 +08:00 |
|
|
|
98815747f5
|
修改商品改价列表
|
2025-03-18 15:20:56 +08:00 |
|
|
|
4d22eecf2d
|
Merge pull request '修改商品溯源导出' (#553) from dev into main
Reviewed-on: #553
|
2025-03-18 09:40:19 +08:00 |
|
|
|
4be97abe72
|
Merge branch 'main' into dev
|
2025-03-18 09:38:35 +08:00 |
|
|
|
6751be1f23
|
修改商品溯源导出
|
2025-03-18 09:37:05 +08:00 |
|
|
|
0d30d497cc
|
Merge pull request '修改商品溯源导出' (#552) from dev into main
Reviewed-on: #552
|
2025-03-17 18:48:10 +08:00 |
|
|
|
7fc4d87249
|
修改商品溯源导出
|
2025-03-17 18:47:43 +08:00 |
|
|
|
2c5c541fe8
|
Merge pull request '添加商品溯源导出' (#551) from dev into main
Reviewed-on: #551
|
2025-03-17 18:36:36 +08:00 |
|
|
|
43b34ea55b
|
添加商品溯源导出
|
2025-03-17 18:35:48 +08:00 |
|
|
|
2d615a43e6
|
Merge pull request '修改出入库补单' (#550) from dev into main
Reviewed-on: #550
|
2025-03-17 17:34:41 +08:00 |
|
|
|
712409b41b
|
修改出入库补单
|
2025-03-17 17:31:15 +08:00 |
|
|
|
67a019608a
|
Merge pull request '添加出入库补单' (#549) from dev into main
Reviewed-on: #549
|
2025-03-17 17:21:52 +08:00 |
|
|
|
4d89794a05
|
添加出入库补单
|
2025-03-17 16:40:34 +08:00 |
|
|
|
2accc5e41d
|
Merge pull request 'dev' (#548) from dev into main
Reviewed-on: #548
|
2025-03-17 15:34:14 +08:00 |
|
|
|
6475df1d71
|
修改图片字段的错误
|
2025-03-17 15:33:03 +08:00 |
|
|
|
a9ae0ede08
|
修改出库单商品详情
|
2025-03-17 15:04:40 +08:00 |
|
|
|
cfcb1c181c
|
Merge pull request 'dev' (#547) from dev into main
Reviewed-on: #547
|
2025-03-17 14:42:28 +08:00 |
|
|
|
60ae388d9f
|
Merge branch 'update_warehouse_product' into dev
|
2025-03-17 14:36:13 +08:00 |
|
|
|
c3acd04bf8
|
商品溯源详情添加跳转
|
2025-03-17 14:36:02 +08:00 |
|
|
|
8bfe65cea9
|
修改商品改价
|
2025-03-17 11:00:45 +08:00 |
|
|
|
6375194854
|
Merge pull request 'update_warehouse_product' (#546) from update_warehouse_product into main
Reviewed-on: #546
|
2025-03-15 11:26:09 +08:00 |
|
|
|
a8acf3ae67
|
修改预订单导出
|
2025-03-15 11:18:26 +08:00 |
|
|
|
f27d25311a
|
Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
|
2025-03-15 10:47:10 +08:00 |
|
|
|
a49919882a
|
调整商品溯源
|
2025-03-14 18:16:27 +08:00 |
|
|
|
c9684b2f8b
|
调整商品溯源
|
2025-03-14 17:37:36 +08:00 |
|
|
|
4a8d90d1a6
|
调整商品溯源
|
2025-03-14 17:18:17 +08:00 |
|
|
|
b2e51cbf5f
|
refactor(app): 调整商品价格显示逻辑
- 注释掉原代码中处理活动价的部分
- 新增高级会员价处理逻辑
- 修改价格显示为成本价
- 更新商品名称后缀为"高级会员价"
|
2025-03-14 16:56:05 +08:00 |
|
|
|
092e5e1785
|
fix(admin): 修复预订单购物车信息逻辑
- 在预订单购物车信息中添加 purchase 字段，用于记录商品价格
- 修复了未定义 prices 导致的潜在问题，使用空值合并运算符 ?? 0 提供默认值
- 确保 cart_num、accept_num 和 price 字段正确赋值
|
2025-03-14 14:46:18 +08:00 |
|
|
|
02c96c75d7
|
feat: 价格趋势数据按时间顺序排序
- 在处理价格趋势数据时，增加了对列表进行按时间顺序排序的步骤
- 使用 asort() 函数对 $list 数组进行排序，确保价格趋势数据按时间轴正确展示
|
2025-03-14 11:59:23 +08:00 |
|
|
|
d367e0e49f
|
refactor(admin): 优化商品价格查询和订单处理逻辑
- 修改商品价格查询排序方式，从升序改为降序
|
2025-03-14 11:50:36 +08:00 |
|
|
|
0ad56182cf
|
修改商品出入库溯源
|
2025-03-13 17:49:03 +08:00 |
|
|
|
ad25d6c599
|
调整商品溯源
|
2025-03-12 17:54:08 +08:00 |
|
|
|
8c4128ccd4
|
calc(product-source-link): 计算商品溯源列表中的总数和仓库数
- 移除了字段 'total_nums', 'nums', 'warehouse_total_nums', 'warehouse_nums' 的直接查询
- 使用 each 函数遍历查询结果，计算每个商品的总数量和仓库数量
- 通过 ProductSourceLinkInfo 模型
|
2025-03-12 14:34:21 +08:00 |
|
|
|
47de656777
|
refactor(api): 更新 IndexController 中的数据处理逻辑
- 移除了未使用的注释代码
- 添加了对 'ceshi_copy_copy' 表的数据处理逻辑
- 使用 Db 类进行数据库操作，提高了代码的可读性和维护性
- 优化了数据处理流程，提高了代码执行效率
|
2025-03-12 11:21:45 +08:00 |
|
