1. 【新增】售后单售后原因类型支持搜索

2. 【新增】手工创建订单折扣可输入正数 3. 【优化】盘点申请单确认 4. 【修复】采购退货单模拟出库失败问题 5. 【新增】订单金额客户实付与结算金额 6. 【优化】仓库发货统计报表物料名称显示 7. 【优化】自有仓储虚拟发货逻辑 8. 【修复】基础物料分类管理问题
2026-04-22 04:35:38 +08:00 · 2026-04-01 11:59:17 +08:00
parent 9341122827
commit 61783b7d01
754 changed files with 46179 additions and 5700 deletions
--- a/app/ome/model/order/reservation.php
+++ b/app/ome/model/order/reservation.php
@@ -0,0 +1,117 @@
+<?php
+
+class ome_mdl_order_reservation extends dbeav_model
+{
+    public function _filter($filter,$tableAlias=null,$baseWhere=null)
+    {
+        $where = '';
+        $is_assign_time = true;
+        
+        //多订单号查询
+        $orderBns = array();
+        if($filter['order_bn'] && is_string($filter['order_bn']) && strpos($filter['order_bn'], "\n") !== false){
+            $orderBns = array_unique(array_map('trim', array_filter(explode("\n", $filter['order_bn']))));
+            
+            unset($filter['order_bn']);
+        }elseif($filter['order_bn']){
+            $orderBns = array($filter['order_bn']);
+            
+            unset($filter['order_bn']);
+        }
+        
+        if($orderBns){
+            $orderIds = array();
+            
+            //订单列表
+            $orderObj = app::get('ome')->model('orders');
+            $tempList = $orderObj->getList('order_id', array('order_bn'=>$orderBns), 0, 500);
+            foreach((array)$tempList as $row){
+                $orderIds[] = $row['order_id'];
+            }
+            
+            //[兼容]归档订单
+            if(empty($orderIds)){
+                $ordersObj = app::get('archive')->model('orders');
+                $tempList = $ordersObj->getList('order_id', array('order_bn'=>$orderBns), 0, 500);
+                foreach((array)$tempList as $row) {
+                    $orderIds[] = $row['order_id'];
+                }
+            }
+            
+            if(empty($orderIds)){
+                $orderIds[] = 0;
+            }
+            
+            // where
+            $where .= ' AND order_id IN ('. implode(',', $orderIds) .')';
+            
+            // flag
+            $is_assign_time = false;
+            
+            // unset
+            unset($orderIds, $tempList);
+        }
+        
+        //多订单号查询
+        $erpOrderBns = array();
+        if($filter['erp_order_bn'] && is_string($filter['erp_order_bn']) && strpos($filter['erp_order_bn'], "\n") !== false){
+            $erpOrderBns = array_unique(array_map('trim', array_filter(explode("\n", $filter['erp_order_bn']))));
+            
+            // unset
+            unset($filter['erp_order_bn']);
+        }elseif($filter['erp_order_bn']){
+            $erpOrderBns = array($filter['erp_order_bn']);
+            
+            // flag
+            $is_assign_time = false;
+            
+            // unset
+            unset($filter['erp_order_bn']);
+        }
+        
+        if($erpOrderBns){
+            $filter['erp_order_bn'] = $erpOrderBns;
+            
+            // unset
+            unset($erpOrderBns);
+        }
+        
+        // 默认指定：只搜索三个月之内的订单
+        if($is_assign_time){
+            if(empty($filter['at_time']) && empty($filter['up_time'])){
+                $start_date = date('Y-m-d H:i:s', strtotime('-3 month'));
+                $end_date = date('Y-m-d H:i:s', time());
+                
+                $filter['at_time|betweenstr'] = [$start_date, $end_date];
+            }
+        }
+        
+        return parent::_filter($filter,$tableAlias,$baseWhere) . $where;
+    }
+    
+    /**
+     * 收货人省、市、区
+     *
+     * @param $row
+     * @return string
+     */
+    public function modifier_custom_reserved_area($row)
+    {
+        $area = explode(':', $row);
+        
+        return $area[1];
+    }
+    
+    /**
+     * 收货人省、市、区
+     *
+     * @param $row
+     * @return string
+     */
+    public function modifier_custom_reserved_time($row)
+    {
+        $date = ($row ? date('Y-m-d', $row) : '');
+        
+        return $date;
+    }
+}