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 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								7318b04339
								
							
						 | 
						
							
							
								
								科目分类通用插件优化,添加差旅报销单:行程信息分录编辑页插件;费用项目过滤和科目属性过滤与赋值插件
							
							
							
							
							
						 | 
						
							2025-07-23 16:56:00 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangzhiguo
							
						 | 
						
							
							
							
							
							
								
							
							
								09119816f2
								
							
						 | 
						
							
							
								
								预付单增加收款人信息校验
							
							
							
							
							
						 | 
						
							2025-07-23 16:50:59 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								d9e9c80ca2
								
							
						 | 
						
							
							
								
								科目分类通用插件去除差旅报销单逻辑
							
							
							
							
							
						 | 
						
							2025-07-23 16:11:17 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								31b70ffe22
								
							
						 | 
						
							
							
								
								科目分类通用插件性能优化
							
							
							
							
							
						 | 
						
							2025-07-23 14:28:35 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								c6ec93c2bf
								
							
						 | 
						
							
							
								
								科目分类通用插件优化
							
							
							
							
							
						 | 
						
							2025-07-23 10:07:49 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								f477b3ff90
								
							
						 | 
						
							
							
								
								科目分类通用插件优化
							
							
							
							
							
						 | 
						
							2025-07-23 10:00:52 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangzhiguo
							
						 | 
						
							
							
							
							
							
								
							
							
								f05be78785
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-07-23 09:33:59 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangzhiguo
							
						 | 
						
							
							
							
							
							
								
							
							
								5b94ca5a06
								
							
						 | 
						
							
							
								
								清单运维
							
							
							
							
							
						 | 
						
							2025-07-22 18:25:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangzhiguo
							
						 | 
						
							
							
							
							
							
								
							
							
								0d74173d41
								
							
						 | 
						
							
							
								
								司库付款校验功能关闭
							
							
							
							
							
						 | 
						
							2025-07-22 18:25:28 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								bcd2e4acfc
								
							
						 | 
						
							
							
								
								科目分类通用插件优化
							
							
							
							
							
						 | 
						
							2025-07-22 18:17:06 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								11d72a8bc5
								
							
						 | 
						
							
							
								
								科目分类通用插件优化
							
							
							
							
							
						 | 
						
							2025-07-22 18:02:01 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								0ec46b3a82
								
							
						 | 
						
							
							
								
								科目分类通用插件优化
							
							
							
							
							
						 | 
						
							2025-07-22 16:50:06 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								77eff0c809
								
							
						 | 
						
							
							
								
								科目分类通用插件优化
							
							
							
							
							
						 | 
						
							2025-07-22 14:55:11 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								85478571da
								
							
						 | 
						
							
							
								
								科目分类通用插件优化
							
							
							
							
							
						 | 
						
							2025-07-22 11:31:38 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								82c1c1bf54
								
							
						 | 
						
							
							
								
								报销单费用项目过滤
							
							
							
							
							
						 | 
						
							2025-07-22 10:42:06 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangzhiguo
							
						 | 
						
							
							
							
							
							
								
							
							
								3a6bfaa1f8
								
							
						 | 
						
							
							
								
								收款人类型重定义
							
							
							
							
							
						 | 
						
							2025-07-22 10:41:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangzhiguo
							
						 | 
						
							
							
							
							
							
								
							
							
								be399a1454
								
							
						 | 
						
							
							
								
								查询台账单,只查询当前公司下的人员
							
							
							
							
							
						 | 
						
							2025-07-22 10:39:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangzhiguo
							
						 | 
						
							
							
							
							
							
								
							
							
								940957083d
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-07-22 10:31:33 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 xuhaihui
							
						 | 
						
							
							
							
							
							
								
							
							
								c268823e60
								
							
						 | 
						
							
							
								
								费用报销单优化费用项目过滤和科目属性赋值逻辑
							
							
							
							
							
						 | 
						
							2025-07-22 10:29:51 +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 |