Commit Graph

352 Commits

Author SHA1 Message Date
zhangzhiguo 5b94ca5a06 清单运维 2025-07-22 18:25:57 +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 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
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
xuhaihui 327e0259ff 二开系统插件-付款申请单审核与反审核操作插件:修改累计收票金额逻辑 2025-07-15 16:13:05 +08:00
xuhaihui 769ddb5fc8 标记 2025-07-15 14:55:18 +08:00
xuhaihui 8dfdf6c1bc 付款申请单(项目资金)提交校验,付款信息中一个合同不能填写多行相同的支付类型+结算方式 2025-07-11 16:12:37 +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
哈哈哈丿 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
哈哈哈丿 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