Commit Graph

230 Commits

Author SHA1 Message Date
zhangzhiguo ed193c4279 1.付款申请单实付金额根据付款申请单行号过滤反写功能开发 2025-04-15 17:07:48 +08:00
程小伟 c467e552df Merge remote-tracking branch 'origin/dev' into dev 2025-04-15 16:16:30 +08:00
程小伟 50903445e1 当前单价变动 提醒 2025-04-15 16:16:22 +08:00
zhangzhiguo f574bfb930 1.付款申请单实付金额根据付款申请单行号过滤反写功能开发 2025-04-14 15:43:26 +08:00
程小伟 3f1eaa90c1 税额校验 2025-04-14 13:38:19 +08:00
程小伟 c85a07cf45 合同字段带出 综合税率 2025-04-10 13:59:30 +08:00
zhangzhiguo f2a9e43f75 1.重新计算费用申请单的实付金额值
2.反写工程-项目资金-付款申请单的实际付款
2025-04-10 09:50:09 +08:00
zhangzhiguo eba9c167e1 1.合同变更税率丢失问题处理 2025-04-10 09:48:22 +08:00
zhangzhiguo 34a9e63c49 1.共享任务中心凭证批量复制和删除功能
2.差旅报销单报单往来家居明细控制功能优化
2025-04-10 09:47:19 +08:00
zhangzhiguo 5975ccb143 工程付款申单分录复制功能优化 2025-04-10 09:45:44 +08:00
zhangzhiguo 818b080d40 代码还原 2025-04-10 09:37:35 +08:00
zhangzhiguo f55f1c4a8a 1.任务共享中心批量生成凭证功能 2025-04-09 18:35:39 +08:00
zhangzhiguo e6e589697f Merge remote-tracking branch 'origin/dev' into dev 2025-04-08 20:12:21 +08:00
zhangzhiguo 5905dfac07 1.任务共享中心批量生成凭证功能 2025-04-08 20:10:55 +08:00
程小伟 7f9f3b41ed 系统校验计量清单变动的单价 2025-04-08 14:23:25 +08:00
程小伟 898165509b 系统校验计量清单变动的单价 2025-04-07 14:07:41 +08:00
程小伟 13844f37c3 Merge remote-tracking branch 'origin/dev' into dev 2025-04-07 14:06:27 +08:00
程小伟 6550181717 系统校验计量清单变动的单价 2025-04-07 14:06:12 +08:00
zhangzhiguo bf874af17b 1.支出合同增加工序分摊开发
2.合同付款申请单付款金额关联发票后未锁定问题开发
3.合同付款申请单实际付款金额重复计算问题开发
2025-04-03 18:54:11 +08:00
zhangzhiguo 0c7ef831e5 1.增加支出合同多税率变更为单税率逻辑
2.增加支出合同单税率变更为多税率逻辑
2025-04-02 17:23:38 +08:00
程小伟 f66388a623 付款会计科目过滤 2025-04-02 16:10:21 +08:00
程小伟 235f27dc6e Merge remote-tracking branch 'origin/dev' into dev 2025-04-02 15:19:53 +08:00
程小伟 6e329bb970 付款会计科目过滤 2025-04-02 15:19:31 +08:00
zhangzhiguo 28002f5310 审批流程预测审批人提醒 2025-03-28 18:07:26 +08:00
zhangzhiguo 483b2fc098 审批流程预测审批人提醒 2025-03-27 16:03:26 +08:00
zhangzhiguo 944ba17c7e 工程管理付款申请复制功能字段缺失问题处理 2025-03-25 18:26:14 +08:00
zhangzhiguo 426c023324 1.探亲休假台账调整 2025-03-25 09:14:35 +08:00
zhangzhiguo 55975606a7 1.发票延迟报销功能改造 2025-03-19 11:05:18 +08:00
zhangzhiguo 9d401a8097 延迟报销发票提醒 2025-03-18 09:57:13 +08:00
zhangzhiguo 5a5733a843 延迟报销发票提醒 2025-03-18 09:56:42 +08:00
zhangzhiguo 75e5298a95 付款收款会计科目过滤 2025-03-14 10:53:56 +08:00
zhangzhiguo 785132b439 付款收款会计科目过滤 2025-03-10 18:05:42 +08:00
zhangzhiguo 7ff5e1d92a 付款收款会计科目过滤 2025-03-07 14:45:35 +08:00
程小伟 4d7fb3b51e 付款会计科目过滤 2025-03-07 13:50:34 +08:00
程小伟 9346e2395c 付款会计科目过滤 2025-03-06 18:03:30 +08:00
程小伟 91489a9398 Merge remote-tracking branch 'origin/dev' into dev 2025-03-06 16:01:19 +08:00
程小伟 2458db9af7 付款会计科目过滤 2025-03-06 16:00:30 +08:00
zhangzhiguo 00b2222090 探亲bug修复 2025-03-06 14:28:11 +08:00
程小伟 869bf3eb35 付款会计科目过滤 2025-03-06 14:09:27 +08:00
程小伟 4ec0e1b517 付款会计科目过滤 2025-03-06 14:01:31 +08:00
zhangzhiguo 5b6938e397 探亲bug修复 2025-02-27 17:01:03 +08:00
zhangzhiguo 74d0352ba4 支出合同实际结算乙方插件 2025-02-27 16:21:44 +08:00
zhangzhiguo ec18a7a57b 收入合同结算单实际结算甲方插件 2025-02-27 13:59:38 +08:00
zhangzhiguo 04bd9e8a08 收入合同结算单实际结算甲方插件 2025-02-27 10:30:06 +08:00
xiaoshi 6a1a850c57 Merge remote-tracking branch 'origin/dev' into dev 2025-02-26 16:49:36 +08:00
xiaoshi 651726964e 优化代码 计量分录清单数据带入结算分录 2025-02-26 16:49:23 +08:00
zhangzhiguo 1b143d9c9e 收入合同结算单实际结算甲方插件 2025-02-26 14:35:49 +08:00
zhangzhiguo 040f25551f 报销单切换费用承担公司报错问题修复 2025-02-25 11:28:11 +08:00
zhangzhiguo effc1455f0 职员餐补扣除天数统计详情 2025-02-21 17:26:14 +08:00
zhangzhiguo 0de251a569 会计科目过滤 2025-02-21 14:51:09 +08:00
zhangzhiguo cadf5f0436 1.财务共享功能开发 2025-02-20 16:07:46 +08:00
zhangzhiguo 65caf1c583 1.财务共享功能开发 2025-02-19 17:03:28 +08:00
zhangzhiguo a722ae200b 1.财务共享功能开发 2025-02-19 14:12:50 +08:00
zhangzhiguo 62a675fe82 1.功能开发 2025-01-20 11:27:32 +08:00
zhangzhiguo a7f9de802e 1.功能开发 2025-01-17 10:03:32 +08:00
zhangzhiguo 16696064e7 1.功能开发 2025-01-16 16:41:24 +08:00
zhangzhiguo 3bd576df24 1.功能开发 2025-01-16 16:36:02 +08:00
xiaoshi fb487fb726 Merge remote-tracking branch 'origin/dev' into dev 2025-01-13 09:50:24 +08:00
xiaoshi 97416d354f 优化代码 项目更新项目经理 2025-01-13 09:50:12 +08:00
zhangzhiguo 1feb440837 1.功能开发 2025-01-13 09:49:01 +08:00
zhangzhiguo a3399800c3 1.功能开发 2025-01-11 14:11:19 +08:00
zhangzhiguo afa260f40d Merge remote-tracking branch 'origin/dev' into dev 2025-01-09 20:12:55 +08:00
zhangzhiguo 97fe253709 1.功能开发 2025-01-09 20:12:17 +08:00
xiaoshi 7ec830c713 优化代码 支出合同合作类型代码塞值 2025-01-09 17:18:57 +08:00
xiaoshi 1b7e75fb29 Merge remote-tracking branch 'origin/dev' into dev 2025-01-08 10:32:49 +08:00
xiaoshi 702ff4ef47 优化代码 2025-01-08 10:32:40 +08:00
zhangzhiguo 2f17723ba5 1.功能开发 2025-01-07 15:31:45 +08:00
zhangzhiguo ae61c06d4f 1.矿山组织下差旅报销单、费用报销单、对公报销单、预付单超预算提醒
2.科目的科目类型过滤
2025-01-03 18:48:28 +08:00
zhangzhiguo 2b4c11f1ef Merge remote-tracking branch 'origin/dev' into dev 2025-01-03 15:34:48 +08:00
zhangzhiguo 4b27343203 1.矿山组织下差旅报销单、费用报销单、对公报销单、预付单超预算提醒
2.科目的科目类型过滤
2025-01-03 15:33:50 +08:00
xiaoshi 742be1d163 Merge remote-tracking branch 'origin/dev' into dev 2025-01-03 14:33:56 +08:00
xiaoshi 7d6415927e 优化代码 支出合同合作类型代码塞值 支出合同计量问题优化 2025-01-03 14:33:47 +08:00
zhangzhiguo dd9a29bb62 1.增加职员出差天数统计台账 2025-01-02 18:44:51 +08:00
zhangzhiguo cee3debf85 1.增加职员出差天数统计台账 2025-01-02 15:29:05 +08:00
zhangzhiguo 6d981ff250 Merge remote-tracking branch 'origin/dev' into dev 2024-12-31 18:30:51 +08:00
zhangzhiguo 0767caa6de 1.增加职员出差天数统计台账 2024-12-31 18:30:11 +08:00
xiaoshi 80816b7562 优化代码 付款申请校验取消 合同计量优化 2024-12-31 17:30:30 +08:00
zhangzhiguo 2fc98ac060 1.费用报销单和差旅报销单增加往来居家校验 2024-12-31 15:14:51 +08:00
xiaoshi 6a5ea5764b 优化代码 付款申请校验取消 合同计量优化 2024-12-30 17:08:13 +08:00
xiaoshi 82805a2a04 Merge remote-tracking branch 'origin/dev' into dev 2024-12-27 18:02:49 +08:00
xiaoshi d239a30a42 优化代码 2024-12-27 18:02:38 +08:00
zhangzhiguo a609a1a37a .合同台账签约方默认为当前核算组织 2024-12-27 17:28:39 +08:00
zhangzhiguo 5f8a4a4c41 1.提取矿山组织判断逻辑至工具类
2.合同台账签约方默认为当前人组织
2024-12-27 17:16:32 +08:00
zhangzhiguo c55ed5d85a 国外住宿标准增加自动取数 2024-12-27 11:09:08 +08:00
zhangzhiguo b6adb20b87 Merge remote-tracking branch 'origin/dev' into dev 2024-12-27 09:19:05 +08:00
zhangzhiguo 3d451abc07 1.增加组织过滤,仅限矿山本部及以下单位
2.台账代码调整
3.增加自动取数
2024-12-27 09:18:28 +08:00
xiaoshi d592f66778 优化代码 2024-12-26 17:46:45 +08:00
xiaoshi febbc71fea Merge remote-tracking branch 'origin/dev' into dev 2024-12-25 17:04:33 +08:00
xiaoshi d1477ffbb7 优化代码 合同计量时间校验取消 合同结算锁定取消 项目增加业主全称 2024-12-25 17:04:25 +08:00
zhangzhiguo 0956b6d924 Merge remote-tracking branch 'origin/dev' into dev 2024-12-24 17:03:48 +08:00
zhangzhiguo 260fb1525b 1.增加审批人不能是提交人代码
2.修改台账逻辑
2024-12-24 17:03:06 +08:00
xiaoshi e08cfdc9b4 优化代码 資源清單過濾與基於清單控制 2024-12-24 16:23:48 +08:00
xiaoshi 20565cbd5e 优化代码 合同计量与支出合同 2024-12-23 18:31:26 +08:00
xiaoshi bb6b654434 优化代码 合同计量与支出合同 2024-12-23 17:48:26 +08:00
xiaoshi fd6033a32a Merge remote-tracking branch 'origin/dev' into dev 2024-12-23 09:35:17 +08:00
xiaoshi 22a04670b1 优化代码 合同结算 2024-12-23 09:35:07 +08:00
zhangzhiguo 605eecdcb3 职务消费台账功能调整 2024-12-20 18:00:32 +08:00
zhangzhiguo 108b3ebbfd Merge remote-tracking branch 'origin/dev' into dev 2024-12-20 17:14:01 +08:00
zhangzhiguo 74d5389012 代码优化 2024-12-20 17:13:06 +08:00
xiaoshi 28ee9e2915 优化代码 合同结算 2024-12-19 20:09:29 +08:00