mirror of
https://gitee.com/ShopeX/OMS
synced 2026-04-30 12:35:32 +08:00
1. 【新增】售后单售后原因类型支持搜索
2. 【新增】手工创建订单折扣可输入正数 3. 【优化】盘点申请单确认 4. 【修复】采购退货单模拟出库失败问题 5. 【新增】订单金额客户实付与结算金额 6. 【优化】仓库发货统计报表物料名称显示 7. 【优化】自有仓储虚拟发货逻辑 8. 【修复】基础物料分类管理问题
This commit is contained in:
@@ -127,9 +127,7 @@ class ome_mdl_product_serial_history extends dbeav_model{
|
||||
FROM sdb_ome_delivery_order as deo
|
||||
LEFT JOIN sdb_ome_delivery AS d ON deo.delivery_id = d.delivery_id
|
||||
WHERE deo.order_id={$order_id}
|
||||
AND (d.parent_id=0 OR d.is_bind='true')
|
||||
|
||||
AND d.status IN('succ')";
|
||||
AND (d.parent_id=0 OR d.is_bind='true')";
|
||||
$delivery = kernel::database()->select($sql);
|
||||
if ($delivery){
|
||||
$delivery_list[$order_bn] = array_map('current', $delivery);
|
||||
@@ -170,8 +168,10 @@ class ome_mdl_product_serial_history extends dbeav_model{
|
||||
$order_info = app::get('ome')->model('orders')->select()->columns('order_id')->where('order_bn=?',$order_bn)->instance()->fetch_row();
|
||||
if ($order_info){
|
||||
$order_detail[$order_bn] = $order_info['order_id'];
|
||||
return $order_detail[$order_bn];
|
||||
} else {
|
||||
$order_detail[$order_bn] = -1;
|
||||
}
|
||||
return $order_detail[$order_bn];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user