 xuhaihui
|
f477b3ff90
|
科目分类通用插件优化
|
2025-07-23 10:00:52 +08:00 |
zhangzhiguo
|
f05be78785
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-23 09:33:59 +08:00 |
|
zhangzhiguo
|
5b94ca5a06
|
清单运维
|
2025-07-22 18:25:57 +08:00 |
|
zhangzhiguo
|
0d74173d41
|
司库付款校验功能关闭
|
2025-07-22 18:25:28 +08:00 |
|
xuhaihui
|
bcd2e4acfc
|
科目分类通用插件优化
|
2025-07-22 18:17:06 +08:00 |
|
xuhaihui
|
11d72a8bc5
|
科目分类通用插件优化
|
2025-07-22 18:02:01 +08:00 |
|
xuhaihui
|
0ec46b3a82
|
科目分类通用插件优化
|
2025-07-22 16:50:06 +08:00 |
|
xuhaihui
|
77eff0c809
|
科目分类通用插件优化
|
2025-07-22 14:55:11 +08:00 |
|
xuhaihui
|
85478571da
|
科目分类通用插件优化
|
2025-07-22 11:31:38 +08:00 |
|
zhangzhiguo
|
6e210388a7
|
付款登记单审核与反审核操作插件
|
2025-07-22 10:45:23 +08:00 |
|
zhangzhiguo
|
ac92bd9efc
|
收入、支出确认单发票bug修复
|
2025-07-22 10:44:30 +08:00 |
|
zhangzhiguo
|
f192fb22ef
|
收入、支出确认单发票必填校验
|
2025-07-22 10:43:47 +08:00 |
|
zhangzhiguo
|
261aff0114
|
结算单微调金额自动计算
|
2025-07-22 10:42:57 +08:00 |
|
zhangzhiguo
|
82c1c1bf54
|
报销单费用项目过滤
|
2025-07-22 10:42:06 +08:00 |
|
zhangzhiguo
|
3a6bfaa1f8
|
收款人类型重定义
|
2025-07-22 10:41:17 +08:00 |
|
zhangzhiguo
|
be399a1454
|
查询台账单，只查询当前公司下的人员
|
2025-07-22 10:39:16 +08:00 |
|
zhangzhiguo
|
940957083d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-22 10:31:33 +08:00 |
|
xuhaihui
|
c268823e60
|
费用报销单优化费用项目过滤和科目属性赋值逻辑
|
2025-07-22 10:29:51 +08:00 |
|
zhangzhiguo
|
50e9729283
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmePlugin.java
|
2025-07-21 18:24:16 +08:00 |
|
xuhaihui
|
56ffe5eba6
|
1：支出合同确认单添加费用项目过滤和费用项目清空时的避免报错；2：费用报销单：费用项目过滤和科目属性赋值过滤逻辑添加
|
2025-07-21 18:21:40 +08:00 |
|
zhangzhiguo
|
006298e711
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-18 17:15:18 +08:00 |
 xiaoshi
|
95dce05fef
|
取消计算
|
2025-07-18 15:25:53 +08:00 |
|
xiaoshi
|
930f9af9e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-18 14:58:50 +08:00 |
|
xiaoshi
|
7f2abe0009
|
多税率计算
|
2025-07-18 14:58:37 +08:00 |
|
xuhaihui
|
2c018c66bb
|
费用报销单提交校验优化
|
2025-07-17 15:25:16 +08:00 |
|
zhangzhiguo
|
582d0ca002
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-17 14:25:00 +08:00 |
|
xuhaihui
|
d90a8cde7a
|
费用报销单提交校验优化
|
2025-07-17 14:19:21 +08:00 |
|
zhangzhiguo
|
7e704c2a70
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-16 17:46:51 +08:00 |
|
xuhaihui
|
02ed45c2e5
|
用款申请单插件优化
|
2025-07-16 17:46:23 +08:00 |
|
xuhaihui
|
6e29a3ed3c
|
用款申请单插件优化
|
2025-07-16 15:49:04 +08:00 |
|
xuhaihui
|
d27a17abc3
|
用款申请单插件优化
|
2025-07-16 15:37:17 +08:00 |
|
zhangzhiguo
|
552af0d182
|
支出财务确认单科目分类增加单据类型判断
|
2025-07-16 15:30:59 +08:00 |
|
zhangzhiguo
|
5aa051cbcf
|
收入/支出财务确认单生成的凭证反写问题修复
|
2025-07-16 15:30:17 +08:00 |
|
zhangzhiguo
|
411b1619a8
|
收入/支出财务确认单超链接点击为编码时取消原逻辑 跳转至自定义页面
|
2025-07-16 15:29:35 +08:00 |
|
zhangzhiguo
|
e115fd8cd4
|
提交司库状态“同步成功” 或 已付款，才能审批通过
|
2025-07-16 15:28:39 +08:00 |
|
zhangzhiguo
|
567273b4d9
|
1、费用报销单；2、差旅报销单；3、对公报销单；4、预付单
增加科目分类字段，按费用与科目分类进行过滤可选的科目分类
|
2025-07-16 15:28:04 +08:00 |
|
zhangzhiguo
|
f350619bea
|
费用报销单，收款信息的收款人类型，把供应商，客户隐藏
|
2025-07-16 15:27:43 +08:00 |
|
xuhaihui
|
f8c601d531
|
用款申请单插件
|
2025-07-16 14:49:32 +08:00 |
|
xuhaihui
|
0660fc913a
|
用款申请单业务组织赋值
|
2025-07-16 10:17:59 +08:00 |
|
xuhaihui
|
a746bc7661
|
用款申请单业务组织赋值
|
2025-07-15 18:44:54 +08:00 |
|
xuhaihui
|
ee55e6dd24
|
费用报销单提交校验逻辑：申请人需与个人的收款信息中的收款人一致
|
2025-07-15 18:28:21 +08:00 |
|
xuhaihui
|
a15bdb2293
|
添加仅针对矿山下组织下的逻辑
|
2025-07-15 18:15:34 +08:00 |
|
xuhaihui
|
32ee5602e9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-15 17:30:44 +08:00 |
|
xuhaihui
|
89f4fd31a5
|
对公报销单提交校验插件：校验往来单位与开票公司是否一致，不一致需填写特殊说明
|
2025-07-15 17:30:38 +08:00 |
|
zhangzhiguo
|
ebfdff5367
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-15 16:56:40 +08:00 |
|
zhangzhiguo
|
097414a884
|
代码
|
2025-07-15 16:55:48 +08:00 |
|
xuhaihui
|
327e0259ff
|
二开系统插件-付款申请单审核与反审核操作插件:修改累计收票金额逻辑
|
2025-07-15 16:13:05 +08:00 |
|
xuhaihui
|
769ddb5fc8
|
标记
|
2025-07-15 14:55:18 +08:00 |
|
zhangzhiguo
|
74447e38ec
|
共享合并生成凭证问题
|
2025-07-14 16:15:30 +08:00 |
|
zhangzhiguo
|
0caafcd63d
|
共享合并生成凭证问题
|
2025-07-14 16:03:06 +08:00 |
|
zhangzhiguo
|
f0115bb5d3
|
共享合并生成凭证问题
|
2025-07-14 15:44:48 +08:00 |
|
xuhaihui
|
8dfdf6c1bc
|
付款申请单（项目资金）提交校验,付款信息中一个合同不能填写多行相同的支付类型+结算方式
|
2025-07-11 16:12:37 +08:00 |
|
zhangzhiguo
|
a6e469197d
|
共享模块问题处理
|
2025-07-10 13:51:58 +08:00 |
|
zhangzhiguo
|
8a588d1ad0
|
支出合同结算多出合同支付项bug调整(未完成)
|
2025-07-10 13:51:32 +08:00 |
|
zhangzhiguo
|
92a166b316
|
付款申请单移除所属部门过滤和默认功能
|
2025-07-10 13:49:12 +08:00 |
|
zhangzhiguo
|
c48de98b79
|
代码修改
|
2025-07-10 13:47:45 +08:00 |
|
zhangzhiguo
|
c5a11a52b8
|
收入结算单作废增加作废名称标识
|
2025-07-10 13:46:58 +08:00 |
|
哈哈哈丿
|
9377d4712b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-10 13:45:14 +08:00 |
|
xuhaihui
|
8e9e392dd2
|
移动位置
|
2025-07-09 18:48:50 +08:00 |
|
哈哈哈丿
|
fd821fb4b8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-09 18:38:44 +08:00 |
|
xuhaihui
|
82c424e705
|
用款申请单所属组织默认赋值
|
2025-07-09 18:32:12 +08:00 |
|
哈哈哈丿
|
7db93353cd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-09 15:48:06 +08:00 |
|
xuhaihui
|
1434be8987
|
用款申请单部门字段过滤与初始赋值逻辑
|
2025-07-09 14:09:13 +08:00 |
|
哈哈哈丿
|
3c544648ec
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-08 16:35:15 +08:00 |
|
xiaoshi
|
e31f35e6ef
|
修复
|
2025-07-07 17:04:37 +08:00 |
|
哈哈哈丿
|
44d1f7b1c0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-07 16:51:08 +08:00 |
|
xiaoshi
|
de1f6b299f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-07 09:50:15 +08:00 |
|
xiaoshi
|
30c9db3769
|
修复
|
2025-07-07 09:47:49 +08:00 |
|
哈哈哈丿
|
234060e0d1
|
收入财务确认单报错问题处理
|
2025-07-04 19:50:46 +08:00 |
|
哈哈哈丿
|
ff94fd70bd
|
收入合同确认单增加销项发票检查逻辑
|
2025-07-04 19:50:12 +08:00 |
|
哈哈哈丿
|
8f173d6d60
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-04 11:34:46 +08:00 |
|
xiaoshi
|
dd8a621f2b
|
修复
|
2025-07-04 11:13:59 +08:00 |
|
哈哈哈丿
|
e94cf6c10d
|
报销单发票日期和关联申请审核日期校验报错日期处理
|
2025-07-04 10:58:21 +08:00 |
|
哈哈哈丿
|
d5cc425dae
|
对公报销单付款人为空报错处理
|
2025-07-04 10:57:27 +08:00 |
|
哈哈哈丿
|
439d984c4e
|
合同签订单报错问题修复
|
2025-07-04 10:56:47 +08:00 |
|
哈哈哈丿
|
4f1de702dd
|
支出财务确认增加工序必填判断
|
2025-07-04 10:56:16 +08:00 |
|
哈哈哈丿
|
4bf9c004ea
|
支出财务确认单增加所属组织关联带出
|
2025-07-04 10:55:29 +08:00 |
|
哈哈哈丿
|
bfd1fc3ef4
|
支出财务确认单增加工序必填校验
|
2025-07-04 10:54:58 +08:00 |
|
哈哈哈丿
|
a4bb31c6e8
|
重写校验是否超过资金计划的金额控制
|
2025-07-04 10:54:01 +08:00 |
|
哈哈哈丿
|
93bde50a7c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-02 18:40:52 +08:00 |
|
哈哈哈丿
|
3707cf73ce
|
职务消费台账统计领导问题处理
|
2025-07-02 17:17:30 +08:00 |
|
哈哈哈丿
|
d55f5745be
|
付款处理单无合同付款代码移除
|
2025-07-02 17:16:32 +08:00 |
|
哈哈哈丿
|
3403774ea8
|
支出财务确认单，发票校验
|
2025-07-02 17:15:28 +08:00 |
|
哈哈哈丿
|
f99054f9bb
|
合同修订单报错处理
|
2025-07-02 17:14:39 +08:00 |
|
哈哈哈丿
|
fe6fa7e9e5
|
无合同相关代码注释
|
2025-07-02 17:13:37 +08:00 |
|
xiaoshi
|
daa79ff959
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-02 15:54:45 +08:00 |
|
xiaoshi
|
d0b31577d0
|
修复
|
2025-07-02 15:54:34 +08:00 |
|
xuhaihui
|
b05a23820f
|
出库单添加使用设备赋值逻辑
|
2025-07-02 14:52:35 +08:00 |
|
xiaoshi
|
6385e97a73
|
修复
|
2025-07-02 11:34:55 +08:00 |
|
xiaoshi
|
ece80dab9e
|
修复
|
2025-07-02 11:21:01 +08:00 |
|
xiaoshi
|
5f6cadb475
|
修复
|
2025-07-02 10:03:52 +08:00 |
|
xiaoshi
|
da52adc449
|
修复
|
2025-07-02 09:48:10 +08:00 |
|
xiaoshi
|
69e18eec18
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-01 17:46:18 +08:00 |
|
xiaoshi
|
4605cbf74b
|
修复
|
2025-07-01 17:45:40 +08:00 |
|
哈哈哈丿
|
4deac7d98c
|
对公报销单提交时付款人为空判断
|
2025-07-01 16:54:57 +08:00 |
|
xiaoshi
|
a2ec2e33e7
|
修复
|
2025-07-01 16:21:50 +08:00 |
|
xiaoshi
|
06e222897e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-01 15:11:58 +08:00 |
|
xiaoshi
|
1d881e8f63
|
修复
|
2025-07-01 15:11:12 +08:00 |
|
哈哈哈丿
|
c612a2655b
|
收入/支出财务确认单编辑界面增加组织过滤
|
2025-07-01 15:08:16 +08:00 |
|
哈哈哈丿
|
66a15b3152
|
收入合同结算单增加反审核校验逻辑
|
2025-07-01 15:07:26 +08:00 |