ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-18 19:25:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

1. 【新增】售后单售后原因类型支持搜索

Browse Source 
2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题
This commit is contained in:
chenping
2026-04-01 11:59:17 +08:00
parent 9341122827
commit 61783b7d01
754 changed files with 46179 additions and 5700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/ome/lib/entity/branch/product.php
View File

@@ -166,7 +166,7 @@ class ome_entity_branch_product
return array();
}
//判断是否是主仓
$branchInfo = $branchMdl->db_dump($branchId, 'branch_id,parent_id,type');
$branchInfo = $branchMdl->db_dump(['branch_id' => $branchId, 'check_permission' => 'false'], 'branch_id,parent_id,type');
if ($branchInfo['type'] != 'main' && $branchInfo['parent_id'] != 0) {
$branchInfo = $branchMdl->db_dump($branchInfo['parent_id'], 'branch_id,parent_id,type');
$branchChildInfo = $branchMdl->getList('branch_id', array('parent_id' => $branchInfo['branch_id']));