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

2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题

app/financebase/lib/finder/expenses/rule.php

@@ -23,6 +23,7 @@
  * ============================
  */
 class financebase_finder_expenses_rule {
+    public $addon_cols = 'rule_content';
 
     public $column_edit = "操作";
     public $column_edit_width = "80";
@@ -39,4 +40,27 @@ class financebase_finder_expenses_rule {
 
         return $ret;
     }
+
+    var $column_platform = '平台设置';
+    var $column_platform_width = "500";
+    var $column_platform_order = 20;
+    function column_platform($row) {
+
+        $oFunc = kernel::single('financebase_func');
+
+        $platform = $oFunc->getShopPlatform();
+
+        $ret = [];
+
+        $row['rule_content'] = $row[$this->col_prefix.'rule_content'];
+
+        $rule_content = $row['rule_content'] ? json_decode($row['rule_content'],1) : array();
+        foreach ($platform as $key => $value) {
+            if(isset($rule_content[$key]) && $rule_content[$key]) {
+                $ret[] = $value;
+            }
+        }
+
+        return implode(',', $ret);  
+    }
 }

app/financebase/lib/finder/expenses/split.php

@@ -23,7 +23,7 @@
  * ============================
  */
 class financebase_finder_expenses_split {
-    public $addon_cols = 'bm_id';
+    public $addon_cols = 'bm_id,order_bn,shop_id';
 
     public $column_skucode = "基础物料编码";
     public $column_skucode_width = "80";
@@ -38,4 +38,135 @@ class financebase_finder_expenses_split {
         $bm = app::get('material')->model('basic_material')->db_dump(array('bm_id'=>$bmId), 'material_bn');
         return (string)$bm['material_bn'];
     }
+
+    public $column_verification_status = "核销状态";
+    public $column_verification_status_width = "100";
+    public function column_verification_status($row, $list) {
+        $orderBn = $row[$this->col_prefix . 'order_bn'];
+        if (empty($orderBn)) {
+            return '-';
+        }
+        
+        // 批量查询优化：使用静态缓存确保整个列表只查询一次数据库
+        static $verificationStatusCache;
+        
+        if (!isset($verificationStatusCache)) {
+            $verificationStatusCache = array();
+            
+            // 从传入的list参数获取当前页面的所有订单号
+            $orderBns = array();
+            foreach ($list as $listRow) {
+                $bn = $listRow[$this->col_prefix . 'order_bn'];
+                if (!empty($bn)) {
+                    $orderBns[] = $bn;
+                }
+            }
+            $orderBns = array_unique($orderBns);
+            
+            if (!empty($orderBns)) {
+                // 批量查询所有订单号的核销状态
+                $monthlyReportItemsModel = app::get('finance')->model('monthly_report_items');
+                $items = $monthlyReportItemsModel->getList(
+                    'order_bn,verification_status',
+                    array('order_bn' => $orderBns)
+                );
+                
+                // 构建缓存映射：order_bn => verification_status
+                foreach ($items as $item) {
+                    $verificationStatusCache[$item['order_bn']] = $item['verification_status'];
+                }
+            }
+        }
+        
+        // 从缓存中获取核销状态
+        $verificationStatus = $verificationStatusCache[$orderBn] ?? null;
+        
+        if (empty($verificationStatus)) {
+            return '-';
+        }
+        
+        $statusMap = array(
+            '1' => '未核销',
+            '2' => '已核销',
+        );
+        
+        return $statusMap[$verificationStatus] ?? '-';
+    }
+
+    public $column_shop_name = "店铺名称";
+    public $column_shop_name_width = "120";
+    public $column_shop_name_order = 20;
+    public function column_shop_name($row, $list) {
+        $shopId = $row[$this->col_prefix . 'shop_id'];
+        if (empty($shopId)) {
+            return '-';
+        }
+        
+        // 批量查询优化：使用静态缓存确保整个列表只查询一次数据库
+        static $shopCache;
+        
+        if (!isset($shopCache)) {
+            $shopCache = array();
+            
+            // 从传入的list参数获取当前页面的所有店铺ID
+            $shopIds = array();
+            foreach ($list as $listRow) {
+                $sid = $listRow[$this->col_prefix . 'shop_id'];
+                if (!empty($sid)) {
+                    $shopIds[] = $sid;
+                }
+            }
+            $shopIds = array_unique($shopIds);
+            
+            if (!empty($shopIds)) {
+                // 批量查询所有店铺信息
+                $shopModel = app::get('ome')->model('shop');
+                $shops = $shopModel->getList(
+                    'shop_id,name',
+                    array('shop_id' => $shopIds)
+                );
+                
+                // 构建缓存映射：shop_id => name
+                foreach ($shops as $shop) {
+                    $shopCache[$shop['shop_id']] = $shop['name'];
+                }
+            }
+        }
+        
+        // 从缓存中获取店铺名称
+        return $shopCache[$shopId] ?? '-';
+    }
+
+    public $column_platform = '平台规则设置（蓝色：已设置、红色：未设置)';
+    public $column_platform_width = "500";
+    public $column_platform_order = 21;
+    public function column_platform($row) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+
+        $finder_id = $_GET['_finder']['finder_id'];
+        $oFunc = kernel::single('financebase_func');
+        $platform = $oFunc->getShopPlatform();
+
+        $ret = "";
+
+        // 通过 bill_category 获取规则内容
+        $ruleModel = app::get('financebase')->model('bill_category_rules');
+        $ruleInfo = $ruleModel->getRow('rule_id,rule_content', array('bill_category' => $billCategory));
+        
+        if (empty($ruleInfo)) {
+            return '-';
+        }
+
+        $ruleId = $ruleInfo['rule_id'];
+        $rule_content = $ruleInfo['rule_content'] ? json_decode($ruleInfo['rule_content'], 1) : array();
+        foreach ($platform as $key => $value) {
+            $color = (isset($rule_content[$key]) && $rule_content[$key]) ? 'blue' : 'red';
+            $ret .= '<a style="color:'.$color.';" href="index.php?app=financebase&ctl=admin_shop_settlement_rules&act=setRule&p[0]='.$ruleId.'&p[1]='.$key.'&_finder[finder_id]=' . $finder_id . '&finder_id=' . $finder_id . '" target="_blank">'.$value.'</a>&nbsp;&nbsp;&nbsp;&nbsp;';
+        }
+
+        return $ret;
+    }
 }

app/financebase/lib/finder/expenses/unsplit.php

@@ -23,7 +23,7 @@
  * ============================
  */
 class financebase_finder_expenses_unsplit {
-    public $addon_cols = 'bill_category';
+    public $addon_cols = 'bill_category,order_bn';
 
     public $column_edit = "操作";
     public $column_edit_width = "80";
@@ -40,4 +40,340 @@ class financebase_finder_expenses_unsplit {
 
         return $ret;
     }
+
+    /**
+     * 获取会计科目信息缓存
+     * @param array $list 当前列表数据
+     * @return array 返回 bill_category => account_info 的映射
+     */
+    private function _getAccountInfoCache($list) {
+        static $accountInfoCache;
+        
+        if (!isset($accountInfoCache)) {
+            $accountInfoCache = array();
+            
+            // 收集所有 bill_category
+            $billCategories = array();
+            foreach ($list as $listRow) {
+                $category = $listRow[$this->col_prefix . 'bill_category'];
+                if (!empty($category)) {
+                    $billCategories[] = $category;
+                }
+            }
+            $billCategories = array_unique($billCategories);
+            
+            if (!empty($billCategories)) {
+                // 批量查询 bill_category_rules 获取会计科目ID
+                $ruleModel = app::get('financebase')->model('expenses_rule');
+                $rules = $ruleModel->getList(
+                    'bill_category,account_id_plus,account_id_minus',
+                    array('bill_category' => $billCategories)
+                );
+                
+                // 收集所有会计科目ID
+                $accountIds = array();
+                foreach ($rules as $rule) {
+                    if (!empty($rule['account_id_plus'])) {
+                        $accountIds[] = $rule['account_id_plus'];
+                    }
+                    if (!empty($rule['account_id_minus'])) {
+                        $accountIds[] = $rule['account_id_minus'];
+                    }
+                }
+                $accountIds = array_unique($accountIds);
+                
+                // 批量查询 account_chart 获取详细信息
+                $accountChartModel = app::get('financebase')->model('account_chart');
+                $accounts = array();
+                if (!empty($accountIds)) {
+                    $accounts = $accountChartModel->getList(
+                        'id,account,postingkey,costcenter,tax_rate,customer',
+                        array('id' => $accountIds)
+                    );
+                }
+                
+                // 构建 account_id => account_info 映射
+                $accountMap = array();
+                foreach ($accounts as $account) {
+                    $accountMap[$account['id']] = $account;
+                }
+                
+                // 构建 bill_category => account_info 映射
+                foreach ($rules as $rule) {
+                    $accountInfoCache[$rule['bill_category']] = array(
+                        'plus' => isset($accountMap[$rule['account_id_plus']]) ? $accountMap[$rule['account_id_plus']] : null,
+                        'minus' => isset($accountMap[$rule['account_id_minus']]) ? $accountMap[$rule['account_id_minus']] : null,
+                    );
+                }
+            }
+        }
+        
+        return $accountInfoCache;
+    }
+
+    /**
+     * 获取核销状态缓存
+     * @param array $list 当前列表数据
+     * @return array 返回 order_bn => verification_status 的映射
+     */
+    private function _getVerificationStatusCache($list) {
+        static $verificationStatusCache;
+        
+        if (!isset($verificationStatusCache)) {
+            $verificationStatusCache = array();
+            
+            // 收集所有订单号
+            $orderBns = array();
+            foreach ($list as $listRow) {
+                $bn = $listRow[$this->col_prefix . 'order_bn'];
+                if (!empty($bn)) {
+                    $orderBns[] = $bn;
+                }
+            }
+            $orderBns = array_unique($orderBns);
+            
+            if (!empty($orderBns)) {
+                // 批量查询所有订单号的核销状态
+                $monthlyReportItemsModel = app::get('finance')->model('monthly_report_items');
+                $items = $monthlyReportItemsModel->getList(
+                    'order_bn,verification_status',
+                    array('order_bn' => $orderBns)
+                );
+                
+                // 构建缓存映射：order_bn => verification_status
+                foreach ($items as $item) {
+                    $verificationStatusCache[$item['order_bn']] = $item['verification_status'];
+                }
+            }
+        }
+        
+        return $verificationStatusCache;
+    }
+
+    // 贷方会计科目
+    public $column_account_plus = "贷方会计科目";
+    public $column_account_plus_width = "120";
+    public $column_account_plus_order = 100;
+    public function column_account_plus($row, $list) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+        
+        $accountInfoCache = $this->_getAccountInfoCache($list);
+        $accountInfo = isset($accountInfoCache[$billCategory]) ? $accountInfoCache[$billCategory] : null;
+        
+        if (empty($accountInfo) || empty($accountInfo['plus'])) {
+            return '-';
+        }
+        
+        return $accountInfo['plus']['account'] ?: '-';
+    }
+
+    // 借方会计科目
+    public $column_account_minus = "借方会计科目";
+    public $column_account_minus_width = "120";
+    public $column_account_minus_order = 101;
+    public function column_account_minus($row, $list) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+        
+        $accountInfoCache = $this->_getAccountInfoCache($list);
+        $accountInfo = isset($accountInfoCache[$billCategory]) ? $accountInfoCache[$billCategory] : null;
+        
+        if (empty($accountInfo) || empty($accountInfo['minus'])) {
+            return '-';
+        }
+        
+        return $accountInfo['minus']['account'] ?: '-';
+    }
+
+    // 贷方记账码
+    public $column_postingkey_plus = "贷方记账码";
+    public $column_postingkey_plus_width = "100";
+    public $column_postingkey_plus_order = 102;
+    public function column_postingkey_plus($row, $list) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+        
+        $accountInfoCache = $this->_getAccountInfoCache($list);
+        $accountInfo = isset($accountInfoCache[$billCategory]) ? $accountInfoCache[$billCategory] : null;
+        
+        if (empty($accountInfo) || empty($accountInfo['plus'])) {
+            return '-';
+        }
+        
+        return $accountInfo['plus']['postingkey'] ?: '-';
+    }
+
+    // 借方记账码
+    public $column_postingkey_minus = "借方记账码";
+    public $column_postingkey_minus_width = "100";
+    public $column_postingkey_minus_order = 103;
+    public function column_postingkey_minus($row, $list) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+        
+        $accountInfoCache = $this->_getAccountInfoCache($list);
+        $accountInfo = isset($accountInfoCache[$billCategory]) ? $accountInfoCache[$billCategory] : null;
+        
+        if (empty($accountInfo) || empty($accountInfo['minus'])) {
+            return '-';
+        }
+        
+        return $accountInfo['minus']['postingkey'] ?: '-';
+    }
+
+    // 贷方成本中心
+    public $column_costcenter_plus = "贷方成本中心";
+    public $column_costcenter_plus_width = "100";
+    public $column_costcenter_plus_order = 104;
+    public function column_costcenter_plus($row, $list) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+        
+        $accountInfoCache = $this->_getAccountInfoCache($list);
+        $accountInfo = isset($accountInfoCache[$billCategory]) ? $accountInfoCache[$billCategory] : null;
+        
+        if (empty($accountInfo) || empty($accountInfo['plus'])) {
+            return '-';
+        }
+        
+        return $accountInfo['plus']['costcenter'] ?: '-';
+    }
+
+    // 借方成本中心
+    public $column_costcenter_minus = "借方成本中心";
+    public $column_costcenter_minus_width = "100";
+    public $column_costcenter_minus_order = 105;
+    public function column_costcenter_minus($row, $list) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+        
+        $accountInfoCache = $this->_getAccountInfoCache($list);
+        $accountInfo = isset($accountInfoCache[$billCategory]) ? $accountInfoCache[$billCategory] : null;
+        
+        if (empty($accountInfo) || empty($accountInfo['minus'])) {
+            return '-';
+        }
+        
+        return $accountInfo['minus']['costcenter'] ?: '-';
+    }
+
+    // 贷方税率
+    public $column_tax_rate_plus = "贷方税率";
+    public $column_tax_rate_plus_width = "100";
+    public $column_tax_rate_plus_order = 106;
+    public function column_tax_rate_plus($row, $list) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+        
+        $accountInfoCache = $this->_getAccountInfoCache($list);
+        $accountInfo = isset($accountInfoCache[$billCategory]) ? $accountInfoCache[$billCategory] : null;
+        
+        if (empty($accountInfo) || empty($accountInfo['plus'])) {
+            return '-';
+        }
+        
+        $taxRate = $accountInfo['plus']['tax_rate'];
+        return $taxRate !== null && $taxRate !== '' ? $taxRate : '-';
+    }
+
+    // 借方税率
+    public $column_tax_rate_minus = "借方税率";
+    public $column_tax_rate_minus_width = "100";
+    public $column_tax_rate_minus_order = 107;
+    public function column_tax_rate_minus($row, $list) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+        
+        $accountInfoCache = $this->_getAccountInfoCache($list);
+        $accountInfo = isset($accountInfoCache[$billCategory]) ? $accountInfoCache[$billCategory] : null;
+        
+        if (empty($accountInfo) || empty($accountInfo['minus'])) {
+            return '-';
+        }
+        
+        $taxRate = $accountInfo['minus']['tax_rate'];
+        return $taxRate !== null && $taxRate !== '' ? $taxRate : '-';
+    }
+
+    // 贷方客户
+    public $column_customer_plus = "贷方客户";
+    public $column_customer_plus_width = "100";
+    public $column_customer_plus_order = 108;
+    public function column_customer_plus($row, $list) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+        
+        $accountInfoCache = $this->_getAccountInfoCache($list);
+        $accountInfo = isset($accountInfoCache[$billCategory]) ? $accountInfoCache[$billCategory] : null;
+        
+        if (empty($accountInfo) || empty($accountInfo['plus'])) {
+            return '-';
+        }
+        
+        return $accountInfo['plus']['customer'] ?: '-';
+    }
+
+    // 借方客户
+    public $column_customer_minus = "借方客户";
+    public $column_customer_minus_width = "100";
+    public $column_customer_minus_order = 109;
+    public function column_customer_minus($row, $list) {
+        $billCategory = $row[$this->col_prefix . 'bill_category'];
+        if (empty($billCategory)) {
+            return '-';
+        }
+        
+        $accountInfoCache = $this->_getAccountInfoCache($list);
+        $accountInfo = isset($accountInfoCache[$billCategory]) ? $accountInfoCache[$billCategory] : null;
+        
+        if (empty($accountInfo) || empty($accountInfo['minus'])) {
+            return '-';
+        }
+        
+        return $accountInfo['minus']['customer'] ?: '-';
+    }
+
+    // 核销状态
+    public $column_verification_status = "核销状态";
+    public $column_verification_status_width = "100";
+    public $column_verification_status_order = 110;
+    public function column_verification_status($row, $list) {
+        $orderBn = $row[$this->col_prefix . 'order_bn'];
+        if (empty($orderBn)) {
+            return '-';
+        }
+        
+        $verificationStatusCache = $this->_getVerificationStatusCache($list);
+        $verificationStatus = isset($verificationStatusCache[$orderBn]) ? $verificationStatusCache[$orderBn] : null;
+        
+        if (empty($verificationStatus)) {
+            return '-';
+        }
+        
+        $statusMap = array(
+            '1' => '未核销',
+            '2' => '已核销',
+        );
+        
+        return isset($statusMap[$verificationStatus]) ? $statusMap[$verificationStatus] : '-';
+    }
 }