|
|
a2cd013b07
|
Merge pull request 'refactor(warehousing): 优化入库功能' (#527) from dev into main
Reviewed-on: #527
|
2025-02-21 11:36:19 +08:00 |
|
|
|
da35e7be6a
|
refactor(warehousing): 优化入库功能
- 新增分拣入库功能
- 修改门店入库记录控制器，使用新的仓库产品列表
|
2025-02-21 11:35:51 +08:00 |
|
|
|
1aa6ad89df
|
Merge pull request '修改价格趋势排序' (#526) from dev into main
Reviewed-on: #526
|
2025-02-21 10:03:33 +08:00 |
|
|
|
e3737176e4
|
修改价格趋势排序
|
2025-02-21 10:01:08 +08:00 |
|
|
|
f4460d5dfe
|
Merge pull request 'dev' (#525) from dev into main
Reviewed-on: #525
|
2025-02-21 09:37:41 +08:00 |
|
|
|
928ae0013d
|
修改商品改价
|
2025-02-21 09:37:16 +08:00 |
|
|
|
6a6b142651
|
修改采购商品导入
|
2025-02-20 17:58:36 +08:00 |
|
|
|
6ec2b73721
|
Merge pull request '修改采购商品导入' (#524) from dev into main
Reviewed-on: #524
|
2025-02-20 17:55:37 +08:00 |
|
|
|
9a7951bdf3
|
修改采购商品导入
|
2025-02-20 17:55:14 +08:00 |
|
|
|
fd91afa36d
|
Merge pull request '添加采购商品导入' (#523) from dev into main
Reviewed-on: #523
|
2025-02-20 17:35:37 +08:00 |
|
|
|
ab020238a0
|
添加采购商品导入
|
2025-02-20 17:35:12 +08:00 |
|
|
|
0f6993796c
|
Merge pull request '修改现金流水列表查询' (#522) from dev into main
Reviewed-on: #522
|
2025-02-20 16:00:39 +08:00 |
|
|
|
69cffe9f85
|
修改现金流水列表查询
|
2025-02-20 15:54:49 +08:00 |
|
|
|
66fa4c039a
|
Merge pull request '修改商品价格设置的错误' (#521) from dev into main
Reviewed-on: #521
|
2025-02-20 10:35:17 +08:00 |
|
|
|
ae54e3f26e
|
修改商品价格设置的错误
|
2025-02-20 10:23:10 +08:00 |
|
|
|
6c546ddfc6
|
Merge pull request '修改商品价格设置的错误' (#520) from dev into main
Reviewed-on: #520
|
2025-02-20 10:02:29 +08:00 |
|
|
|
7d149aed99
|
修改商品价格设置的错误
|
2025-02-20 09:59:33 +08:00 |
|
|
|
26cbcace03
|
Merge pull request '修改商品改价的错误' (#519) from dev into main
Reviewed-on: #519
|
2025-02-20 09:22:52 +08:00 |
|
|
|
1417143eaf
|
修改商品改价的错误
|
2025-02-19 18:06:33 +08:00 |
|
|
|
e5fcae622b
|
Merge pull request 'dev' (#518) from dev into main
Reviewed-on: #518
|
2025-02-19 17:56:40 +08:00 |
|
|
|
f709b79455
|
修改入库单数量更新的错误
|
2025-02-19 17:26:18 +08:00 |
|
|
|
8c602ead5e
|
修改商品列表导出
|
2025-02-19 10:53:50 +08:00 |
|
|
|
9bcd722e47
|
Merge pull request '修改商品列表导出' (#517) from dev into main
Reviewed-on: #517
|
2025-02-19 10:44:39 +08:00 |
|
|
|
b3cbc13896
|
修改商品列表导出
|
2025-02-19 10:44:25 +08:00 |
|
|
|
f76a364929
|
Merge pull request 'dev' (#516) from dev into main
Reviewed-on: #516
|
2025-02-19 09:23:50 +08:00 |
|
|
|
debfc5cb62
|
修改入库单列表、入库商品列表
|
2025-02-18 16:15:14 +08:00 |
|
|
|
ca1570abb2
|
商品价格更改列表添加走势图
|
2025-02-18 10:51:19 +08:00 |
|
|
|
ef95b1989f
|
修改收银订单采购款支付校验
|
2025-02-17 10:34:50 +08:00 |
|
|
|
53adbca681
|
Merge pull request '修改收银订单采购款支付校验' (#515) from dev into main
Reviewed-on: #515
|
2025-02-17 10:27:04 +08:00 |
|
|
|
66a6915e4f
|
修改收银订单采购款支付校验
|
2025-02-17 10:21:14 +08:00 |
|
|
|
282b26baaa
|
Merge pull request '账期欠款添加统计' (#514) from dev into main
Reviewed-on: #514
|
2025-02-15 17:35:17 +08:00 |
|
|
|
a70d3f7dbf
|
账期欠款添加统计
|
2025-02-15 17:10:50 +08:00 |
|
|
|
75b8d794e5
|
Merge pull request 'dev' (#513) from dev into main
Reviewed-on: #513
|
2025-02-15 15:47:10 +08:00 |
|
|
|
36016871da
|
修改门店入库列表查询
|
2025-02-15 14:06:16 +08:00 |
|
|
|
8567f2de4a
|
fix(inventory_store): 修复库存盘点逻辑
- 引入 Raw 类以处理复杂的数据库查询
- 使用 Raw 实例解决 nums 和 enter_nums 直接比较的问题
|
2025-02-14 18:00:33 +08:00 |
|
|
|
d3d3556038
|
feat(inventory_store): 优化门店盘存列表和生成逻辑
- 在 InventoryStoreLists 中添加了对管理员、员工、门店和商品名称的关联查询
- 在 InventoryStoreLogic 中增加了对当日数据已生成的检查，避免重复生成
-
|
2025-02-14 16:42:57 +08:00 |
|
|
|
ea5687eabe
|
feat(inventory_store): 添加管理员ID字段
- 在编辑库存时，添加管理员ID字段
- 在逻辑层更新库存时，记录管理员ID
|
2025-02-14 16:24:23 +08:00 |
|
|
|
d718fd567d
|
feat(inventory_store): 添加门店盘存功能
- 新增 InventoryStoreController 控制器，实现门店盘存列表、添加、编辑和核准
|
2025-02-14 16:01:53 +08:00 |
|
|
|
de15271e14
|
Merge pull request '门店入库记录添加退库操作，采购单添加追加商品，调整商品改价列表' (#512) from dev into main
Reviewed-on: #512
|
2025-02-13 19:25:59 +08:00 |
|
|
|
45418d5f55
|
门店入库记录添加退库操作，采购单添加追加商品，调整商品改价列表
|
2025-02-13 17:11:12 +08:00 |
|
|
|
32721fb910
|
Merge pull request '添加导入商品价格比例' (#511) from dev into main
Reviewed-on: #511
|
2025-02-12 17:17:34 +08:00 |
|
|
|
681f31153f
|
添加导入商品价格比例
|
2025-02-12 17:17:11 +08:00 |
|
|
|
c77e49f0ba
|
Merge pull request '添加导入商品价格比例' (#510) from dev into main
Reviewed-on: #510
|
2025-02-12 17:13:31 +08:00 |
|
|
|
2fa2267832
|
添加导入商品价格比例
|
2025-02-12 17:12:21 +08:00 |
|
|
|
f810a002a4
|
Merge pull request 'dev' (#509) from dev into main
Reviewed-on: #509
|
2025-02-12 16:59:50 +08:00 |
|
|
|
eb9de07654
|
修改商品改价
|
2025-02-12 16:58:47 +08:00 |
|
|
|
5641eaecab
|
修改商品改价
|
2025-02-12 15:45:51 +08:00 |
|
|
|
8aa7355485
|
添加导出门店财务流水
|
2025-02-11 17:59:21 +08:00 |
|
|
|
906fd620a9
|
refactor(store): 优化管理员信息返回格式
- 将 is_operated 字段直接赋值给 admin 数组，而不是 result 数组
- 更新 result 数组结构，简化返回数据格式
|
2025-02-11 17:58:11 +08:00 |
|
|
|
78bf3ac5a8
|
feat(admin): 获取管理员详情时增加门店是否营业字段
- 在获取管理员详情时，添加了门店是否营业（is_operated）的信息
- 通过 SystemStore 模型查询门店状态，并将结果添加到
|
2025-02-11 17:51:56 +08:00 |
|
