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

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

View File

@@ -252,6 +252,17 @@ class console_ctl_admin_material_package extends desktop_controller
$storeManageLib = kernel::single('ome_store_manage');
$storeManageLib->loadBranch(array('branch_id' => $main['branch_id']));
// 校验物料同步状态
// 同时获取主商品和子商品进行校验
$mainItems = app::get('console')->model('material_package_items')->getList('*', ['mp_id' => $id]);
$detailItems = app::get('console')->model('material_package_items_detail')->getList('*', ['mp_id' => $id]);
// 调用封装的校验方法
list($validateRs, $validateMsg) = $mpObj->_validateMaterialSyncStatus($main['branch_id'], $mainItems, $detailItems);
if (!$validateRs) {
$this->end(false, $validateMsg);
}
$params = array();
$params['main'] = $main;
$params['items'] = $itemsDetail;