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

7
app/ome/lib/finder/extend/filter/branch/product.php
View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class ome_finder_extend_filter_branch_product{
function get_extend_colums(){
$brObj = app::get('ome')->model('branch');
@@ -49,7 +48,7 @@ class ome_finder_extend_filter_branch_product{
array (
'type' => 'varchar(40)',
'editable' => false,
'label' => '货号',
'label' => '基础物料编码',
'width' => 110,
'filtertype' => 'normal',
@@ -61,7 +60,7 @@ class ome_finder_extend_filter_branch_product{
array (
'type' => 'varchar(200)',
'required' => true,
'label' => '货品名称',
'label' => '基础物料名称',
'width' => 260,
'searchtype' => 'has',
'editable' => false,
@@ -103,4 +102,4 @@ class ome_finder_extend_filter_branch_product{
}
}
}

25
app/ome/lib/finder/extend/filter/order/reservation.php Normal file
View File

@@ -0,0 +1,25 @@
<?php
class ome_finder_extend_filter_order_reservation
{
function get_extend_colums()
{
$db = [];
// $db['order_reservation'] = array (
// 'columns' => array (
// 'order_bn' => array (
// 'type' => 'varchar(50)',
// 'label' => '订单号',
// 'width' => 130,
// 'filtertype' => 'textarea',
// 'searchtype' => 'nequal',
// 'filterdefault' => true,
// 'editable' => false,
// 'in_list' => true,
// 'default_in_list' => true,
// ),
// )
// );
//
return $db;
}
}

20
app/ome/lib/finder/extend/filter/orders.php
View File

@@ -383,6 +383,26 @@ class ome_finder_extend_filter_orders{
'in_list' => true,
'default_in_list' => true,
),
'seller_code' => array(
'type' => 'varchar(50)',
'label' => '销售人员编码',
'width' => 120,
'filtertype' => 'normal',
'filterdefault' => true,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
),
'seller_name' => array(
'type' => 'varchar(50)',
'label' => '销售人员名称',
'width' => 160,
'filtertype' => 'normal',
'filterdefault' => true,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
),
)
);
#只有财务那边的才用这个签收

11
app/ome/lib/finder/extend/filter/reship.php
View File

@@ -136,6 +136,7 @@ class ome_finder_extend_filter_reship
ome_reship_const::__ZERO_INTERCEPT => '零秒退拦截',
ome_reship_const::__LANJIE_RUKU => '拦截入库',
ome_reship_const::__RESHIP_DIFF => '差异入库',
ome_reship_const::__RETURN_LOGI_DUP => '物流重复',
),
'label' => '标识',
'editable' => false,
@@ -156,6 +157,16 @@ class ome_finder_extend_filter_reship
'filtertype' => 'normal',
'filterdefault' => true,
),
'product_bn' => array (
'type' => 'varchar(30)',
'label' => '基础物料编码',
'width' => 85,
'filtertype' => 'textarea',
'filterdefault' => true,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
),
)
);
$organization_permissions = kernel::single('desktop_user')->get_organization_permission();

10
app/ome/lib/finder/extend/filter/return/product.php
View File

@@ -74,6 +74,16 @@ class ome_finder_extend_filter_return_product{
'filtertype' => 'normal',
'filterdefault' => true,
),
'product_bn' => array (
'type' => 'varchar(30)',
'label' => '基础物料编码',
'width' => 85,
'filtertype' => 'textarea',
'filterdefault' => true,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
),
)
);
return $db;