 xiaoshi
|
52b1dd4bb0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-15 14:15:16 +08:00 |
 xuhaihui
|
129060aaa0
|
支出合同结算表单插件优化
|
2025-08-15 14:15:10 +08:00 |
|
xiaoshi
|
2e4727e818
|
youhua
|
2025-08-15 14:14:46 +08:00 |
|
xuhaihui
|
22a9a56abe
|
设备调令单表单插件逻辑优化
|
2025-08-14 15:32:05 +08:00 |
zhangzhiguo
|
23666aaf12
|
资金计划申请完善
|
2025-08-14 15:12:25 +08:00 |
|
zhangzhiguo
|
9cb5c571b9
|
锁定费用承担部门和公司
|
2025-08-14 15:12:09 +08:00 |
|
xuhaihui
|
7fe122ccba
|
设备调令单表单插件逻辑优化
|
2025-08-14 14:27:59 +08:00 |
|
xuhaihui
|
58e268988a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-14 13:33:42 +08:00 |
|
xuhaihui
|
9637f4f3cc
|
设备调令单表单插件逻辑优化
|
2025-08-14 13:33:37 +08:00 |
|
zhangzhiguo
|
f97e831c94
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-14 11:00:52 +08:00 |
|
zhangzhiguo
|
6fab72963a
|
锁定费用承担部门
|
2025-08-14 11:00:41 +08:00 |
|
xuhaihui
|
0398ef0bd7
|
工程项目系统二开代码修改
|
2025-08-14 10:49:51 +08:00 |
|
xuhaihui
|
3dc81d2b33
|
工程项目系统二开标记
|
2025-08-14 10:48:18 +08:00 |
|
xuhaihui
|
2619a92f08
|
设备调令单表单插件逻辑优化
|
2025-08-14 10:43:27 +08:00 |
|
xuhaihui
|
bdfd3c6117
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-13 17:16:33 +08:00 |
|
xuhaihui
|
9acaea9c02
|
设备调令单表单插件逻辑优化
|
2025-08-13 17:16:18 +08:00 |
|
zhangzhiguo
|
96921a75ec
|
资金计划申请功能完善
|
2025-08-13 16:31:36 +08:00 |
|
xiaoshi
|
fe609728ce
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-13 15:14:13 +08:00 |
|
xiaoshi
|
6efc945827
|
youhua
|
2025-08-13 15:13:30 +08:00 |
|
xuhaihui
|
6833840038
|
采购申请字段过滤逻辑加仓库修改后清空采购申请字段逻辑添加
|
2025-08-13 14:10:01 +08:00 |
|
xuhaihui
|
3e9c202d7f
|
入库单表单插件逻辑优化
|
2025-08-13 11:14:32 +08:00 |
|
xuhaihui
|
4a66d95a59
|
劳务班组系统插件二开：去除自动携带身份证号和联系电话逻辑
|
2025-08-13 10:40:35 +08:00 |
|
xuhaihui
|
b208c7513b
|
劳务班组系统插件标志
|
2025-08-13 10:38:25 +08:00 |
|
xuhaihui
|
5589ade5d5
|
设备调令单表单插件优化
|
2025-08-13 10:01:39 +08:00 |
|
xuhaihui
|
3ee371b2ed
|
优化测试
|
2025-08-12 18:07:16 +08:00 |
|
xuhaihui
|
408ec569f4
|
测试
|
2025-08-12 18:05:02 +08:00 |
|
xuhaihui
|
ce24f39cf4
|
优化
|
2025-08-12 17:53:48 +08:00 |
|
zhangzhiguo
|
36679aa757
|
预警消息提醒消息解析插件
|
2025-08-12 17:09:05 +08:00 |
|
xuhaihui
|
a7cc8f0410
|
优化
|
2025-08-12 16:24:39 +08:00 |
|
xuhaihui
|
f1b0676256
|
优化
|
2025-08-12 11:16:55 +08:00 |
|
xuhaihui
|
1b4014a8f5
|
设备调令单表单插件逻辑优化
|
2025-08-12 10:01:07 +08:00 |
|
xuhaihui
|
c89d0811f9
|
优化
|
2025-08-11 17:10:51 +08:00 |
|
xuhaihui
|
3ebb551f44
|
设备命令单表单插件优化
|
2025-08-11 16:57:09 +08:00 |
|
xiaoshi
|
17257439e5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-11 16:14:42 +08:00 |
|
xiaoshi
|
1b1cab2029
|
youhua
|
2025-08-11 16:14:12 +08:00 |
|
xuhaihui
|
84c54e187c
|
设备命令单表单插件：新加逻辑：1：设备编码带出资产编码；2:过滤设备编码字段；3：调出调入项目带出调出调入负责人
|
2025-08-11 16:14:03 +08:00 |
|
zhangzhiguo
|
da15158c2f
|
收入合同结算冲销单去除冲销生成默认值
|
2025-08-11 15:34:52 +08:00 |
|
zhangzhiguo
|
9d10e600fb
|
1.付款处理单实付金额反写和剩余待拨付金额重新计算
2.余额取数表增加期初余额取数逻辑
|
2025-08-11 15:31:32 +08:00 |
|
zhangzhiguo
|
ed3c4100f9
|
资金计划申请默认期间
|
2025-08-11 15:05:06 +08:00 |
|
xuhaihui
|
e510a01769
|
设备退场审核反审核操作去除不存在设备进厂逻辑
|
2025-08-08 10:59:21 +08:00 |
|
xuhaihui
|
d220d45211
|
标记
|
2025-08-08 10:58:11 +08:00 |
|
xuhaihui
|
951e8999a8
|
目标成本评审表单插件新增工序成本预算逻辑与项目成本预算分录赋值逻辑
|
2025-08-07 17:39:11 +08:00 |
|
xuhaihui
|
91d003516e
|
* 工序期间成本预算表单插件
* 说明：通过项目与期间带出工序成本预算字段内容
|
2025-08-07 16:57:22 +08:00 |
|
zhangzhiguo
|
9971000218
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-07 16:38:23 +08:00 |
|
zhangzhiguo
|
b8b7a9e05e
|
初始化资金计划申请界面数据
|
2025-08-07 16:37:03 +08:00 |
|
xuhaihui
|
728ec480c0
|
工序期间成本预算保存提交添加校验：项目加期间加版本的组合是否存在，存在便提示不可重复创建
|
2025-08-07 10:35:55 +08:00 |
|
xuhaihui
|
bdfb0c1658
|
支出合同结算表单插件工序分摊逻辑优化
|
2025-08-07 10:35:19 +08:00 |
|
xuhaihui
|
ad460d8b80
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-07 09:44:39 +08:00 |
|
xuhaihui
|
1b404b1abb
|
工序成本预算单保存提交操作插件优化
|
2025-08-07 09:44:34 +08:00 |
|
zhangzhiguo
|
9a2527d6f8
|
付款处理反写资金计划申请实付金额功能
|
2025-08-06 19:38:58 +08:00 |
|
zhangzhiguo
|
a2588e7d6a
|
付款处理反写资金计划申请实付金额功能
|
2025-08-06 19:38:06 +08:00 |
|
xiaoshi
|
4d5975d6e2
|
youhua
|
2025-08-06 18:27:29 +08:00 |
|
xiaoshi
|
a787950a8c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-06 17:24:18 +08:00 |
|
xiaoshi
|
affa2ee26f
|
youhua
|
2025-08-06 17:23:27 +08:00 |
|
xuhaihui
|
cfec7cd726
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-06 17:13:55 +08:00 |
|
xuhaihui
|
39a42c5eb7
|
支出合同结算单生成冲销和作废等支出财务确认单逻辑添加支出财务确认单-费用项目分录逻辑
|
2025-08-06 17:13:51 +08:00 |
|
zhangzhiguo
|
572d377c08
|
科目余额取数表增加项目经理字段
|
2025-08-06 14:15:10 +08:00 |
|
zhangzhiguo
|
d91a700fbe
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-06 14:13:05 +08:00 |
|
xuhaihui
|
b880d268f6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-06 14:11:36 +08:00 |
|
zhangzhiguo
|
11e6def68a
|
财务部核定金额付款方式重复校验
|
2025-08-06 14:11:32 +08:00 |
|
xuhaihui
|
f2e7560de3
|
支出合同结算单中的工序分摊新增逻辑优化
|
2025-08-06 14:11:31 +08:00 |
|
xiaoshi
|
f45404050d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-06 12:44:36 +08:00 |
|
xiaoshi
|
942ae6ead4
|
youhua
|
2025-08-06 12:40:23 +08:00 |
|
xuhaihui
|
e404ee6e60
|
支出合同结算新增合同支付项明细后将对应不同分录拆分至工序分摊中
|
2025-08-06 11:15:56 +08:00 |
|
xuhaihui
|
e8065649b1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-05 14:10:09 +08:00 |
|
xuhaihui
|
4d53ece9f8
|
差旅报销单提交按钮操作逻辑优化
|
2025-08-05 14:10:02 +08:00 |
|
xiaoshi
|
4a4edf72ea
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-05 13:11:19 +08:00 |
|
xiaoshi
|
1517727dbf
|
youhua
|
2025-08-05 13:10:31 +08:00 |
|
zhangzhiguo
|
c11b58c1b7
|
职务消费台账增加费用归属领导查询逻辑
|
2025-08-05 11:37:10 +08:00 |
|
xiaoshi
|
1dc6c68a54
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-05 11:04:02 +08:00 |
|
xiaoshi
|
0c37fcc02c
|
youhua
|
2025-08-05 11:03:27 +08:00 |
|
zhangzhiguo
|
cce3525cb6
|
科目余额表取数
|
2025-08-05 11:03:01 +08:00 |
|
xuhaihui
|
12e0744b63
|
* 单据注册位置：差旅报销单提交按钮
* 说明：校验不同行程信息开始结束时间是否存在相同的日期
|
2025-08-05 10:45:15 +08:00 |
|
zhangzhiguo
|
935b609247
|
科目余额表取数
|
2025-08-04 19:01:30 +08:00 |
|
xiaoshi
|
a120667f44
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-04 16:39:56 +08:00 |
|
xiaoshi
|
26b87df6a9
|
youhua
|
2025-08-04 16:39:21 +08:00 |
|
xuhaihui
|
d708326083
|
优化
|
2025-08-04 16:31:42 +08:00 |
|
xuhaihui
|
8962e95bac
|
对公报销单提交操作插件：冲预付时预付单支付日期与开票日期和当前日期的对比校验
|
2025-08-04 16:15:14 +08:00 |
|
xuhaihui
|
cfea1526f3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-04 16:11:57 +08:00 |
|
xiaoshi
|
9940372930
|
youhua
|
2025-08-04 15:46:25 +08:00 |
|
xuhaihui
|
0138cbf94a
|
优化
|
2025-08-04 13:56:39 +08:00 |
|
xuhaihui
|
f8b1191489
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-04 13:54:15 +08:00 |
|
xuhaihui
|
846145ee2f
|
费用报销单、差旅报销单、对公报销单提交操作插件：开票日期与当前日期的对比校验逻辑
|
2025-08-04 13:54:07 +08:00 |
|
xiaoshi
|
efca0bd7ea
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-04 13:25:08 +08:00 |
|
xiaoshi
|
44c35f68d5
|
youhua
|
2025-08-04 13:24:53 +08:00 |
|
zhangzhiguo
|
52d01b1a40
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-04 09:33:25 +08:00 |
|
xiaoshi
|
e8fc9783f9
|
youhua
|
2025-08-01 21:17:36 +08:00 |
|
zhangzhiguo
|
221535deb6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-01 20:08:49 +08:00 |
|
xiaoshi
|
9b069670e9
|
youhua
|
2025-08-01 19:34:54 +08:00 |
|
xiaoshi
|
53249a396f
|
youhua
|
2025-08-01 17:40:33 +08:00 |
|
xiaoshi
|
ef7c631314
|
youhua
|
2025-08-01 17:20:40 +08:00 |
|
zhangzhiguo
|
ba93f9fb5e
|
余额表取数
|
2025-08-01 16:45:51 +08:00 |
|
xiaoshi
|
d9659d4311
|
youhua
|
2025-08-01 16:34:47 +08:00 |
|
xiaoshi
|
a86c0ba314
|
youhua
|
2025-08-01 15:55:10 +08:00 |
|
xiaoshi
|
629f3b7f1c
|
youhua
|
2025-08-01 14:43:24 +08:00 |
|
xuhaihui
|
5c4d04271f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-01 14:05:21 +08:00 |
|
xuhaihui
|
31f7ebf78d
|
费用报销单申请人需与个人的收款信息中的收款人一致逻辑优化
|
2025-08-01 14:05:15 +08:00 |
|
xiaoshi
|
82ec9a3155
|
youhua
|
2025-08-01 11:13:46 +08:00 |
|
xiaoshi
|
2202c71790
|
youhua
|
2025-08-01 11:11:31 +08:00 |
|
xiaoshi
|
330b6d9a90
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-01 11:10:32 +08:00 |
|
xiaoshi
|
5277494fdc
|
youhua
|
2025-08-01 11:10:12 +08:00 |
|
xuhaihui
|
5efb378c94
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-08-01 10:43:37 +08:00 |
|
xuhaihui
|
62587e3f63
|
针对矿山组织的过滤逻辑添加基础资料判断条件；费用报销单收款人（个人逻辑优化
|
2025-08-01 10:43:20 +08:00 |
|
xiaoshi
|
211352174b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-31 19:26:39 +08:00 |
|
xiaoshi
|
753e2dfd0b
|
youhua
|
2025-07-31 19:25:46 +08:00 |
|
zhangzhiguo
|
0a144492af
|
资金计划插件开发
|
2025-07-31 18:51:51 +08:00 |
|
zhangzhiguo
|
3ab2957c62
|
1.组织工具类优化
2.职务消费台账功能优化
3.计算扣除餐补天数优化
|
2025-07-31 18:46:13 +08:00 |
|
xiaoshi
|
34f30062f9
|
youhua
|
2025-07-31 17:26:03 +08:00 |
|
xiaoshi
|
ca4fc13b7c
|
youhua
|
2025-07-31 15:41:13 +08:00 |
|
xiaoshi
|
47437dd7e1
|
youhua
|
2025-07-31 15:01:48 +08:00 |
|
xiaoshi
|
632ef9bef7
|
youhua
|
2025-07-31 14:20:03 +08:00 |
|
xiaoshi
|
1897d56193
|
youhua
|
2025-07-31 12:42:26 +08:00 |
|
xiaoshi
|
963e5f0864
|
youhua
|
2025-07-31 10:02:44 +08:00 |
|
xiaoshi
|
eaeadf5398
|
youhua
|
2025-07-30 17:47:14 +08:00 |
|
xiaoshi
|
71344fe3d2
|
youhua
|
2025-07-30 17:39:50 +08:00 |
|
xiaoshi
|
f6e06271f4
|
youhua
|
2025-07-30 17:04:37 +08:00 |
|
xiaoshi
|
565e815ef6
|
youhua
|
2025-07-30 16:16:41 +08:00 |
|
xiaoshi
|
8cf40f8cae
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-30 16:05:09 +08:00 |
|
xiaoshi
|
a27f31230c
|
youhua
|
2025-07-30 16:04:41 +08:00 |
|
zhangzhiguo
|
e370c05eba
|
付款申请单费用项目过滤问题处理
|
2025-07-30 15:58:46 +08:00 |
|
zhangzhiguo
|
8321bb3b40
|
实际结算甲方值缺失问题处理
|
2025-07-30 15:47:46 +08:00 |
|
xiaoshi
|
1afa521471
|
youhua
|
2025-07-30 15:27:20 +08:00 |
|
xiaoshi
|
131530c483
|
youhua
|
2025-07-30 14:48:44 +08:00 |
|
xiaoshi
|
f8ab23ff3b
|
youhua
|
2025-07-30 14:22:54 +08:00 |
|
xiaoshi
|
04e98b6f2e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-30 14:02:01 +08:00 |
|
xiaoshi
|
1ecae316b3
|
youhua
|
2025-07-30 14:01:49 +08:00 |
|
xuhaihui
|
2e98950f6f
|
科目属性逻辑优化
|
2025-07-30 13:51:59 +08:00 |
|
xiaoshi
|
5b0a2e2850
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-30 13:33:24 +08:00 |
|
xiaoshi
|
a86e970125
|
youhua
|
2025-07-30 13:33:14 +08:00 |
|
xuhaihui
|
4337b580f3
|
入库单和采购申请列表插件逻辑优化
|
2025-07-30 10:34:13 +08:00 |
|
xiaoshi
|
192a891710
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-30 10:12:53 +08:00 |
|
xiaoshi
|
dff7777788
|
youhua
|
2025-07-30 10:12:17 +08:00 |
|
xuhaihui
|
97dd88085d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-29 15:49:16 +08:00 |
|
xuhaihui
|
40ff221682
|
优化点击选择采购申请按钮后弹出的采购申请分录中的数据的条数
|
2025-07-29 15:48:56 +08:00 |
|
xiaoshi
|
a6674f5a2c
|
youhua
|
2025-07-29 15:45:45 +08:00 |
|
xuhaihui
|
f125fad5b8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-29 15:25:06 +08:00 |
|
xuhaihui
|
d3499a4d1c
|
1：入库单审核操作插件：校验是否合计数量超过采购申请单数量；2：入库单审核反审核操作插件：审核、反审核时，将入库单数量反写至采购申请单
|
2025-07-29 15:24:58 +08:00 |
|
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 |