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

4
app/o2o/lib/finder/branch/products.php
View File

@@ -26,9 +26,9 @@ class o2o_finder_branch_products extends console_finder_branch_product
}
/**
* 货品重量字段
* 基础物料重量字段
*/
var $column_weight = '货品重量(g)';
var $column_weight = '基础物料重量(g)';
var $column_weight_width = 100;
var $column_weight_order = 35;
function column_weight($row, $list)

8
app/o2o/lib/finder/delivery.php
View File

@@ -25,7 +25,7 @@
*/
class o2o_finder_delivery {
var $detail_basic = "发货单详情";
var $detail_item = "货品详情";
var $detail_item = "基础物料详情";
public function __construct()
{
@@ -175,7 +175,7 @@ class o2o_finder_delivery {
}
var $column_product_name = "货品名称";
var $column_product_name = "基础物料名称";
var $column_product_name_width = "160";
function column_product_name($row,$list) {
@@ -190,7 +190,7 @@ class o2o_finder_delivery {
foreach ($product_id as $pid) {
$names[] = $productName[$pid];
}
$cnt = sprintf("共有 %d 种商品，总共数量为 %d 件， 具体 名称 为： %s", $skuNum, $itemNum, @implode(', ', $names));
$cnt = sprintf("共有 %d 种基础物料，总共数量为 %d 件， 具体 名称 为： %s", $skuNum, $itemNum, @implode(', ', $names));
@reset($names);
$content = $names[@key($names)];
@@ -203,7 +203,7 @@ class o2o_finder_delivery {
}
/*
* 获取商品名称
* 获取基础物料名称
*/
public function _getMaterialNames($list)
{

2
app/o2o/lib/finder/extend/filter/branch/products.php
View File

@@ -64,7 +64,7 @@ class o2o_finder_extend_filter_branch_products{
'bn' => array (
'type' => 'varchar(40)',
'editable' => false,
'label' => '货号',
'label' => '基础物料编码',
'width' => 110,
'filtertype' => 'normal',
'filterdefault' => true,

2
app/o2o/task.php
View File

@@ -59,7 +59,7 @@ class o2o_task{
}
//初始化数据
kernel::single('base_initial', 'o2o')->init();
//kernel::single('base_initial', 'o2o')->init();
}
function post_uninstall(){

2
app/o2o/view/admin/delivery/check.html
View File

@@ -88,7 +88,7 @@
</table>
</div>
<div class="tableform">
<h4><div class="fl">货品信息:</div></h4>
<h4><div class="fl">基础物料信息:</div></h4>
<div class="division clear">
<table border="0" cellspacing="0" class="gridlist finder-list" cellpadding="0">
<thead>

2
app/o2o/view/admin/delivery/delivery_detail.html
View File

@@ -62,7 +62,7 @@
<td >
<{$dly.weight}>
</td>
<th >商品重量:</th>
<th >基础物料重量:</th>
<td ><{$dly.net_weight}></td>
<th >生成时间：</th>
<td ><{$dly.create_time}></td>