 allen_xiong
|
91ee7467c5
|
Merge branch 'develop' into 'develop'
调整比议价程式相关前端效果；修改制程最低价记录后端逻辑
See merge request pisteams/pis!30
|
2026-03-30 05:44:20 +00:00 |
|
|
nebula_chen
|
e41983eb5a
|
调整比议价程式相关前端效果；修改制程最低价记录后端逻辑
|
2026-03-30 12:34:00 +08:00 |
|
|
allen_xiong
|
ddab82a71a
|
Merge branch 'develop' into 'develop'
迁移脚本更新
See merge request pisteams/pis!29
|
2026-03-30 00:39:15 +00:00 |
|
|
Developer01
|
8211811dd0
|
更新0007_alter_misclowpriceheader_item_no.py和0005_alter_quotationmaster_quote_deadline_and_more.py
|
2026-03-29 19:50:25 +08:00 |
|
|
pandas_xiao
|
857b745ddc
|
Merge branch 'develop' into 'develop'
Develop同步
See merge request pandas_xiao/pispandas!6
|
2026-03-29 11:31:20 +00:00 |
|
|
allen_xiong
|
466aec8fe9
|
Merge branch 'develop' into 'develop'
新增 - 报价截止时间校验逻辑；报价单流转到”已过期“状态逻辑；完善询价单流转到”报价结束“状态逻辑
See merge request pisteams/pis!27
|
2026-03-29 06:39:04 +00:00 |
|
|
nebula_chen
|
0f0d40588d
|
修复测试发现的问题；调整部分ui效果
|
2026-03-27 19:15:44 +08:00 |
|
|
nebula_chen
|
e7ad616152
|
新增 - 报价截止时间校验逻辑；报价单流转到”已过期“状态逻辑；完善询价单流转到”报价结束“状态逻辑
|
2026-03-27 19:12:14 +08:00 |
|
|
allen_xiong
|
b94fcbd4f8
|
Merge branch 'develop' into 'develop'
询报价增加采购方式、招标开始时间、招标结束时间
See merge request pisteams/pis!26
|
2026-03-27 08:11:04 +00:00 |
|
|
Developer01
|
5075ff91c2
|
询报价增加采购方式、招标开始时间、招标结束时间
|
2026-03-27 16:09:16 +08:00 |
|
|
pandas_xiao
|
d47a9951ae
|
Merge branch 'develop' into 'develop'
Develop
See merge request pandas_xiao/pispandas!5
|
2026-03-27 07:54:21 +00:00 |
|
|
allen_xiong
|
379ebfa60f
|
Merge branch 'develop' into 'develop'
新增 杂采比议价、询价履历记录 实现；调整部分ui效果
See merge request pisteams/pis!25
|
2026-03-27 07:30:34 +00:00 |
|
|
nebula_chen
|
6f2000041f
|
新增 杂采比议价、询价履历记录 实现；调整部分ui效果
|
2026-03-27 14:32:50 +08:00 |
|
|
allen_xiong
|
0b0ad16f94
|
Merge branch 'develop' into 'develop'
询价单主表模板版本号字段默认初始值
See merge request pisteams/pis!24
|
2026-03-26 08:25:25 +00:00 |
|
|
Developer01
|
b87d549f41
|
询价模板版本增加初始默认值
|
2026-03-26 15:56:19 +08:00 |
|
|
pandas_xiao
|
9e50bd6e1b
|
Merge branch 'develop' into 'develop'
新增 - 询/报价列表增加首列“交易厂区”列；
See merge request pandas_xiao/pispandas!4
|
2026-03-26 07:48:41 +00:00 |
|
|
allen_xiong
|
68f1a757b2
|
Merge branch 'develop' into 'develop'
新增 - 询/报价列表增加首列“交易厂区”列；修改 - 报价窗口“询价状态”改为"交易厂区"；修复“报价中”状态无法报价bug。
See merge request pisteams/pis!23
|
2026-03-26 07:19:53 +00:00 |
|
|
nebula_chen
|
7af8dbde95
|
新增 - 询/报价列表增加首列“交易厂区”列；
修改 - 报价窗口“询价状态”改为"交易厂区"；修复“报价中”状态无法报价bug。
|
2026-03-26 15:14:19 +08:00 |
|
|
allen_xiong
|
19fc9e8980
|
Merge branch 'develop' into 'develop'
Develop-询报价增加重量栏位
See merge request pisteams/pis!22
|
2026-03-26 03:54:38 +00:00 |
|
|
Developer01
|
23fd346151
|
询报价增加重量栏位和询价单增加模板版本字段
|
2026-03-26 11:48:37 +08:00 |
|
|
pandas_xiao
|
84d1ec948c
|
Merge branch 'develop' into 'develop'
Develop同步
See merge request pandas_xiao/pispandas!3
|
2026-03-26 01:49:10 +00:00 |
|
|
allen_xiong
|
b44438681b
|
Merge branch 'develop' into 'develop'
修改部分前端效果并根据业务逻辑调整后端实现
See merge request pisteams/pis!20
|
2026-03-26 00:47:59 +00:00 |
|
|
nebula_chen
|
11ee089689
|
修改部分前端效果并根据业务逻辑调整后端实现
|
2026-03-25 17:52:52 +08:00 |
|
|
allen_xiong
|
d600b1fd2c
|
Merge branch 'develop' into 'develop'
增加邮件服务功能
See merge request pisteams/pis!19
|
2026-03-25 09:45:45 +00:00 |
|
|
Developer01
|
81b313d790
|
增加邮件服务配置及功能
|
2026-03-25 17:41:41 +08:00 |
|
|
pandas_xiao
|
44012facfd
|
Merge branch 'develop' into 'develop'
代码同步
See merge request pandas_xiao/pispandas!2
|
2026-03-25 09:35:21 +00:00 |
|
|
allen_xiong
|
ca201f5d0b
|
Merge branch 'develop' into 'develop'
1.单据编号设置表迁移脚本更新
See merge request pisteams/pis!17
|
2026-03-25 06:41:43 +00:00 |
|
|
Developer01
|
93d53bd908
|
1.单据编号设置表迁移脚本更新
|
2026-03-25 14:40:07 +08:00 |
|
|
allen_xiong
|
cbf78f9e2f
|
Merge branch 'develop' into 'develop'
新增 - 邮件通知模型及其序列化器，邮件发文模板；询价单发布同步向对应供应商发送邮件。
See merge request pisteams/pis!15
|
2026-03-25 06:19:10 +00:00 |
|
|
nebula_chen
|
6572d1acda
|
新增 - 邮件通知模型及其序列化器，邮件发文模板；询价单发布同步向对应供应商发送邮件。
|
2026-03-25 11:34:27 +08:00 |
|
|
allen_xiong
|
23067831d6
|
Merge branch 'develop' into 'develop'
新增 - 取号规则表模型结构及相应序列化器；修改 - 报价单展开改为三个页签，且修复询价单附件回显异常的问题；当前询报价单号取号规则改为基于取号规则表字段进行组装；
See merge request pisteams/pis!14
|
2026-03-25 02:38:03 +00:00 |
|
|
nebula_chen
|
41a9ebc4da
|
新增 - 取号规则表模型结构及相应序列化器；
修改 - 报价单展开改为三个页签，且修复询价单附件回显异常的问题；当前询报价单号取号规则改为基于取号规则表字段进行组装；
|
2026-03-24 19:58:56 +08:00 |
|
|
allen_xiong
|
6b2ff3c16a
|
Merge branch 'develop' into 'develop'
更新服务器代码迁移文件
See merge request pisteams/pis!13
|
2026-03-24 06:44:58 +00:00 |
|
|
allen_xiong
|
bba8d60dd0
|
更新服务器迁移文件
|
2026-03-24 14:43:42 +08:00 |
|
|
allen_xiong
|
7c6d3e9498
|
Merge branch 'develop' into 'develop'
Develop
See merge request allen_xiong/pis-allen!1
|
2026-03-24 06:17:29 +00:00 |
|
|
allen_xiong
|
1bf4b22fbc
|
Merge branch 'develop' into 'develop'
删除 - 前端已作废目录及子项
See merge request pisteams/pis!12
|
2026-03-24 06:14:19 +00:00 |
|
|
nebula_chen
|
cfed2ba734
|
删除 - 前端已作废目录及子项
|
2026-03-24 14:07:08 +08:00 |
|
|
allen_xiong
|
f42275b88e
|
Merge branch 'develop' into 'develop'
新增 - 模板版本号及状态；修复 - 报价存在部分问题
See merge request pisteams/pis!11
|
2026-03-24 05:53:27 +00:00 |
|
|
nebula_chen
|
09c6c4650d
|
新增 - 模板版本号及状态；修复 - 报价存在部分问题
|
2026-03-24 13:48:26 +08:00 |
|
|
nebula_chen
|
2351c1175d
|
Merge branch 'develop' into 'develop'
自动部署测试
See merge request nebula_chen/pis!2
|
2026-03-24 03:40:30 +00:00 |
|
|
allen_xiong
|
23544d47d3
|
Merge branch 'develop' into 'develop'
日常优化
See merge request pisteams/pis!10
|
2026-03-24 01:03:07 +00:00 |
|
|
allen_xiong
|
11a3360c9d
|
日常优化
1. 优化redis连接失败问题
2. 修改runner配置文件中标签为主项目标签
|
2026-03-24 09:02:04 +08:00 |
|
|
allen_xiong
|
980e67e100
|
Merge branch 'develop' into 'develop'
自动部署优化
See merge request pisteams/pis!9
|
2026-03-23 12:07:34 +00:00 |
|
|
allen_xiong
|
eacea78280
|
修改代码部署脚本配置文件迁移目录为测试环境目录
|
2026-03-23 20:04:18 +08:00 |
|
|
allen_xiong
|
82f3f5303c
|
补充服务器migrations迁移文件
1. 取消后端.gitignore文件中migrations文件忽略配置
2. 补充服务器上已有迁移文件
|
2026-03-23 20:02:58 +08:00 |
|
|
allen_xiong
|
e71371542d
|
优化脚本执行报错问题
|
2026-03-23 19:24:23 +08:00 |
|
|
allen_xiong
|
e87fe65b20
|
优化部署脚本执行报错问题
|
2026-03-23 19:18:39 +08:00 |
|
|
allen_xiong
|
7bd5048bf8
|
优化文件迁移时报错问题
|
2026-03-23 19:11:35 +08:00 |
|
|
allen_xiong
|
d6ce8fa3f4
|
切换任务执行标签
|
2026-03-23 17:54:40 +08:00 |
|
|
allen_xiong
|
3eaa06a22d
|
修改代码部署路径为测试路径
|
2026-03-23 17:53:12 +08:00 |
|