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

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

View File

@@ -48,7 +48,7 @@ class monitor_event_notify
$notifyData['template_id'] = $templateInfo['template_id'];
$notifyData['event_type'] = $eventType;
$notifyData['original_content'] = $templateInfo['content'];
$notifyData['send_content'] = '**域名:'.kernel::base_url(1)."**\n".$this->getNotifyParams($templateInfo, $params);
$notifyData['send_content'] = ($templateInfo['send_type'] == 'workwx' ? '**域名:'.kernel::base_url(1)."**\n" : '').$this->getNotifyParams($templateInfo, $params);
$notifyData['send_type'] = $templateInfo['send_type'];
$notifyData['params'] = json_encode($params);
$notifyData['file_path'] = json_encode($params['file_path'],JSON_UNESCAPED_SLASHES);
@@ -78,7 +78,10 @@ class monitor_event_notify
//同步发送
if ($is_sync) {
//调用发送方法
$this->sendNotify($result);
if($params['receiver']) {
$notifyData['receiver'] = $params['receiver'];
}
$this->sendNotify($result, $notifyData);
}
}
return true;
@@ -213,14 +216,22 @@ class monitor_event_notify
* 每天检测将超过30天的发送数据清除
*/
public function clean($clean_time = 30){
$db = kernel::database();
$time = time();
$where = " WHERE `at_time`<'".date('Y-m-d',$time-$clean_time*24*60*60).' 00:00:00'."' ";
$del_sql = " DELETE FROM `sdb_monitor_event_notify` $where ";
kernel::database()->exec($del_sql);
// // 只查询一条数据,判断是否有数据
// $select_sql = "SELECT notify_id FROM sdb_monitor_event_notify ". $where ." LIMIT 0, 1";
// $dataList = $db->select($select_sql);
// if(empty($dataList)){
// return true;
// }
// 删除数据
$del_sql = " DELETE FROM `sdb_monitor_event_notify` $where ";
$db->exec($del_sql);
return true;
}