 xuhaihui
|
1b404b1abb
|
工序成本预算单保存提交操作插件优化
|
2025-08-07 09:44:34 +08:00 |
zhangzhiguo
|
9a2527d6f8
|
付款处理反写资金计划申请实付金额功能
|
2025-08-06 19:38:58 +08:00 |
|
zhangzhiguo
|
a2588e7d6a
|
付款处理反写资金计划申请实付金额功能
|
2025-08-06 19:38:06 +08:00 |
 xiaoshi
|
4d5975d6e2
|
youhua
|
2025-08-06 18:27:29 +08:00 |
|
xiaoshi
|
a787950a8c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-06 17:24:18 +08:00 |
|
xiaoshi
|
affa2ee26f
|
youhua
|
2025-08-06 17:23:27 +08:00 |
|
xuhaihui
|
cfec7cd726
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-06 17:13:55 +08:00 |
|
xuhaihui
|
39a42c5eb7
|
支出合同结算单生成冲销和作废等支出财务确认单逻辑添加支出财务确认单-费用项目分录逻辑
|
2025-08-06 17:13:51 +08:00 |
|
zhangzhiguo
|
572d377c08
|
科目余额取数表增加项目经理字段
|
2025-08-06 14:15:10 +08:00 |
|
zhangzhiguo
|
d91a700fbe
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-06 14:13:05 +08:00 |
|
xuhaihui
|
b880d268f6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-06 14:11:36 +08:00 |
|
zhangzhiguo
|
11e6def68a
|
财务部核定金额付款方式重复校验
|
2025-08-06 14:11:32 +08:00 |
|
xuhaihui
|
f2e7560de3
|
支出合同结算单中的工序分摊新增逻辑优化
|
2025-08-06 14:11:31 +08:00 |
|
xiaoshi
|
f45404050d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-06 12:44:36 +08:00 |
|
xiaoshi
|
942ae6ead4
|
youhua
|
2025-08-06 12:40:23 +08:00 |
|
xuhaihui
|
e404ee6e60
|
支出合同结算新增合同支付项明细后将对应不同分录拆分至工序分摊中
|
2025-08-06 11:15:56 +08:00 |
|
xuhaihui
|
e8065649b1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-05 14:10:09 +08:00 |
|
xuhaihui
|
4d53ece9f8
|
差旅报销单提交按钮操作逻辑优化
|
2025-08-05 14:10:02 +08:00 |
|
xiaoshi
|
4a4edf72ea
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-05 13:11:19 +08:00 |
|
xiaoshi
|
1517727dbf
|
youhua
|
2025-08-05 13:10:31 +08:00 |
|
zhangzhiguo
|
c11b58c1b7
|
职务消费台账增加费用归属领导查询逻辑
|
2025-08-05 11:37:10 +08:00 |
|
xiaoshi
|
1dc6c68a54
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-05 11:04:02 +08:00 |
|
xiaoshi
|
0c37fcc02c
|
youhua
|
2025-08-05 11:03:27 +08:00 |
|
zhangzhiguo
|
cce3525cb6
|
科目余额表取数
|
2025-08-05 11:03:01 +08:00 |
|
xuhaihui
|
12e0744b63
|
* 单据注册位置：差旅报销单提交按钮
* 说明：校验不同行程信息开始结束时间是否存在相同的日期
|
2025-08-05 10:45:15 +08:00 |
|
zhangzhiguo
|
935b609247
|
科目余额表取数
|
2025-08-04 19:01:30 +08:00 |
|
xiaoshi
|
a120667f44
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-04 16:39:56 +08:00 |
|
xiaoshi
|
26b87df6a9
|
youhua
|
2025-08-04 16:39:21 +08:00 |
|
xuhaihui
|
d708326083
|
优化
|
2025-08-04 16:31:42 +08:00 |
|
xuhaihui
|
8962e95bac
|
对公报销单提交操作插件：冲预付时预付单支付日期与开票日期和当前日期的对比校验
|
2025-08-04 16:15:14 +08:00 |
|
xuhaihui
|
cfea1526f3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-04 16:11:57 +08:00 |
|
xiaoshi
|
9940372930
|
youhua
|
2025-08-04 15:46:25 +08:00 |
|
xuhaihui
|
0138cbf94a
|
优化
|
2025-08-04 13:56:39 +08:00 |
|
xuhaihui
|
f8b1191489
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-04 13:54:15 +08:00 |
|
xuhaihui
|
846145ee2f
|
费用报销单、差旅报销单、对公报销单提交操作插件：开票日期与当前日期的对比校验逻辑
|
2025-08-04 13:54:07 +08:00 |
|
xiaoshi
|
efca0bd7ea
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-04 13:25:08 +08:00 |
|
xiaoshi
|
44c35f68d5
|
youhua
|
2025-08-04 13:24:53 +08:00 |
|
zhangzhiguo
|
52d01b1a40
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-04 09:33:25 +08:00 |
|
xiaoshi
|
e8fc9783f9
|
youhua
|
2025-08-01 21:17:36 +08:00 |
|
zhangzhiguo
|
221535deb6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-01 20:08:49 +08:00 |
|
xiaoshi
|
9b069670e9
|
youhua
|
2025-08-01 19:34:54 +08:00 |
|
xiaoshi
|
53249a396f
|
youhua
|
2025-08-01 17:40:33 +08:00 |
|
xiaoshi
|
ef7c631314
|
youhua
|
2025-08-01 17:20:40 +08:00 |
|
zhangzhiguo
|
ba93f9fb5e
|
余额表取数
|
2025-08-01 16:45:51 +08:00 |
|
xiaoshi
|
d9659d4311
|
youhua
|
2025-08-01 16:34:47 +08:00 |
|
xiaoshi
|
a86c0ba314
|
youhua
|
2025-08-01 15:55:10 +08:00 |
|
xiaoshi
|
629f3b7f1c
|
youhua
|
2025-08-01 14:43:24 +08:00 |
|
xuhaihui
|
5c4d04271f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-01 14:05:21 +08:00 |
|
xuhaihui
|
31f7ebf78d
|
费用报销单申请人需与个人的收款信息中的收款人一致逻辑优化
|
2025-08-01 14:05:15 +08:00 |
|
xiaoshi
|
82ec9a3155
|
youhua
|
2025-08-01 11:13:46 +08:00 |
|
xiaoshi
|
2202c71790
|
youhua
|
2025-08-01 11:11:31 +08:00 |
|
xiaoshi
|
330b6d9a90
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-01 11:10:32 +08:00 |
|
xiaoshi
|
5277494fdc
|
youhua
|
2025-08-01 11:10:12 +08:00 |
|
xuhaihui
|
5efb378c94
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-01 10:43:37 +08:00 |
|
xuhaihui
|
62587e3f63
|
针对矿山组织的过滤逻辑添加基础资料判断条件；费用报销单收款人（个人逻辑优化
|
2025-08-01 10:43:20 +08:00 |
|
xiaoshi
|
211352174b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-31 19:26:39 +08:00 |
|
xiaoshi
|
753e2dfd0b
|
youhua
|
2025-07-31 19:25:46 +08:00 |
|
zhangzhiguo
|
0a144492af
|
资金计划插件开发
|
2025-07-31 18:51:51 +08:00 |
|
zhangzhiguo
|
3ab2957c62
|
1.组织工具类优化
2.职务消费台账功能优化
3.计算扣除餐补天数优化
|
2025-07-31 18:46:13 +08:00 |
|
xiaoshi
|
34f30062f9
|
youhua
|
2025-07-31 17:26:03 +08:00 |
|
xiaoshi
|
ca4fc13b7c
|
youhua
|
2025-07-31 15:41:13 +08:00 |
|
xiaoshi
|
47437dd7e1
|
youhua
|
2025-07-31 15:01:48 +08:00 |
|
xiaoshi
|
632ef9bef7
|
youhua
|
2025-07-31 14:20:03 +08:00 |
|
xiaoshi
|
1897d56193
|
youhua
|
2025-07-31 12:42:26 +08:00 |
|
xiaoshi
|
963e5f0864
|
youhua
|
2025-07-31 10:02:44 +08:00 |
|
xiaoshi
|
eaeadf5398
|
youhua
|
2025-07-30 17:47:14 +08:00 |
|
xiaoshi
|
71344fe3d2
|
youhua
|
2025-07-30 17:39:50 +08:00 |
|
xiaoshi
|
f6e06271f4
|
youhua
|
2025-07-30 17:04:37 +08:00 |
|
xiaoshi
|
565e815ef6
|
youhua
|
2025-07-30 16:16:41 +08:00 |
|
xiaoshi
|
8cf40f8cae
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-30 16:05:09 +08:00 |
|
xiaoshi
|
a27f31230c
|
youhua
|
2025-07-30 16:04:41 +08:00 |
|
zhangzhiguo
|
e370c05eba
|
付款申请单费用项目过滤问题处理
|
2025-07-30 15:58:46 +08:00 |
|
zhangzhiguo
|
8321bb3b40
|
实际结算甲方值缺失问题处理
|
2025-07-30 15:47:46 +08:00 |
|
xiaoshi
|
1afa521471
|
youhua
|
2025-07-30 15:27:20 +08:00 |
|
xiaoshi
|
131530c483
|
youhua
|
2025-07-30 14:48:44 +08:00 |
|
xiaoshi
|
f8ab23ff3b
|
youhua
|
2025-07-30 14:22:54 +08:00 |
|
xiaoshi
|
04e98b6f2e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-30 14:02:01 +08:00 |
|
xiaoshi
|
1ecae316b3
|
youhua
|
2025-07-30 14:01:49 +08:00 |
|
xuhaihui
|
2e98950f6f
|
科目属性逻辑优化
|
2025-07-30 13:51:59 +08:00 |
|
xiaoshi
|
5b0a2e2850
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-30 13:33:24 +08:00 |
|
xiaoshi
|
a86e970125
|
youhua
|
2025-07-30 13:33:14 +08:00 |
|
xuhaihui
|
4337b580f3
|
入库单和采购申请列表插件逻辑优化
|
2025-07-30 10:34:13 +08:00 |
|
xiaoshi
|
192a891710
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-30 10:12:53 +08:00 |
|
xiaoshi
|
dff7777788
|
youhua
|
2025-07-30 10:12:17 +08:00 |
|
xuhaihui
|
97dd88085d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-29 15:49:16 +08:00 |
|
xuhaihui
|
40ff221682
|
优化点击选择采购申请按钮后弹出的采购申请分录中的数据的条数
|
2025-07-29 15:48:56 +08:00 |
|
xiaoshi
|
a6674f5a2c
|
youhua
|
2025-07-29 15:45:45 +08:00 |
|
xuhaihui
|
f125fad5b8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-29 15:25:06 +08:00 |
|
xuhaihui
|
d3499a4d1c
|
1：入库单审核操作插件：校验是否合计数量超过采购申请单数量；2：入库单审核反审核操作插件：审核、反审核时，将入库单数量反写至采购申请单
|
2025-07-29 15:24:58 +08:00 |
|
xiaoshi
|
b8fb6b8557
|
youhua
|
2025-07-29 14:57:30 +08:00 |
|
xiaoshi
|
77b964a148
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-29 11:30:22 +08:00 |
|
xiaoshi
|
400242cc2f
|
youhua
|
2025-07-29 11:29:37 +08:00 |
|
xuhaihui
|
88908f67b6
|
采购申请单表单插件：初始默认采购组织等于所属组织
|
2025-07-29 10:10:20 +08:00 |
|
xuhaihui
|
86890397bc
|
入库单插件修改，废弃事物类型默认为空和是否主材隐显逻辑
|
2025-07-29 09:55:10 +08:00 |
|
xuhaihui
|
3fb0022904
|
入库单表单插件优化，选择采购申请单后赋值逻辑添加备注字段
|
2025-07-28 17:32:27 +08:00 |
|
xuhaihui
|
6409208f48
|
工序期间成本预算系统插件：二开去除项目过滤逻辑和校验逻辑
|
2025-07-28 17:20:02 +08:00 |
|
xuhaihui
|
e3906e5d15
|
标记
|
2025-07-28 17:15:47 +08:00 |
|
xuhaihui
|
d2f7661b2b
|
出库单事务类型赋值逻辑修改
|
2025-07-28 16:55:17 +08:00 |
|
xuhaihui
|
c36e23b893
|
入库单反写采购申请单逻辑添加与选择采购申请逻辑优化
|
2025-07-28 16:24:08 +08:00 |
|
xuhaihui
|
465c959e30
|
入库单点击选择采购申请按钮后弹出对应采购申请分录内容，后通过选择弹出的采购申请分录行赋值给入库单中
|
2025-07-25 18:09:49 +08:00 |
|
xuhaihui
|
e7142a269f
|
入库单修改入库来源字段下拉显示逻辑
|
2025-07-25 10:39:31 +08:00 |
|
xuhaihui
|
725c8ce0f6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-25 10:14:03 +08:00 |
|
xuhaihui
|
470be319e0
|
标记
|
2025-07-25 10:13:56 +08:00 |
|
xiaoshi
|
a5b859ebee
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-24 17:18:49 +08:00 |
|
xiaoshi
|
f363823274
|
youhua
|
2025-07-24 17:18:30 +08:00 |
|
zhangzhiguo
|
c2a9b82dc5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-24 11:19:18 +08:00 |
|
zhangzhiguo
|
9547c02b0c
|
合同变更清单选择过滤插件
|
2025-07-24 11:18:28 +08:00 |
|
xuhaihui
|
72fc3fe0b0
|
付款申请单审核反审核操作插件优化
|
2025-07-24 11:16:01 +08:00 |
|
xuhaihui
|
3a4ee08fea
|
支出财务确认单:审核反审核操作插件；将合同进项发票信息分录中的价税合加减赋给→支出合同的累计开票价税合计中
|
2025-07-24 11:11:47 +08:00 |
|
xuhaihui
|
d1d468c727
|
付款申请单审核与反审核操作插件:修改累计收票金额逻辑优化
|
2025-07-23 18:45:14 +08:00 |
|
zhangzhiguo
|
e087d24de1
|
工程资金付款申请单费用项目增加过滤
|
2025-07-23 17:34:35 +08:00 |
|
xuhaihui
|
7318b04339
|
科目分类通用插件优化，添加差旅报销单：行程信息分录编辑页插件；费用项目过滤和科目属性过滤与赋值插件
|
2025-07-23 16:56:00 +08:00 |
|
zhangzhiguo
|
09119816f2
|
预付单增加收款人信息校验
|
2025-07-23 16:50:59 +08:00 |
|
xuhaihui
|
d9e9c80ca2
|
科目分类通用插件去除差旅报销单逻辑
|
2025-07-23 16:11:17 +08:00 |
|
xuhaihui
|
31b70ffe22
|
科目分类通用插件性能优化
|
2025-07-23 14:28:35 +08:00 |
|
xuhaihui
|
c6ec93c2bf
|
科目分类通用插件优化
|
2025-07-23 10:07:49 +08:00 |
|
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 |
|
xiaoshi
|
9f96ccdfc8
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/QueryInstancesFromPlugin.java
|
2025-06-30 15:20:40 +08:00 |
|
xiaoshi
|
c1c3d335b9
|
修复
|
2025-06-30 15:18:37 +08:00 |
zhangzhiguo
|
b3559d2686
|
合同关联续签穿透查看点击报错
|
2025-06-30 09:23:58 +08:00 |
|
zhangzhiguo
|
6a74206728
|
收入/支出合同财务确认单合同确认所属组织过滤开发
|
2025-06-30 09:22:26 +08:00 |
|
zhangzhiguo
|
1d230f4dd5
|
插件工具类代码提交
|
2025-06-30 09:20:26 +08:00 |
|
zhangzhiguo
|
e2cdf37c77
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-28 18:16:31 +08:00 |
|
zhangzhiguo
|
7cc8d86549
|
兖州公司座位等级发生改变事件校验插件(未完成)
|
2025-06-28 18:15:16 +08:00 |
|
zhangzhiguo
|
d3e6c72bab
|
共享任务中心审批检查
|
2025-06-28 18:14:43 +08:00 |
|
zhangzhiguo
|
3ab1d6815d
|
用款申请单插件
|
2025-06-28 18:13:37 +08:00 |
|
xiaoshi
|
165b98b913
|
提示信息优化
|
2025-06-27 17:14:36 +08:00 |
|
xiaoshi
|
5426a761e6
|
合同清单校验
|
2025-06-27 16:48:01 +08:00 |
|
xiaoshi
|
87a7082151
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-27 15:22:14 +08:00 |
|
xiaoshi
|
906fdadf32
|
日志打印
|
2025-06-27 15:20:14 +08:00 |
|
zhangzhiguo
|
5d5fc9ea02
|
支出财务确认单，唯一科目分类时自动赋值
|
2025-06-26 17:13:37 +08:00 |
|
zhangzhiguo
|
594a86c755
|
共享任务校验逻辑调整
|
2025-06-26 16:00:34 +08:00 |
|
zhangzhiguo
|
2f45abf406
|
用款申请单增加隐藏附件删除按钮插件
|
2025-06-26 15:59:37 +08:00 |
|
zhangzhiguo
|
5818d4d2f6
|
增加组织机构判断
|
2025-06-26 15:59:02 +08:00 |
|
zhangzhiguo
|
8c96159598
|
合同签订单增加工序过滤
|
2025-06-26 15:58:23 +08:00 |
|
zhangzhiguo
|
4f2f90577b
|
支出合同确认单增加工序和科目分类过滤
|
2025-06-26 15:57:09 +08:00 |
|
zhangzhiguo
|
57763f863b
|
工程资金付款申请单申请人带出主职部门插件
|
2025-06-26 15:55:31 +08:00 |
|
zhangzhiguo
|
753f145350
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-25 17:08:48 +08:00 |
|
zhangzhiguo
|
2c99401448
|
我的共享，任务审批时增加付款完成校验
|
2025-06-25 17:08:01 +08:00 |
|
zhangzhiguo
|
e8e869efd3
|
财务确认单增加所属组织过滤
|
2025-06-25 17:07:19 +08:00 |
|
zhangzhiguo
|
05914e452a
|
自动生成财务确认单时，增加创建人字段
|
2025-06-25 17:06:43 +08:00 |
|
zhangzhiguo
|
b1dd342385
|
付款申请单移除无合同付款反写金额代码
|
2025-06-25 17:05:41 +08:00 |
|
xiaoshi
|
10be8d1cf8
|
日志打印
|
2025-06-25 13:46:22 +08:00 |
|
xiaoshi
|
811b2ce1e8
|
bug修复
|
2025-06-25 10:07:30 +08:00 |
|
xiaoshi
|
2141e30794
|
bug修复
|
2025-06-24 15:59:17 +08:00 |
|
xiaoshi
|
5bc5287ee7
|
bug修复
|
2025-06-23 18:38:33 +08:00 |
|
xiaoshi
|
2786d65392
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-23 17:59:46 +08:00 |
|
xiaoshi
|
16a18d5e2d
|
bug修复
|
2025-06-23 17:59:15 +08:00 |
|
zhangzhiguo
|
ba78bf724c
|
支出财务确认单和收入财务确认单所属组织权限过滤
|
2025-06-23 17:47:50 +08:00 |
|
zhangzhiguo
|
4e42698434
|
1.更改成本中心默认值取数逻辑
|
2025-06-23 17:46:57 +08:00 |
|
xiaoshi
|
831a11990c
|
bug修复
|
2025-06-23 17:19:52 +08:00 |