ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-05 22:55: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

15
app/ome/controller/admin/branchset.php
View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class ome_ctl_admin_branchset extends desktop_controller{
var $name = "仓库设置";
var $workground = "setting_tools";
@@ -28,6 +27,8 @@ class ome_ctl_admin_branchset extends desktop_controller{
$setData = array();
$setData['return_auto_branch'] = app::get('ome')->getConf('return.auto_branch');
$setData['return_auto_shop_branch'] = app::get('ome')->getConf('return.auto_shop_branch');
// 获取WMS商品类型仓库配置
$setData['wms_goods_type_branch'] = app::get('ome')->getConf('wms.goods.type.branch');
$this->pagedata['setData'] = $setData;
$shopMdl = app::get('ome')->model('shop');
$shopList = $shopMdl->getlist('shop_id,name',array('s_type'=>'1','s_status'=>'2'));
@@ -40,14 +41,6 @@ class ome_ctl_admin_branchset extends desktop_controller{
$this->page('admin/branch/branchset.html');
}
/**
* 保存设置
* @param
* @return
* @access public
* @author sunjing@shopex.cn
*/
function save()
{
$this->begin();
@@ -59,6 +52,10 @@ class ome_ctl_admin_branchset extends desktop_controller{
$_POST['set']['return.auto_shop_branch'][$shop_id] = $_POST['auto_shop_branch']['branch_id'][$key];
}
}
// 保存WMS商品类型仓库配置
if ($_POST['set']['wms_goods_type_branch']) {
app::get('ome')->setConf('wms.goods.type.branch', $_POST['set']['wms_goods_type_branch']);
}
app::get('wms')->setConf('wms.branchset.type',$settype);
app::get('ome')->setConf('ome.aftersale.goods.branch.type',$goodsBranchType);
app::get('ome')->setConf('return.auto_branch', $_POST['set']['return.auto_branch']);