 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 |