|
|
ca772ea9dd
|
Merge pull request '调整采购商品查询' (#481) from dev into main
Reviewed-on: #481
|
2025-01-22 17:56:49 +08:00 |
|
|
|
75e153031b
|
调整采购商品查询
|
2025-01-22 17:49:48 +08:00 |
|
|
|
a1a6e74938
|
Merge pull request 'dev' (#480) from dev into main
Reviewed-on: #480
|
2025-01-22 17:26:02 +08:00 |
|
|
|
6cb055d9fb
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2025-01-22 16:08:21 +08:00 |
|
|
|
02130d9b8a
|
添加单采购商品入库
|
2025-01-22 16:08:14 +08:00 |
|
|
|
2f59a51257
|
Merge pull request 'dev' (#479) from dev into main
Reviewed-on: #479
|
2025-01-22 11:31:04 +08:00 |
|
|
|
3b13ad4a2e
|
refactor(DemoLogic): 优化库存回滚功能
- 在 test3 函数中添加 $warehouse_id 参数，默认值为 1
- 修改查询条件，使用 $warehouse_id 替代硬编码的 1
- 修复更新语句中的 ID，使用 $find['id'] 替代 $v['id']
|
2025-01-22 11:18:17 +08:00 |
|
|
|
607b523fcd
|
feat(admin): 添加库存回滚功能
- 在 IndexController 中添加 demo3 方法，用于触发库存回滚
- 在 DemoLogic 中实现 test3 方法，执行库存回滚逻辑
- 使用 WarehouseProduct 和 WarehouseProductStorege 模型处理库存数据
- 库存回滚成功后更新数据库并记录日志
|
2025-01-22 10:22:08 +08:00 |
|
|
|
ea7087c234
|
Merge pull request '修改自营门店价格' (#478) from dev into main
Reviewed-on: #478
|
2025-01-21 16:46:51 +08:00 |
|
|
|
d0a583a9bd
|
修改自营门店价格
|
2025-01-21 16:46:35 +08:00 |
|
|
|
f5a7815687
|
Merge pull request 'dev' (#477) from dev into main
Reviewed-on: #477
|
2025-01-21 16:42:41 +08:00 |
|
|
|
92c0eac1fc
|
修改自营门店价格
|
2025-01-21 16:37:04 +08:00 |
|
|
|
393659cdf5
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2025-01-21 16:19:25 +08:00 |
|
|
|
5bb7fcd0e6
|
修改自营门店价格
|
2025-01-21 16:19:17 +08:00 |
|
|
|
6bca7c2dd3
|
Merge pull request 'fix(api): 修正价格更新逻辑' (#476) from dev into main
Reviewed-on: #476
|
2025-01-21 16:07:41 +08:00 |
|
|
|
3df1a5c67c
|
fix(api): 修正价格更新逻辑
- 更新 store_product 表中的 vip_price 字段，使用 price10 列的值
- 新增对 store_branch_product 表的更新操作，与 store_product 表同步
|
2025-01-21 16:04:31 +08:00 |
|
|
|
2252caa643
|
Merge pull request 'dev' (#475) from dev into main
Reviewed-on: #475
|
2025-01-21 15:48:57 +08:00 |
|
|
|
7f99a6b34e
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2025-01-21 15:48:09 +08:00 |
|
|
|
db9257518e
|
修改自营门店价格
|
2025-01-21 15:48:03 +08:00 |
|
|
|
0a131e0c16
|
refactor(purchase): 重构采购模块逻辑
- 注释掉 PurchaseProductOfferController 中的 setStoreroomInfoTwo 方法
- 修改 BeforehandOrderLists 中的搜索条件逻辑
- 更新 PurchaseProductOfferLogic 中的采购逻辑:
- 移除部分字段的更新
- 调整产品分组价格的设置位置
- 优化接受采购数量的处理流程
- 调整订单总价的计算方式
|
2025-01-21 15:10:51 +08:00 |
|
|
|
63f4285759
|
修改预订单出库的错误
|
2025-01-20 15:51:42 +08:00 |
|
|
|
97d529e465
|
Merge pull request 'dev' (#474) from dev into main
Reviewed-on: #474
|
2025-01-20 14:59:37 +08:00 |
|
|
|
29c7f1494a
|
修改预订单商品删除的错误
|
2025-01-20 14:59:05 +08:00 |
|
|
|
209d4366bf
|
添加门店预订单列表
|
2025-01-20 14:32:12 +08:00 |
|
|
|
f0b7f234f4
|
Merge pull request 'dev' (#473) from dev into main
Reviewed-on: #473
|
2025-01-20 11:25:22 +08:00 |
|
|
|
bd6018ab1b
|
调整往期补单
|
2025-01-18 16:38:54 +08:00 |
|
|
|
4c918cca71
|
feat(purchase): 一键添加往期采购商品功能
- 新增 AddPurchasesOneClick 方法实现一键添加往期采购商品
- 更新采购订单逻辑，支持往期补单采购
- 修改仓库产品逻辑，优化订单类型判断条件
- 调整订单列表显示，区分往期补单出库和入库
|
2025-01-18 16:34:30 +08:00 |
|
|
|
92de8b8ead
|
修改微信实际支付金额
|
2025-01-18 14:35:07 +08:00 |
|
|
|
69870c6dd6
|
商品添加活动价
|
2025-01-18 11:43:40 +08:00 |
|
|
|
0ec22bf2d7
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2025-01-17 16:55:45 +08:00 |
|
|
|
82edbfd35a
|
预订单商品添加门店出货
|
2025-01-17 16:55:39 +08:00 |
|
|
|
5890cb68ec
|
feat(warehouse): 添加出库单 ID 和仓库 ID 字段
- 在创建仓库产品记录时，增加了 outbound_id 和 warehouse_id 字段
- outbound_id 从请求参数中获取，若不存在则默认为 0
- warehouse_id 固定为 1，可能是默认仓库或首个仓库
|
2025-01-17 10:27:41 +08:00 |
|
|
|
81ba9228c5
|
Merge pull request '添加预订单商品关联采购订单' (#472) from dev into main
Reviewed-on: #472
|
2025-01-16 17:09:41 +08:00 |
|
|
|
39796fd908
|
添加预订单商品关联采购订单
|
2025-01-16 17:01:29 +08:00 |
|
|
|
885cac9ad6
|
Merge pull request 'dev' (#471) from dev into main
Reviewed-on: #471
|
2025-01-16 14:30:27 +08:00 |
|
|
|
5dd1bbd0bf
|
修改门店现金查询
|
2025-01-16 14:29:50 +08:00 |
|
|
|
7bb22503b4
|
修改门店现金查询
|
2025-01-16 14:23:19 +08:00 |
|
|
|
de1c26ac88
|
Merge pull request '修改铺货订单复制' (#470) from dev into main
Reviewed-on: #470
|
2025-01-15 17:58:13 +08:00 |
|
|
|
ddfe35d2c9
|
修改铺货订单复制
|
2025-01-15 17:57:38 +08:00 |
|
|
|
06b60af477
|
Merge pull request '修改库存调拨商品列表，预订单添加同步价格' (#469) from dev into main
Reviewed-on: #469
|
2025-01-15 15:12:51 +08:00 |
|
|
|
ed9ffc8d8c
|
修改库存调拨商品列表，预订单添加同步价格
|
2025-01-15 15:05:40 +08:00 |
|
|
|
abed6f154f
|
Merge pull request 'refactor(StoreOrderCartInfoLogic): 移除不必要的店铺配置验证' (#468) from dev into main
Reviewed-on: #468
|
2025-01-15 15:01:26 +08:00 |
|
|
|
88bb49563b
|
refactor(StoreOrderCartInfoLogic): 移除不必要的店铺配置验证
- 注释掉了用于验证店铺配置的代码块
- 删除了多余的错误提示代码
- 优化了代码结构，提高了代码可读性
|
2025-01-15 15:00:54 +08:00 |
|
|
|
e61518dca5
|
Merge pull request 'refactor(app): 注释掉订单商品状态检查逻辑' (#467) from dev into main
Reviewed-on: #467
|
2025-01-15 14:21:18 +08:00 |
|
|
|
99499f3334
|
refactor(app): 注释掉订单商品状态检查逻辑
在 OrderLogic
|
2025-01-15 14:20:38 +08:00 |
|
|
|
d4104e5e46
|
Merge pull request '修改预订单一键入库' (#466) from dev into main
Reviewed-on: #466
|
2025-01-14 17:47:48 +08:00 |
|
|
|
ed68949326
|
修改预订单一键入库
|
2025-01-14 16:57:17 +08:00 |
|
|
|
07761d7a95
|
Merge pull request '修改批量入库' (#465) from dev into main
Reviewed-on: #465
|
2025-01-14 14:10:42 +08:00 |
|
|
|
c12a519bcd
|
修改批量入库
|
2025-01-14 11:38:18 +08:00 |
|
|
|
1f9d9db187
|
Merge pull request 'dev' (#464) from dev into main
Reviewed-on: #464
|
2025-01-14 11:17:28 +08:00 |
|
