 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 |
|
zhangzhiguo
|
8fc5d49a18
|
支出/收入合同结算作废功能开发
|
2025-06-06 15:06:09 +08:00 |
|
zhangzhiguo
|
a01328a5c6
|
支出/收入合同结算作废功能开发
|
2025-06-06 14:44:49 +08:00 |
|
xuhaihui
|
c89608a038
|
入库单发票导入插件，选择发票与导入删除发票逻辑
|
2025-06-06 14:31:25 +08:00 |
|
xiaoshi
|
73cd665b75
|
合同类型控制字段
|
2025-06-05 19:01:19 +08:00 |
|
xiaoshi
|
98b0cc2528
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-05 18:15:13 +08:00 |
|
xiaoshi
|
b841584609
|
合同类型控制字段
续签合同与续签查询
合同结算提示
|
2025-06-05 18:14:49 +08:00 |
|
zhangzhiguo
|
686680d16d
|
支出合同结算单作废功能开发
|
2025-06-05 18:11:06 +08:00 |
|
xuhaihui
|
d3e465cdc0
|
工序成本预算单提交操作插件：验证项目和年份的组合是否已经存在
|
2025-06-05 17:21:38 +08:00 |
|
xuhaihui
|
bec5bc505b
|
工程量清单成本预算提交操作插件：去除调整操作校验项目逻辑，且在提交审核时校验年月和项目的组合是否有重复
|
2025-06-05 15:46:37 +08:00 |
|
xuhaihui
|
734761f095
|
工程量清单成本预算列表插件：调整操作逻辑修改
|
2025-06-05 15:45:31 +08:00 |
|
xuhaihui
|
72297999fa
|
工程量清单成本预算表单插件：预算余额赋值修改和项目基础资料过滤和填写校验逻辑修改
|
2025-06-05 15:45:14 +08:00 |
|
xuhaihui
|
16b151ab77
|
工序成本预算单表单和列表插件添加注释
|
2025-06-05 15:32:39 +08:00 |
|
xuhaihui
|
6f40122a16
|
添加注释
|
2025-06-05 14:58:47 +08:00 |
|
xuhaihui
|
a4192ed5f2
|
工序成本预算单据调整操作年月赋值锁定逻辑添加（测试
|
2025-06-05 14:07:19 +08:00 |
|
xuhaihui
|
23d8f38896
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-05 11:33:15 +08:00 |
|
xuhaihui
|
bf17af635f
|
工序成本预算单据调整操作报空指针异常bug优化（测试
|
2025-06-05 11:33:02 +08:00 |
|
zhangzhiguo
|
ce7170abd6
|
1，支出合同结算审核通过后自动生成财务确认单
2，收入合同结算审核通过后自动生成财务确认单
|
2025-06-05 11:30:39 +08:00 |
|
xuhaihui
|
00b4dd02ee
|
工序成本预算单据调整操作修改需选范围操作数据（测试
|
2025-06-05 11:21:45 +08:00 |
|
xuhaihui
|
1fd14197ff
|
工序成本预算单据去除项目保存校验（测试
|
2025-06-05 10:51:00 +08:00 |
|
xuhaihui
|
acc94bed60
|
工序成本预算单据去除项目基础资料过滤逻辑（测试
|
2025-06-05 10:37:27 +08:00 |
|
xuhaihui
|
2343e13618
|
付款申请单（项目资金）单据整单复制后将单位名称加上-复制尾缀
|
2025-06-04 19:09:19 +08:00 |
|
zhangzhiguo
|
8d14b23087
|
支出合同结算冲销单生成收入合同结算冲销单功能开发
|
2025-06-04 19:09:19 +08:00 |
|
xuhaihui
|
b867001265
|
去除工程量清单成本预算单据系统逻辑中预算余额赋值逻辑
|
2025-06-04 15:42:20 +08:00 |
|
xuhaihui
|
8773ca9362
|
付款申请单（项目资金）列表整单复制时将源单“收款账号”放入缓存并调用赋值
|
2025-06-04 14:31:50 +08:00 |
|
xuhaihui
|
0b700c7797
|
付款申请单（项目资金）整单复制时将源单“收款账号”放入缓存并调用赋值
|
2025-06-04 14:03:16 +08:00 |
|
zhangzhiguo
|
7e06fc62c6
|
支出合同结算单冲销功能开发
|
2025-06-04 09:55:50 +08:00 |
|
zhangzhiguo
|
140bd6e3ac
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-03 17:51:35 +08:00 |
|
zhangzhiguo
|
52de5652ce
|
支出合同结算单冲销功能开发
|
2025-06-03 17:51:23 +08:00 |
|
xuhaihui
|
b2dc914e49
|
付款申请单（项目资金）整单复制时业务日期和期间赋值逻辑
|
2025-06-03 16:49:50 +08:00 |
|
xuhaihui
|
772004aec3
|
测试
|
2025-06-03 14:17:12 +08:00 |
|
zhangzhiguo
|
cafbb26049
|
收入财务确认单发票导入功能问题处理
|
2025-05-30 16:08:37 +08:00 |
|
zhangzhiguo
|
6359429d47
|
差旅报销单扣除餐补天数计算逻辑调整
|
2025-05-30 08:50:33 +08:00 |
|
zhangzhiguo
|
06ffd9292d
|
收入合同结算单功能开发
|
2025-05-30 08:49:35 +08:00 |
|
zhangzhiguo
|
c32235fe53
|
合同上传的附件删除校验调整
|
2025-05-29 11:11:58 +08:00 |
|
zhangzhiguo
|
7110952a39
|
财务共享，我的任务业务单据付款状态校验
|
2025-05-27 18:13:13 +08:00 |