 xiaoshi
|
b8fb6b8557
|
youhua
|
2025-07-29 14:57:30 +08:00 |
|
xiaoshi
|
77b964a148
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-29 11:30:22 +08:00 |
|
xiaoshi
|
400242cc2f
|
youhua
|
2025-07-29 11:29:37 +08:00 |
 xuhaihui
|
88908f67b6
|
采购申请单表单插件：初始默认采购组织等于所属组织
|
2025-07-29 10:10:20 +08:00 |
|
xuhaihui
|
86890397bc
|
入库单插件修改，废弃事物类型默认为空和是否主材隐显逻辑
|
2025-07-29 09:55:10 +08:00 |
|
xuhaihui
|
3fb0022904
|
入库单表单插件优化，选择采购申请单后赋值逻辑添加备注字段
|
2025-07-28 17:32:27 +08:00 |
|
xuhaihui
|
6409208f48
|
工序期间成本预算系统插件：二开去除项目过滤逻辑和校验逻辑
|
2025-07-28 17:20:02 +08:00 |
|
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 |
|
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 |
|
xiaoshi
|
ece80dab9e
|
修复
|
2025-07-02 11:21:01 +08:00 |
|
xiaoshi
|
5f6cadb475
|
修复
|
2025-07-02 10:03:52 +08:00 |
|
xiaoshi
|
da52adc449
|
修复
|
2025-07-02 09:48:10 +08:00 |
|
xiaoshi
|
4605cbf74b
|
修复
|
2025-07-01 17:45:40 +08:00 |
|
xiaoshi
|
a2ec2e33e7
|
修复
|
2025-07-01 16:21:50 +08:00 |
|
xiaoshi
|
06e222897e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-01 15:11:58 +08:00 |
|
xiaoshi
|
1d881e8f63
|
修复
|
2025-07-01 15:11:12 +08:00 |
|
哈哈哈丿
|
c612a2655b
|
收入/支出财务确认单编辑界面增加组织过滤
|
2025-07-01 15:08:16 +08:00 |
|
哈哈哈丿
|
66a15b3152
|
收入合同结算单增加反审核校验逻辑
|
2025-07-01 15:07:26 +08:00 |
|
xiaoshi
|
9f96ccdfc8
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/QueryInstancesFromPlugin.java
|
2025-06-30 15:20:40 +08:00 |
|
xiaoshi
|
c1c3d335b9
|
修复
|
2025-06-30 15:18:37 +08:00 |
zhangzhiguo
|
b3559d2686
|
合同关联续签穿透查看点击报错
|
2025-06-30 09:23:58 +08:00 |
|
zhangzhiguo
|
6a74206728
|
收入/支出合同财务确认单合同确认所属组织过滤开发
|
2025-06-30 09:22:26 +08:00 |
|
zhangzhiguo
|
1d230f4dd5
|
插件工具类代码提交
|
2025-06-30 09:20:26 +08:00 |
|
xiaoshi
|
165b98b913
|
提示信息优化
|
2025-06-27 17:14:36 +08:00 |
|
xiaoshi
|
5426a761e6
|
合同清单校验
|
2025-06-27 16:48:01 +08:00 |
|
xiaoshi
|
87a7082151
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-27 15:22:14 +08:00 |
|
xiaoshi
|
906fdadf32
|
日志打印
|
2025-06-27 15:20:14 +08:00 |
|
zhangzhiguo
|
5d5fc9ea02
|
支出财务确认单，唯一科目分类时自动赋值
|
2025-06-26 17:13:37 +08:00 |
|
zhangzhiguo
|
8c96159598
|
合同签订单增加工序过滤
|
2025-06-26 15:58:23 +08:00 |
|
zhangzhiguo
|
4f2f90577b
|
支出合同确认单增加工序和科目分类过滤
|
2025-06-26 15:57:09 +08:00 |
|
zhangzhiguo
|
57763f863b
|
工程资金付款申请单申请人带出主职部门插件
|
2025-06-26 15:55:31 +08:00 |
|
zhangzhiguo
|
753f145350
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-25 17:08:48 +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 |