ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-24 18:04:30 +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

23
app/desktop/lib/controller.php
View File

@@ -838,19 +838,14 @@ JS;
}
/**
* returnJson
* @param array $data 数据
* @param mixed $status status
* @param mixed $msg msg
* @return mixed 返回值
*/
public function returnJson(array $data,$status = true,$msg = '')
public function returnJson(array $data,$status = true,$msg = '',$code = 200)
{
$params = [
'rsp' => $status ? 'succ' : 'fail',
'msg' => $msg ? $msg : $status,
'data' => $data
'rsp' => $status ? 'succ' : 'fail',
'msg' => $msg ? $msg : $status,
'data' => $data,
'code' => $code,
'message' => $msg ? $msg : $status,
];
$this->splash($status ? 'success' : 'fail', null, $msg, 'redirect', $params);
}
@@ -874,11 +869,15 @@ JS;
* 订单单切片导入页面
* @date 2024-10-11 4:05 下午
*/
public function displayImportV2($type='')
public function displayImportV2($type='', $extraParams=[])
{
$finder_id = $_GET['_finder']['finder_id'];
$this->pagedata['type'] = $type;
$this->pagedata['download_url'] = sprintf('index.php?app=%s&ctl=%s&act=exportTemplateV2&finder_id=%s', $_GET['app'], $_GET['ctl'], $finder_id);
// 传递额外参数到模板
$this->pagedata['extra_hidden_fields'] = $extraParams;
$this->display('admin/order/order_import.html', 'ome');
}

2
app/desktop/lib/io/type/csv.php
View File

@@ -337,7 +337,7 @@ class desktop_io_type_csv extends desktop_io_io{
if(function_exists('iconv')){
//excel 2007 读取utf8乱码bug。
$string = iconv('UTF-8', 'GB2312//IGNORE', $rs)."\n";
$string = iconv('UTF-8', 'GBK//IGNORE', $rs)."\n";
}else{
$string = $this->charset->utf2local( $rs )."\n";
}

8
app/desktop/lib/router.php
View File

@@ -41,8 +41,12 @@ class desktop_router implements base_interface_router{
$arrMethods = get_class_methods($controller);
if (in_array($_GET['act'], $arrMethods))
call_user_func_array(array(&$controller,$_GET['act']),(array)$query_args);
else
call_user_func_array(array(&$controller,'index'),(array)$query_args);
else{
header("HTTP/1.1 404 Not Found");
echo '<h1>404 - Page Not Found</h1>';
echo '<p>请求的页面不存在</p>';
exit;
}
}
/**

9
app/desktop/lib/user.php
View File

@@ -338,7 +338,14 @@ class desktop_user{
}
$finderId = app::get('desktop')->router()->getFinderVid($menu['menu_path'].$query);
$menu['menu_path'] = $menu['menu_path'].$query.'&finder_vid='.$finderId;
$menu['route_path'] = '/m-'.str_replace('_','',$menu['workground']).'/'.$menu['en'].'/'.$menu['menu_id'];
// 如果target有值且以"/"开头，使用target作为route_path，如：/audit-template-list（审批流模板列表）
if(!empty($menu['target']) && strpos($menu['target'], '/') === 0){
$menu['route_path'] = $menu['target'];
} else {
$menu['route_path'] = '/m-'.str_replace('_','',$menu['workground']).'/'.$menu['en'].'/'.$menu['menu_id'];
}
$aData['menu'][$k1][$k2][$k3] = $menu;
}
}