Commit Graph

427 Commits

Author SHA1 Message Date
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
xiaoshi 3d1a6903f2 bug修复 2025-06-23 16:36:37 +08:00
xiaoshi 7d4682e389 bug修复 2025-06-20 15:27:39 +08:00
xiaoshi 4865e3cf61 Merge remote-tracking branch 'origin/dev' into dev 2025-06-20 14:35:26 +08:00
xiaoshi 284ad9842a bug修复 2025-06-20 14:34:35 +08:00
zhangzhiguo bc93ccf9dd 1.财务确认单增加所属组织字段 2025-06-19 09:17:01 +08:00
zhangzhiguo 0aabbc73de 1.重写合同看板拉去合同结算数据逻辑 2025-06-19 09:15:17 +08:00
xuhaihui c342e7ca0a 付款登记单无合同反写逻辑添加 2025-06-18 18:37:57 +08:00
xuhaihui fd75b48d1b Merge remote-tracking branch 'origin/dev' into dev 2025-06-18 18:34:18 +08:00
xuhaihui bd05d7f2ff 付款登记单无合同反写逻辑添加 2025-06-18 18:34:07 +08:00
xiaoshi 6ee4e48246 Merge remote-tracking branch 'origin/dev' into dev 2025-06-18 17:57:03 +08:00
xiaoshi 29a6e46c76 bug修复 2025-06-18 17:56:22 +08:00
xuhaihui 89a3b836fd 还原付款登记单审核反审核操作插件,还原至2025/6/13 2025-06-18 16:08:21 +08:00
xuhaihui 2c6c2d4ec1 付款申请单无合同bug修复 2025-06-18 15:48:52 +08:00
xiaoshi ac9c03ac92 Merge remote-tracking branch 'origin/dev' into dev 2025-06-18 15:19:26 +08:00
xiaoshi 515dfde32e bug修复 2025-06-18 15:19:02 +08:00
xuhaihui f60593547b 目标成本评审审核操作插件,系统二开,去除审核通过后反写工序成本清单是否启用逻辑/工序成本预算单审核通过后“是否启用”赋值逻辑 2025-06-18 15:12:46 +08:00
xuhaihui fb120d58c8 二开系统插件标识 2025-06-18 14:12:02 +08:00
xuhaihui 81165f2e07 付款申请单提交校验逻辑优化 2025-06-18 11:28:35 +08:00
xuhaihui fa4fb79d7e 付款申请单提交校验逻辑优化 2025-06-18 11:25:55 +08:00
xuhaihui 01adcd8a8c 二开系统插件标识 2025-06-18 11:22:21 +08:00
xuhaihui 8cca233a97 出库单关联领料申请单二开修改数量赋值 2025-06-18 10:38:45 +08:00
xiaoshi 8117925d64 Merge remote-tracking branch 'origin/dev' into dev 2025-06-18 10:36:38 +08:00
xiaoshi ab0eed2bb5 bug修复 2025-06-18 10:35:45 +08:00
xuhaihui 71d3d99d6d 出库单关联领料申请单二开添加使用设备赋值,领料申请物料列表动态表单添加使用设备赋值 2025-06-18 10:34:28 +08:00
xuhaihui e9458c36d9 二开系统插件标记 2025-06-18 10:12:58 +08:00
xuhaihui 077a42523f 二开系统插件标记 2025-06-18 10:03:33 +08:00
xuhaihui bc497f295c 付款申请单审核报错修复 2025-06-18 09:33:10 +08:00
xuhaihui 08dcb2d4e4 付款申请单提交报错修复 2025-06-18 09:15:25 +08:00
xuhaihui d12eac307b 添加日志 2025-06-17 18:31:27 +08:00
xuhaihui e49011a7e7 Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 18:04:12 +08:00
xuhaihui 2ae8e62996 付款申请单操作插件优化 2025-06-17 18:04:02 +08:00
xiaoshi 68fee5d57b Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 17:33:50 +08:00
xiaoshi 83931a9dc5 设备维修确认分录选择 2025-06-17 17:32:54 +08:00
xuhaihui 59ee6ccb42 系统二开插件标记 2025-06-17 17:28:05 +08:00
xuhaihui 5f0e76c04e 付款申请单提交审核反审核操作插件二开系统插件标记 2025-06-17 17:03:37 +08:00
xuhaihui 9176867a2a Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 16:47:26 +08:00
xuhaihui 1d42049cf1 二开系统插件标记 2025-06-17 16:47:17 +08:00
xiaoshi 663baefb2c 设备维修申请界面插件 2025-06-17 15:06:49 +08:00
xiaoshi 90a1ca92f1 Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 15:05:27 +08:00
xiaoshi 6d6a16f472 实物卡片同步至设备优化
定时任务优化
2025-06-17 15:04:51 +08:00
xuhaihui 4acfc8616c 付款登记单审核与反审核操作添加无合同付款申请类型 2025-06-17 14:37:54 +08:00
xuhaihui 4824ca3b57 添加注释 2025-06-17 14:37:14 +08:00
xuhaihui 914e721dfa 入库单发票号码超链接点击事件逻辑添加 2025-06-17 10:59:30 +08:00
xiaoshi bde479ef56 实物卡片同步至设备优化
定时任务优化
2025-06-17 09:56:03 +08:00
xiaoshi 27d350faa2 实物卡片同步至设备优化
定时任务优化
2025-06-17 09:53:42 +08:00
xiaoshi 71bd4265cc Merge remote-tracking branch 'origin/dev' into dev 2025-06-16 18:38:54 +08:00
xiaoshi 23221d1cf1 实物卡片同步至设备
定时任务开发
2025-06-16 18:29:00 +08:00
xuhaihui 7f998886a3 领料申请单添加剩余未出库数量赋值逻辑 2025-06-16 14:22:50 +08:00
xuhaihui 21c89b05a5 领料申请单去除系统插件中申请数量的赋值逻辑 2025-06-16 11:12:41 +08:00
zhangzhiguo 430132a78a 1.报销单发票日期和关联申请审核日期校验 2025-06-16 10:40:38 +08:00
zhangzhiguo fab05e56c7 1.财务确认单增加所属组织字段 2025-06-16 10:39:31 +08:00
xuhaihui ddd9abec06 工程量清单成本预算单据优化年份和预算余额代码 2025-06-13 15:08:20 +08:00
xuhaihui 4a4b47fe23 工序成本预算单保存提交操作调整后单据添加版本号过滤条件 2025-06-13 14:51:44 +08:00
xuhaihui fbada4b273 入库单点击添加发票报错bug优化 2025-06-13 14:13:49 +08:00
owan b8bcdb5249 无合同付款不校验合同相关信息 2025-06-13 10:17:19 +08:00
owan 5e462e8b94 Merge remote-tracking branch 'origin/dev' into dev 2025-06-12 16:16:54 +08:00
owan 6a088cb815 无合同付款不校验合同相关信息 2025-06-12 16:15:56 +08:00
zhangzhiguo 34e3876536 1.职务消费台账增加查询人员配置表 2025-06-12 14:10:37 +08:00
xuhaihui f56d08816a Merge remote-tracking branch 'origin/dev' into dev 2025-06-12 10:00:34 +08:00
xuhaihui 4766b8ae49 工序成本预算添加保存校验,校验新增单据是否存在相同的年份加项目,且不是源单修改提交 2025-06-12 10:00:28 +08:00
zhangzhiguo 5478714fb3 1.差旅报销单扣除餐补天数问题处理
2.消费台账计算问题处理
2025-06-11 17:21:27 +08:00
zhangzhiguo 57e246fcbf 插件开发 2025-06-11 17:19:20 +08:00
xiaoshi 550844c1d2 Merge remote-tracking branch 'origin/dev' into dev 2025-06-11 16:47:25 +08:00
xiaoshi c1401be6b4 付款申请关联维修确认
设备闲置功能
2025-06-11 16:47:08 +08:00
xuhaihui bbcec0604a 入库单事物类型默认为空+是否主材隐显逻辑添加 2025-06-11 16:14:23 +08:00
xuhaihui 70570de660 入库单添加发票逻辑添加过滤条件 2025-06-11 10:48:39 +08:00
xuhaihui 3c2b27ed8b Merge remote-tracking branch 'origin/dev' into dev 2025-06-10 17:55:56 +08:00
xuhaihui ea83eb5a9e 付款申请单二开供应商-银行信息弹窗逻辑 2025-06-10 17:55:48 +08:00
xiaoshi 58dd9118f6 设备维修确认关联设备维修申请 2025-06-10 15:48:32 +08:00
xiaoshi 498a96d911 设备维修确认关联设备维修申请 2025-06-10 15:47:30 +08:00
xiaoshi 016bd8f9aa Merge remote-tracking branch 'origin/dev' into dev 2025-06-10 10:56:42 +08:00
xiaoshi 61c34e608e 设备维修确认发票功能 2025-06-10 10:56:27 +08:00
zhangzhiguo f5bfa2fc5b Merge remote-tracking branch 'origin/dev' into dev 2025-06-10 09:22:17 +08:00
zhangzhiguo c4d2b97131 费用报销单会计科目插件移除 2025-06-10 09:22:09 +08:00
xuhaihui 2fbf5d1172 付款申请(项目资金)中应付字段赋值和分录中的供应商赋值 2025-06-09 17:08:34 +08:00
zhangzhiguo a17f3d53e3 Merge remote-tracking branch 'origin/dev' into dev 2025-06-09 14:58:00 +08:00
zhangzhiguo e060f56d0d 费用报销单会计科目插件移除 2025-06-09 14:57:52 +08:00
xuhaihui fb7bef5fff Merge remote-tracking branch 'origin/dev' into dev 2025-06-09 14:15:04 +08:00
xuhaihui fe7d729753 测试 2025-06-09 14:14:43 +08:00
zhangzhiguo 2874c03ad7 支出合同确认单累计冲销预付金额功能开发 2025-06-09 11:32:40 +08:00
xiaoshi 21cac3881c 支出结算续签提示 2025-06-06 17:12:37 +08:00
xiaoshi 6be6cd51f6 Merge remote-tracking branch 'origin/dev' into dev 2025-06-06 17:11:36 +08:00
xiaoshi fb127cd05c 合同类型控制字段 2025-06-06 17:11:24 +08:00
xuhaihui 3b0deb688d 入库单发票导入插件优化 2025-06-06 16:27:06 +08:00
xuhaihui aafc6c63b6 付款申请(项目资金)供应商赋值收款银行和收款账号 2025-06-06 15:56:11 +08:00
xuhaihui 15f1caf561 入库单发票导入优化 2025-06-06 15:55:55 +08:00