Commit Graph

367 Commits

Author SHA1 Message Date
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
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