‘wangjiuyun
|
2fdccaa30c
|
采购和收入导入功能调整
|
2024-12-20 11:01:17 +08:00 |
|
‘wangjiuyun
|
010e81c32f
|
Merge branch 'dev_2.0.1' of http://git.unissense.tech/mula/fourcal into dev_2.0.1
|
2024-12-19 16:25:16 +08:00 |
 chenhao
|
c202756962
|
feat(activiti): 添加四算协同解决方案变量
- 在 ActConstant 中添加 KEY_RESOLVE_PLAN_SYNERGY 常量
- 在 ProjectBudget 模型中添加 resolvePlanSynergy 字段
- 修改 ProjectBudgetService 中的批量保存逻辑
- 在 ProjectInstanceService 中添加 resolvePlanSynergy 变量到流程启动参数
|
2024-12-19 16:24:57 +08:00 |
|
‘wangjiuyun
|
46f099f478
|
导入调试
|
2024-12-19 16:24:29 +08:00 |
|
‘wangjiuyun
|
77e10082c5
|
。。。资金计划表readonly问题
|
2024-11-29 17:34:19 +08:00 |
|
‘wangjiuyun
|
6d4cedd5dd
|
。。。资金计划表计算完善
|
2024-11-29 17:00:03 +08:00 |
|
‘wangjiuyun
|
a2c6135305
|
资金计划表日期bug
|
2024-11-29 16:36:24 +08:00 |
|
‘wangjiuyun
|
bdec78bf63
|
。。。改bug
|
2024-11-29 16:12:52 +08:00 |
|
‘wangjiuyun
|
a884037ae5
|
Merge branch 'dev_2.0.1' of http://git.unissense.tech/mula/fourcal into dev_2.0.1
|
2024-11-29 16:03:05 +08:00 |
|
‘wangjiuyun
|
c2599b40bf
|
。。。。
|
2024-11-29 16:02:58 +08:00 |
|
chenhao
|
60c9576cdd
|
refactor(ProjectBudgetService): 修改销售收益计算方法的参数
将`calSaleIncome`方法的参数从`List<ProjectBudgetIncomeDetail>`更改为`List<ProjectBudgetPlanDetail>`，并相应地调整了方法内部的逻辑。具体来说，将循环中的对象从`ProjectBudgetIncomeDetail`变更为`ProjectBudgetPlanDetail`，并且获取销售收益的方式也由`getTotalTaxInclude()`变更为`getSaleIncome()`。此外，在调用`calSaleIncome`的地方，传入的参数也做了相应的更新。
|
2024-11-29 15:55:40 +08:00 |
|
‘wangjiuyun
|
ccebcc0885
|
取消收款和采购明细与资金计划表的联动
增加收款和付款计划表与资金计划表的联动
|
2024-11-29 11:49:34 +08:00 |
|
‘wangjiuyun
|
e1b14e16ca
|
保存草稿去掉资金计划表校验
|
2024-11-19 14:19:32 +08:00 |
|
‘wangjiuyun
|
7978c17d96
|
资金计划表月份吃初始化问题
|
2024-11-14 11:58:38 +08:00 |
|
‘wangjiuyun
|
0d6771b0d5
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-11-13 16:42:47 +08:00 |
|
‘wangjiuyun
|
cf9c367577
|
资金计划表 付款和收款增加公式校验
|
2024-11-13 16:42:38 +08:00 |
|
chenhao
|
0fe38a481e
|
feat :缺失代码提交
1:6月代码未同步 同步代码
|
2024-11-12 16:14:24 +08:00 |
|
‘wangjiuyun
|
182a9991cf
|
资金计划表公式调整
|
2024-11-11 17:57:05 +08:00 |
|
‘wangjiuyun
|
0973b958bc
|
资金计划计算问题
|
2024-11-11 17:00:44 +08:00 |
|
‘wangjiuyun
|
ea1647b97f
|
资金计划表资金利息问题，按钮问题
|
2024-11-11 16:24:08 +08:00 |
|
‘wangjiuyun
|
42150fe0a8
|
注释资金计划表滚动条问题
|
2024-11-07 16:53:08 +08:00 |
|
‘wangjiuyun
|
281cf72c20
|
重名验证问题
|
2024-11-07 11:22:25 +08:00 |
|
‘wangjiuyun
|
7488e711a4
|
预算必填
资金计划表输入框
|
2024-11-07 10:50:19 +08:00 |
|
‘wangjiuyun
|
606f0ff7b2
|
第三期需求问题调整
|
2024-11-06 17:01:04 +08:00 |
|
‘wangjiuyun
|
a1c7aa0337
|
第三期需求
|
2024-11-05 17:47:59 +08:00 |
|
‘wangjiuyun
|
11ca310ec6
|
文本提示修改
|
2024-11-01 17:05:53 +08:00 |
|
‘wangjiuyun
|
c69e81107c
|
审批采购明细，产品大类展示
|
2024-10-31 20:10:57 +08:00 |
|
‘wangjiuyun
|
c4fe63d879
|
采购成本表和付款表校验
|
2024-10-31 18:47:01 +08:00 |
|
‘wangjiuyun
|
a91eb5f0cf
|
最终完成
|
2024-10-31 17:39:13 +08:00 |
|
‘wangjiuyun
|
beeb889780
|
基本完成
|
2024-10-31 15:56:26 +08:00 |
|
chenhao
|
45721a3d84
|
feat 收入明细表:
1:产品大类修改为字符串
|
2024-10-31 14:06:26 +08:00 |
|
‘wangjiuyun
|
07a6165c2a
|
基本完成
|
2024-10-31 13:12:29 +08:00 |
|
chenhao
|
5209e2c8d0
|
feat 收入明细表:
1:产品大类修改为字符串
|
2024-10-31 11:00:52 +08:00 |
|
‘wangjiuyun
|
14de7c568d
|
附件保存完成
|
2024-10-30 19:53:14 +08:00 |
|
‘wangjiuyun
|
d0daa67ddf
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-10-30 19:22:34 +08:00 |
|
‘wangjiuyun
|
b04d88c0e2
|
调试文件上传
|
2024-10-30 19:22:22 +08:00 |
|
chenhao
|
02da71d4a9
|
feat 收入明细表:
1:产品大类修改为字符串
|
2024-10-30 17:35:41 +08:00 |
|
‘wangjiuyun
|
fd43f2f71f
|
除附件外功能
|
2024-10-30 16:31:46 +08:00 |
|
‘wangjiuyun
|
09680c6b43
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-10-30 14:10:20 +08:00 |
|
‘wangjiuyun
|
8050f16a11
|
未完成文件上传
|
2024-10-30 14:10:11 +08:00 |
|
chenhao
|
4f7ae569e9
|
feat 收入明细表:
1:产品大类修改为字符串
|
2024-10-30 11:52:49 +08:00 |
|
‘wangjiuyun
|
122e560b21
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-10-30 11:30:46 +08:00 |
|
‘wangjiuyun
|
5057ce6b40
|
采购明细下拉联动，收入明细下拉联动
|
2024-10-30 11:30:38 +08:00 |
|
chenhao
|
949f5558b6
|
feat 收入明细表:
1:附件改动
|
2024-10-30 11:18:33 +08:00 |
|
‘wangjiuyun
|
5cfa2f90dc
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-10-30 11:11:37 +08:00 |
|
‘wangjiuyun
|
e1ca488327
|
前端2期需求未完成
|
2024-10-30 11:11:27 +08:00 |
|
chenhao
|
e0704f47da
|
feat 收入明细表:
1:附件改动
|
2024-10-30 10:47:17 +08:00 |
|
chenhao
|
6880f80a7c
|
feat 收入明细表:
1:二期需求修改
|
2024-10-29 17:37:24 +08:00 |
|
‘wangjiuyun
|
6a4e423276
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-10-29 17:08:00 +08:00 |
|
‘wangjiuyun
|
e45cbd63c1
|
第一期调整完成
|
2024-10-29 17:07:51 +08:00 |