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

2
app/financebase/lib/autotask/task/type/billImport.php
View File

@@ -56,7 +56,7 @@ class financebase_autotask_task_type_billImport extends financebase_autotask_tas
if ($task_info['queue_data']['is_last'] && $begin_time = strtotime($task_info['queue_data']['bill_date'])) {
// 打到对应的账期
finance_monthly_report::updateMonthlyAmount(array ('begin_time' => $begin_time));
finance_monthly_report::updateMonthlyAmount(array ('begin_time|nequal' => $begin_time));
}
if($errmsg){

6
app/financebase/lib/autotask/task/type/billJdWalletAssign.php
View File

@@ -57,7 +57,7 @@ class financebase_autotask_task_type_billJdWalletAssign extends financebase_auto
$getfile_res = $storageLib->get($remote_url, $local_file);
if (!$getfile_res) {
$error_msg = '文件下载失败';
$error_msg = serialize('文件下载失败');
$this->oFunc->writelog('京东钱包导入分派任务-文件下载失败', 'settlement', '任务ID:' . $task_info['queue_id']);
return false;
}
@@ -70,7 +70,7 @@ class financebase_autotask_task_type_billJdWalletAssign extends financebase_auto
list($status, $errmsg) = $oTask->_spliteJdWalletData($local_file, $file_type, $shop_id, $task_info);
if (!$status) {
$error_msg = $errmsg;
$error_msg = serialize($errmsg);
$this->oFunc->writelog('京东钱包导入分派任务-分片失败', 'settlement', '任务ID:' . $task_info['queue_id'] . ', 错误:' . $errmsg);
return false;
}
@@ -82,7 +82,7 @@ class financebase_autotask_task_type_billJdWalletAssign extends financebase_auto
$this->oFunc->writelog('京东钱包导入分派任务-完成', 'settlement', '任务ID:' . $task_info['queue_id']);
} catch (Exception $e) {
$error_msg = '分派任务异常：' . $e->getMessage();
$error_msg = serialize('分派任务异常：' . $e->getMessage());
$this->oFunc->writelog('京东钱包导入分派任务-异常', 'settlement', '任务ID:' . $task_info['queue_id'] . ', 错误:' . $e->getMessage());
return false;
} finally {

8
app/financebase/lib/autotask/task/type/expensessplit.php
View File

@@ -179,9 +179,17 @@ class financebase_autotask_task_type_expensessplit extends financebase_autotask_
$oldIds = [];
foreach ($olds as $v) {
$oldIds[] = $v['id'];
$v['split_bn'] = $expensesSplitModel->gen_id();
$v['split_status'] = '2';
$v['split_time'] = $this->splitTime;
$v['money'] = -$v['money'];
// 贷方和借方税金都需要红冲（取反）
if (isset($v['tax_amount_plus'])) {
$v['tax_amount_plus'] = -$v['tax_amount_plus'];
}
if (isset($v['tax_amount_minus'])) {
$v['tax_amount_minus'] = -$v['tax_amount_minus'];
}
unset($v['id']);
$expensesSplit[] = $v;
}