From 43fdfd183061d10db632ac21e05fa99eddbd0566 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 11 Jun 2026 22:24:08 +0800 Subject: [PATCH] =?UTF-8?q?F2-3=EF=BC=9A=E8=BF=90=E8=A1=8C=E6=97=B6?= =?UTF-8?q?=E5=8A=A8=E8=AF=8D=E9=97=AD=E5=8C=85=E5=AD=90=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E6=9C=BA=E5=88=B6=20+=20staging=20=E6=99=8B=E7=BA=A7=EF=BC=88F?= =?UTF-8?q?ULL=5FAUTO=20507/HARD=2074=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ScriptFacade:addFieldButton 扩第3参闭包(onClick 子指令数组)+ showConfirm 新动词,服务端急切求值闭包,子指令收进子缓冲,输出嵌套指令 JSON。 前端 scriptCommands.ts/registerReplayAction.ts:处理 addButton onClick/ confirmDialog onOk 嵌套重放,onClickActions/onOkActions 透传给 amis。 ScriptFacadeTest 补 7 个正反例(24/24 全绿)。 staging 晋级:FULL_AUTO 507(+10)/HARD 74(-12)/自动化率 82.7%, 双库各更新 801 条,e2e 30/30 全绿。 Co-Authored-By: Claude Fable 5 --- docs/P1/F2-3脚本运行时报告.md | 179 +++++++++ .../metadata/script/ScriptFacade.java | 74 +++- .../metadata/script/ScriptFacadeTest.java | 114 ++++++ tools/s3_rewriter/output/full_auto_index.json | 106 ++++++ ...002_HARD_1a7f5b05_物资合同评审_五建定制.md | 2 +- ...003_HARD_1a7f5b05_物资合同评审_五建定制.md | 2 +- ...005_HARD_1edd6c1c_物资合同登记_需要评审.md | 2 +- ...RD_213d1b7e_劳务分包合同登记_不需要评审.md | 2 +- ...RD_213d1b7e_劳务分包合同登记_不需要评审.md | 2 +- ...6d_劳务分包合同登记_不需要评审_五建定制.md | 2 +- ...6d_劳务分包合同登记_不需要评审_五建定制.md | 2 +- .../011_HARD_26fe10ae_专业分包合同评审.md | 2 +- .../012_HARD_26fe10ae_专业分包合同评审.md | 2 +- .../014_HARD_2852ff22_计划成本变更.md | 2 +- .../015_HARD_2852ff22_计划成本变更.md | 2 +- .../016_HARD_2cceb83c_建造师注册证.md | 71 +--- .../017_HARD_2cceb83c_建造师注册证.md | 67 +++- .../018_HARD_2cceb83c_建造师注册证.md | 104 ------ ... => 018_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md} | 4 +- ...审批.md => 019_HARD_328b3366_施工日志_审批.md} | 2 +- ...¬申报.md => 020_HARD_35b9139e_计划成本申报.md} | 4 +- ..._业绩库.md => 021_HARD_38bebdb5_业绩库.md} | 2 +- ...22_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md} | 2 +- ...¯�书.md => 023_HARD_4230b669_员工档案_带证书.md} | 4 +- ...标公示.md => 024_HARD_4d4d019b_中标公示.md} | 2 +- ...3ef3_职称.md => 025_HARD_4ea83ef3_职称.md} | 2 +- ...标工程.md => 026_HARD_5440da49_招标工程.md} | 2 +- ...¡.md => 027_HARD_58684bbb_物资合同登记_不需要评审.md} | 39 +- ...8_HARD_58684bbb_物资合同登记_不需要评审.md | 37 +- ...件监控.md => 029_HARD_5a51c93c_文件监控.md} | 26 +- .../030_HARD_5a51c93c_文件监控.md | 24 +- ...md => 031_HARD_5be37b88_专业分包合同登记_不需要评审.md} | 43 ++- ...RD_5be37b88_专业分包合同登记_不需要评审.md | 41 +- ....md => 033_HARD_5e618173_专业分包合同评审_五建定制.md} | 66 ++-- ...HARD_5e618173_专业分包合同评审_五建定制.md | 64 ++-- ...¥看.md => 035_HARD_71efbb03_项目部质量目标查看.md} | 2 +- ...Œ‡标.md => 036_HARD_7a2cbfcc_分_公司质量指标.md} | 2 +- .../037_HARD_75fb9a46_培训签到.md | 67 ---- ...œ公示.md => 037_HARD_7a7c0ce5_评标结果公示.md} | 2 +- .../038_HARD_7a0ac7a9_造价师注册证.md | 94 ----- ...¬拆分.md => 038_HARD_7d50dd37_项目成本拆分.md} | 4 +- ...š制.md => 039_HARD_8350f440_中标登记_五建定制.md} | 2 +- ...> 040_HARD_8c4a3b9f_专业分包合同登记_需要评审_五建定制.md} | 4 +- ...> 041_HARD_908652e1_劳务分包合同登记_需要评审_五建定制.md} | 4 +- ... => 042_HARD_90ab3b6d_物资合同登记_需要评审_五建定制.md} | 4 +- .../043_HARD_86c05eb5_销项税发票.md | 191 ---------- ...=> 043_HARD_91497e54_物资合同登记_不需要评审_五建定制.md} | 4 +- ...44_HARD_884f0dde_物资采购申请_土建_项目.md | 85 ----- ...=> 044_HARD_91497e54_物资合同登记_不需要评审_五建定制.md} | 4 +- ...œ登记.md => 045_HARD_938201e3_开标结果登记.md} | 2 +- ...优目标.md => 046_HARD_99930d79_创优目标.md} | 2 +- ...大员证.md => 047_HARD_99d77f69_十大员证.md} | 2 +- ...¾申请.md => 048_HARD_9b0ea26a_项目付款申请.md} | 2 +- ...¾申请.md => 049_HARD_9b0ea26a_项目付款申请.md} | 2 +- ...资方案.md => 050_HARD_9d690abb_薪资方案.md} | 4 +- ...†.md => 051_HARD_a0307625_周转_自购_材料盘点管理.md} | 4 +- ...款确认.md => 052_HARD_a18b1f38_付款确认.md} | 2 +- ...¯管理.md => 053_HARD_a1b39022_网站信息管理.md} | 2 +- ... 054_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md} | 4 +- ... 055_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md} | 4 +- ...¯„审.md => 056_HARD_ad1ffdd2_劳务分包合同评审.md} | 4 +- ...¯„审.md => 057_HARD_ad1ffdd2_劳务分包合同评审.md} | 4 +- ...·¥人证.md => 058_HARD_b17684cf_技术工人证.md} | 2 +- ...名申请.md => 059_HARD_c0982679_报名申请.md} | 2 +- ...Œ结算.md => 060_HARD_c5b5160e_分包合同结算.md} | 4 +- .../061_HARD_a760fba0_项目人员配置.md | 61 --- ....md => 061_HARD_c752e928_劳务分包合同登记_需要评审.md} | 4 +- ...ˆ¶.md => 062_HARD_cf71f83a_物资合同评审_明辉定制.md} | 4 +- ...ˆ¶.md => 063_HARD_cf71f83a_物资合同评审_明辉定制.md} | 4 +- ....md => 064_HARD_d193b838_劳务分包合同评审_五建定制.md} | 4 +- ....md => 065_HARD_d193b838_劳务分包合同评审_五建定制.md} | 4 +- ...目标.md => 066_HARD_d2a01b24_项目部质量目标.md} | 2 +- ....md => 067_HARD_d41063b3_专业分包合同登记_需要评审.md} | 4 +- ...Œ评审.md => 068_HARD_e282bd37_物资合同评审.md} | 4 +- ...Œ评审.md => 069_HARD_e282bd37_物资合同评审.md} | 4 +- ...š制.md => 070_HARD_e7670207_付款确认_五建定制.md} | 2 +- ...他证书.md => 071_HARD_f475e860_其他证书.md} | 2 +- ...ˆ¶.md => 072_HARD_f9b884de_项目付款申请_五建定制.md} | 2 +- ...ˆ¶.md => 073_HARD_f9b884de_项目付款申请_五建定制.md} | 2 +- ...计划.md => 074_HARD_fb51a8c9_发薪_扣款计划.md} | 4 +- ...®°.md => 075_PARTIAL_0567316f_车辆维修保养登记.md} | 2 +- ...54_进项税发票_批量调整抵扣日期_五建定制.md | 110 ------ ....md => 076_PARTIAL_208996a7_办公用品库初始化凭证.md} | 2 +- ...54_进项税发票_批量调整抵扣日期_五建定制.md | 192 ---------- ...Š¥.md => 077_PARTIAL_2b39c3e1_项目部污染源申报.md} | 2 +- .../078_PARTIAL_2cceb83c_建造师注册证.md | 157 ++++++++ .../079_HARD_e7670207_付款确认_五建定制.md | 186 --------- ...¯·.md => 079_PARTIAL_2d046844_办公用品领用申请.md} | 2 +- ...80_HARD_ee9e2a39_物资采购申请_土建_公司.md | 85 ----- ...Š¥.md => 080_PARTIAL_3cfaeaa6_项目部危险源申报.md} | 2 +- ...2f57_销项税发票_增加审批通过后_五建定制.md | 110 ------ ...‹试树.md => 081_PARTIAL_459103d3_测试树.md} | 2 +- ...工程.md => 082_PARTIAL_5440da49_招标工程.md} | 2 +- ...„则.md => 083_PARTIAL_68dc06dc_组织缴费规则.md} | 2 +- ....md => 084_PARTIAL_6e412e62_物资需求总计划_土建.md} | 2 +- ...º间.md => 085_PARTIAL_745c9534_验工月报区间.md} | 2 +- ...086_HARD_fe20a392_项目人员配置_五建定制.md | 61 --- .../086_PARTIAL_7a0ac7a9_造价师注册证.md | 157 ++++++++ ....md => 087_PARTIAL_85966712_周转_租赁_材料报废.md} | 2 +- ...�‘票.md => 088_PARTIAL_86c05eb5_销项税发票.md} | 2 +- .../089_PARTIAL_292e76e6_月度检查.md | 51 --- ...�‘票.md => 089_PARTIAL_86c05eb5_销项税发票.md} | 2 +- .../090_PARTIAL_86c05eb5_销项税发票.md | 351 +++++++++++++++++ ...PARTIAL_884f0dde_物资采购申请_土建_项目.md | 148 ++++++++ ...配置.md => 092_PARTIAL_8fadaa6e_费率配置.md} | 2 +- .../093_PARTIAL_a760fba0_项目人员配置.md | 93 +++++ ...¿¡息.md => 094_PARTIAL_a9abafe3_驾驶员信息.md} | 2 +- ...˜动.md => 095_PARTIAL_b233e091_固定资产变动.md} | 2 +- .../096_PARTIAL_6c11d228_季度检查整改.md | 55 --- ...˜动.md => 096_PARTIAL_b233e091_固定资产变动.md} | 2 +- .../097_PARTIAL_6c11d228_季度检查整改.md | 59 --- ...d => 097_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md} | 2 +- ...申请.md => 098_PARTIAL_c0982679_报名申请.md} | 2 +- ... => 099_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md} | 2 +- ...54_进项税发票_批量调整抵扣日期_五建定制.md | 353 ++++++++++++++++++ ...放.md => 101_PARTIAL_e70d25ef_农民工工资发放.md} | 2 +- ...PARTIAL_ee9e2a39_物资采购申请_土建_公司.md | 148 ++++++++ ...03_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md} | 2 +- .../104_PARTIAL_92072d44_月度检查整改.md | 51 --- ...04_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md} | 2 +- ...„则.md => 105_PARTIAL_f805a46c_项目缴费规则.md} | 2 +- ..._PARTIAL_fe20a392_项目人员配置_五建定制.md | 93 +++++ .../111_PARTIAL_c7b23419_季度检查.md | 53 --- ..._PARTIAL_f78c44ca_月度检查整改_五建定制.md | 51 --- .../3.HARD.groovy | 2 +- .../4.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../1.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../1.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../3.HARD.groovy | 2 +- .../1.HARD.groovy | 2 +- .../3.HARD.groovy | 2 +- .../{2.PARTIAL.groovy => 2.FULL_AUTO.groovy} | 7 +- .../{3.HARD.groovy => 3.PARTIAL.groovy} | 28 +- .../2.HARD.groovy | 2 +- .../1.HARD.groovy | 2 +- .../6.HARD.groovy | 2 +- .../1.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../1.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../1.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../3.HARD.groovy | 2 +- .../4.HARD.groovy | 2 +- .../{1.PARTIAL.groovy => 1.FULL_AUTO.groovy} | 7 +- .../{2.PARTIAL.groovy => 2.FULL_AUTO.groovy} | 9 +- .../1.FULL_AUTO.groovy | 32 ++ .../1.HARD.groovy | 46 --- .../{3.HARD.groovy => 3.PARTIAL.groovy} | 28 +- .../1.HARD.groovy | 2 +- .../{6.HARD.groovy => 6.PARTIAL.groovy} | 38 +- .../{1.HARD.groovy => 1.PARTIAL.groovy} | 38 +- .../2.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../1.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../{2.PARTIAL.groovy => 2.FULL_AUTO.groovy} | 7 +- .../4.HARD.groovy | 2 +- .../4.HARD.groovy | 2 +- .../1.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../3.HARD.groovy | 40 -- .../3.PARTIAL.groovy | 32 ++ .../2.HARD.groovy | 2 +- .../3.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../{3.PARTIAL.groovy => 3.FULL_AUTO.groovy} | 7 +- .../2.HARD.groovy | 2 +- .../3.HARD.groovy | 2 +- .../3.HARD.groovy | 2 +- .../4.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../2.HARD.groovy | 2 +- .../3.HARD.groovy | 2 +- .../{6.HARD.groovy => 6.FULL_AUTO.groovy} | 56 +-- .../{9.HARD.groovy => 9.PARTIAL.groovy} | 38 +- .../{7.HARD.groovy => 7.FULL_AUTO.groovy} | 37 +- .../{1.HARD.groovy => 1.PARTIAL.groovy} | 38 +- .../{5.HARD.groovy => 5.FULL_AUTO.groovy} | 56 +-- .../{2.PARTIAL.groovy => 2.FULL_AUTO.groovy} | 7 +- .../1.HARD.groovy | 2 +- .../3.HARD.groovy | 40 -- .../3.PARTIAL.groovy | 32 ++ tools/s3_rewriter/output/stats.json | 33 +- 190 files changed, 2625 insertions(+), 2454 deletions(-) create mode 100644 docs/P1/F2-3脚本运行时报告.md delete mode 100644 tools/s3_rewriter/output/manual_workpackage/018_HARD_2cceb83c_建造师注册证.md rename tools/s3_rewriter/output/manual_workpackage/{019_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md => 018_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md} (96%) rename tools/s3_rewriter/output/manual_workpackage/{020_HARD_328b3366_施工日志_审批.md => 019_HARD_328b3366_施工日志_审批.md} (99%) rename tools/s3_rewriter/output/manual_workpackage/{021_HARD_35b9139e_计划成本申报.md => 020_HARD_35b9139e_计划成本申报.md} (96%) rename tools/s3_rewriter/output/manual_workpackage/{022_HARD_38bebdb5_业绩库.md => 021_HARD_38bebdb5_业绩库.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{023_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md => 022_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{024_HARD_4230b669_员工档案_带证书.md => 023_HARD_4230b669_员工档案_带证书.md} (99%) rename tools/s3_rewriter/output/manual_workpackage/{025_HARD_4d4d019b_中标公示.md => 024_HARD_4d4d019b_中标公示.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{026_HARD_4ea83ef3_职称.md => 025_HARD_4ea83ef3_职称.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{027_HARD_5440da49_招标工程.md => 026_HARD_5440da49_招标工程.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{029_HARD_58684bbb_物资合同登记_不需要评审.md => 027_HARD_58684bbb_物资合同登记_不需要评审.md} (50%) rename tools/s3_rewriter/output/manual_workpackage/{031_HARD_5a51c93c_文件监控.md => 029_HARD_5a51c93c_文件监控.md} (79%) rename tools/s3_rewriter/output/manual_workpackage/{033_HARD_5be37b88_专业分包合同登记_不需要评审.md => 031_HARD_5be37b88_专业分包合同登记_不需要评审.md} (51%) rename tools/s3_rewriter/output/manual_workpackage/{035_HARD_5e618173_专业分包合同评审_五建定制.md => 033_HARD_5e618173_专业分包合同评审_五建定制.md} (54%) rename tools/s3_rewriter/output/manual_workpackage/{036_HARD_71efbb03_项目部质量目标查看.md => 035_HARD_71efbb03_项目部质量目标查看.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{039_HARD_7a2cbfcc_分_公司质量指标.md => 036_HARD_7a2cbfcc_分_公司质量指标.md} (98%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/037_HARD_75fb9a46_培训签到.md rename tools/s3_rewriter/output/manual_workpackage/{040_HARD_7a7c0ce5_评标结果公示.md => 037_HARD_7a7c0ce5_评标结果公示.md} (98%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/038_HARD_7a0ac7a9_造价师注册证.md rename tools/s3_rewriter/output/manual_workpackage/{041_HARD_7d50dd37_项目成本拆分.md => 038_HARD_7d50dd37_项目成本拆分.md} (99%) rename tools/s3_rewriter/output/manual_workpackage/{042_HARD_8350f440_中标登记_五建定制.md => 039_HARD_8350f440_中标登记_五建定制.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{045_HARD_8c4a3b9f_专业分包合同登记_需要评审_五建定制.md => 040_HARD_8c4a3b9f_专业分包合同登记_需要评审_五建定制.md} (95%) rename tools/s3_rewriter/output/manual_workpackage/{046_HARD_908652e1_劳务分包合同登记_需要评审_五建定制.md => 041_HARD_908652e1_劳务分包合同登记_需要评审_五建定制.md} (95%) rename tools/s3_rewriter/output/manual_workpackage/{047_HARD_90ab3b6d_物资合同登记_需要评审_五建定制.md => 042_HARD_90ab3b6d_物资合同登记_需要评审_五建定制.md} (95%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/043_HARD_86c05eb5_销项税发票.md rename tools/s3_rewriter/output/manual_workpackage/{048_HARD_91497e54_物资合同登记_不需要评审_五建定制.md => 043_HARD_91497e54_物资合同登记_不需要评审_五建定制.md} (97%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/044_HARD_884f0dde_物资采购申请_土建_项目.md rename tools/s3_rewriter/output/manual_workpackage/{049_HARD_91497e54_物资合同登记_不需要评审_五建定制.md => 044_HARD_91497e54_物资合同登记_不需要评审_五建定制.md} (95%) rename tools/s3_rewriter/output/manual_workpackage/{050_HARD_938201e3_开标结果登记.md => 045_HARD_938201e3_开标结果登记.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{051_HARD_99930d79_创优目标.md => 046_HARD_99930d79_创优目标.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{052_HARD_99d77f69_十大员证.md => 047_HARD_99d77f69_十大员证.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{053_HARD_9b0ea26a_项目付款申请.md => 048_HARD_9b0ea26a_项目付款申请.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{054_HARD_9b0ea26a_项目付款申请.md => 049_HARD_9b0ea26a_项目付款申请.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{055_HARD_9d690abb_薪资方案.md => 050_HARD_9d690abb_薪资方案.md} (96%) rename tools/s3_rewriter/output/manual_workpackage/{056_HARD_a0307625_周转_自购_材料盘点管理.md => 051_HARD_a0307625_周转_自购_材料盘点管理.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{057_HARD_a18b1f38_付款确认.md => 052_HARD_a18b1f38_付款确认.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{058_HARD_a1b39022_网站信息管理.md => 053_HARD_a1b39022_网站信息管理.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{059_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md => 054_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{060_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md => 055_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md} (95%) rename tools/s3_rewriter/output/manual_workpackage/{062_HARD_ad1ffdd2_劳务分包合同评审.md => 056_HARD_ad1ffdd2_劳务分包合同评审.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{063_HARD_ad1ffdd2_劳务分包合同评审.md => 057_HARD_ad1ffdd2_劳务分包合同评审.md} (95%) rename tools/s3_rewriter/output/manual_workpackage/{064_HARD_b17684cf_技术工人证.md => 058_HARD_b17684cf_技术工人证.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{065_HARD_c0982679_报名申请.md => 059_HARD_c0982679_报名申请.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{066_HARD_c5b5160e_分包合同结算.md => 060_HARD_c5b5160e_分包合同结算.md} (95%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/061_HARD_a760fba0_项目人员配置.md rename tools/s3_rewriter/output/manual_workpackage/{067_HARD_c752e928_劳务分包合同登记_需要评审.md => 061_HARD_c752e928_劳务分包合同登记_需要评审.md} (95%) rename tools/s3_rewriter/output/manual_workpackage/{068_HARD_cf71f83a_物资合同评审_明辉定制.md => 062_HARD_cf71f83a_物资合同评审_明辉定制.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{069_HARD_cf71f83a_物资合同评审_明辉定制.md => 063_HARD_cf71f83a_物资合同评审_明辉定制.md} (95%) rename tools/s3_rewriter/output/manual_workpackage/{070_HARD_d193b838_劳务分包合同评审_五建定制.md => 064_HARD_d193b838_劳务分包合同评审_五建定制.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{071_HARD_d193b838_劳务分包合同评审_五建定制.md => 065_HARD_d193b838_劳务分包合同评审_五建定制.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{072_HARD_d2a01b24_项目部质量目标.md => 066_HARD_d2a01b24_项目部质量目标.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{073_HARD_d41063b3_专业分包合同登记_需要评审.md => 067_HARD_d41063b3_专业分包合同登记_需要评审.md} (95%) rename tools/s3_rewriter/output/manual_workpackage/{074_HARD_e282bd37_物资合同评审.md => 068_HARD_e282bd37_物资合同评审.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{075_HARD_e282bd37_物资合同评审.md => 069_HARD_e282bd37_物资合同评审.md} (95%) rename tools/s3_rewriter/output/manual_workpackage/{078_HARD_e7670207_付款确认_五建定制.md => 070_HARD_e7670207_付款确认_五建定制.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{082_HARD_f475e860_其他证书.md => 071_HARD_f475e860_其他证书.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{083_HARD_f9b884de_项目付款申请_五建定制.md => 072_HARD_f9b884de_项目付款申请_五建定制.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{084_HARD_f9b884de_项目付款申请_五建定制.md => 073_HARD_f9b884de_项目付款申请_五建定制.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{085_HARD_fb51a8c9_发薪_扣款计划.md => 074_HARD_fb51a8c9_发薪_扣款计划.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{087_PARTIAL_0567316f_车辆维修保养登记.md => 075_PARTIAL_0567316f_车辆维修保养登记.md} (98%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/076_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md rename tools/s3_rewriter/output/manual_workpackage/{088_PARTIAL_208996a7_办公用品库初始化凭证.md => 076_PARTIAL_208996a7_办公用品库初始化凭证.md} (96%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/077_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md rename tools/s3_rewriter/output/manual_workpackage/{090_PARTIAL_2b39c3e1_项目部污染源申报.md => 077_PARTIAL_2b39c3e1_项目部污染源申报.md} (99%) create mode 100644 tools/s3_rewriter/output/manual_workpackage/078_PARTIAL_2cceb83c_建造师注册证.md delete mode 100644 tools/s3_rewriter/output/manual_workpackage/079_HARD_e7670207_付款确认_五建定制.md rename tools/s3_rewriter/output/manual_workpackage/{091_PARTIAL_2d046844_办公用品领用申请.md => 079_PARTIAL_2d046844_办公用品领用申请.md} (97%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/080_HARD_ee9e2a39_物资采购申请_土建_公司.md rename tools/s3_rewriter/output/manual_workpackage/{092_PARTIAL_3cfaeaa6_项目部危险源申报.md => 080_PARTIAL_3cfaeaa6_项目部危险源申报.md} (99%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/081_HARD_f01c2f57_销项税发票_增加审批通过后_五建定制.md rename tools/s3_rewriter/output/manual_workpackage/{093_PARTIAL_459103d3_测试树.md => 081_PARTIAL_459103d3_测试树.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{094_PARTIAL_5440da49_招标工程.md => 082_PARTIAL_5440da49_招标工程.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{095_PARTIAL_68dc06dc_组织缴费规则.md => 083_PARTIAL_68dc06dc_组织缴费规则.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{098_PARTIAL_6e412e62_物资需求总计划_土建.md => 084_PARTIAL_6e412e62_物资需求总计划_土建.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{099_PARTIAL_745c9534_验工月报区间.md => 085_PARTIAL_745c9534_验工月报区间.md} (99%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/086_HARD_fe20a392_项目人员配置_五建定制.md create mode 100644 tools/s3_rewriter/output/manual_workpackage/086_PARTIAL_7a0ac7a9_造价师注册证.md rename tools/s3_rewriter/output/manual_workpackage/{100_PARTIAL_85966712_周转_租赁_材料报废.md => 087_PARTIAL_85966712_周转_租赁_材料报废.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{101_PARTIAL_86c05eb5_销项税发票.md => 088_PARTIAL_86c05eb5_销项税发票.md} (98%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_292e76e6_月度检查.md rename tools/s3_rewriter/output/manual_workpackage/{102_PARTIAL_86c05eb5_销项税发票.md => 089_PARTIAL_86c05eb5_销项税发票.md} (98%) create mode 100644 tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_86c05eb5_销项税发票.md create mode 100644 tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_884f0dde_物资采购申请_土建_项目.md rename tools/s3_rewriter/output/manual_workpackage/{103_PARTIAL_8fadaa6e_费率配置.md => 092_PARTIAL_8fadaa6e_费率配置.md} (97%) create mode 100644 tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_a760fba0_项目人员配置.md rename tools/s3_rewriter/output/manual_workpackage/{105_PARTIAL_a9abafe3_驾驶员信息.md => 094_PARTIAL_a9abafe3_驾驶员信息.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{106_PARTIAL_b233e091_固定资产变动.md => 095_PARTIAL_b233e091_固定资产变动.md} (99%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_6c11d228_季度检查整改.md rename tools/s3_rewriter/output/manual_workpackage/{107_PARTIAL_b233e091_固定资产变动.md => 096_PARTIAL_b233e091_固定资产变动.md} (99%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_6c11d228_季度检查整改.md rename tools/s3_rewriter/output/manual_workpackage/{108_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md => 097_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md} (99%) rename tools/s3_rewriter/output/manual_workpackage/{109_PARTIAL_c0982679_报名申请.md => 098_PARTIAL_c0982679_报名申请.md} (97%) rename tools/s3_rewriter/output/manual_workpackage/{110_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md => 099_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md} (97%) create mode 100644 tools/s3_rewriter/output/manual_workpackage/100_PARTIAL_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md rename tools/s3_rewriter/output/manual_workpackage/{112_PARTIAL_e70d25ef_农民工工资发放.md => 101_PARTIAL_e70d25ef_农民工工资发放.md} (97%) create mode 100644 tools/s3_rewriter/output/manual_workpackage/102_PARTIAL_ee9e2a39_物资采购申请_土建_公司.md rename tools/s3_rewriter/output/manual_workpackage/{113_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md => 103_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md} (98%) delete mode 100644 tools/s3_rewriter/output/manual_workpackage/104_PARTIAL_92072d44_月度检查整改.md rename tools/s3_rewriter/output/manual_workpackage/{114_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md => 104_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md} (98%) rename tools/s3_rewriter/output/manual_workpackage/{116_PARTIAL_f805a46c_项目缴费规则.md => 105_PARTIAL_f805a46c_项目缴费规则.md} (98%) create mode 100644 tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_fe20a392_项目人员配置_五建定制.md delete mode 100644 tools/s3_rewriter/output/manual_workpackage/111_PARTIAL_c7b23419_季度检查.md delete mode 100644 tools/s3_rewriter/output/manual_workpackage/115_PARTIAL_f78c44ca_月度检查整改_五建定制.md rename tools/s3_rewriter/output/rewritten/292e76e6-df04-4be3-9108-73eaa1565b4c/{2.PARTIAL.groovy => 2.FULL_AUTO.groovy} (55%) rename tools/s3_rewriter/output/rewritten/2cceb83c-4079-43e4-b7b7-c395fd68cbbc/{3.HARD.groovy => 3.PARTIAL.groovy} (69%) rename tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/{1.PARTIAL.groovy => 1.FULL_AUTO.groovy} (58%) rename tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/{2.PARTIAL.groovy => 2.FULL_AUTO.groovy} (50%) create mode 100644 tools/s3_rewriter/output/rewritten/75fb9a46-b874-46b4-a6e5-c12c14ec54b6/1.FULL_AUTO.groovy delete mode 100644 tools/s3_rewriter/output/rewritten/75fb9a46-b874-46b4-a6e5-c12c14ec54b6/1.HARD.groovy rename tools/s3_rewriter/output/rewritten/7a0ac7a9-32bc-4d32-9231-4d1bbcd86002/{3.HARD.groovy => 3.PARTIAL.groovy} (69%) rename tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/{6.HARD.groovy => 6.PARTIAL.groovy} (89%) rename tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/{1.HARD.groovy => 1.PARTIAL.groovy} (67%) rename tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/{2.PARTIAL.groovy => 2.FULL_AUTO.groovy} (56%) delete mode 100644 tools/s3_rewriter/output/rewritten/a760fba0-693e-4f0a-8007-3bdca7fb0305/3.HARD.groovy create mode 100644 tools/s3_rewriter/output/rewritten/a760fba0-693e-4f0a-8007-3bdca7fb0305/3.PARTIAL.groovy rename tools/s3_rewriter/output/rewritten/c7b23419-22e1-4a5a-aa09-464b3bb2a242/{3.PARTIAL.groovy => 3.FULL_AUTO.groovy} (57%) rename tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/{6.HARD.groovy => 6.FULL_AUTO.groovy} (67%) rename tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/{9.HARD.groovy => 9.PARTIAL.groovy} (89%) rename tools/s3_rewriter/output/rewritten/e7670207-9cf7-4db9-a452-884b58408b96/{7.HARD.groovy => 7.FULL_AUTO.groovy} (86%) rename tools/s3_rewriter/output/rewritten/ee9e2a39-45e2-434a-b691-a02a2041b7e6/{1.HARD.groovy => 1.PARTIAL.groovy} (67%) rename tools/s3_rewriter/output/rewritten/f01c2f57-1891-45de-9318-7246f9d6ac97/{5.HARD.groovy => 5.FULL_AUTO.groovy} (67%) rename tools/s3_rewriter/output/rewritten/f78c44ca-4a23-4195-996b-2cd7cf629c41/{2.PARTIAL.groovy => 2.FULL_AUTO.groovy} (57%) delete mode 100644 tools/s3_rewriter/output/rewritten/fe20a392-d4fd-402f-bbf8-be8cd41ab932/3.HARD.groovy create mode 100644 tools/s3_rewriter/output/rewritten/fe20a392-d4fd-402f-bbf8-be8cd41ab932/3.PARTIAL.groovy diff --git a/docs/P1/F2-3脚本运行时报告.md b/docs/P1/F2-3脚本运行时报告.md new file mode 100644 index 0000000..d092b8d --- /dev/null +++ b/docs/P1/F2-3脚本运行时报告.md @@ -0,0 +1,179 @@ +# F2-3 脚本运行时报告 + +生成时间:2026-06-11 +作者:P4 脚本迁移线 + +--- + +## 一、F2-1b 默认导入补全 + +### 问题根因 + +视图脚本执行路径(`ScriptExecuteController` → `com.dsasp.server.dataDic.binding.ScriptingEnginesManager`)使用裸 `GroovyScriptEngineFactory`,缺少服务端默认导入注入,导致: + +- `GetServicesFunction.loadPOJO(...)` 报「No such property: GetServicesFunction」 +- `new DateTime[2]` 报「unable to resolve class DateTime」 + +服务流路径(`com.dsasp.server.core.service.script.ScriptingEnginesManager`)已正确使用 `SecureGroovyScriptEngineFactory`(含 DEFAULTIMPORTSLIST 8 条 + org.joda.time 星号导入)。 + +### 修法 + +`com.dsasp.server.dataDic.binding.ScriptingEnginesManager` 换用 `SecureGroovyScriptEngineFactory`。最小改动:删除 `GroovyScriptEngineFactory` 引入,添加 `SecureGroovyScriptEngineFactory` 引入,ArchUnit 保真层纪律不受影响。 + +### 默认导入串对照(SecureGroovyScriptEngineFactory.DEFAULTIMPORTSLIST) + +| 类 | 来源 | 用途 | +|---|---|---| +| `com.dsasp.server.common.dataDic.bean.GeneralPOJO` | platform-legacy-core | 数据实体 | +| `com.dsasp.server.common.dataDic.bean.CustomSearchConditional` | platform-legacy-core | 查询条件 | +| `com.dsasp.server.common.dataDic.service.POJOCRUDService` | platform-legacy-core | CRUD 服务 | +| `com.dsasp.server.common.util.StringUtil` | platform-legacy-core | 字符串工具 | +| `com.dsasp.server.common.function.GetServicesFunction` | platform-legacy-core | 服务调用函数库 | +| `com.dsasp.server.common.function.GetDefaultValueFunction` | platform-legacy-core | 默认值函数库 | +| `com.dsasp.server.common.function.GetValueFunction` | platform-legacy-core | 字段取值函数库 | +| `com.dsasp.client.viewframework.template.util.Console` | platform-legacy-core | 脚本调试日志 | + +星号导入:`org.joda.time`(DateTime/DateTimeFormatter 等,joda-time 2.12.7 已在 legacy-core pom) + +--- + +## 二、F2-3 嵌套指令协议 + +### 规格 + +改写器(tools/s3_rewriter F2-3 规则族)产出两个新动词形态,服务端 `ScriptFacade` 急切求值闭包,收集子指令入子缓冲,输出含嵌套数组的指令 JSON。 + +#### addFieldButton 四参形态 + +**脚本**: +```groovy +addFieldButton("FIELD", "文案", { + // 闭包体动词 + setFieldVisible("X", true) + showToast("完成") +}, 1) +``` + +**服务端输出**: +```json +{ + "actionType": "addButton", + "componentId": "FIELD", + "args": { + "label": "文案", + "index": 1, + "onClick": [ + { "actionType": "show", "componentId": "X" }, + { "actionType": "toast", "args": { "msgType": "info", "msg": "完成" } } + ] + } +} +``` + +#### showConfirm 形态 + +**脚本**: +```groovy +showConfirm("确认操作?", { + setFieldEnabled("BTN", false) +}) +``` + +**服务端输出**: +```json +{ + "actionType": "confirmDialog", + "args": { + "msg": "确认操作?", + "onOk": [ + { "actionType": "disabled", "componentId": "BTN" } + ] + } +} +``` + +### 前端重放协议(registerReplayAction.ts) + +- `addButton` + `onClick` 数组:翻译子指令为 amis 动作数组,挂 `args.onClickActions`,透传给 amis `addButton` 动作;amis 侧按钮点击后 runActions 重放。 +- `confirmDialog` + `onOk` 数组:翻译子指令为 amis 动作数组,挂 `args.onOkActions`,透传给 amis `confirmDialog` 动作;用户确认后 runActions 重放。 +- 无嵌套数组的 `addButton` 走常规路径(向后兼容旧三参形态)。 + +--- + +## 三、staging 晋级前后分布 + +| 标签 | 晋级前(基线) | 晋级后(staging) | 变化 | +|------|--------------|-----------------|------| +| FULL_AUTO | 497 | **507** | +10 | +| PARTIAL | 30 | **32** | +2 | +| HARD | 86 | **74** | -12 | +| NO_S3 | 815 | 815 | 0 | +| **自动化率** | **81.1%** | **82.7%** | **+1.6pp** | +| 人工作业单 | 116 | **106** | -10 | +| templates_with_scripts | 721 | 721 | 0 | + +**双库核数**(load_page_schema.py): +- `eip4dev.eip3`:更新 801 条,幂等跳过 688 条 +- `eip4m0.public`:更新 801 条,幂等跳过 688 条 + +**BatchConvertCli**:总量 1516,闸一通过 1489(98.2%),onEvent 钩子挂载 380 个模板 + +--- + +## 四、4 样本验证结果 + +| 样本 | templateId | seq | 脚本标签 | 结果 | 分类 | +|------|-----------|-----|---------|------|------| +| getConfigValue+page绑定 | 021e3ba7-e03a-412a-9f0e-c20ef440a885 | 2 | NO_S3 | `page` MissingProperty | **预期**:page 是 Vaadin 视图对象,服务端不绑定 | +| GetServicesFunction.loadPOJO | 0670aaf9-a045-450d-9ebc-06f3ac36ca19 | 1 | NO_S3 | `PM_BIDRELATIONSHIP_ID` MissingProperty | **预期**:类名已解析,缺行数据 item 字段(无 ID 注入) | +| new DateTime[2] | 087739c4-3dee-4bac-b031-772497addc6b | 1 | NO_S3 | **passed: True** | F2-1b 修复验证通过 | +| GetValueFunction | 1cc15e59-460e-4949-8a2f-41ea39bad097 | 1 | FULL_AUTO | **passed: True** | F2-1b 修复验证通过 | + +**补充类名解析验证**(/api/script/execute 直接测试): + +| 验证项 | 结果 | +|-------|------| +| `GetServicesFunction.class.simpleName` → `"GetServicesFunction"` | passed: True | +| `GetValueFunction.class.simpleName` → `"GetValueFunction"` | passed: True | +| `new DateTime[2]; arr.length` → `2` | passed: True | + +--- + +## 五、单测覆盖 + +### Java(ScriptFacadeTest,platform-metadata) + +新增 7 个 F2-3 测试用例(总计 24,全绿): + +| 用例 | 验证点 | +|-----|-------| +| `addFieldButton_withClosure_emitsOnClickSubCommands` | 闭包内动词产生 onClick 子指令数组(2 条) | +| `addFieldButton_emptyClosure_emitsEmptyOnClick` | 空闭包产生空 onClick 数组(非 null) | +| `addFieldButton_nullHandler_noOnClick` | null handler 不含 onClick 字段(向后兼容) | +| `showConfirm_withClosure_emitsOnOkSubCommands` | 闭包内动词产生 onOk 子指令数组(2 条) | +| `showConfirm_emptyClosure_emitsEmptyOnOk` | 空闭包产生空 onOk 数组 | +| `showConfirm_nullHandler_noOnOk` | null handler 不含 onOk 字段 | +| `addFieldButton_nestedClosure_closureBodyExceptionStillReturnsPartialSubCommands` | 闭包内异常前已产生的子指令仍收集(容错) | + +### TypeScript(vitest,eip4-web) + +新增 7 个单测用例(总计 23,全绿): + +**scriptCommands.test.ts(+4)**: +- addButton 无 onClick 时透传 args +- addButton 含 onClick 子指令数组时原样透传 onClick +- confirmDialog 含 onOk 子指令数组时原样透传 onOk +- confirmDialog 空 onOk 不含 onOk 字段 + +**registerReplayAction.test.ts(+3)**: +- addButton 含 onClick 时翻译并挂 onClickActions +- confirmDialog 含 onOk 时翻译并挂 onOkActions +- addButton 空 onClick 时不挂 onClickActions(直接派发) + +--- + +## 六、e2e 验证 + +晋级后 `npx playwright test`:**30/30 全绿**(eip4-web) + +8093 状态:RUNNING(PID 55015,Java 17,/tmp/eip4-8093.log) diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/script/ScriptFacade.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/script/ScriptFacade.java index c68dad5..a5df244 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/script/ScriptFacade.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/script/ScriptFacade.java @@ -175,8 +175,76 @@ public class ScriptFacade { return emit("removeOption", field, args("value", value)); } + /** + * addFieldButton("FIELD","文案",{闭包},N) — F2-3 运行时动词:闭包子指令机制。 + * + *

服务端急切求值闭包({@link Closure}),闭包内动词产生的指令收进子缓冲, + * 输出 {@code {actionType:"addButton",componentId:"FIELD",args:{label,index:N,onClick:[子指令数组]}}}。 + * 非闭包参数(null 或旧版 handler 占位)按原有行为退化(onClick 不含子指令数组)。 + */ public Object addFieldButton(String field, Object label, Object handler) { - return emit("addButton", field, args("label", label)); + return addFieldButton(field, label, handler, null); + } + + /** + * addFieldButton("FIELD","文案",{闭包},N) 四参完整形态。 + */ + public Object addFieldButton(String field, Object label, Object handler, Object index) { + List> onClick = evalClosure(handler); + Map a = new LinkedHashMap<>(); + a.put("label", label); + if (index != null) { + a.put("index", index); + } + if (onClick != null) { + a.put("onClick", onClick); + } + return emit("addButton", field, a); + } + + /** + * showConfirm("消息",{闭包}) — F2-3 运行时动词:弹确认框。 + * + *

同闭包子指令机制:闭包内动词收进子缓冲, + * 输出 {@code {actionType:"confirmDialog",args:{msg,onOk:[子指令数组]}}}。 + */ + public Object showConfirm(Object msg, Object handler) { + List> onOk = evalClosure(handler); + Map a = new LinkedHashMap<>(); + a.put("msg", msg); + if (onOk != null) { + a.put("onOk", onOk); + } + return emit("confirmDialog", null, a); + } + + /** + * 急切求值闭包,返回闭包执行期间产生的子指令列表。 + * 非 Closure 入参(含 null)返回 null(调用方按无 onClick/onOk 处理)。 + */ + private List> evalClosure(Object handler) { + if (!(handler instanceof Closure)) { + return null; + } + // 用子 facade 执行闭包,闭包内所有动词写入子缓冲 + ScriptFacade child = new ScriptFacade(this.item); + Bindings childBindings = child.buildBindings(this.item); + @SuppressWarnings("unchecked") + Closure closure = (Closure) handler; + closure.setDelegate(child); + closure.setResolveStrategy(Closure.DELEGATE_FIRST); + // 用子 bindings 注入的闭包变量替代 delegate 属性查找—— + // Groovy Closure 内调用动词走 MissingPropertyException→delegate, + // 但直接把子 bindings 里的闭包先塞进当前脚本执行的 binding 会互相污染。 + // 最简可靠做法:在新 ScriptEngine 上下文内 eval 闭包体(保持隔离)。 + // 这里直接 call closure,delegate=child,闭包内动词调用经 delegate 走到 child 方法。 + try { + closure.call(); + } catch (Exception e) { + // 闭包内业务异常(如缺行数据)不阻断外层指令收集,子指令仍返回已产生部分 + } + List> sub = child.getCommands(); + return sub.isEmpty() ? new ArrayList<>() : sub; } public Object addSubTableButton(String field, Object targetField, Object index) { @@ -293,7 +361,8 @@ public class ScriptFacade { // UI 语义动词(字段 + 2 参) bind(b, "addFieldOption", a -> addFieldOption(str(a, 0), arg(a, 1), arg(a, 2))); - bind(b, "addFieldButton", a -> addFieldButton(str(a, 0), arg(a, 1), arg(a, 2))); + // addFieldButton 支持 3 参(旧)和 4 参(F2-3 闭包+index 形态) + bind(b, "addFieldButton", a -> addFieldButton(str(a, 0), arg(a, 1), arg(a, 2), arg(a, 3))); bind(b, "addSubTableButton", a -> addSubTableButton(str(a, 0), arg(a, 1), arg(a, 2))); // 组级动词(无字段参) @@ -302,6 +371,7 @@ public class ScriptFacade { // 通知/按钮/基础绑定 bind(b, "showToast", a -> showToast(arg(a, 0))); + bind(b, "showConfirm", a -> showConfirm(arg(a, 0), arg(a, 1))); // F2-3 确认框 bind(b, "enableButton", a -> enableButton(str(a, 0), arg(a, 1))); bind(b, "bindField", a -> bindField(str(a, 0), arg(a, 1))); diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/script/ScriptFacadeTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/script/ScriptFacadeTest.java index a1ed9c4..9435857 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/script/ScriptFacadeTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/script/ScriptFacadeTest.java @@ -2,6 +2,8 @@ package com.eip4.platform.metadata.script; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.LinkedHashMap; @@ -230,6 +232,118 @@ class ScriptFacadeTest { // G. 端到端:真实改写后脚本组合多动词 // ────────────────────────────────────────────── + // ────────────────────────────────────────────── + // H. F2-3:addFieldButton 闭包子指令 + showConfirm(正反例) + // ────────────────────────────────────────────── + + @Test + void addFieldButton_withClosure_emitsOnClickSubCommands() { + // 闭包体内动词产生子指令,输出 onClick 数组 + String groovy = + "addFieldButton(\"BTN_FIELD\", \"全选签到\", {\n" + + " setFieldVisible(\"DETAIL\", true)\n" + + " showToast(\"已全选\")\n" + + "}, 1)"; + List> cmds = run(groovy, item()); + assertEquals(1, cmds.size(), "外层仅 1 条 addButton 指令"); + Map cmd = cmds.get(0); + assertEquals("addButton", cmd.get("actionType")); + assertEquals("BTN_FIELD", cmd.get("componentId")); + Map args = (Map) cmd.get("args"); + assertEquals("全选签到", args.get("label")); + assertEquals(1, args.get("index")); + @SuppressWarnings("unchecked") + List> onClick = (List>) args.get("onClick"); + assertNotNull(onClick, "onClick 子指令不应为 null"); + assertEquals(2, onClick.size(), "闭包内 2 个动词产生 2 条子指令"); + assertEquals("show", onClick.get(0).get("actionType")); + assertEquals("DETAIL", onClick.get(0).get("componentId")); + assertEquals("toast", onClick.get(1).get("actionType")); + } + + @Test + void addFieldButton_emptyClosure_emitsEmptyOnClick() { + // 空闭包产生空 onClick 数组(非 null) + String groovy = "addFieldButton(\"BTN\", \"操作\", {}, 0)"; + List> cmds = run(groovy, item()); + assertEquals(1, cmds.size()); + @SuppressWarnings("unchecked") + List onClick = (List) ((Map) cmds.get(0).get("args")).get("onClick"); + assertNotNull(onClick); + assertEquals(0, onClick.size(), "空闭包产生空 onClick 数组"); + } + + @Test + void addFieldButton_nullHandler_noOnClick() { + // null handler(旧版三参形态)不含 onClick 字段 + String groovy = "addFieldButton(\"BTN\", \"文案\", null)"; + List> cmds = run(groovy, item()); + assertEquals(1, cmds.size()); + Map args = (Map) cmds.get(0).get("args"); + assertFalse(args.containsKey("onClick"), "null handler 不产生 onClick"); + } + + @Test + void showConfirm_withClosure_emitsOnOkSubCommands() { + // showConfirm 闭包内动词收进 onOk 子指令数组 + String groovy = + "showConfirm(\"确认删除?\", {\n" + + " setFieldEnabled(\"NAME\", false)\n" + + " showToast(\"已删除\")\n" + + "})"; + List> cmds = run(groovy, item()); + assertEquals(1, cmds.size(), "外层仅 1 条 confirmDialog 指令"); + Map cmd = cmds.get(0); + assertEquals("confirmDialog", cmd.get("actionType")); + assertNull(cmd.get("componentId"), "confirmDialog 无 componentId"); + Map args = (Map) cmd.get("args"); + assertEquals("确认删除?", args.get("msg")); + @SuppressWarnings("unchecked") + List> onOk = (List>) args.get("onOk"); + assertNotNull(onOk); + assertEquals(2, onOk.size()); + assertEquals("disabled", onOk.get(0).get("actionType")); + assertEquals("toast", onOk.get(1).get("actionType")); + } + + @Test + void showConfirm_emptyClosure_emitsEmptyOnOk() { + String groovy = "showConfirm(\"确认?\", {})"; + List> cmds = run(groovy, item()); + assertEquals(1, cmds.size()); + @SuppressWarnings("unchecked") + List onOk = (List) ((Map) cmds.get(0).get("args")).get("onOk"); + assertNotNull(onOk); + assertEquals(0, onOk.size()); + } + + @Test + void showConfirm_nullHandler_noOnOk() { + String groovy = "showConfirm(\"确认?\", null)"; + List> cmds = run(groovy, item()); + assertEquals(1, cmds.size()); + Map args = (Map) cmds.get(0).get("args"); + assertFalse(args.containsKey("onOk"), "null handler 不产生 onOk"); + } + + @Test + void addFieldButton_nestedClosure_closureBodyExceptionStillReturnsPartialSubCommands() { + // 闭包内前段指令已产生,后段抛异常 → 已产生的子指令仍收集返回 + String groovy = + "addFieldButton(\"BTN\", \"测试\", {\n" + + " setFieldVisible(\"A\", true)\n" + + " def x = null; x.nope()\n" + // 抛 NullPointerException + " showToast(\"不应到达\")\n" + + "}, 0)"; + List> cmds = run(groovy, item()); + assertEquals(1, cmds.size()); + @SuppressWarnings("unchecked") + List> onClick = (List>) ((Map) cmds.get(0).get("args")).get("onClick"); + // 异常前已产生 1 条子指令(show),异常后的 toast 不产生 + assertEquals(1, onClick.size(), "异常前已产生的子指令应收集"); + assertEquals("show", onClick.get(0).get("actionType")); + } + @Test void realRewrittenScript_multiVerbCombo_capturedAsAmisCommandArray() { // 形态取自真实 FULL_AUTO 改写产出(addSubTableButton + setFieldReadOnly + getFieldValue 分支) diff --git a/tools/s3_rewriter/output/full_auto_index.json b/tools/s3_rewriter/output/full_auto_index.json index 2875042..b04f55b 100644 --- a/tools/s3_rewriter/output/full_auto_index.json +++ b/tools/s3_rewriter/output/full_auto_index.json @@ -671,6 +671,17 @@ "removeAllItems" ] }, + { + "template_id": "292e76e6-df04-4be3-9108-73eaa1565b4c", + "template_name": "月度检查", + "seq": 2, + "rules": [ + "addFieldOption", + "comboBox_setValue", + "getContainerDataSource", + "removeAllItems" + ] + }, { "template_id": "2a19fa81-d79a-48af-8005-f19661959d1d", "template_name": "周转(自购)材料摊销", @@ -1767,6 +1778,29 @@ "balanced_setFilter" ] }, + { + "template_id": "6c11d228-a9d7-43de-85e4-d56e43cad10c", + "template_name": "季度检查整改", + "seq": 1, + "rules": [ + "addFieldOption", + "comboBox_removeItem", + "getContainerDataSource", + "removeAllItems" + ] + }, + { + "template_id": "6c11d228-a9d7-43de-85e4-d56e43cad10c", + "template_name": "季度检查整改", + "seq": 2, + "rules": [ + "addFieldOption", + "comboBox_removeItem", + "comboBox_setValue", + "getContainerDataSource", + "removeAllItems" + ] + }, { "template_id": "6c11d228-a9d7-43de-85e4-d56e43cad10c", "template_name": "季度检查整改", @@ -1913,6 +1947,17 @@ "setValue" ] }, + { + "template_id": "75fb9a46-b874-46b4-a6e5-c12c14ec54b6", + "template_name": "培训签到", + "seq": 1, + "rules": [ + "addSubTableButton", + "dynamic_button", + "getValue", + "setValue" + ] + }, { "template_id": "76a6a2ee-5e36-4fc5-95d1-4ef24e2d811a", "template_name": "物资采购合同报表", @@ -2500,6 +2545,17 @@ "removeAllItems" ] }, + { + "template_id": "92072d44-33e8-4110-a8cc-aeb8ae300ef5", + "template_name": "月度检查整改", + "seq": 2, + "rules": [ + "addFieldOption", + "comboBox_setValue", + "getContainerDataSource", + "removeAllItems" + ] + }, { "template_id": "93a3c6d5-bdda-4fbc-b1f3-a496aea19575", "template_name": "物资采购订单(土建)", @@ -3178,6 +3234,17 @@ "removeAllItems" ] }, + { + "template_id": "c7b23419-22e1-4a5a-aa09-464b3bb2a242", + "template_name": "季度检查", + "seq": 3, + "rules": [ + "addFieldOption", + "comboBox_setValue", + "getContainerDataSource", + "removeAllItems" + ] + }, { "template_id": "c804608f-eed6-45f6-accc-16414ff41e32", "template_name": "培训结果登记", @@ -3649,6 +3716,15 @@ "reload" ] }, + { + "template_id": "e5a03e54-37b2-4122-971f-7f0ac57c2650", + "template_name": "进项税发票(批量调整抵扣日期)-五建定制", + "seq": 6, + "rules": [ + "addSubTableButton", + "dynamic_button" + ] + }, { "template_id": "e5a03e54-37b2-4122-971f-7f0ac57c2650", "template_name": "进项税发票(批量调整抵扣日期)-五建定制", @@ -3719,6 +3795,16 @@ "addSubTableButton" ] }, + { + "template_id": "e7670207-9cf7-4db9-a452-884b58408b96", + "template_name": "付款确认(五建定制)", + "seq": 7, + "rules": [ + "Notification_show", + "addSubTableButton", + "dynamic_button" + ] + }, { "template_id": "e76f7d06-c407-4a2f-a913-37d13287d4d8", "template_name": "现场材料进场-无订单(土建-查看)", @@ -3922,6 +4008,15 @@ "reload" ] }, + { + "template_id": "f01c2f57-1891-45de-9318-7246f9d6ac97", + "template_name": "销项税发票(增加审批通过后)-五建定制", + "seq": 5, + "rules": [ + "addSubTableButton", + "dynamic_button" + ] + }, { "template_id": "f01c2f57-1891-45de-9318-7246f9d6ac97", "template_name": "销项税发票(增加审批通过后)-五建定制", @@ -4038,6 +4133,17 @@ "removeAllItems" ] }, + { + "template_id": "f78c44ca-4a23-4195-996b-2cd7cf629c41", + "template_name": "月度检查整改(五建定制)", + "seq": 2, + "rules": [ + "addFieldOption", + "comboBox_setValue", + "getContainerDataSource", + "removeAllItems" + ] + }, { "template_id": "f78c44ca-4a23-4195-996b-2cd7cf629c41", "template_name": "月度检查整改(五建定制)", diff --git a/tools/s3_rewriter/output/manual_workpackage/002_HARD_1a7f5b05_物资合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/002_HARD_1a7f5b05_物资合同评审_五建定制.md index 1a4f154..eb27133 100644 --- a/tools/s3_rewriter/output/manual_workpackage/002_HARD_1a7f5b05_物资合同评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/002_HARD_1a7f5b05_物资合同评审_五建定制.md @@ -79,7 +79,7 @@ button.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/003_HARD_1a7f5b05_物资合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/003_HARD_1a7f5b05_物资合同评审_五建定制.md index d782b60..c9035ed 100644 --- a/tools/s3_rewriter/output/manual_workpackage/003_HARD_1a7f5b05_物资合同评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/003_HARD_1a7f5b05_物资合同评审_五建定制.md @@ -71,7 +71,7 @@ if(getFieldValue("PM_PROJECTID")!=null&&getFieldValue("PM_PROJECTID")!=""){ ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/005_HARD_1edd6c1c_物资合同登记_需要评审.md b/tools/s3_rewriter/output/manual_workpackage/005_HARD_1edd6c1c_物资合同登记_需要评审.md index 7e49d83..c06848c 100644 --- a/tools/s3_rewriter/output/manual_workpackage/005_HARD_1edd6c1c_物资合同登记_需要评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/005_HARD_1edd6c1c_物资合同登记_需要评审.md @@ -47,7 +47,7 @@ button.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/007_HARD_213d1b7e_劳务分包合同登记_不需要评审.md b/tools/s3_rewriter/output/manual_workpackage/007_HARD_213d1b7e_劳务分包合同登记_不需要评审.md index 034d27d..b4a393a 100644 --- a/tools/s3_rewriter/output/manual_workpackage/007_HARD_213d1b7e_劳务分包合同登记_不需要评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/007_HARD_213d1b7e_劳务分包合同登记_不需要评审.md @@ -80,7 +80,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/008_HARD_213d1b7e_劳务分包合同登记_不需要评审.md b/tools/s3_rewriter/output/manual_workpackage/008_HARD_213d1b7e_劳务分包合同登记_不需要评审.md index 6c9ac7b..acf9b50 100644 --- a/tools/s3_rewriter/output/manual_workpackage/008_HARD_213d1b7e_劳务分包合同登记_不需要评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/008_HARD_213d1b7e_劳务分包合同登记_不需要评审.md @@ -51,7 +51,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/009_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/009_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md index 664ce75..fd39645 100644 --- a/tools/s3_rewriter/output/manual_workpackage/009_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/009_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md @@ -80,7 +80,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/010_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/010_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md index 478d3f9..15be42e 100644 --- a/tools/s3_rewriter/output/manual_workpackage/010_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/010_HARD_2213796d_劳务分包合同登记_不需要评审_五建定制.md @@ -51,7 +51,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/011_HARD_26fe10ae_专业分包合同评审.md b/tools/s3_rewriter/output/manual_workpackage/011_HARD_26fe10ae_专业分包合同评审.md index 39f2c67..0b9ffb3 100644 --- a/tools/s3_rewriter/output/manual_workpackage/011_HARD_26fe10ae_专业分包合同评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/011_HARD_26fe10ae_专业分包合同评审.md @@ -78,7 +78,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/012_HARD_26fe10ae_专业分包合同评审.md b/tools/s3_rewriter/output/manual_workpackage/012_HARD_26fe10ae_专业分包合同评审.md index 9cf2d80..f0bdfdd 100644 --- a/tools/s3_rewriter/output/manual_workpackage/012_HARD_26fe10ae_专业分包合同评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/012_HARD_26fe10ae_专业分包合同评审.md @@ -47,7 +47,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/014_HARD_2852ff22_计划成本变更.md b/tools/s3_rewriter/output/manual_workpackage/014_HARD_2852ff22_计划成本变更.md index 1dc4453..23905a5 100644 --- a/tools/s3_rewriter/output/manual_workpackage/014_HARD_2852ff22_计划成本变更.md +++ b/tools/s3_rewriter/output/manual_workpackage/014_HARD_2852ff22_计划成本变更.md @@ -106,7 +106,7 @@ button2.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/015_HARD_2852ff22_计划成本变更.md b/tools/s3_rewriter/output/manual_workpackage/015_HARD_2852ff22_计划成本变更.md index 4e53e74..ba6dc40 100644 --- a/tools/s3_rewriter/output/manual_workpackage/015_HARD_2852ff22_计划成本变更.md +++ b/tools/s3_rewriter/output/manual_workpackage/015_HARD_2852ff22_计划成本变更.md @@ -108,7 +108,7 @@ button2.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/016_HARD_2cceb83c_建造师注册证.md b/tools/s3_rewriter/output/manual_workpackage/016_HARD_2cceb83c_建造师注册证.md index c59af6b..fe6881c 100644 --- a/tools/s3_rewriter/output/manual_workpackage/016_HARD_2cceb83c_建造师注册证.md +++ b/tools/s3_rewriter/output/manual_workpackage/016_HARD_2cceb83c_建造师注册证.md @@ -2,77 +2,22 @@ - 模板ID : `2cceb83c-4079-43e4-b7b7-c395fd68cbbc` - 模板名 : 建造师注册证 -- 脚本序 : 3 +- 脚本序 : 5 - 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) ## 1. 原文(S3 原始 Groovy) ```groovy - -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; -import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.data.Property.ValueChangeEvent; -import com.dsasp.client.viewframework.listener.ConfirmDialogListener; - import com.vaadin.ui.Link; import com.vaadin.server.ExternalResource; import com.vaadin.ui.Label; - -final def professionals = group.getField("PROFESSIONALS"); -final Button but = new Button("注销"); - -final Object table = professionals?.table; -table?.setImmediate(true); - - -final group1 = group; -but?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def id = table?.getValue(); - if (id == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); - return; - } - - def hr_con_id = id?.getField("HR_CONSTRUCTORREGISTERED_ID")?.getValue(); - def islogout = id?.getField("ISLOGOUT")?.getValue(); - if(islogout){ - Notification.show("已经注销!", Type.ERROR_MESSAGE); - return; - } - - final pojo = GetServicesFunction.loadPOJO(hr_con_id,"HR_CONSTRUCTORREGISTERED",false); - if(pojo!=null){ - if(pojo.get_Value("ISMAINITEMS")){ - Notification.show("如要注销主项注册专业,请注销建造师注册证!", Type.ERROR_MESSAGE); - return; - } - - def updateMap=[:]; - updateMap["HR_CONSTRUCTORREGISTERED_ID"] = hr_con_id; - updateMap["ISLOGOUT"] = 1; - GetServicesFunction.excuteFlow(updateMap,"HR_CONSTRUCTORREGISTERED_LOGOUT"); - - - id?.getField("ISLOGOUT")?.setImmediate(true); - setFieldReadOnly(id,"ISLOGOUT",false); - - id?.getField("ISLOGOUT")?.setValue(true); - - setFieldReadOnly(id,"ISLOGOUT",true); - professionals.setValue(new ArrayList(professionals.getValue())); - } - } -}); - -professionals?.addButton(but,0); - -professionals?.showAddButton(false); -professionals?.showDeleteButton(false); +def url = group.getField("CARDURL"); +if(url.getValue()!= null){ + Link link = new Link("信息链接", new ExternalResource(url.getValue())); + link.setTargetName("_blank"); + url.setVisible(false); + url.parent?.addComponent(link); +} ``` ## 2. 硬 S3 原因 diff --git a/tools/s3_rewriter/output/manual_workpackage/017_HARD_2cceb83c_建造师注册证.md b/tools/s3_rewriter/output/manual_workpackage/017_HARD_2cceb83c_建造师注册证.md index 2a423d4..1b12607 100644 --- a/tools/s3_rewriter/output/manual_workpackage/017_HARD_2cceb83c_建造师注册证.md +++ b/tools/s3_rewriter/output/manual_workpackage/017_HARD_2cceb83c_建造师注册证.md @@ -2,11 +2,21 @@ - 模板ID : `2cceb83c-4079-43e4-b7b7-c395fd68cbbc` - 模板名 : 建造师注册证 -- 脚本序 : 5 +- 脚本序 : 6 - 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) ## 1. 原文(S3 原始 Groovy) ```groovy + +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.data.Property.ValueChangeEvent; +import com.dsasp.client.viewframework.listener.ConfirmDialogListener; + import com.vaadin.ui.Link; import com.vaadin.server.ExternalResource; import com.vaadin.ui.Label; @@ -15,9 +25,64 @@ def url = group.getField("CARDURL"); if(url.getValue()!= null){ Link link = new Link("信息链接", new ExternalResource(url.getValue())); link.setTargetName("_blank"); + url.setVisible(false); url.parent?.addComponent(link); + } + + +final def professionals = group.getField("PROFESSIONALS"); +final Button but = new Button("注销"); + +final Object table = professionals?.table; +table?.setImmediate(true); + + +final group1 = group; +but?.addClickListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + def id = table?.getValue(); + if (id == null){ + Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + + def hr_con_id = id?.getField("HR_CONSTRUCTORREGISTERED_ID")?.getValue(); + def islogout = id?.getField("ISLOGOUT")?.getValue(); + if(islogout){ + Notification.show("已经注销!", Type.ERROR_MESSAGE); + return; + } + + final pojo = GetServicesFunction.loadPOJO(hr_con_id,"HR_CONSTRUCTORREGISTERED",false); + if(pojo!=null){ + if(pojo.get_Value("ISMAINITEMS")){ + Notification.show("如要注销主项注册专业,请注销建造师注册证!", Type.ERROR_MESSAGE); + return; + } + + def updateMap=[:]; + updateMap["HR_CONSTRUCTORREGISTERED_ID"] = hr_con_id; + updateMap["ISLOGOUT"] = 1; + GetServicesFunction.excuteFlow(updateMap,"HR_CONSTRUCTORREGISTERED_LOGOUT"); + + + id?.getField("ISLOGOUT")?.setImmediate(true); + setFieldReadOnly(id,"ISLOGOUT",false); + + id?.getField("ISLOGOUT")?.setValue(true); + + setFieldReadOnly(id,"ISLOGOUT",true); + professionals.setValue(new ArrayList(professionals.getValue())); + } + } +}); + +professionals?.addButton(but,0); + +professionals?.showAddButton(false); +professionals?.showDeleteButton(false); ``` ## 2. 硬 S3 原因 diff --git a/tools/s3_rewriter/output/manual_workpackage/018_HARD_2cceb83c_建造师注册证.md b/tools/s3_rewriter/output/manual_workpackage/018_HARD_2cceb83c_建造师注册证.md deleted file mode 100644 index 4975666..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/018_HARD_2cceb83c_建造师注册证.md +++ /dev/null @@ -1,104 +0,0 @@ -# 人工作业单 #018 — HARD - -- 模板ID : `2cceb83c-4079-43e4-b7b7-c395fd68cbbc` -- 模板名 : 建造师注册证 -- 脚本序 : 6 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy - -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; -import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.data.Property.ValueChangeEvent; -import com.dsasp.client.viewframework.listener.ConfirmDialogListener; - -import com.vaadin.ui.Link; -import com.vaadin.server.ExternalResource; -import com.vaadin.ui.Label; - -def url = group.getField("CARDURL"); -if(url.getValue()!= null){ - Link link = new Link("信息链接", new ExternalResource(url.getValue())); - link.setTargetName("_blank"); - - url.setVisible(false); - url.parent?.addComponent(link); - -} - - -final def professionals = group.getField("PROFESSIONALS"); -final Button but = new Button("注销"); - -final Object table = professionals?.table; -table?.setImmediate(true); - - -final group1 = group; -but?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def id = table?.getValue(); - if (id == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); - return; - } - - def hr_con_id = id?.getField("HR_CONSTRUCTORREGISTERED_ID")?.getValue(); - def islogout = id?.getField("ISLOGOUT")?.getValue(); - if(islogout){ - Notification.show("已经注销!", Type.ERROR_MESSAGE); - return; - } - - final pojo = GetServicesFunction.loadPOJO(hr_con_id,"HR_CONSTRUCTORREGISTERED",false); - if(pojo!=null){ - if(pojo.get_Value("ISMAINITEMS")){ - Notification.show("如要注销主项注册专业,请注销建造师注册证!", Type.ERROR_MESSAGE); - return; - } - - def updateMap=[:]; - updateMap["HR_CONSTRUCTORREGISTERED_ID"] = hr_con_id; - updateMap["ISLOGOUT"] = 1; - GetServicesFunction.excuteFlow(updateMap,"HR_CONSTRUCTORREGISTERED_LOGOUT"); - - - id?.getField("ISLOGOUT")?.setImmediate(true); - setFieldReadOnly(id,"ISLOGOUT",false); - - id?.getField("ISLOGOUT")?.setValue(true); - - setFieldReadOnly(id,"ISLOGOUT",true); - professionals.setValue(new ArrayList(professionals.getValue())); - } - } -}); - -professionals?.addButton(but,0); - -professionals?.showAddButton(false); -professionals?.showDeleteButton(false); -``` - -## 2. 硬 S3 原因 - -- 动态创建 Vaadin 组件 - -## 3. 已改写部分 - -无(HARD 整条不自动改写,原样保留)。 - -## 4. 余留模式 - -整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。 - -## 5. 建议改法 - -- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。 -- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。 -- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。 diff --git a/tools/s3_rewriter/output/manual_workpackage/019_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md b/tools/s3_rewriter/output/manual_workpackage/018_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md similarity index 96% rename from tools/s3_rewriter/output/manual_workpackage/019_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md rename to tools/s3_rewriter/output/manual_workpackage/018_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md index eb23857..d95c028 100644 --- a/tools/s3_rewriter/output/manual_workpackage/019_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md +++ b/tools/s3_rewriter/output/manual_workpackage/018_HARD_2fac21ea_合格供方对账_五建_分包合同结算.md @@ -1,4 +1,4 @@ -# 人工作业单 #019 — HARD +# 人工作业单 #018 — HARD - 模板ID : `2fac21ea-2964-4295-b3e9-cad7c3391ff1` - 模板名 : 合格供方对账(五建-分包合同结算) @@ -50,7 +50,7 @@ bindField("ISFINISHED",null); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/020_HARD_328b3366_施工日志_审批.md b/tools/s3_rewriter/output/manual_workpackage/019_HARD_328b3366_施工日志_审批.md similarity index 99% rename from tools/s3_rewriter/output/manual_workpackage/020_HARD_328b3366_施工日志_审批.md rename to tools/s3_rewriter/output/manual_workpackage/019_HARD_328b3366_施工日志_审批.md index 651861c..b5ee227 100644 --- a/tools/s3_rewriter/output/manual_workpackage/020_HARD_328b3366_施工日志_审批.md +++ b/tools/s3_rewriter/output/manual_workpackage/019_HARD_328b3366_施工日志_审批.md @@ -1,4 +1,4 @@ -# 人工作业单 #020 — HARD +# 人工作业单 #019 — HARD - 模板ID : `328b3366-170f-4321-b06c-5593668b5535` - 模板名 : 施工日志-审批 diff --git a/tools/s3_rewriter/output/manual_workpackage/021_HARD_35b9139e_计划成本申报.md b/tools/s3_rewriter/output/manual_workpackage/020_HARD_35b9139e_计划成本申报.md similarity index 96% rename from tools/s3_rewriter/output/manual_workpackage/021_HARD_35b9139e_计划成本申报.md rename to tools/s3_rewriter/output/manual_workpackage/020_HARD_35b9139e_计划成本申报.md index 3b57cd5..d093d76 100644 --- a/tools/s3_rewriter/output/manual_workpackage/021_HARD_35b9139e_计划成本申报.md +++ b/tools/s3_rewriter/output/manual_workpackage/020_HARD_35b9139e_计划成本申报.md @@ -1,4 +1,4 @@ -# 人工作业单 #021 — HARD +# 人工作业单 #020 — HARD - 模板ID : `35b9139e-a491-44a8-b586-cfa50554377d` - 模板名 : 计划成本申报 @@ -49,7 +49,7 @@ button.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/022_HARD_38bebdb5_业绩库.md b/tools/s3_rewriter/output/manual_workpackage/021_HARD_38bebdb5_业绩库.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/022_HARD_38bebdb5_业绩库.md rename to tools/s3_rewriter/output/manual_workpackage/021_HARD_38bebdb5_业绩库.md index d522a88..e026be3 100644 --- a/tools/s3_rewriter/output/manual_workpackage/022_HARD_38bebdb5_业绩库.md +++ b/tools/s3_rewriter/output/manual_workpackage/021_HARD_38bebdb5_业绩库.md @@ -1,4 +1,4 @@ -# 人工作业单 #022 — HARD +# 人工作业单 #021 — HARD - 模板ID : `38bebdb5-ebd4-4fdc-b1e6-e676ba7c4c2a` - 模板名 : 业绩库 diff --git a/tools/s3_rewriter/output/manual_workpackage/023_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md b/tools/s3_rewriter/output/manual_workpackage/022_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/023_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md rename to tools/s3_rewriter/output/manual_workpackage/022_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md index 1170020..9b72ac7 100644 --- a/tools/s3_rewriter/output/manual_workpackage/023_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md +++ b/tools/s3_rewriter/output/manual_workpackage/022_HARD_3f77bb7a_付款确认选择框_五建定制_未付讫的付款申请.md @@ -1,4 +1,4 @@ -# 人工作业单 #023 — HARD +# 人工作业单 #022 — HARD - 模板ID : `3f77bb7a-5f68-4924-ad59-7522fd07904e` - 模板名 : 付款确认选择框-五建定制(未付讫的付款申请) diff --git a/tools/s3_rewriter/output/manual_workpackage/024_HARD_4230b669_员工档案_带证书.md b/tools/s3_rewriter/output/manual_workpackage/023_HARD_4230b669_员工档案_带证书.md similarity index 99% rename from tools/s3_rewriter/output/manual_workpackage/024_HARD_4230b669_员工档案_带证书.md rename to tools/s3_rewriter/output/manual_workpackage/023_HARD_4230b669_员工档案_带证书.md index 659c151..804ebd0 100644 --- a/tools/s3_rewriter/output/manual_workpackage/024_HARD_4230b669_员工档案_带证书.md +++ b/tools/s3_rewriter/output/manual_workpackage/023_HARD_4230b669_员工档案_带证书.md @@ -1,4 +1,4 @@ -# 人工作业单 #024 — HARD +# 人工作业单 #023 — HARD - 模板ID : `4230b669-a107-4ffb-9aae-e814560d8c6e` - 模板名 : 员工档案(带证书) @@ -569,7 +569,7 @@ othercards?.getDetailButton().setVisible(false); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件; UI.getCurrent() +- UI.getCurrent() ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/025_HARD_4d4d019b_中标公示.md b/tools/s3_rewriter/output/manual_workpackage/024_HARD_4d4d019b_中标公示.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/025_HARD_4d4d019b_中标公示.md rename to tools/s3_rewriter/output/manual_workpackage/024_HARD_4d4d019b_中标公示.md index 285b9db..c482ba7 100644 --- a/tools/s3_rewriter/output/manual_workpackage/025_HARD_4d4d019b_中标公示.md +++ b/tools/s3_rewriter/output/manual_workpackage/024_HARD_4d4d019b_中标公示.md @@ -1,4 +1,4 @@ -# 人工作业单 #025 — HARD +# 人工作业单 #024 — HARD - 模板ID : `4d4d019b-5f5c-4207-9a21-a1dec198c5d0` - 模板名 : 中标公示 diff --git a/tools/s3_rewriter/output/manual_workpackage/026_HARD_4ea83ef3_职称.md b/tools/s3_rewriter/output/manual_workpackage/025_HARD_4ea83ef3_职称.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/026_HARD_4ea83ef3_职称.md rename to tools/s3_rewriter/output/manual_workpackage/025_HARD_4ea83ef3_职称.md index 456e350..dfe1589 100644 --- a/tools/s3_rewriter/output/manual_workpackage/026_HARD_4ea83ef3_职称.md +++ b/tools/s3_rewriter/output/manual_workpackage/025_HARD_4ea83ef3_职称.md @@ -1,4 +1,4 @@ -# 人工作业单 #026 — HARD +# 人工作业单 #025 — HARD - 模板ID : `4ea83ef3-2c84-4525-a792-7a7097e4037d` - 模板名 : 职称 diff --git a/tools/s3_rewriter/output/manual_workpackage/027_HARD_5440da49_招标工程.md b/tools/s3_rewriter/output/manual_workpackage/026_HARD_5440da49_招标工程.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/027_HARD_5440da49_招标工程.md rename to tools/s3_rewriter/output/manual_workpackage/026_HARD_5440da49_招标工程.md index a786dd7..e0b70e4 100644 --- a/tools/s3_rewriter/output/manual_workpackage/027_HARD_5440da49_招标工程.md +++ b/tools/s3_rewriter/output/manual_workpackage/026_HARD_5440da49_招标工程.md @@ -1,4 +1,4 @@ -# 人工作业单 #027 — HARD +# 人工作业单 #026 — HARD - 模板ID : `5440da49-89d6-4dc5-94e5-82693913d6e4` - 模板名 : 招标工程 diff --git a/tools/s3_rewriter/output/manual_workpackage/029_HARD_58684bbb_物资合同登记_不需要评审.md b/tools/s3_rewriter/output/manual_workpackage/027_HARD_58684bbb_物资合同登记_不需要评审.md similarity index 50% rename from tools/s3_rewriter/output/manual_workpackage/029_HARD_58684bbb_物资合同登记_不需要评审.md rename to tools/s3_rewriter/output/manual_workpackage/027_HARD_58684bbb_物资合同登记_不需要评审.md index b04e69b..4d3f41f 100644 --- a/tools/s3_rewriter/output/manual_workpackage/029_HARD_58684bbb_物资合同登记_不需要评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/027_HARD_58684bbb_物资合同登记_不需要评审.md @@ -1,17 +1,48 @@ -# 人工作业单 #029 — HARD +# 人工作业单 #027 — HARD - 模板ID : `58684bbb-59e9-4a83-9788-ec91d15ec0e8` - 模板名 : 物资合同登记-不需要评审 -- 脚本序 : 2 +- 脚本序 : 1 - 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) ## 1. 原文(S3 原始 Groovy) ```groovy +bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")); + + //绑定费率项 + def ratelist = []; + def returnCol = []; + def PM_MATERIALCONTRACTREGISTERCONFIG_ID = null; + def PM_MATERIALCONTRACTREGISTER_ID = null; + returnCol.add("PM_MATERIALCONTRACTREGISTERCONFIG_ID"); + returnCol.add("MATERIALCONTRACTREGISTERID"); + returnCol.add("RATEITEM"); + returnCol.add("RATEVALUE"); + + def sql = "select PM_MATERIALCONTRACTREGISTERCONFIG_ID,'"+PM_MATERIALCONTRACTREGISTER_ID+"' as MATERIALCONTRACTREGISTERID,'' as MATERIALCONTRACTREGISTERID_DISPLAY__,codevalue as rateitem,"; + sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a "; + sql += " left outer join PM_MATERIALCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'"; + sql += " left outer join ("; + sql += " select count(rateitem) AS rowcount,MATERIALCONTRACTREGISTERID from PM_MATERIALCONTRACTREGISTERCONFIG where MATERIALCONTRACTREGISTERID = '"+PM_MATERIALCONTRACTREGISTER_ID+"'"; + sql += " Group by MATERIALCONTRACTREGISTERID) as temp1 on b.MATERIALCONTRACTREGISTERID = temp1.MATERIALCONTRACTREGISTERID"; + sql += " left OUTER JOIN PM_SUBCONTRACTBASICSCONFIG c on a.codevalue = c.rateitem" + sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'"; + + def list = GetServicesFunction.listSelectResultBySql(map,"PM_MATERIALCONTRACTREGISTERCONFIG",sql,returnCol); + + if(list!=null && list.size()>0){ + for(i in 0..0){ - for(i in 0..0){ + for(i in 0..0){ balancedetails?.each{ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){ - summoney = summoney.add(new BigDecimal(it.get('VALENCE'))) + summoney = summoney.add(new BigDecimal(it.get('VALENCE'))) } } } @@ -40,7 +72,6 @@ button.addClickListener(new Button.ClickListener() { } }); - def tie = new TableImportExport(contents,"com.dsasp.pm.specialtycontract.client.ContentsImport"); tie.addImportButton(2); tie.addExportButton(3); @@ -48,7 +79,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/032_HARD_5be37b88_专业分包合同登记_不需要评审.md b/tools/s3_rewriter/output/manual_workpackage/032_HARD_5be37b88_专业分包合同登记_不需要评审.md index 2a8ffb8..93f10b8 100644 --- a/tools/s3_rewriter/output/manual_workpackage/032_HARD_5be37b88_专业分包合同登记_不需要评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/032_HARD_5be37b88_专业分包合同登记_不需要评审.md @@ -2,49 +2,17 @@ - 模板ID : `5be37b88-fd93-4070-8060-c5e660372d90` - 模板名 : 专业分包合同登记_不需要评审 -- 脚本序 : 1 +- 脚本序 : 2 - 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) ## 1. 原文(S3 原始 Groovy) ```groovy -import com.dsasp.client.viewframework.util.TableImportExport; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; - -bindField("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")); - -//绑定费率项 -def ratelist = []; -def returnCol = []; -def PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID = null; -def PM_SPECIALTYSUBCONTRACTREGISTER_ID = null; -returnCol.add("PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID"); -returnCol.add("SPECIALTYSUBCONTRACTREGISTERID"); -returnCol.add("RATEITEM"); -returnCol.add("RATEVALUE"); - -def sql = "select PM_SPECIALTYSUBCONTRACTREGISTERCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"' as SPECIALTYSUBCONTRACTREGISTERID,'' as SPECIALTYSUBCONTRACTREGISTERID_DISPLAY__,codevalue as rateitem,"; -sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a "; -sql += " left outer join PM_SPECIALTYSUBCONTRACTREGISTERCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'"; -sql += " left outer join ("; -sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTREGISTERID from PM_SPECIALTYSUBCONTRACTREGISTERCONFIG where SPECIALTYSUBCONTRACTREGISTERID = '"+PM_SPECIALTYSUBCONTRACTREGISTER_ID+"'"; -sql += " Group by SPECIALTYSUBCONTRACTREGISTERID) as temp1 on b.SPECIALTYSUBCONTRACTREGISTERID = temp1.SPECIALTYSUBCONTRACTREGISTERID"; -sql += " left OUTER JOIN PM_SUBCONTRACTBASICSCONFIG c on a.codevalue = c.rateitem" -sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'"; - -def list = GetServicesFunction.listSelectResultBySql(map,"PM_SPECIALTYSUBCONTRACTREGISTERCONFIG",sql,returnCol); - -if(list!=null && list.size()>0){ - for(i in 0..0){ balancedetails?.each{ if(it.get('VALENCE') !=null && it.get('VALENCE') !=""){ - summoney = summoney.add(new BigDecimal(it.get('VALENCE'))) + summoney = summoney.add(new BigDecimal(it.get('VALENCE'))) } } } @@ -72,6 +40,7 @@ button.addClickListener(new Button.ClickListener() { } }); + def tie = new TableImportExport(contents,"com.dsasp.pm.specialtycontract.client.ContentsImport"); tie.addImportButton(2); tie.addExportButton(3); @@ -79,7 +48,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/035_HARD_5e618173_专业分包合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/033_HARD_5e618173_专业分包合同评审_五建定制.md similarity index 54% rename from tools/s3_rewriter/output/manual_workpackage/035_HARD_5e618173_专业分包合同评审_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/033_HARD_5e618173_专业分包合同评审_五建定制.md index 3b05f0f..cd9a977 100644 --- a/tools/s3_rewriter/output/manual_workpackage/035_HARD_5e618173_专业分包合同评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/033_HARD_5e618173_专业分包合同评审_五建定制.md @@ -1,8 +1,8 @@ -# 人工作业单 #035 — HARD +# 人工作业单 #033 — HARD - 模板ID : `5e618173-2ee1-406b-9829-28c58871316e` - 模板名 : 专业分包合同评审(五建定制) -- 脚本序 : 4 +- 脚本序 : 3 - 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) ## 1. 原文(S3 原始 Groovy) @@ -12,6 +12,39 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; +import com.dsasp.client.viewframework.util.TableImportExport; + + +bindField("A_PART",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")); + + +def ratelist = []; +def returnCol = []; +def PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID = null; +def PM_SPECIALTYSUBCONTRACTREVIEW_ID = null; +returnCol.add("PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID"); +returnCol.add("SPECIALTYSUBCONTRACTVIEWID"); +returnCol.add("RATEITEM"); +returnCol.add("RATEVALUE"); + +def sql = "select PM_SPECIALTYSUBCONTRACTVIEWCONFIG_ID,'"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"' as SPECIALTYSUBCONTRACTVIEWID,'' as SPECIALTYSUBCONTRACTVIEWID_DISPLAY__,codevalue as rateitem,"; +sql += " case when rowcount > 0 then b.ratevalue else c.ratevalue end as ratevalue from sys_enumerate a "; +sql += " left outer join PM_SPECIALTYSUBCONTRACTVIEWCONFIG b on a.codevalue = b.rateitem and SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'"; +sql += " left outer join ("; +sql += " select count(rateitem) AS rowcount,SPECIALTYSUBCONTRACTVIEWID from PM_SPECIALTYSUBCONTRACTVIEWCONFIG where SPECIALTYSUBCONTRACTVIEWID = '"+PM_SPECIALTYSUBCONTRACTREVIEW_ID+"'"; +sql += " Group by SPECIALTYSUBCONTRACTVIEWID) as temp1 on b.SPECIALTYSUBCONTRACTVIEWID = temp1.SPECIALTYSUBCONTRACTVIEWID"; +sql += " left OUTER JOIN PM_SUBCONTRACTBASICSCONFIG c on a.codevalue = c.rateitem" +sql += " where sys_enumeratetype_id = 'SUBCONTRACT_BASICSCONFIG'"; + +def list = GetServicesFunction.listSelectResultBySql(map,"PM_SPECIALTYSUBCONTRACTVIEWCONFIG",sql,returnCol); + +if(list!=null && list.size()>0){ + for(i in 0..0){ - for(i in 0..0){ - def message = " ";//提示消息 - documentfp.eachWithIndex{it,index-> - //批量选择发票类型后给子表赋值 - if(it && it.get("TEMPFILE")){ - // 表示本地路径 - def filePath = it.get("TEMPFILE"); - //String endpointUrl = "http://192.168.20.63:5020/detection";//内网环境 - String endpointUrl = "http://58.211.166.190:5020/detection";//正式环境 - - //文件流 上传方法 - def responseBody = HTTPClientUtils.getTempFiletoFile(endpointUrl,filePath); -// Console.debug(responseBody); - if(responseBody == null || !responseBody.contains("data")){ - message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n" - }else{ - def json = HTTPClientUtils.stringToJson(responseBody); - if(json && json.getString("message") && json.get("message")=="ok"){ - def rows = json.get("data"); - def item = rows?.get("data"); - if(rows && item){ - //Console.debug(item); - def fplist = [:]; - fplist.put("DOCUMENT",[it]);//附件图片 - - //发票类型 - if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){ - fplist.put("RECEIPTTYPE",rows.get("invoiceType").contains("专用") ? 3 : rows.get("invoiceType").contains("普通") ? 2 : 1); - }else{ - fplist.put("RECEIPTTYPE",null); - }; - if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){ - fplist.put("PURCHASER",item.get("buyer_name")); - }else{ - fplist.put("PURCHASER",null); - }; - if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){ - fplist.put("SALESPARTY",item.get("seller_name")); - }else{ - fplist.put("SALESPARTY",null); - }; - if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){ - fplist.put("INVOICECODE",item.get("invoice_code")); - }else{ - fplist.put("INVOICECODE",null); - }; - if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){ - fplist.put("INVOICENO",item.get("invoice_number")); - }else{ - fplist.put("INVOICENO",null); - }; - if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){ - fplist.put("INVOICEMONEY",transformnum(item.getString("money"))); - }else{ - fplist.put("INVOICEMONEY",null); - }; - if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){ - fplist.put("TAX",transformnum(item.getString("tax"))); - }else{ - fplist.put("TAX",null); - }; - if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){ - fplist.put("TOTALMONEY",transformnum(item.getString("price"))); - }else{ - fplist.put("TOTALMONEY",null); - }; - if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){ - def date = item.getString("invoice_date"); - fplist.put("INVOICEDATE",GetValueFunction.toDate(date,"yyyy年MM月dd日")); - }else{ - fplist.put("INVOICEDATE",null); - }; - if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){ - fplist.put("TAXRATE",transformnum(item.getString("tax_rate"))); - }else{ - fplist.put("TAXRATE",null); - }; - if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){ - def electronic_number = item.getString("electronic_number"); - fplist.put("GLFPHM",electronic_number); - }else{ - fplist.put("GLFPHM",null); - }; - if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){ - def buyer_code = item.getString("buyer_code"); - fplist.put("KHSH",buyer_code); - }else{ - fplist.put("KHSH",null); - }; - if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){ - def seller_code = item.getString("seller_code"); - fplist.put("XFSH",seller_code); - }else{ - fplist.put("XFSH",null); - }; - if(fplist!=null){ - def flag = true; - if(invoicelist.getValue() && invoicelist.getValue().size()>0){ - for (int j = 0; j < invoicelist.getValue().size(); j++) { - def tempitem = invoicelist.getValue().get(j); - if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){ - flag = false;; - } - }; - }; - if(flag){ - invoicelist.addItem(fplist); - }; - } - } - }else{ - if(json && json.getString("message")){ - message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票"+json.getString("message")+"!\n"; - } else{ - message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n"; - } - } - } - } - } - if(message.trim()!=""){ - Notification.show(message, Type.ERROR_MESSAGE); - } - } - }; -}); - -//将自定义的按钮添加至 -invoicelist?.addButton(cb, 0); -``` - -## 2. 硬 S3 原因 - -- 动态创建 Vaadin 组件 - -## 3. 已改写部分 - -无(HARD 整条不自动改写,原样保留)。 - -## 4. 余留模式 - -整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。 - -## 5. 建议改法 - -- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。 -- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。 -- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。 diff --git a/tools/s3_rewriter/output/manual_workpackage/048_HARD_91497e54_物资合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/043_HARD_91497e54_物资合同登记_不需要评审_五建定制.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/048_HARD_91497e54_物资合同登记_不需要评审_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/043_HARD_91497e54_物资合同登记_不需要评审_五建定制.md index e04cd62..4a8c5cc 100644 --- a/tools/s3_rewriter/output/manual_workpackage/048_HARD_91497e54_物资合同登记_不需要评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/043_HARD_91497e54_物资合同登记_不需要评审_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #048 — HARD +# 人工作业单 #043 — HARD - 模板ID : `91497e54-702d-47a7-bbcd-3f5d67b6fd91` - 模板名 : 物资合同登记-不需要评审(五建定制) @@ -78,7 +78,7 @@ button.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/044_HARD_884f0dde_物资采购申请_土建_项目.md b/tools/s3_rewriter/output/manual_workpackage/044_HARD_884f0dde_物资采购申请_土建_项目.md deleted file mode 100644 index ce9a303..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/044_HARD_884f0dde_物资采购申请_土建_项目.md +++ /dev/null @@ -1,85 +0,0 @@ -# 人工作业单 #044 — HARD - -- 模板ID : `884f0dde-564a-4e6e-9a5d-55d12d0a16e1` -- 模板名 : 物资采购申请(土建-项目) -- 脚本序 : 1 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; - -def materialList = group.getField("MATERIALDETAILS"); -final Button cb = new Button("复制"); -final Object table = materialList?.table; -table?.setImmediate(true);//设置验证 -final group1 = group; -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object o = table?.getValue(); - if (o == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); - return; - } - - def itemMap = [:]; - itemMap["MATERIALID"] = getFieldValue(o, "MATERIALID");//材料ID - itemMap["MATERIALCODE"] = getFieldValue(o, "MATERIALCODE");//材料编码 - //itemMap["MATERIALALIASID"] = getFieldValue(o, "MATERIALALIASID");//材料别名ID - itemMap["MATERIALNAME"] = getFieldValue(o, "MATERIALNAME");//材料名称 - itemMap["SPECIFICATIONS"] = getFieldValue(o, "SPECIFICATIONS");//规格 - //itemMap["FIGURENO"] = getFieldValue(o, "FIGURENO");//图号编号 - //itemMap["SURFACETREATMENT"] = getFieldValue(o, "SURFACETREATMENT");//表面处理 - //itemMap["COLORNUMBER"] = getFieldValue(o, "COLORNUMBER");//色泽色号 - //itemMap["LENGTH"] = getFieldValue(o, "LENGTH");//长度 - itemMap["NUMBER"] = getFieldValue(o, "NUMBER");//件数 - //itemMap["CHILDUNIT"] = getFieldValue(o, "CHILDUNIT");//子单位 - //itemMap["LENGTHSUM"] = getFieldValue(o, "LENGTHSUM");//总长 - //itemMap["METERWEIGHT"] = getFieldValue(o, "METERWEIGHT");//米重 - itemMap["PURCHASENUM"] = getFieldValue(o, "PURCHASENUM");//数量 - itemMap["UNIT"] = getFieldValue(o, "UNIT");//主单位 - itemMap["REMARK"] = getFieldValue(o, "REMARK");//备注 - - //调用addItem()方法可直接在 - materialList.addItem(itemMap); - table.select(o); - } -}); - -//将自定义的按钮添加至 -materialList?.addButton(group.getField("SELECT"),0); -materialList?.addButton(cb, 1); - -import com.dsasp.client.viewframework.util.TableImportExport; -def tie = new TableImportExport(materialList,"com.dsasp.pm.materialmanagertj.client.MaterialApplyDetailImportOfTJ"); -tie.addImportButton(4); -tie.addExportButton(5); - - - -group.getField("MATERIALDETAILS")?.addButton(group.getField("SELECT"),0); -group.getField("ISPREPARATION")?.setVisible(false); -//group.getField("ISPREPARATION").setCaption("公司备料"); -``` - -## 2. 硬 S3 原因 - -- 动态创建 Vaadin 组件 - -## 3. 已改写部分 - -无(HARD 整条不自动改写,原样保留)。 - -## 4. 余留模式 - -整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。 - -## 5. 建议改法 - -- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。 -- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。 -- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。 diff --git a/tools/s3_rewriter/output/manual_workpackage/049_HARD_91497e54_物资合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/044_HARD_91497e54_物资合同登记_不需要评审_五建定制.md similarity index 95% rename from tools/s3_rewriter/output/manual_workpackage/049_HARD_91497e54_物资合同登记_不需要评审_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/044_HARD_91497e54_物资合同登记_不需要评审_五建定制.md index 3665525..ff3cf1d 100644 --- a/tools/s3_rewriter/output/manual_workpackage/049_HARD_91497e54_物资合同登记_不需要评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/044_HARD_91497e54_物资合同登记_不需要评审_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #049 — HARD +# 人工作业单 #044 — HARD - 模板ID : `91497e54-702d-47a7-bbcd-3f5d67b6fd91` - 模板名 : 物资合同登记-不需要评审(五建定制) @@ -47,7 +47,7 @@ button.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/050_HARD_938201e3_开标结果登记.md b/tools/s3_rewriter/output/manual_workpackage/045_HARD_938201e3_开标结果登记.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/050_HARD_938201e3_开标结果登记.md rename to tools/s3_rewriter/output/manual_workpackage/045_HARD_938201e3_开标结果登记.md index 63c5218..2da885c 100644 --- a/tools/s3_rewriter/output/manual_workpackage/050_HARD_938201e3_开标结果登记.md +++ b/tools/s3_rewriter/output/manual_workpackage/045_HARD_938201e3_开标结果登记.md @@ -1,4 +1,4 @@ -# 人工作业单 #050 — HARD +# 人工作业单 #045 — HARD - 模板ID : `938201e3-e6b1-4b46-b536-e195f5cfb90f` - 模板名 : 开标结果登记 diff --git a/tools/s3_rewriter/output/manual_workpackage/051_HARD_99930d79_创优目标.md b/tools/s3_rewriter/output/manual_workpackage/046_HARD_99930d79_创优目标.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/051_HARD_99930d79_创优目标.md rename to tools/s3_rewriter/output/manual_workpackage/046_HARD_99930d79_创优目标.md index c4fbd01..8ace0dd 100644 --- a/tools/s3_rewriter/output/manual_workpackage/051_HARD_99930d79_创优目标.md +++ b/tools/s3_rewriter/output/manual_workpackage/046_HARD_99930d79_创优目标.md @@ -1,4 +1,4 @@ -# 人工作业单 #051 — HARD +# 人工作业单 #046 — HARD - 模板ID : `99930d79-bb49-47d7-9a40-3e9f275e53de` - 模板名 : 创优目标 diff --git a/tools/s3_rewriter/output/manual_workpackage/052_HARD_99d77f69_十大员证.md b/tools/s3_rewriter/output/manual_workpackage/047_HARD_99d77f69_十大员证.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/052_HARD_99d77f69_十大员证.md rename to tools/s3_rewriter/output/manual_workpackage/047_HARD_99d77f69_十大员证.md index 2c51527..1757cdc 100644 --- a/tools/s3_rewriter/output/manual_workpackage/052_HARD_99d77f69_十大员证.md +++ b/tools/s3_rewriter/output/manual_workpackage/047_HARD_99d77f69_十大员证.md @@ -1,4 +1,4 @@ -# 人工作业单 #052 — HARD +# 人工作业单 #047 — HARD - 模板ID : `99d77f69-b08f-49d3-937a-2ad8fcb5ca6f` - 模板名 : 十大员证 diff --git a/tools/s3_rewriter/output/manual_workpackage/053_HARD_9b0ea26a_项目付款申请.md b/tools/s3_rewriter/output/manual_workpackage/048_HARD_9b0ea26a_项目付款申请.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/053_HARD_9b0ea26a_项目付款申请.md rename to tools/s3_rewriter/output/manual_workpackage/048_HARD_9b0ea26a_项目付款申请.md index be46fa2..3d631ec 100644 --- a/tools/s3_rewriter/output/manual_workpackage/053_HARD_9b0ea26a_项目付款申请.md +++ b/tools/s3_rewriter/output/manual_workpackage/048_HARD_9b0ea26a_项目付款申请.md @@ -1,4 +1,4 @@ -# 人工作业单 #053 — HARD +# 人工作业单 #048 — HARD - 模板ID : `9b0ea26a-26a3-4dd2-be5e-2b18e7837005` - 模板名 : 项目付款申请 diff --git a/tools/s3_rewriter/output/manual_workpackage/054_HARD_9b0ea26a_项目付款申请.md b/tools/s3_rewriter/output/manual_workpackage/049_HARD_9b0ea26a_项目付款申请.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/054_HARD_9b0ea26a_项目付款申请.md rename to tools/s3_rewriter/output/manual_workpackage/049_HARD_9b0ea26a_项目付款申请.md index e956d7e..f8ba615 100644 --- a/tools/s3_rewriter/output/manual_workpackage/054_HARD_9b0ea26a_项目付款申请.md +++ b/tools/s3_rewriter/output/manual_workpackage/049_HARD_9b0ea26a_项目付款申请.md @@ -1,4 +1,4 @@ -# 人工作业单 #054 — HARD +# 人工作业单 #049 — HARD - 模板ID : `9b0ea26a-26a3-4dd2-be5e-2b18e7837005` - 模板名 : 项目付款申请 diff --git a/tools/s3_rewriter/output/manual_workpackage/055_HARD_9d690abb_薪资方案.md b/tools/s3_rewriter/output/manual_workpackage/050_HARD_9d690abb_薪资方案.md similarity index 96% rename from tools/s3_rewriter/output/manual_workpackage/055_HARD_9d690abb_薪资方案.md rename to tools/s3_rewriter/output/manual_workpackage/050_HARD_9d690abb_薪资方案.md index 06974d1..1b7fb91 100644 --- a/tools/s3_rewriter/output/manual_workpackage/055_HARD_9d690abb_薪资方案.md +++ b/tools/s3_rewriter/output/manual_workpackage/050_HARD_9d690abb_薪资方案.md @@ -1,4 +1,4 @@ -# 人工作业单 #055 — HARD +# 人工作业单 #050 — HARD - 模板ID : `9d690abb-916b-427c-9bd6-4a8001ac0813` - 模板名 : 薪资方案 @@ -69,7 +69,7 @@ group.getField("ITEMS")?.addButton(downBtn,"down_arrow.png",1); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/056_HARD_a0307625_周转_自购_材料盘点管理.md b/tools/s3_rewriter/output/manual_workpackage/051_HARD_a0307625_周转_自购_材料盘点管理.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/056_HARD_a0307625_周转_自购_材料盘点管理.md rename to tools/s3_rewriter/output/manual_workpackage/051_HARD_a0307625_周转_自购_材料盘点管理.md index 58d091d..aee2d2c 100644 --- a/tools/s3_rewriter/output/manual_workpackage/056_HARD_a0307625_周转_自购_材料盘点管理.md +++ b/tools/s3_rewriter/output/manual_workpackage/051_HARD_a0307625_周转_自购_材料盘点管理.md @@ -1,4 +1,4 @@ -# 人工作业单 #056 — HARD +# 人工作业单 #051 — HARD - 模板ID : `a0307625-8abc-46b6-b835-93719a881e47` - 模板名 : 周转(自购)材料盘点管理 @@ -70,7 +70,7 @@ private void setInventoryDetails(){ ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件; 同步确认框 showConfirmDialog +- 同步确认框 showConfirmDialog ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/057_HARD_a18b1f38_付款确认.md b/tools/s3_rewriter/output/manual_workpackage/052_HARD_a18b1f38_付款确认.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/057_HARD_a18b1f38_付款确认.md rename to tools/s3_rewriter/output/manual_workpackage/052_HARD_a18b1f38_付款确认.md index 449bdad..d5f15d9 100644 --- a/tools/s3_rewriter/output/manual_workpackage/057_HARD_a18b1f38_付款确认.md +++ b/tools/s3_rewriter/output/manual_workpackage/052_HARD_a18b1f38_付款确认.md @@ -1,4 +1,4 @@ -# 人工作业单 #057 — HARD +# 人工作业单 #052 — HARD - 模板ID : `a18b1f38-073c-4190-bfd5-b95274cf9f31` - 模板名 : 付款确认 diff --git a/tools/s3_rewriter/output/manual_workpackage/058_HARD_a1b39022_网站信息管理.md b/tools/s3_rewriter/output/manual_workpackage/053_HARD_a1b39022_网站信息管理.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/058_HARD_a1b39022_网站信息管理.md rename to tools/s3_rewriter/output/manual_workpackage/053_HARD_a1b39022_网站信息管理.md index 04b77da..fdb4ca9 100644 --- a/tools/s3_rewriter/output/manual_workpackage/058_HARD_a1b39022_网站信息管理.md +++ b/tools/s3_rewriter/output/manual_workpackage/053_HARD_a1b39022_网站信息管理.md @@ -1,4 +1,4 @@ -# 人工作业单 #058 — HARD +# 人工作业单 #053 — HARD - 模板ID : `a1b39022-aabb-4ecc-8078-66d9da144ab0` - 模板名 : 网站信息管理 diff --git a/tools/s3_rewriter/output/manual_workpackage/059_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/054_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/059_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/054_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md index fef9626..7d76b77 100644 --- a/tools/s3_rewriter/output/manual_workpackage/059_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/054_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #059 — HARD +# 人工作业单 #054 — HARD - 模板ID : `a1df0f12-8bfb-4807-882a-ca7b510e10f9` - 模板名 : 专业分包合同登记_不需要评审(五建定制) @@ -79,7 +79,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/060_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/055_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md similarity index 95% rename from tools/s3_rewriter/output/manual_workpackage/060_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/055_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md index 04a6486..d04e379 100644 --- a/tools/s3_rewriter/output/manual_workpackage/060_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/055_HARD_a1df0f12_专业分包合同登记_不需要评审_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #060 — HARD +# 人工作业单 #055 — HARD - 模板ID : `a1df0f12-8bfb-4807-882a-ca7b510e10f9` - 模板名 : 专业分包合同登记_不需要评审(五建定制) @@ -48,7 +48,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/062_HARD_ad1ffdd2_劳务分包合同评审.md b/tools/s3_rewriter/output/manual_workpackage/056_HARD_ad1ffdd2_劳务分包合同评审.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/062_HARD_ad1ffdd2_劳务分包合同评审.md rename to tools/s3_rewriter/output/manual_workpackage/056_HARD_ad1ffdd2_劳务分包合同评审.md index 9578111..942ff52 100644 --- a/tools/s3_rewriter/output/manual_workpackage/062_HARD_ad1ffdd2_劳务分包合同评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/056_HARD_ad1ffdd2_劳务分包合同评审.md @@ -1,4 +1,4 @@ -# 人工作业单 #062 — HARD +# 人工作业单 #056 — HARD - 模板ID : `ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3` - 模板名 : 劳务分包合同评审 @@ -82,7 +82,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/063_HARD_ad1ffdd2_劳务分包合同评审.md b/tools/s3_rewriter/output/manual_workpackage/057_HARD_ad1ffdd2_劳务分包合同评审.md similarity index 95% rename from tools/s3_rewriter/output/manual_workpackage/063_HARD_ad1ffdd2_劳务分包合同评审.md rename to tools/s3_rewriter/output/manual_workpackage/057_HARD_ad1ffdd2_劳务分包合同评审.md index 9a14629..db50f12 100644 --- a/tools/s3_rewriter/output/manual_workpackage/063_HARD_ad1ffdd2_劳务分包合同评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/057_HARD_ad1ffdd2_劳务分包合同评审.md @@ -1,4 +1,4 @@ -# 人工作业单 #063 — HARD +# 人工作业单 #057 — HARD - 模板ID : `ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3` - 模板名 : 劳务分包合同评审 @@ -47,7 +47,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/064_HARD_b17684cf_技术工人证.md b/tools/s3_rewriter/output/manual_workpackage/058_HARD_b17684cf_技术工人证.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/064_HARD_b17684cf_技术工人证.md rename to tools/s3_rewriter/output/manual_workpackage/058_HARD_b17684cf_技术工人证.md index ae3c9d5..6411ed0 100644 --- a/tools/s3_rewriter/output/manual_workpackage/064_HARD_b17684cf_技术工人证.md +++ b/tools/s3_rewriter/output/manual_workpackage/058_HARD_b17684cf_技术工人证.md @@ -1,4 +1,4 @@ -# 人工作业单 #064 — HARD +# 人工作业单 #058 — HARD - 模板ID : `b17684cf-061d-4006-b87f-048d128fe71a` - 模板名 : 技术工人证 diff --git a/tools/s3_rewriter/output/manual_workpackage/065_HARD_c0982679_报名申请.md b/tools/s3_rewriter/output/manual_workpackage/059_HARD_c0982679_报名申请.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/065_HARD_c0982679_报名申请.md rename to tools/s3_rewriter/output/manual_workpackage/059_HARD_c0982679_报名申请.md index 3ce6390..9c26369 100644 --- a/tools/s3_rewriter/output/manual_workpackage/065_HARD_c0982679_报名申请.md +++ b/tools/s3_rewriter/output/manual_workpackage/059_HARD_c0982679_报名申请.md @@ -1,4 +1,4 @@ -# 人工作业单 #065 — HARD +# 人工作业单 #059 — HARD - 模板ID : `c0982679-2ac1-4be9-8043-cbe47210beee` - 模板名 : 报名申请 diff --git a/tools/s3_rewriter/output/manual_workpackage/066_HARD_c5b5160e_分包合同结算.md b/tools/s3_rewriter/output/manual_workpackage/060_HARD_c5b5160e_分包合同结算.md similarity index 95% rename from tools/s3_rewriter/output/manual_workpackage/066_HARD_c5b5160e_分包合同结算.md rename to tools/s3_rewriter/output/manual_workpackage/060_HARD_c5b5160e_分包合同结算.md index 827986c..d3f9039 100644 --- a/tools/s3_rewriter/output/manual_workpackage/066_HARD_c5b5160e_分包合同结算.md +++ b/tools/s3_rewriter/output/manual_workpackage/060_HARD_c5b5160e_分包合同结算.md @@ -1,4 +1,4 @@ -# 人工作业单 #066 — HARD +# 人工作业单 #060 — HARD - 模板ID : `c5b5160e-2289-4b8d-8f8e-57a4801a6e43` - 模板名 : 分包合同结算 @@ -47,7 +47,7 @@ button.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/061_HARD_a760fba0_项目人员配置.md b/tools/s3_rewriter/output/manual_workpackage/061_HARD_a760fba0_项目人员配置.md deleted file mode 100644 index 6efffe4..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/061_HARD_a760fba0_项目人员配置.md +++ /dev/null @@ -1,61 +0,0 @@ -# 人工作业单 #061 — HARD - -- 模板ID : `a760fba0-693e-4f0a-8007-3bdca7fb0305` -- 模板名 : 项目人员配置 -- 脚本序 : 3 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; - -final user = group.getField("PM_PROJECT_USERS"); -final Button cb = new Button("删除"); - -final Object table = user?.table; -table?.setImmediate(true);//设置验证 -final group1 = group; -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object o = table?.getValue(); - if (o == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); - return; - } - def isLock = getFieldValue(o, "ISLOCK"); - if(isLock == 1){ - Notification.show("已备案人员无法删除!", Type.ERROR_MESSAGE); - }else{ - table.removeItem(o); - table.select(null); - user.fireValueChange(true); - } - } -}); - -//将自定义的按钮添加至 -user?.addButton(cb,"delete.png", 1); -user?.deleteButton.setVisible(false); -``` - -## 2. 硬 S3 原因 - -- 动态创建 Vaadin 组件 - -## 3. 已改写部分 - -无(HARD 整条不自动改写,原样保留)。 - -## 4. 余留模式 - -整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。 - -## 5. 建议改法 - -- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。 -- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。 -- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。 diff --git a/tools/s3_rewriter/output/manual_workpackage/067_HARD_c752e928_劳务分包合同登记_需要评审.md b/tools/s3_rewriter/output/manual_workpackage/061_HARD_c752e928_劳务分包合同登记_需要评审.md similarity index 95% rename from tools/s3_rewriter/output/manual_workpackage/067_HARD_c752e928_劳务分包合同登记_需要评审.md rename to tools/s3_rewriter/output/manual_workpackage/061_HARD_c752e928_劳务分包合同登记_需要评审.md index 8535780..a319c7a 100644 --- a/tools/s3_rewriter/output/manual_workpackage/067_HARD_c752e928_劳务分包合同登记_需要评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/061_HARD_c752e928_劳务分包合同登记_需要评审.md @@ -1,4 +1,4 @@ -# 人工作业单 #067 — HARD +# 人工作业单 #061 — HARD - 模板ID : `c752e928-335d-443c-8f2d-9aa8e2630c8e` - 模板名 : 劳务分包合同登记-需要评审 @@ -47,7 +47,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/068_HARD_cf71f83a_物资合同评审_明辉定制.md b/tools/s3_rewriter/output/manual_workpackage/062_HARD_cf71f83a_物资合同评审_明辉定制.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/068_HARD_cf71f83a_物资合同评审_明辉定制.md rename to tools/s3_rewriter/output/manual_workpackage/062_HARD_cf71f83a_物资合同评审_明辉定制.md index a0998d2..98b2a4a 100644 --- a/tools/s3_rewriter/output/manual_workpackage/068_HARD_cf71f83a_物资合同评审_明辉定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/062_HARD_cf71f83a_物资合同评审_明辉定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #068 — HARD +# 人工作业单 #062 — HARD - 模板ID : `cf71f83a-0428-4e69-a736-97c91f998d19` - 模板名 : 物资合同评审-明辉定制 @@ -79,7 +79,7 @@ button.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/069_HARD_cf71f83a_物资合同评审_明辉定制.md b/tools/s3_rewriter/output/manual_workpackage/063_HARD_cf71f83a_物资合同评审_明辉定制.md similarity index 95% rename from tools/s3_rewriter/output/manual_workpackage/069_HARD_cf71f83a_物资合同评审_明辉定制.md rename to tools/s3_rewriter/output/manual_workpackage/063_HARD_cf71f83a_物资合同评审_明辉定制.md index d5ca427..1628471 100644 --- a/tools/s3_rewriter/output/manual_workpackage/069_HARD_cf71f83a_物资合同评审_明辉定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/063_HARD_cf71f83a_物资合同评审_明辉定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #069 — HARD +# 人工作业单 #063 — HARD - 模板ID : `cf71f83a-0428-4e69-a736-97c91f998d19` - 模板名 : 物资合同评审-明辉定制 @@ -47,7 +47,7 @@ button.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/070_HARD_d193b838_劳务分包合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/064_HARD_d193b838_劳务分包合同评审_五建定制.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/070_HARD_d193b838_劳务分包合同评审_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/064_HARD_d193b838_劳务分包合同评审_五建定制.md index caf7ff3..e693121 100644 --- a/tools/s3_rewriter/output/manual_workpackage/070_HARD_d193b838_劳务分包合同评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/064_HARD_d193b838_劳务分包合同评审_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #070 — HARD +# 人工作业单 #064 — HARD - 模板ID : `d193b838-f8a3-4d72-9fef-300c7a97d23c` - 模板名 : 劳务分包合同评审(五建定制) @@ -82,7 +82,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/071_HARD_d193b838_劳务分包合同评审_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/065_HARD_d193b838_劳务分包合同评审_五建定制.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/071_HARD_d193b838_劳务分包合同评审_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/065_HARD_d193b838_劳务分包合同评审_五建定制.md index 84a4734..f0c322f 100644 --- a/tools/s3_rewriter/output/manual_workpackage/071_HARD_d193b838_劳务分包合同评审_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/065_HARD_d193b838_劳务分包合同评审_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #071 — HARD +# 人工作业单 #065 — HARD - 模板ID : `d193b838-f8a3-4d72-9fef-300c7a97d23c` - 模板名 : 劳务分包合同评审(五建定制) @@ -69,7 +69,7 @@ def sql1 = "select coalesce(sum(p.CONTRACTMONEY),0) as TOTALCONTROLCOST from( "; ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/072_HARD_d2a01b24_项目部质量目标.md b/tools/s3_rewriter/output/manual_workpackage/066_HARD_d2a01b24_项目部质量目标.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/072_HARD_d2a01b24_项目部质量目标.md rename to tools/s3_rewriter/output/manual_workpackage/066_HARD_d2a01b24_项目部质量目标.md index 37f9f19..e9627df 100644 --- a/tools/s3_rewriter/output/manual_workpackage/072_HARD_d2a01b24_项目部质量目标.md +++ b/tools/s3_rewriter/output/manual_workpackage/066_HARD_d2a01b24_项目部质量目标.md @@ -1,4 +1,4 @@ -# 人工作业单 #072 — HARD +# 人工作业单 #066 — HARD - 模板ID : `d2a01b24-9941-4e7c-a96e-74fbb54d2e79` - 模板名 : 项目部质量目标 diff --git a/tools/s3_rewriter/output/manual_workpackage/073_HARD_d41063b3_专业分包合同登记_需要评审.md b/tools/s3_rewriter/output/manual_workpackage/067_HARD_d41063b3_专业分包合同登记_需要评审.md similarity index 95% rename from tools/s3_rewriter/output/manual_workpackage/073_HARD_d41063b3_专业分包合同登记_需要评审.md rename to tools/s3_rewriter/output/manual_workpackage/067_HARD_d41063b3_专业分包合同登记_需要评审.md index 8ee00c7..c68dca3 100644 --- a/tools/s3_rewriter/output/manual_workpackage/073_HARD_d41063b3_专业分包合同登记_需要评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/067_HARD_d41063b3_专业分包合同登记_需要评审.md @@ -1,4 +1,4 @@ -# 人工作业单 #073 — HARD +# 人工作业单 #067 — HARD - 模板ID : `d41063b3-9189-42ce-8689-8ce022a99fc2` - 模板名 : 专业分包合同登记_需要评审 @@ -49,7 +49,7 @@ tie.addExportButton(3); ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/074_HARD_e282bd37_物资合同评审.md b/tools/s3_rewriter/output/manual_workpackage/068_HARD_e282bd37_物资合同评审.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/074_HARD_e282bd37_物资合同评审.md rename to tools/s3_rewriter/output/manual_workpackage/068_HARD_e282bd37_物资合同评审.md index 7de4268..0b3b655 100644 --- a/tools/s3_rewriter/output/manual_workpackage/074_HARD_e282bd37_物资合同评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/068_HARD_e282bd37_物资合同评审.md @@ -1,4 +1,4 @@ -# 人工作业单 #074 — HARD +# 人工作业单 #068 — HARD - 模板ID : `e282bd37-a9a7-4390-9c96-4411b2508a33` - 模板名 : 物资合同评审 @@ -79,7 +79,7 @@ button.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/075_HARD_e282bd37_物资合同评审.md b/tools/s3_rewriter/output/manual_workpackage/069_HARD_e282bd37_物资合同评审.md similarity index 95% rename from tools/s3_rewriter/output/manual_workpackage/075_HARD_e282bd37_物资合同评审.md rename to tools/s3_rewriter/output/manual_workpackage/069_HARD_e282bd37_物资合同评审.md index 7e11a6b..dd4460d 100644 --- a/tools/s3_rewriter/output/manual_workpackage/075_HARD_e282bd37_物资合同评审.md +++ b/tools/s3_rewriter/output/manual_workpackage/069_HARD_e282bd37_物资合同评审.md @@ -1,4 +1,4 @@ -# 人工作业单 #075 — HARD +# 人工作业单 #069 — HARD - 模板ID : `e282bd37-a9a7-4390-9c96-4411b2508a33` - 模板名 : 物资合同评审 @@ -47,7 +47,7 @@ button.addClickListener(new Button.ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/078_HARD_e7670207_付款确认_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/070_HARD_e7670207_付款确认_五建定制.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/078_HARD_e7670207_付款确认_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/070_HARD_e7670207_付款确认_五建定制.md index dbda453..46ab2bb 100644 --- a/tools/s3_rewriter/output/manual_workpackage/078_HARD_e7670207_付款确认_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/070_HARD_e7670207_付款确认_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #078 — HARD +# 人工作业单 #070 — HARD - 模板ID : `e7670207-9cf7-4db9-a452-884b58408b96` - 模板名 : 付款确认(五建定制) diff --git a/tools/s3_rewriter/output/manual_workpackage/082_HARD_f475e860_其他证书.md b/tools/s3_rewriter/output/manual_workpackage/071_HARD_f475e860_其他证书.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/082_HARD_f475e860_其他证书.md rename to tools/s3_rewriter/output/manual_workpackage/071_HARD_f475e860_其他证书.md index a98b00d..0482e59 100644 --- a/tools/s3_rewriter/output/manual_workpackage/082_HARD_f475e860_其他证书.md +++ b/tools/s3_rewriter/output/manual_workpackage/071_HARD_f475e860_其他证书.md @@ -1,4 +1,4 @@ -# 人工作业单 #082 — HARD +# 人工作业单 #071 — HARD - 模板ID : `f475e860-0026-49a8-b2ff-510101386c6a` - 模板名 : 其他证书 diff --git a/tools/s3_rewriter/output/manual_workpackage/083_HARD_f9b884de_项目付款申请_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/072_HARD_f9b884de_项目付款申请_五建定制.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/083_HARD_f9b884de_项目付款申请_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/072_HARD_f9b884de_项目付款申请_五建定制.md index 8bba10c..13eea6d 100644 --- a/tools/s3_rewriter/output/manual_workpackage/083_HARD_f9b884de_项目付款申请_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/072_HARD_f9b884de_项目付款申请_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #083 — HARD +# 人工作业单 #072 — HARD - 模板ID : `f9b884de-6d46-4242-b93f-f3babd358f36` - 模板名 : 项目付款申请-五建定制 diff --git a/tools/s3_rewriter/output/manual_workpackage/084_HARD_f9b884de_项目付款申请_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/073_HARD_f9b884de_项目付款申请_五建定制.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/084_HARD_f9b884de_项目付款申请_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/073_HARD_f9b884de_项目付款申请_五建定制.md index e2d98df..c842094 100644 --- a/tools/s3_rewriter/output/manual_workpackage/084_HARD_f9b884de_项目付款申请_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/073_HARD_f9b884de_项目付款申请_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #084 — HARD +# 人工作业单 #073 — HARD - 模板ID : `f9b884de-6d46-4242-b93f-f3babd358f36` - 模板名 : 项目付款申请-五建定制 diff --git a/tools/s3_rewriter/output/manual_workpackage/085_HARD_fb51a8c9_发薪_扣款计划.md b/tools/s3_rewriter/output/manual_workpackage/074_HARD_fb51a8c9_发薪_扣款计划.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/085_HARD_fb51a8c9_发薪_扣款计划.md rename to tools/s3_rewriter/output/manual_workpackage/074_HARD_fb51a8c9_发薪_扣款计划.md index ff81a72..4c8d27f 100644 --- a/tools/s3_rewriter/output/manual_workpackage/085_HARD_fb51a8c9_发薪_扣款计划.md +++ b/tools/s3_rewriter/output/manual_workpackage/074_HARD_fb51a8c9_发薪_扣款计划.md @@ -1,4 +1,4 @@ -# 人工作业单 #085 — HARD +# 人工作业单 #074 — HARD - 模板ID : `fb51a8c9-3bd4-4517-b19f-74edcc34f8f7` - 模板名 : 发薪/扣款计划 @@ -82,7 +82,7 @@ button.addClickListener(new ClickListener() { ## 2. 硬 S3 原因 -- 动态创建 Vaadin 组件 +- 动态创建 Vaadin Button(无法自动改写形态) ## 3. 已改写部分 diff --git a/tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_0567316f_车辆维修保养登记.md b/tools/s3_rewriter/output/manual_workpackage/075_PARTIAL_0567316f_车辆维修保养登记.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_0567316f_车辆维修保养登记.md rename to tools/s3_rewriter/output/manual_workpackage/075_PARTIAL_0567316f_车辆维修保养登记.md index e2d1d3a..80fe49e 100644 --- a/tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_0567316f_车辆维修保养登记.md +++ b/tools/s3_rewriter/output/manual_workpackage/075_PARTIAL_0567316f_车辆维修保养登记.md @@ -1,4 +1,4 @@ -# 人工作业单 #087 — PARTIAL +# 人工作业单 #075 — PARTIAL - 模板ID : `0567316f-6a71-47f6-a669-eb8c91670e45` - 模板名 : 车辆维修保养登记 diff --git a/tools/s3_rewriter/output/manual_workpackage/076_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/076_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md deleted file mode 100644 index eb609f2..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/076_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md +++ /dev/null @@ -1,110 +0,0 @@ -# 人工作业单 #076 — HARD - -- 模板ID : `e5a03e54-37b2-4122-971f-7f0ac57c2650` -- 模板名 : 进项税发票(批量调整抵扣日期)-五建定制 -- 脚本序 : 6 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy - -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; - -def signDetails = group.getField("TASKS"); - -final Button cb0 = new Button("查询"); -cb0?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - - - - def thisuser = GetDefaultValueFunction.getCurrentUserId(); - def newlist = []; - - def returncol = ["VIEW_ACT_RU_TASK_ID","PROCESSID","TITLE","TASKNAME","INITUSERID","STARTTIME","ASSIGNEE","DUEDATE","COMMENTTEXT","PROCESSNAME","INITUSERORGID"]; - def csql = "select VIEW_ACT_RU_TASK_ID,PROCESSID,TITLE,TASKNAME,INITUSERID,STARTTIME,ASSIGNEE,DUEDATE,COMMENTTEXT,PROCESSNAME,INITUSERORGID,PROCESSID as PROCESSID_DISPLAY__,TITLE as TITLE_DISPLAY__,"; - csql += " TASKNAME as TASKNAME_DISPLAY__,VIEW_ACT_RU_TASK_ID as VIEW_ACT_RU_TASK_ID_DISPLAY__,INITUSERID as INITUSERID_DISPLAY__,STARTTIME as STARTTIME_DISPLAY__,"; - csql += " ASSIGNEE as ASSIGNEE_DISPLAY__,DUEDATE as DUEDATE_DISPLAY__,COMMENTTEXT as COMMENTTEXT_DISPLAY__,PROCESSNAME as PROCESSNAME_DISPLAY__,INITUSERORGID as INITUSERORGID_DISPLAY__ from"; - csql += " VIEW_ACT_RU_TASK where processname = '进项税发票' and (assignee = '"+thisuser+"' or commenttext = '"+thisuser+"')"; - if(getFieldValue("ORGID") != null){ - csql += " and INITUSERORGID = '"+getFieldValue("ORGID")+"'"; - } - csql += " order by starttime desc"; - def list = GetServicesFunction.listSelectResultBySql([:],"VIEW_ACT_RU_TASK",csql,returncol); - - if(list!=null && list.size()>0){ - for(ilist in list){ - def imap = ilist?.toMap(); - imap["ISSIGN"] = false; - newlist.add(imap); - } - bindField("TASKS",null); - bindField("TASKS",newlist); - - }else{ - bindField("TASKS",null); - bindField("TASKS",newlist); - } - - - } -}); - - -final Button cb = new Button("全选"); -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def details = getFieldValue("TASKS"); - if(details != null){ - details.each{ - it.put("ISSIGN",true); - } - bindField("TASKS",null); - bindField("TASKS",details); - } - } -}); - - -final Button cb2 = new Button("取消全选"); -cb2?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def details = getFieldValue("TASKS"); - if(details != null){ - details.each{ - it.put("ISSIGN",false); - } - bindField("TASKS",null); - bindField("TASKS",details); - } - } -}); - -//将自定义的按钮添加至 -//signDetails?.addButton(group.getField("SELECT"),0); -signDetails?.addButton(cb0, 0); -signDetails?.addButton(cb, 1); -signDetails?.addButton(cb2, 2); -``` - -## 2. 硬 S3 原因 - -- 动态创建 Vaadin 组件 - -## 3. 已改写部分 - -无(HARD 整条不自动改写,原样保留)。 - -## 4. 余留模式 - -整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。 - -## 5. 建议改法 - -- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。 -- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。 -- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。 diff --git a/tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_208996a7_办公用品库初始化凭证.md b/tools/s3_rewriter/output/manual_workpackage/076_PARTIAL_208996a7_办公用品库初始化凭证.md similarity index 96% rename from tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_208996a7_办公用品库初始化凭证.md rename to tools/s3_rewriter/output/manual_workpackage/076_PARTIAL_208996a7_办公用品库初始化凭证.md index 347cf9a..a445361 100644 --- a/tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_208996a7_办公用品库初始化凭证.md +++ b/tools/s3_rewriter/output/manual_workpackage/076_PARTIAL_208996a7_办公用品库初始化凭证.md @@ -1,4 +1,4 @@ -# 人工作业单 #088 — PARTIAL +# 人工作业单 #076 — PARTIAL - 模板ID : `208996a7-fa97-4e99-8e35-4b592385eb37` - 模板名 : 办公用品库初始化凭证 diff --git a/tools/s3_rewriter/output/manual_workpackage/077_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/077_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md deleted file mode 100644 index 993fbd6..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/077_HARD_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md +++ /dev/null @@ -1,192 +0,0 @@ -# 人工作业单 #077 — HARD - -- 模板ID : `e5a03e54-37b2-4122-971f-7f0ac57c2650` -- 模板名 : 进项税发票(批量调整抵扣日期)-五建定制 -- 脚本序 : 9 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -import com.dsasp.server.common.exception.ValidationException; -import com.dsasp.server.common.util.HTTPClientUtils; -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; - -def transformnum (moneyStr) { - def numericStr = moneyStr.replaceAll(/[^\d.]/, '') // 移除非数字字符:ml-citation{ref="5,11" data="citationList"} - def result = numericStr.isNumber() ? numericStr.toBigDecimal() : null // 高精度转换:ml-citation{ref="9,11" data="citationList"} - return result; -} - - -def invoicelist = group.getField("INVOICELIST"); -def document = group.getField("SELECT"); - -final Button cb = new Button("识别"); -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object fplists = document?.getValue(); - def documentfp = []; - for (int i = 0; i < fplists.size(); i++) { - def item = fplists.get(i); - if(item.get("DOCUMENT")!=null){ - documentfp.addAll(item.get("DOCUMENT")); - } - }; -// Console.debug(documentfp); - if (documentfp == null || documentfp.size()==0){ - Notification.show("请先上传发票信息!", Type.ERROR_MESSAGE); - return; - }; - if(documentfp && documentfp.size()>0){ - def message = " ";//提示消息 - documentfp.eachWithIndex{it,index-> - //批量选择发票类型后给子表赋值 - if(it && it.get("TEMPFILE")){ - // 表示本地路径 - def filePath = it.get("TEMPFILE"); - //String endpointUrl = "http://192.168.20.63:5020/detection";//内网环境 - String endpointUrl = "http://58.211.166.190:5020/detection";//正式环境 - - //文件流 上传方法 - def responseBody = HTTPClientUtils.getTempFiletoFile(endpointUrl,filePath); -// Console.debug(responseBody); - if(responseBody == null || !responseBody.contains("data")){ - message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n" - }else{ - def json = HTTPClientUtils.stringToJson(responseBody); - if(json && json.getString("message") && json.get("message")=="ok"){ - def rows = json.get("data"); - def item = rows?.get("data"); - if(rows && item){ - //Console.debug(item); - def fplist = [:]; - - //发票类型 - if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){ - fplist.put("RECEIPTTYPE",rows.get("invoiceType").contains("专用") ? 3 : rows.get("invoiceType").contains("普通") ? 2 : 1); - }else{ - fplist.put("RECEIPTTYPE",null); - }; - - if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){ - fplist.put("PURCHASER",item.get("buyer_name")); - }else{ - fplist.put("PURCHASER",null); - }; - if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){ - fplist.put("SALESPARTY",item.get("seller_name")); - }else{ - fplist.put("SALESPARTY",null); - }; - if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){ - fplist.put("INVOICECODE",item.get("invoice_code")); - }else{ - fplist.put("INVOICECODE", "数电票"); - }; - if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){ - fplist.put("INVOICENO",item.get("invoice_number")); - }else{ - fplist.put("INVOICENO",null); - }; - if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){ - fplist.put("INVOICEMONEY",transformnum(item.getString("money"))); - }else{ - fplist.put("INVOICEMONEY",null); - }; - if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){ - fplist.put("TAX",transformnum(item.getString("tax"))); - }else{ - fplist.put("TAX",null); - }; - if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){ - fplist.put("TOTALMONEY",transformnum(item.getString("price"))); - }else{ - fplist.put("TOTALMONEY",null); - }; - if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){ - def date = item.getString("invoice_date"); - fplist.put("INVOICEDATE",GetValueFunction.toDate(date,"yyyy年MM月dd日")); - }else{ - fplist.put("INVOICEDATE",null); - }; - if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){ - fplist.put("TAXRATE",transformnum(item.getString("tax_rate"))); - }else{ - fplist.put("TAXRATE",null); - }; - if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){ - def electronic_number = item.getString("electronic_number"); - fplist.put("GLFPHM",electronic_number); - }else{ - fplist.put("GLFPHM",null); - }; - if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){ - def buyer_code = item.getString("buyer_code"); - fplist.put("KHSH",buyer_code); - }else{ - fplist.put("KHSH",null); - }; - if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){ - def seller_code = item.getString("seller_code"); - fplist.put("XFSH",seller_code); - }else{ - fplist.put("XFSH",null); - }; - if(fplist!=null){ - def flag = true; - if(invoicelist.getValue() && invoicelist.getValue().size()>0){ - for (int j = 0; j < invoicelist.getValue().size(); j++) { - def tempitem = invoicelist.getValue().get(j); - if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){ - flag = false;; - } - }; - }; - if(flag){ - fplist.put("DOCUMENT",[it]);//附件图片 - invoicelist.addItem(fplist); - }; - } - } - }else{ - if(json && json.getString("message")){ - message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票"+json.getString("message")+"!\n"; - } else{ - message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n"; - } - } - } - } - } - if(message.trim()!=""){ - Notification.show(message, Type.ERROR_MESSAGE); - } - } - }; -}); - -//将自定义的按钮添加至 -invoicelist?.addButton(cb, 0); -``` - -## 2. 硬 S3 原因 - -- 动态创建 Vaadin 组件 - -## 3. 已改写部分 - -无(HARD 整条不自动改写,原样保留)。 - -## 4. 余留模式 - -整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。 - -## 5. 建议改法 - -- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。 -- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。 -- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。 diff --git a/tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_2b39c3e1_项目部污染源申报.md b/tools/s3_rewriter/output/manual_workpackage/077_PARTIAL_2b39c3e1_项目部污染源申报.md similarity index 99% rename from tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_2b39c3e1_项目部污染源申报.md rename to tools/s3_rewriter/output/manual_workpackage/077_PARTIAL_2b39c3e1_项目部污染源申报.md index 16fd1f3..4378786 100644 --- a/tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_2b39c3e1_项目部污染源申报.md +++ b/tools/s3_rewriter/output/manual_workpackage/077_PARTIAL_2b39c3e1_项目部污染源申报.md @@ -1,4 +1,4 @@ -# 人工作业单 #090 — PARTIAL +# 人工作业单 #077 — PARTIAL - 模板ID : `2b39c3e1-3bf9-4664-8e02-53d426c5db84` - 模板名 : 项目部污染源申报 diff --git a/tools/s3_rewriter/output/manual_workpackage/078_PARTIAL_2cceb83c_建造师注册证.md b/tools/s3_rewriter/output/manual_workpackage/078_PARTIAL_2cceb83c_建造师注册证.md new file mode 100644 index 0000000..f4d1df4 --- /dev/null +++ b/tools/s3_rewriter/output/manual_workpackage/078_PARTIAL_2cceb83c_建造师注册证.md @@ -0,0 +1,157 @@ +# 人工作业单 #078 — PARTIAL + +- 模板ID : `2cceb83c-4079-43e4-b7b7-c395fd68cbbc` +- 模板名 : 建造师注册证 +- 脚本序 : 3 +- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) + +## 1. 原文(S3 原始 Groovy) +```groovy + +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.data.Property.ValueChangeEvent; +import com.dsasp.client.viewframework.listener.ConfirmDialogListener; + +import com.vaadin.ui.Link; +import com.vaadin.server.ExternalResource; +import com.vaadin.ui.Label; + + +final def professionals = group.getField("PROFESSIONALS"); +final Button but = new Button("注销"); + +final Object table = professionals?.table; +table?.setImmediate(true); + + +final group1 = group; +but?.addClickListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + def id = table?.getValue(); + if (id == null){ + Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + + def hr_con_id = id?.getField("HR_CONSTRUCTORREGISTERED_ID")?.getValue(); + def islogout = id?.getField("ISLOGOUT")?.getValue(); + if(islogout){ + Notification.show("已经注销!", Type.ERROR_MESSAGE); + return; + } + + final pojo = GetServicesFunction.loadPOJO(hr_con_id,"HR_CONSTRUCTORREGISTERED",false); + if(pojo!=null){ + if(pojo.get_Value("ISMAINITEMS")){ + Notification.show("如要注销主项注册专业,请注销建造师注册证!", Type.ERROR_MESSAGE); + return; + } + + def updateMap=[:]; + updateMap["HR_CONSTRUCTORREGISTERED_ID"] = hr_con_id; + updateMap["ISLOGOUT"] = 1; + GetServicesFunction.excuteFlow(updateMap,"HR_CONSTRUCTORREGISTERED_LOGOUT"); + + + id?.getField("ISLOGOUT")?.setImmediate(true); + setFieldReadOnly(id,"ISLOGOUT",false); + + id?.getField("ISLOGOUT")?.setValue(true); + + setFieldReadOnly(id,"ISLOGOUT",true); + professionals.setValue(new ArrayList(professionals.getValue())); + } + } +}); + +professionals?.addButton(but,0); + +professionals?.showAddButton(false); +professionals?.showDeleteButton(false); +``` + +## 2. 已改写部分(自动产出) +```groovy + +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.data.Property.ValueChangeEvent; +import com.dsasp.client.viewframework.listener.ConfirmDialogListener; + +import com.vaadin.ui.Link; +import com.vaadin.server.ExternalResource; +import com.vaadin.ui.Label; + + +final def professionals = group.getField("PROFESSIONALS"); + +final Object table = professionals?.table; +table?.setImmediate(true); + + +final group1 = group; +addFieldButton("PROFESSIONALS", "注销", { +def id = table?.getValue(); + if (id == null){ + showToast("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + + def hr_con_id = id?.getField("HR_CONSTRUCTORREGISTERED_ID")?.getValue(); + def islogout = id?.getField("ISLOGOUT")?.getValue(); + if(islogout){ + showToast("已经注销!", Type.ERROR_MESSAGE); + return; + } + + final pojo = GetServicesFunction.loadPOJO(hr_con_id,"HR_CONSTRUCTORREGISTERED",false); + if(pojo!=null){ + if(pojo.get_Value("ISMAINITEMS")){ + showToast("如要注销主项注册专业,请注销建造师注册证!", Type.ERROR_MESSAGE); + return; + } + + def updateMap=[:]; + updateMap["HR_CONSTRUCTORREGISTERED_ID"] = hr_con_id; + updateMap["ISLOGOUT"] = 1; + GetServicesFunction.excuteFlow(updateMap,"HR_CONSTRUCTORREGISTERED_LOGOUT"); + + + id?.getField("ISLOGOUT")?.setImmediate(true); + setFieldReadOnly(id,"ISLOGOUT",false); + + id?.getField("ISLOGOUT")?.setValue(true); + + setFieldReadOnly(id,"ISLOGOUT",true); + professionals.setValue(new ArrayList(professionals.getValue())); + } +}, 0) + +professionals?.showAddButton(false); +professionals?.showDeleteButton(false); +``` + +## 3. 余留模式与建议改法 + +### 余留:raw .table 组件访问(1 行) + +样例行: +```groovy +final Object table = professionals?.table; +``` +建议改法:操作原始 Table 列模型(getVisibleColumns/setVisibleColumns);amis 侧改 columnsTogglable/静态列配置 + +### 余留:残留字段句柄链(未覆盖动词)(1 行) + +样例行: +```groovy +final def professionals = group.getField("PROFESSIONALS"); +``` +建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 + diff --git a/tools/s3_rewriter/output/manual_workpackage/079_HARD_e7670207_付款确认_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/079_HARD_e7670207_付款确认_五建定制.md deleted file mode 100644 index fd4a600..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/079_HARD_e7670207_付款确认_五建定制.md +++ /dev/null @@ -1,186 +0,0 @@ -# 人工作业单 #079 — HARD - -- 模板ID : `e7670207-9cf7-4db9-a452-884b58408b96` -- 模板名 : 付款确认(五建定制) -- 脚本序 : 7 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; -import com.dsasp.server.common.exception.ValidationException; -import com.dsasp.server.common.util.HTTPClientUtils; - - -//选择付款申请按钮 -group.getField("DRAFTLIST")?.addButton(group.getField("SELECT"),0); - - -/** 页面必填项:客户号(默认)、单位编码(默认)、账号集合、交易类型(默认背书转让)、发查标识(宁波银行账号送 1:查询;非宁波银行账号送0:发查时向开户行同步票据信息)、 - * 票据种类(107:银承108:商承) - 根据接口返回结果(可否转让、可否拆分、操作状态为可交易的票据),带出票据(包)号、子票区间、票据(包)金额,获取可发起背书转让业务的票据列表, - 并从接口返回的票据信息中选取票据发起背书转让申请 -**/ - -//参数配置 -def custId = GetDefaultValueFunction.getConfigValue("com.dsasp.pm.bankWJ.custId");//客户号-银行提供 -def url = GetDefaultValueFunction.getConfigValue("com.dsasp.pm.bankWJ.IPpath");//客户ip接口访问地址 -def transType = "4";//交易类型-背书转让 - -final Button search = new Button("查询"); -search?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - // 付款确认-批量转账付款 - // 验证提醒 - def content = ""; - def corpCode = getFieldValue("CORPCODE");//客户在财资设置的四位单位编码 - if(corpCode==null){ - content += "单位编码不能为空!\n"; - } - def accountnumber = getFieldValue("ACCOUNTNUMBER");//银行账号 - if(accountnumber==null){ - content += "银行账号不能为空!\n"; - } - def syncFlag = getFieldValue("SYNCFLAG");//发查标识 - if(syncFlag==null){ - content += "发查标识不能为空!\n"; - } - def draftType = getFieldValue("DRAFTTYPE");//票据种类 - if(draftType==null){ - content += "票据种类不能为空!\n"; - } - if(content !=null && content !=""){ - //throw new ValidationException(content); - Notification.show(content,Type.ERROR_MESSAGE); - return; - } - - def accountList = [];//账号列表 - accountList.add(accountnumber); - - def params = [:]; - def paramsData = [:]; - paramsData["custId"] = custId; - paramsData["corpCode"] = corpCode; - paramsData["accountList"] = accountList; - paramsData["draftType"] = draftType.toString(); - paramsData["transType"] = transType; - paramsData["registerDateStart"] = GetValueFunction.dateFormate(getFieldValue("REGISTERDATESTART"),"YYYY-MM-dd");//出票日期起日 - paramsData["registerDateEnd"] = GetValueFunction.dateFormate(getFieldValue("REGISTERDATEEND"),"YYYY-MM-dd");//出票日期止日 - paramsData["endDateStart"] = GetValueFunction.dateFormate(getFieldValue("ENDDATESTART"),"YYYY-MM-dd");//到期日期起日 - paramsData["endDateEnd"] = GetValueFunction.dateFormate(getFieldValue("ENDDATEEND"),"YYYY-MM-dd");//到期日期止日 - paramsData["moneyStart"] = getFieldValue("MONEYSTART")?.setScale(2)?.toString();//票面金额起 - paramsData["moneyEnd"] = getFieldValue("MONEYEND")?.setScale(2)?.toString();//票面金额止 - //非宁波银行先发查再查询 - if(syncFlag == 0){ - def tempparams = [:]; - paramsData["syncFlag"] = syncFlag.toString(); - tempparams["Data"] = paramsData; - tempparams["productName"] = "tmsNewBill"; - tempparams["serviceName"] = "queryApplyInfo"; - def tempdataJson = HTTPClientUtils.jsonToString(tempparams); - def tempresponseBody = HTTPClientUtils.sendPostRequest(url,tempdataJson,null,null,null); - if(!tempresponseBody.contains("retCode")){ - Notification.show("发查接口请求超时,请联系管理员",Type.ERROR_MESSAGE); - } - def tempreturnlist = HTTPClientUtils.jsonStringtoMap(tempresponseBody)?.get("data"); - Console.debug("发查"+tempreturnlist); - if(!tempreturnlist || !tempreturnlist.get("retCode")){ - Notification.show("发查接口请求异常,请联系管理员!",Type.ERROR_MESSAGE); - return; - } - //得到付款结果 - def tempretCode = tempreturnlist.get("retCode"); - if(tempretCode && tempretCode != "0000" && tempreturnlist.get("retMsg")){ - Notification.show(tempreturnlist.get("retMsg"),Type.ERROR_MESSAGE); - return; - } - } - paramsData["syncFlag"] = "1";//默认查询-写死 - params["Data"] = paramsData; - params["productName"] = "tmsNewBill"; - params["serviceName"] = "queryApplyInfo"; - def dataJson = HTTPClientUtils.jsonToString(params); - Console.debug(dataJson); - - /** 查询票据申请 **/ - def signdetails = []; - def responseBody = HTTPClientUtils.sendPostRequest(url,dataJson,null,null,null); - if(!responseBody.contains("retCode")){ - Notification.show("查询接口请求超时,请联系管理员",Type.ERROR_MESSAGE); - } - def returnlist = HTTPClientUtils.jsonStringtoMap(responseBody)?.get("data"); - Console.debug("查询"+returnlist); - if(!returnlist || !returnlist.get("retCode")){ - //throw new ValidationException("接口请求异常,请联系管理员!"); - Notification.show("接口请求异常,请联系管理员!",Type.ERROR_MESSAGE); - return; - } - //得到付款结果 - def retCode = returnlist.get("retCode"); - if(retCode && retCode != "0000" && returnlist.get("retMsg")){ - //throw new ValidationException(returnlist.get("retMsg")); - Notification.show(returnlist.get("retMsg"),Type.ERROR_MESSAGE); - return; - }else if(retCode && retCode == "0000"){ - //查询票据查询明细表中是否存在该信息,存在则删除后再新增,不存在则新增 - def PROJECTIDAPIBATCHNO = getFieldValue("PROJECTID")+"-"+getFieldValue("APIBATCHNO"); - def sql = " SELECT PM_ENDORSEAPPLY_ENDORSEDETAILS_ID FROM PM_ENDORSEAPPLY_ENDORSEDETAILS WHERE PROJECTIDAPIBATCHNO = '"+PROJECTIDAPIBATCHNO+"'"; - def list = GetServicesFunction.listSelectResultBySql([:],"PM_ENDORSEAPPLY_ENDORSEDETAILS",sql,["PM_ENDORSEAPPLY_ENDORSEDETAILS_ID"]); - if(list && list.size()>0){ - list.each{ - def tempmap = [:]; - tempmap["PM_ENDORSEAPPLY_ENDORSEDETAILS_ID"] = it.get_Value("PM_ENDORSEAPPLY_ENDORSEDETAILS_ID");//主键 - GetServicesFunction.excuteFlow(tempmap,"PM_ENDORSEAPPLY_ENDORSEDETAILS_DELETE"); - } - }; - Console.debug(returnlist.get("draftList")); - def rows = returnlist.get("draftList"); - for (int i = 0; i < rows?.size(); i++) { - def it = rows.get(i); - def itemMap = [:]; - itemMap["DRAFTCODE"] = it.get("draftCode");//票据(包)号 - itemMap["CHILDRANGE"] = it.get("childRange");// 子票区间 - //itemMap["SYNCFLAG"] = it.get("draftType");//票据种类 - itemMap["SYNCFLAG"] = draftType;//票据种类 - itemMap["DRAFTAMOUNT"] = it.get("draftAmount").toBigDecimal();//票据(包)金额 - itemMap["EXCHANGEFLAG"] = it.get("exchangeFlag") ? (it.get("exchangeFlag") == "EM00" ? 1 : 0) : null;//可否转让-EM00:可再转让 EM01:不得转让 - itemMap["ISSPLIT"] = it.get("isSplit") ? (it.get("isSplit") == "0" ? 0 : 1) : null;//可否拆分 - itemMap["OPERATESTATUS"] = it.get("operateStatus") ? (it.get("operateStatus") == "0" ? "可交易" : "等待复核") : null;//操作状态 0:可交易 1:等待复核 - itemMap["REGISTERDATE"] = GetValueFunction.toDate(it.get("registerDate"),"YYYY-MM-dd");//出票日 - itemMap["ENDDATE"] = GetValueFunction.toDate(it.get("endDate"),"YYYY-MM-dd");//到期日 - signdetails.add(itemMap); - //新增存储查询出来的数据(提交时再清空) - itemMap["PROJECTIDAPIBATCHNO"] = PROJECTIDAPIBATCHNO; - GetServicesFunction.excuteFlow(itemMap,"PM_ENDORSEAPPLY_ENDORSEDETAILS_ADD"); - } - }; - bindField("DETAILS",signdetails); - } -}); -//将自定义的按钮添加至 -def details = group.getField("DETAILS"); -details?.addButton(search, 0); -``` - -## 2. 硬 S3 原因 - -- 动态创建 Vaadin 组件 - -## 3. 已改写部分 - -无(HARD 整条不自动改写,原样保留)。 - -## 4. 余留模式 - -整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。 - -## 5. 建议改法 - -- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。 -- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。 -- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。 diff --git a/tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_2d046844_办公用品领用申请.md b/tools/s3_rewriter/output/manual_workpackage/079_PARTIAL_2d046844_办公用品领用申请.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_2d046844_办公用品领用申请.md rename to tools/s3_rewriter/output/manual_workpackage/079_PARTIAL_2d046844_办公用品领用申请.md index 87c188b..31fb0e9 100644 --- a/tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_2d046844_办公用品领用申请.md +++ b/tools/s3_rewriter/output/manual_workpackage/079_PARTIAL_2d046844_办公用品领用申请.md @@ -1,4 +1,4 @@ -# 人工作业单 #091 — PARTIAL +# 人工作业单 #079 — PARTIAL - 模板ID : `2d046844-a126-4822-910e-bfe1283b5ebf` - 模板名 : 办公用品领用申请 diff --git a/tools/s3_rewriter/output/manual_workpackage/080_HARD_ee9e2a39_物资采购申请_土建_公司.md b/tools/s3_rewriter/output/manual_workpackage/080_HARD_ee9e2a39_物资采购申请_土建_公司.md deleted file mode 100644 index 087d4d1..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/080_HARD_ee9e2a39_物资采购申请_土建_公司.md +++ /dev/null @@ -1,85 +0,0 @@ -# 人工作业单 #080 — HARD - -- 模板ID : `ee9e2a39-45e2-434a-b691-a02a2041b7e6` -- 模板名 : 物资采购申请(土建-公司) -- 脚本序 : 1 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; - -def materialList = group.getField("MATERIALDETAILS"); -final Button cb = new Button("复制"); -final Object table = materialList?.table; -table?.setImmediate(true);//设置验证 -final group1 = group; -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object o = table?.getValue(); - if (o == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); - return; - } - - def itemMap = [:]; - itemMap["MATERIALID"] = getFieldValue(o, "MATERIALID");//材料ID - itemMap["MATERIALCODE"] = getFieldValue(o, "MATERIALCODE");//材料编码 - //itemMap["MATERIALALIASID"] = getFieldValue(o, "MATERIALALIASID");//材料别名ID - itemMap["MATERIALNAME"] = getFieldValue(o, "MATERIALNAME");//材料名称 - itemMap["SPECIFICATIONS"] = getFieldValue(o, "SPECIFICATIONS");//规格 - //itemMap["FIGURENO"] = getFieldValue(o, "FIGURENO");//图号编号 - //itemMap["SURFACETREATMENT"] = getFieldValue(o, "SURFACETREATMENT");//表面处理 - //itemMap["COLORNUMBER"] = getFieldValue(o, "COLORNUMBER");//色泽色号 - //itemMap["LENGTH"] = getFieldValue(o, "LENGTH");//长度 - itemMap["NUMBER"] = getFieldValue(o, "NUMBER");//件数 - //itemMap["CHILDUNIT"] = getFieldValue(o, "CHILDUNIT");//子单位 - //itemMap["LENGTHSUM"] = getFieldValue(o, "LENGTHSUM");//总长 - //itemMap["METERWEIGHT"] = getFieldValue(o, "METERWEIGHT");//米重 - itemMap["PURCHASENUM"] = getFieldValue(o, "PURCHASENUM");//数量 - itemMap["UNIT"] = getFieldValue(o, "UNIT");//主单位 - itemMap["REMARK"] = getFieldValue(o, "REMARK");//备注 - - //调用addItem()方法可直接在 - materialList.addItem(itemMap); - table.select(o); - } -}); - -//将自定义的按钮添加至 -materialList?.addButton(group.getField("SELECT"),0); -materialList?.addButton(cb, 1); - -import com.dsasp.client.viewframework.util.TableImportExport; -def tie = new TableImportExport(materialList,"com.dsasp.pm.materialmanagertj.client.MaterialApplyDetailImportOfTJ"); -tie.addImportButton(4); -tie.addExportButton(5); - - - -group.getField("MATERIALDETAILS")?.addButton(group.getField("SELECT"),0); -group.getField("ISPREPARATION")?.setVisible(false); -//group.getField("ISPREPARATION").setCaption("公司备料"); -``` - -## 2. 硬 S3 原因 - -- 动态创建 Vaadin 组件 - -## 3. 已改写部分 - -无(HARD 整条不自动改写,原样保留)。 - -## 4. 余留模式 - -整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。 - -## 5. 建议改法 - -- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。 -- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。 -- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。 diff --git a/tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_3cfaeaa6_项目部危险源申报.md b/tools/s3_rewriter/output/manual_workpackage/080_PARTIAL_3cfaeaa6_项目部危险源申报.md similarity index 99% rename from tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_3cfaeaa6_项目部危险源申报.md rename to tools/s3_rewriter/output/manual_workpackage/080_PARTIAL_3cfaeaa6_项目部危险源申报.md index c78bb54..d2cc0ac 100644 --- a/tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_3cfaeaa6_项目部危险源申报.md +++ b/tools/s3_rewriter/output/manual_workpackage/080_PARTIAL_3cfaeaa6_项目部危险源申报.md @@ -1,4 +1,4 @@ -# 人工作业单 #092 — PARTIAL +# 人工作业单 #080 — PARTIAL - 模板ID : `3cfaeaa6-2cf9-4364-8f98-25aee16cbda3` - 模板名 : 项目部危险源申报 diff --git a/tools/s3_rewriter/output/manual_workpackage/081_HARD_f01c2f57_销项税发票_增加审批通过后_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/081_HARD_f01c2f57_销项税发票_增加审批通过后_五建定制.md deleted file mode 100644 index a87242e..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/081_HARD_f01c2f57_销项税发票_增加审批通过后_五建定制.md +++ /dev/null @@ -1,110 +0,0 @@ -# 人工作业单 #081 — HARD - -- 模板ID : `f01c2f57-1891-45de-9318-7246f9d6ac97` -- 模板名 : 销项税发票(增加审批通过后)-五建定制 -- 脚本序 : 5 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy - -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; - -def signDetails = group.getField("TASKS"); - -final Button cb0 = new Button("查询"); -cb0?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - - - - def thisuser = GetDefaultValueFunction.getCurrentUserId(); - def newlist = []; - - def returncol = ["VIEW_ACT_RU_TASK_ID","PROCESSID","TITLE","TASKNAME","INITUSERID","STARTTIME","ASSIGNEE","DUEDATE","COMMENTTEXT","PROCESSNAME","INITUSERORGID"]; - def csql = "select VIEW_ACT_RU_TASK_ID,PROCESSID,TITLE,TASKNAME,INITUSERID,STARTTIME,ASSIGNEE,DUEDATE,COMMENTTEXT,PROCESSNAME,INITUSERORGID,PROCESSID as PROCESSID_DISPLAY__,TITLE as TITLE_DISPLAY__,"; - csql += " TASKNAME as TASKNAME_DISPLAY__,VIEW_ACT_RU_TASK_ID as VIEW_ACT_RU_TASK_ID_DISPLAY__,INITUSERID as INITUSERID_DISPLAY__,STARTTIME as STARTTIME_DISPLAY__,"; - csql += " ASSIGNEE as ASSIGNEE_DISPLAY__,DUEDATE as DUEDATE_DISPLAY__,COMMENTTEXT as COMMENTTEXT_DISPLAY__,PROCESSNAME as PROCESSNAME_DISPLAY__,INITUSERORGID as INITUSERORGID_DISPLAY__ from"; - csql += " VIEW_ACT_RU_TASK where processname = '销项税发票' and (assignee = '"+thisuser+"' or commenttext = '"+thisuser+"')"; - if(getFieldValue("ORGID") != null){ - csql += " and INITUSERORGID = '"+getFieldValue("ORGID")+"'"; - } - csql += " order by starttime desc"; - def list = GetServicesFunction.listSelectResultBySql([:],"VIEW_ACT_RU_TASK",csql,returncol); - - if(list!=null && list.size()>0){ - for(ilist in list){ - def imap = ilist?.toMap(); - imap["ISSIGN"] = false; - newlist.add(imap); - } - bindField("TASKS",null); - bindField("TASKS",newlist); - - }else{ - bindField("TASKS",null); - bindField("TASKS",newlist); - } - - - } -}); - - -final Button cb = new Button("全选"); -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def details = getFieldValue("TASKS"); - if(details != null){ - details.each{ - it.put("ISSIGN",true); - } - bindField("TASKS",null); - bindField("TASKS",details); - } - } -}); - - -final Button cb2 = new Button("取消全选"); -cb2?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def details = getFieldValue("TASKS"); - if(details != null){ - details.each{ - it.put("ISSIGN",false); - } - bindField("TASKS",null); - bindField("TASKS",details); - } - } -}); - -//将自定义的按钮添加至 -//signDetails?.addButton(group.getField("SELECT"),0); -signDetails?.addButton(cb0, 0); -signDetails?.addButton(cb, 1); -signDetails?.addButton(cb2, 2); -``` - -## 2. 硬 S3 原因 - -- 动态创建 Vaadin 组件 - -## 3. 已改写部分 - -无(HARD 整条不自动改写,原样保留)。 - -## 4. 余留模式 - -整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。 - -## 5. 建议改法 - -- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。 -- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。 -- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。 diff --git a/tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_459103d3_测试树.md b/tools/s3_rewriter/output/manual_workpackage/081_PARTIAL_459103d3_测试树.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_459103d3_测试树.md rename to tools/s3_rewriter/output/manual_workpackage/081_PARTIAL_459103d3_测试树.md index a5bbeab..c4937bb 100644 --- a/tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_459103d3_测试树.md +++ b/tools/s3_rewriter/output/manual_workpackage/081_PARTIAL_459103d3_测试树.md @@ -1,4 +1,4 @@ -# 人工作业单 #093 — PARTIAL +# 人工作业单 #081 — PARTIAL - 模板ID : `459103d3-9cc9-43f5-87ca-a322c10d2200` - 模板名 : 测试树 diff --git a/tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_5440da49_招标工程.md b/tools/s3_rewriter/output/manual_workpackage/082_PARTIAL_5440da49_招标工程.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_5440da49_招标工程.md rename to tools/s3_rewriter/output/manual_workpackage/082_PARTIAL_5440da49_招标工程.md index 32d29b3..06e30b2 100644 --- a/tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_5440da49_招标工程.md +++ b/tools/s3_rewriter/output/manual_workpackage/082_PARTIAL_5440da49_招标工程.md @@ -1,4 +1,4 @@ -# 人工作业单 #094 — PARTIAL +# 人工作业单 #082 — PARTIAL - 模板ID : `5440da49-89d6-4dc5-94e5-82693913d6e4` - 模板名 : 招标工程 diff --git a/tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_68dc06dc_组织缴费规则.md b/tools/s3_rewriter/output/manual_workpackage/083_PARTIAL_68dc06dc_组织缴费规则.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_68dc06dc_组织缴费规则.md rename to tools/s3_rewriter/output/manual_workpackage/083_PARTIAL_68dc06dc_组织缴费规则.md index 287b8bf..28562e6 100644 --- a/tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_68dc06dc_组织缴费规则.md +++ b/tools/s3_rewriter/output/manual_workpackage/083_PARTIAL_68dc06dc_组织缴费规则.md @@ -1,4 +1,4 @@ -# 人工作业单 #095 — PARTIAL +# 人工作业单 #083 — PARTIAL - 模板ID : `68dc06dc-bc4e-47cc-a9e8-fb089c51fc17` - 模板名 : 组织缴费规则 diff --git a/tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_6e412e62_物资需求总计划_土建.md b/tools/s3_rewriter/output/manual_workpackage/084_PARTIAL_6e412e62_物资需求总计划_土建.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_6e412e62_物资需求总计划_土建.md rename to tools/s3_rewriter/output/manual_workpackage/084_PARTIAL_6e412e62_物资需求总计划_土建.md index 9932595..addda54 100644 --- a/tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_6e412e62_物资需求总计划_土建.md +++ b/tools/s3_rewriter/output/manual_workpackage/084_PARTIAL_6e412e62_物资需求总计划_土建.md @@ -1,4 +1,4 @@ -# 人工作业单 #098 — PARTIAL +# 人工作业单 #084 — PARTIAL - 模板ID : `6e412e62-7cde-4efd-942c-ec4da5877ec7` - 模板名 : 物资需求总计划(土建) diff --git a/tools/s3_rewriter/output/manual_workpackage/099_PARTIAL_745c9534_验工月报区间.md b/tools/s3_rewriter/output/manual_workpackage/085_PARTIAL_745c9534_验工月报区间.md similarity index 99% rename from tools/s3_rewriter/output/manual_workpackage/099_PARTIAL_745c9534_验工月报区间.md rename to tools/s3_rewriter/output/manual_workpackage/085_PARTIAL_745c9534_验工月报区间.md index e5dd220..37755db 100644 --- a/tools/s3_rewriter/output/manual_workpackage/099_PARTIAL_745c9534_验工月报区间.md +++ b/tools/s3_rewriter/output/manual_workpackage/085_PARTIAL_745c9534_验工月报区间.md @@ -1,4 +1,4 @@ -# 人工作业单 #099 — PARTIAL +# 人工作业单 #085 — PARTIAL - 模板ID : `745c9534-c755-4ef5-bc26-8b78a802ec4a` - 模板名 : 验工月报区间 diff --git a/tools/s3_rewriter/output/manual_workpackage/086_HARD_fe20a392_项目人员配置_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/086_HARD_fe20a392_项目人员配置_五建定制.md deleted file mode 100644 index 15dbf86..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/086_HARD_fe20a392_项目人员配置_五建定制.md +++ /dev/null @@ -1,61 +0,0 @@ -# 人工作业单 #086 — HARD - -- 模板ID : `fe20a392-d4fd-402f-bbf8-be8cd41ab932` -- 模板名 : 项目人员配置(五建定制) -- 脚本序 : 3 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; - -final user = group.getField("PM_PROJECT_USERS"); -final Button cb = new Button("删除"); - -final Object table = user?.table; -table?.setImmediate(true);//设置验证 -final group1 = group; -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object o = table?.getValue(); - if (o == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); - return; - } - def isLock = getFieldValue(o, "ISLOCK"); - if(isLock == 1){ - Notification.show("已备案人员无法删除!", Type.ERROR_MESSAGE); - }else{ - table.removeItem(o); - table.select(null); - user.fireValueChange(true); - } - } -}); - -//将自定义的按钮添加至 -user?.addButton(cb,"delete.png", 1); -user?.deleteButton.setVisible(false); -``` - -## 2. 硬 S3 原因 - -- 动态创建 Vaadin 组件 - -## 3. 已改写部分 - -无(HARD 整条不自动改写,原样保留)。 - -## 4. 余留模式 - -整条为硬 S3:动态创建 Vaadin 组件 / showConfirmDialog 同步确认框 / UI.getCurrent()。 - -## 5. 建议改法 - -- 动态组件:在 amis 页面 schema 侧用条件渲染/Dialog 组件声明式表达,脚本仅下发数据。 -- showConfirmDialog:改为 amis confirm 事件动作 + 回调链(异步),脚本中途交互拆为两段。 -- UI.getCurrent():amis 无全局 UI 单例,改用事件上下文/广播动作。 diff --git a/tools/s3_rewriter/output/manual_workpackage/086_PARTIAL_7a0ac7a9_造价师注册证.md b/tools/s3_rewriter/output/manual_workpackage/086_PARTIAL_7a0ac7a9_造价师注册证.md new file mode 100644 index 0000000..073aabb --- /dev/null +++ b/tools/s3_rewriter/output/manual_workpackage/086_PARTIAL_7a0ac7a9_造价师注册证.md @@ -0,0 +1,157 @@ +# 人工作业单 #086 — PARTIAL + +- 模板ID : `7a0ac7a9-32bc-4d32-9231-4d1bbcd86002` +- 模板名 : 造价师注册证 +- 脚本序 : 3 +- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) + +## 1. 原文(S3 原始 Groovy) +```groovy + +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.data.Property.ValueChangeEvent; +import com.dsasp.client.viewframework.listener.ConfirmDialogListener; + +import com.vaadin.ui.Link; +import com.vaadin.server.ExternalResource; +import com.vaadin.ui.Label; + + +final def professionals = group.getField("PROFESSIONALS"); +final Button but = new Button("注销"); + +final Object table = professionals?.table; +table?.setImmediate(true); + + +final group1 = group; +but?.addClickListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + def id = table?.getValue(); + if (id == null){ + Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + + def hr_con_id = id?.getField("HR_COSTENGINEERREGISTERED_ID")?.getValue(); + def islogout = id?.getField("ISLOGOUT")?.getValue(); + if(islogout == 1){ + Notification.show("已经注销!", Type.ERROR_MESSAGE); + return; + } + + final pojo = GetServicesFunction.loadPOJO(hr_con_id,"HR_COSTENGINEERREGISTERED",false); + if(pojo!=null){ + if(pojo.get_Value("ISMAINITEMS") == 1){ + Notification.show("如要注销主项注册专业,请注销造价师注册证!", Type.ERROR_MESSAGE); + return; + } + + def updateMap=[:]; + updateMap["HR_COSTENGINEERREGISTERED_ID"] = hr_con_id; + updateMap["ISLOGOUT"] = 1; + GetServicesFunction.excuteFlow(updateMap,"HR_COSTENGINEERREGISTERED_LOGOUT"); + + + id?.getField("ISLOGOUT")?.setImmediate(true); + setFieldReadOnly(id,"ISLOGOUT",false); + + id?.getField("ISLOGOUT")?.setValue(1); + + setFieldReadOnly(id,"ISLOGOUT",true); + professionals.setValue(new ArrayList(professionals.getValue())); + } + } +}); + +professionals?.addButton(but,0); + +professionals?.showAddButton(false); +professionals?.showDeleteButton(false); +``` + +## 2. 已改写部分(自动产出) +```groovy + +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.data.Property.ValueChangeEvent; +import com.dsasp.client.viewframework.listener.ConfirmDialogListener; + +import com.vaadin.ui.Link; +import com.vaadin.server.ExternalResource; +import com.vaadin.ui.Label; + + +final def professionals = group.getField("PROFESSIONALS"); + +final Object table = professionals?.table; +table?.setImmediate(true); + + +final group1 = group; +addFieldButton("PROFESSIONALS", "注销", { +def id = table?.getValue(); + if (id == null){ + showToast("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + + def hr_con_id = id?.getField("HR_COSTENGINEERREGISTERED_ID")?.getValue(); + def islogout = id?.getField("ISLOGOUT")?.getValue(); + if(islogout == 1){ + showToast("已经注销!", Type.ERROR_MESSAGE); + return; + } + + final pojo = GetServicesFunction.loadPOJO(hr_con_id,"HR_COSTENGINEERREGISTERED",false); + if(pojo!=null){ + if(pojo.get_Value("ISMAINITEMS") == 1){ + showToast("如要注销主项注册专业,请注销造价师注册证!", Type.ERROR_MESSAGE); + return; + } + + def updateMap=[:]; + updateMap["HR_COSTENGINEERREGISTERED_ID"] = hr_con_id; + updateMap["ISLOGOUT"] = 1; + GetServicesFunction.excuteFlow(updateMap,"HR_COSTENGINEERREGISTERED_LOGOUT"); + + + id?.getField("ISLOGOUT")?.setImmediate(true); + setFieldReadOnly(id,"ISLOGOUT",false); + + id?.getField("ISLOGOUT")?.setValue(1); + + setFieldReadOnly(id,"ISLOGOUT",true); + professionals.setValue(new ArrayList(professionals.getValue())); + } +}, 0) + +professionals?.showAddButton(false); +professionals?.showDeleteButton(false); +``` + +## 3. 余留模式与建议改法 + +### 余留:raw .table 组件访问(1 行) + +样例行: +```groovy +final Object table = professionals?.table; +``` +建议改法:操作原始 Table 列模型(getVisibleColumns/setVisibleColumns);amis 侧改 columnsTogglable/静态列配置 + +### 余留:残留字段句柄链(未覆盖动词)(1 行) + +样例行: +```groovy +final def professionals = group.getField("PROFESSIONALS"); +``` +建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 + diff --git a/tools/s3_rewriter/output/manual_workpackage/100_PARTIAL_85966712_周转_租赁_材料报废.md b/tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_85966712_周转_租赁_材料报废.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/100_PARTIAL_85966712_周转_租赁_材料报废.md rename to tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_85966712_周转_租赁_材料报废.md index 82c3de7..6cdab7d 100644 --- a/tools/s3_rewriter/output/manual_workpackage/100_PARTIAL_85966712_周转_租赁_材料报废.md +++ b/tools/s3_rewriter/output/manual_workpackage/087_PARTIAL_85966712_周转_租赁_材料报废.md @@ -1,4 +1,4 @@ -# 人工作业单 #100 — PARTIAL +# 人工作业单 #087 — PARTIAL - 模板ID : `85966712-cdef-4e82-8121-c04b6358fbd4` - 模板名 : 周转(租赁)材料报废 diff --git a/tools/s3_rewriter/output/manual_workpackage/101_PARTIAL_86c05eb5_销项税发票.md b/tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_86c05eb5_销项税发票.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/101_PARTIAL_86c05eb5_销项税发票.md rename to tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_86c05eb5_销项税发票.md index 74faab2..45e6aef 100644 --- a/tools/s3_rewriter/output/manual_workpackage/101_PARTIAL_86c05eb5_销项税发票.md +++ b/tools/s3_rewriter/output/manual_workpackage/088_PARTIAL_86c05eb5_销项税发票.md @@ -1,4 +1,4 @@ -# 人工作业单 #101 — PARTIAL +# 人工作业单 #088 — PARTIAL - 模板ID : `86c05eb5-753d-46e5-b958-cdbcefe7eabc` - 模板名 : 销项税发票 diff --git a/tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_292e76e6_月度检查.md b/tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_292e76e6_月度检查.md deleted file mode 100644 index 0a00e91..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_292e76e6_月度检查.md +++ /dev/null @@ -1,51 +0,0 @@ -# 人工作业单 #089 — PARTIAL - -- 模板ID : `292e76e6-df04-4be3-9108-73eaa1565b4c` -- 模板名 : 月度检查 -- 脚本序 : 2 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -//检查年月下拉框赋值 -def value = getFieldValue("CHECKMONORQUA"); -def month = group.getField("CHECKMONORQUA"); -month?.removeAllItems(); -def icMonth = month?.getContainerDataSource(); -for(k in 1..12){ - icMonth?.addItem(k).getItemProperty("des").setValue(k.toString()); -} -month?.comboBox.setValue(value); -``` - -## 2. 已改写部分(自动产出) -```groovy -//检查年月下拉框赋值 -def value = getFieldValue("CHECKMONORQUA"); - -clearFieldData("CHECKMONORQUA"); - -for(k in 1..12){ - addFieldOption("CHECKMONORQUA", k, k.toString()); -} -group.getField("CHECKMONORQUA")?.comboBox.setValue(value); -``` - -## 3. 余留模式与建议改法 - -### 余留:raw .comboBox 组件访问(1 行) - -样例行: -```groovy -group.getField("CHECKMONORQUA")?.comboBox.setValue(value); -``` -建议改法:直达内嵌 Vaadin ComboBox;amis 侧改用 setValue/setOptions 事件动作,需人工确认语义等价 - -### 余留:残留字段句柄链(未覆盖动词)(1 行) - -样例行: -```groovy -group.getField("CHECKMONORQUA")?.comboBox.setValue(value); -``` -建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 - diff --git a/tools/s3_rewriter/output/manual_workpackage/102_PARTIAL_86c05eb5_销项税发票.md b/tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_86c05eb5_销项税发票.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/102_PARTIAL_86c05eb5_销项税发票.md rename to tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_86c05eb5_销项税发票.md index 6e4ee96..b341805 100644 --- a/tools/s3_rewriter/output/manual_workpackage/102_PARTIAL_86c05eb5_销项税发票.md +++ b/tools/s3_rewriter/output/manual_workpackage/089_PARTIAL_86c05eb5_销项税发票.md @@ -1,4 +1,4 @@ -# 人工作业单 #102 — PARTIAL +# 人工作业单 #089 — PARTIAL - 模板ID : `86c05eb5-753d-46e5-b958-cdbcefe7eabc` - 模板名 : 销项税发票 diff --git a/tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_86c05eb5_销项税发票.md b/tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_86c05eb5_销项税发票.md new file mode 100644 index 0000000..0728c02 --- /dev/null +++ b/tools/s3_rewriter/output/manual_workpackage/090_PARTIAL_86c05eb5_销项税发票.md @@ -0,0 +1,351 @@ +# 人工作业单 #090 — PARTIAL + +- 模板ID : `86c05eb5-753d-46e5-b958-cdbcefe7eabc` +- 模板名 : 销项税发票 +- 脚本序 : 6 +- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) + +## 1. 原文(S3 原始 Groovy) +```groovy +import com.dsasp.server.common.exception.ValidationException; +import com.dsasp.server.common.util.HTTPClientUtils; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + +def transformnum (moneyStr) { + def numericStr = moneyStr.replaceAll(/[^\d.]/, '') // 移除非数字字符:ml-citation{ref="5,11" data="citationList"} + def result = numericStr.isNumber() ? numericStr.toBigDecimal() : null // 高精度转换:ml-citation{ref="9,11" data="citationList"} + return result; +} + + +def invoicelist = group.getField("INVOICELIST"); +def document = group.getField("SELECT"); + +final Button cb = new Button("识别"); +cb?.addClickListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + Object fplists = document?.getValue(); + def documentfp = []; + for (int i = 0; i < fplists.size(); i++) { + def item = fplists.get(i); + if(item.get("DOCUMENT")!=null){ + documentfp.addAll(item.get("DOCUMENT")); + } + }; +// Console.debug(documentfp); + if (documentfp == null || documentfp.size()==0){ + Notification.show("请先上传发票信息!", Type.ERROR_MESSAGE); + return; + }; + if(documentfp && documentfp.size()>0){ + def message = " ";//提示消息 + documentfp.eachWithIndex{it,index-> + //批量选择发票类型后给子表赋值 + if(it && it.get("TEMPFILE")){ + // 表示本地路径 + def filePath = it.get("TEMPFILE"); + //String endpointUrl = "http://192.168.20.63:5020/detection";//内网环境 + String endpointUrl = "http://58.211.166.190:5020/detection";//正式环境 + + //文件流 上传方法 + def responseBody = HTTPClientUtils.getTempFiletoFile(endpointUrl,filePath); +// Console.debug(responseBody); + if(responseBody == null || !responseBody.contains("data")){ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n" + }else{ + def json = HTTPClientUtils.stringToJson(responseBody); + if(json && json.getString("message") && json.get("message")=="ok"){ + def rows = json.get("data"); + def item = rows?.get("data"); + if(rows && item){ + //Console.debug(item); + def fplist = [:]; + fplist.put("DOCUMENT",[it]);//附件图片 + + //发票类型 + if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){ + fplist.put("RECEIPTTYPE",rows.get("invoiceType").contains("专用") ? 3 : rows.get("invoiceType").contains("普通") ? 2 : 1); + }else{ + fplist.put("RECEIPTTYPE",null); + }; + if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){ + fplist.put("PURCHASER",item.get("buyer_name")); + }else{ + fplist.put("PURCHASER",null); + }; + if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){ + fplist.put("SALESPARTY",item.get("seller_name")); + }else{ + fplist.put("SALESPARTY",null); + }; + if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){ + fplist.put("INVOICECODE",item.get("invoice_code")); + }else{ + fplist.put("INVOICECODE",null); + }; + if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){ + fplist.put("INVOICENO",item.get("invoice_number")); + }else{ + fplist.put("INVOICENO",null); + }; + if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){ + fplist.put("INVOICEMONEY",transformnum(item.getString("money"))); + }else{ + fplist.put("INVOICEMONEY",null); + }; + if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){ + fplist.put("TAX",transformnum(item.getString("tax"))); + }else{ + fplist.put("TAX",null); + }; + if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){ + fplist.put("TOTALMONEY",transformnum(item.getString("price"))); + }else{ + fplist.put("TOTALMONEY",null); + }; + if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){ + def date = item.getString("invoice_date"); + fplist.put("INVOICEDATE",GetValueFunction.toDate(date,"yyyy年MM月dd日")); + }else{ + fplist.put("INVOICEDATE",null); + }; + if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){ + fplist.put("TAXRATE",transformnum(item.getString("tax_rate"))); + }else{ + fplist.put("TAXRATE",null); + }; + if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){ + def electronic_number = item.getString("electronic_number"); + fplist.put("GLFPHM",electronic_number); + }else{ + fplist.put("GLFPHM",null); + }; + if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){ + def buyer_code = item.getString("buyer_code"); + fplist.put("KHSH",buyer_code); + }else{ + fplist.put("KHSH",null); + }; + if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){ + def seller_code = item.getString("seller_code"); + fplist.put("XFSH",seller_code); + }else{ + fplist.put("XFSH",null); + }; + if(fplist!=null){ + def flag = true; + if(invoicelist.getValue() && invoicelist.getValue().size()>0){ + for (int j = 0; j < invoicelist.getValue().size(); j++) { + def tempitem = invoicelist.getValue().get(j); + if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){ + flag = false;; + } + }; + }; + if(flag){ + invoicelist.addItem(fplist); + }; + } + } + }else{ + if(json && json.getString("message")){ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票"+json.getString("message")+"!\n"; + } else{ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n"; + } + } + } + } + } + if(message.trim()!=""){ + Notification.show(message, Type.ERROR_MESSAGE); + } + } + }; +}); + +//将自定义的按钮添加至 +invoicelist?.addButton(cb, 0); +``` + +## 2. 已改写部分(自动产出) +```groovy +import com.dsasp.server.common.exception.ValidationException; +import com.dsasp.server.common.util.HTTPClientUtils; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + +def transformnum (moneyStr) { + def numericStr = moneyStr.replaceAll(/[^\d.]/, '') // 移除非数字字符:ml-citation{ref="5,11" data="citationList"} + def result = numericStr.isNumber() ? numericStr.toBigDecimal() : null // 高精度转换:ml-citation{ref="9,11" data="citationList"} + return result; +} + + + + + +//将自定义的按钮添加至 +addFieldButton("INVOICELIST", "识别", { +Object fplists = getFieldValue("SELECT"); + def documentfp = []; + for (int i = 0; i < fplists.size(); i++) { + def item = fplists.get(i); + if(item.get("DOCUMENT")!=null){ + documentfp.addAll(item.get("DOCUMENT")); + } + }; +// Console.debug(documentfp); + if (documentfp == null || documentfp.size()==0){ + showToast("请先上传发票信息!", Type.ERROR_MESSAGE); + return; + }; + if(documentfp && documentfp.size()>0){ + def message = " ";//提示消息 + documentfp.eachWithIndex{it,index-> + //批量选择发票类型后给子表赋值 + if(it && it.get("TEMPFILE")){ + // 表示本地路径 + def filePath = it.get("TEMPFILE"); + //String endpointUrl = "http://192.168.20.63:5020/detection";//内网环境 + String endpointUrl = "http://58.211.166.190:5020/detection";//正式环境 + + //文件流 上传方法 + def responseBody = HTTPClientUtils.getTempFiletoFile(endpointUrl,filePath); +// Console.debug(responseBody); + if(responseBody == null || !responseBody.contains("data")){ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n" + }else{ + def json = HTTPClientUtils.stringToJson(responseBody); + if(json && json.getString("message") && json.get("message")=="ok"){ + def rows = json.get("data"); + def item = rows?.get("data"); + if(rows && item){ + //Console.debug(item); + def fplist = [:]; + fplist.put("DOCUMENT",[it]);//附件图片 + + //发票类型 + if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){ + fplist.put("RECEIPTTYPE",rows.get("invoiceType").contains("专用") ? 3 : rows.get("invoiceType").contains("普通") ? 2 : 1); + }else{ + fplist.put("RECEIPTTYPE",null); + }; + if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){ + fplist.put("PURCHASER",item.get("buyer_name")); + }else{ + fplist.put("PURCHASER",null); + }; + if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){ + fplist.put("SALESPARTY",item.get("seller_name")); + }else{ + fplist.put("SALESPARTY",null); + }; + if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){ + fplist.put("INVOICECODE",item.get("invoice_code")); + }else{ + fplist.put("INVOICECODE",null); + }; + if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){ + fplist.put("INVOICENO",item.get("invoice_number")); + }else{ + fplist.put("INVOICENO",null); + }; + if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){ + fplist.put("INVOICEMONEY",transformnum(item.getString("money"))); + }else{ + fplist.put("INVOICEMONEY",null); + }; + if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){ + fplist.put("TAX",transformnum(item.getString("tax"))); + }else{ + fplist.put("TAX",null); + }; + if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){ + fplist.put("TOTALMONEY",transformnum(item.getString("price"))); + }else{ + fplist.put("TOTALMONEY",null); + }; + if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){ + def date = item.getString("invoice_date"); + fplist.put("INVOICEDATE",GetValueFunction.toDate(date,"yyyy年MM月dd日")); + }else{ + fplist.put("INVOICEDATE",null); + }; + if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){ + fplist.put("TAXRATE",transformnum(item.getString("tax_rate"))); + }else{ + fplist.put("TAXRATE",null); + }; + if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){ + def electronic_number = item.getString("electronic_number"); + fplist.put("GLFPHM",electronic_number); + }else{ + fplist.put("GLFPHM",null); + }; + if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){ + def buyer_code = item.getString("buyer_code"); + fplist.put("KHSH",buyer_code); + }else{ + fplist.put("KHSH",null); + }; + if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){ + def seller_code = item.getString("seller_code"); + fplist.put("XFSH",seller_code); + }else{ + fplist.put("XFSH",null); + }; + if(fplist!=null){ + def flag = true; + if(getFieldValue("INVOICELIST") && getFieldValue("INVOICELIST").size()>0){ + for (int j = 0; j < getFieldValue("INVOICELIST").size(); j++) { + def tempitem = getFieldValue("INVOICELIST").get(j); + if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){ + flag = false;; + } + }; + }; + if(flag){ + group.getField("INVOICELIST").addItem(fplist); + }; + } + } + }else{ + if(json && json.getString("message")){ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票"+json.getString("message")+"!\n"; + } else{ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n"; + } + } + } + } + } + if(message.trim()!=""){ + showToast(message, Type.ERROR_MESSAGE); + } + } +}, 0) +``` + +## 3. 余留模式与建议改法 + +### 余留:数据源 addItem(非标准选项 idiom)(1 行) + +样例行: +```groovy +group.getField("INVOICELIST").addItem(fplist); +``` +建议改法:非 addFieldOption 标准链;人工确认填充语义后映射为 setOptions 数组 + +### 余留:残留字段句柄链(未覆盖动词)(1 行) + +样例行: +```groovy +group.getField("INVOICELIST").addItem(fplist); +``` +建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 + diff --git a/tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_884f0dde_物资采购申请_土建_项目.md b/tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_884f0dde_物资采购申请_土建_项目.md new file mode 100644 index 0000000..24eee8b --- /dev/null +++ b/tools/s3_rewriter/output/manual_workpackage/091_PARTIAL_884f0dde_物资采购申请_土建_项目.md @@ -0,0 +1,148 @@ +# 人工作业单 #091 — PARTIAL + +- 模板ID : `884f0dde-564a-4e6e-9a5d-55d12d0a16e1` +- 模板名 : 物资采购申请(土建-项目) +- 脚本序 : 1 +- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) + +## 1. 原文(S3 原始 Groovy) +```groovy +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + +def materialList = group.getField("MATERIALDETAILS"); +final Button cb = new Button("复制"); +final Object table = materialList?.table; +table?.setImmediate(true);//设置验证 +final group1 = group; +cb?.addClickListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + Object o = table?.getValue(); + if (o == null){ + Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + + def itemMap = [:]; + itemMap["MATERIALID"] = getFieldValue(o, "MATERIALID");//材料ID + itemMap["MATERIALCODE"] = getFieldValue(o, "MATERIALCODE");//材料编码 + //itemMap["MATERIALALIASID"] = getFieldValue(o, "MATERIALALIASID");//材料别名ID + itemMap["MATERIALNAME"] = getFieldValue(o, "MATERIALNAME");//材料名称 + itemMap["SPECIFICATIONS"] = getFieldValue(o, "SPECIFICATIONS");//规格 + //itemMap["FIGURENO"] = getFieldValue(o, "FIGURENO");//图号编号 + //itemMap["SURFACETREATMENT"] = getFieldValue(o, "SURFACETREATMENT");//表面处理 + //itemMap["COLORNUMBER"] = getFieldValue(o, "COLORNUMBER");//色泽色号 + //itemMap["LENGTH"] = getFieldValue(o, "LENGTH");//长度 + itemMap["NUMBER"] = getFieldValue(o, "NUMBER");//件数 + //itemMap["CHILDUNIT"] = getFieldValue(o, "CHILDUNIT");//子单位 + //itemMap["LENGTHSUM"] = getFieldValue(o, "LENGTHSUM");//总长 + //itemMap["METERWEIGHT"] = getFieldValue(o, "METERWEIGHT");//米重 + itemMap["PURCHASENUM"] = getFieldValue(o, "PURCHASENUM");//数量 + itemMap["UNIT"] = getFieldValue(o, "UNIT");//主单位 + itemMap["REMARK"] = getFieldValue(o, "REMARK");//备注 + + //调用addItem()方法可直接在 + materialList.addItem(itemMap); + table.select(o); + } +}); + +//将自定义的按钮添加至 +materialList?.addButton(group.getField("SELECT"),0); +materialList?.addButton(cb, 1); + +import com.dsasp.client.viewframework.util.TableImportExport; +def tie = new TableImportExport(materialList,"com.dsasp.pm.materialmanagertj.client.MaterialApplyDetailImportOfTJ"); +tie.addImportButton(4); +tie.addExportButton(5); + + + +group.getField("MATERIALDETAILS")?.addButton(group.getField("SELECT"),0); +group.getField("ISPREPARATION")?.setVisible(false); +//group.getField("ISPREPARATION").setCaption("公司备料"); +``` + +## 2. 已改写部分(自动产出) +```groovy +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + + +final Object table = group.getField("MATERIALDETAILS")?.table; +table?.setImmediate(true);//设置验证 +final group1 = group; +//将自定义的按钮添加至 +addSubTableButton("MATERIALDETAILS", "SELECT", 0); +addFieldButton("MATERIALDETAILS", "复制", { +Object o = table?.getValue(); + if (o == null){ + showToast("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + + def itemMap = [:]; + itemMap["MATERIALID"] = getFieldValue(o, "MATERIALID");//材料ID + itemMap["MATERIALCODE"] = getFieldValue(o, "MATERIALCODE");//材料编码 + //itemMap["MATERIALALIASID"] = getFieldValue(o, "MATERIALALIASID");//材料别名ID + itemMap["MATERIALNAME"] = getFieldValue(o, "MATERIALNAME");//材料名称 + itemMap["SPECIFICATIONS"] = getFieldValue(o, "SPECIFICATIONS");//规格 + //itemMap["FIGURENO"] = getFieldValue(o, "FIGURENO");//图号编号 + //itemMap["SURFACETREATMENT"] = getFieldValue(o, "SURFACETREATMENT");//表面处理 + //itemMap["COLORNUMBER"] = getFieldValue(o, "COLORNUMBER");//色泽色号 + //itemMap["LENGTH"] = getFieldValue(o, "LENGTH");//长度 + itemMap["NUMBER"] = getFieldValue(o, "NUMBER");//件数 + //itemMap["CHILDUNIT"] = getFieldValue(o, "CHILDUNIT");//子单位 + //itemMap["LENGTHSUM"] = getFieldValue(o, "LENGTHSUM");//总长 + //itemMap["METERWEIGHT"] = getFieldValue(o, "METERWEIGHT");//米重 + itemMap["PURCHASENUM"] = getFieldValue(o, "PURCHASENUM");//数量 + itemMap["UNIT"] = getFieldValue(o, "UNIT");//主单位 + itemMap["REMARK"] = getFieldValue(o, "REMARK");//备注 + + //调用addItem()方法可直接在 + group.getField("MATERIALDETAILS").addItem(itemMap); + table.select(o); +}, 1) + +import com.dsasp.client.viewframework.util.TableImportExport; +def tie = new TableImportExport(materialList,"com.dsasp.pm.materialmanagertj.client.MaterialApplyDetailImportOfTJ"); +tie.addImportButton(4); +tie.addExportButton(5); + + + +addSubTableButton("MATERIALDETAILS", "SELECT", 0); +setFieldVisible("ISPREPARATION", false); +//setFieldCaption("ISPREPARATION", "公司备料"); +``` + +## 3. 余留模式与建议改法 + +### 余留:raw .table 组件访问(1 行) + +样例行: +```groovy +final Object table = group.getField("MATERIALDETAILS")?.table; +``` +建议改法:操作原始 Table 列模型(getVisibleColumns/setVisibleColumns);amis 侧改 columnsTogglable/静态列配置 + +### 余留:数据源 addItem(非标准选项 idiom)(1 行) + +样例行: +```groovy +group.getField("MATERIALDETAILS").addItem(itemMap); +``` +建议改法:非 addFieldOption 标准链;人工确认填充语义后映射为 setOptions 数组 + +### 余留:残留字段句柄链(未覆盖动词)(2 行) + +样例行: +```groovy +final Object table = group.getField("MATERIALDETAILS")?.table; +group.getField("MATERIALDETAILS").addItem(itemMap); +``` +建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 + diff --git a/tools/s3_rewriter/output/manual_workpackage/103_PARTIAL_8fadaa6e_费率配置.md b/tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_8fadaa6e_费率配置.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/103_PARTIAL_8fadaa6e_费率配置.md rename to tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_8fadaa6e_费率配置.md index 45a7461..625a424 100644 --- a/tools/s3_rewriter/output/manual_workpackage/103_PARTIAL_8fadaa6e_费率配置.md +++ b/tools/s3_rewriter/output/manual_workpackage/092_PARTIAL_8fadaa6e_费率配置.md @@ -1,4 +1,4 @@ -# 人工作业单 #103 — PARTIAL +# 人工作业单 #092 — PARTIAL - 模板ID : `8fadaa6e-eef2-4fe6-b13f-a2fb4d598253` - 模板名 : 费率配置 diff --git a/tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_a760fba0_项目人员配置.md b/tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_a760fba0_项目人员配置.md new file mode 100644 index 0000000..dc990ef --- /dev/null +++ b/tools/s3_rewriter/output/manual_workpackage/093_PARTIAL_a760fba0_项目人员配置.md @@ -0,0 +1,93 @@ +# 人工作业单 #093 — PARTIAL + +- 模板ID : `a760fba0-693e-4f0a-8007-3bdca7fb0305` +- 模板名 : 项目人员配置 +- 脚本序 : 3 +- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) + +## 1. 原文(S3 原始 Groovy) +```groovy +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + +final user = group.getField("PM_PROJECT_USERS"); +final Button cb = new Button("删除"); + +final Object table = user?.table; +table?.setImmediate(true);//设置验证 +final group1 = group; +cb?.addClickListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + Object o = table?.getValue(); + if (o == null){ + Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + def isLock = getFieldValue(o, "ISLOCK"); + if(isLock == 1){ + Notification.show("已备案人员无法删除!", Type.ERROR_MESSAGE); + }else{ + table.removeItem(o); + table.select(null); + user.fireValueChange(true); + } + } +}); + +//将自定义的按钮添加至 +user?.addButton(cb,"delete.png", 1); +user?.deleteButton.setVisible(false); +``` + +## 2. 已改写部分(自动产出) +```groovy +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + + + +final Object table = group.getField("PM_PROJECT_USERS")?.table; +table?.setImmediate(true);//设置验证 +final group1 = group; +//将自定义的按钮添加至 +addFieldButton("PM_PROJECT_USERS", "删除", { +Object o = table?.getValue(); + if (o == null){ + showToast("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + def isLock = getFieldValue(o, "ISLOCK"); + if(isLock == 1){ + showToast("已备案人员无法删除!", Type.ERROR_MESSAGE); + }else{ + table.removeItem(o); + table.select(null); + group.getField("PM_PROJECT_USERS").fireValueChange(true); + } +}) +group.getField("PM_PROJECT_USERS")?.deleteButton.setVisible(false); +``` + +## 3. 余留模式与建议改法 + +### 余留:raw .table 组件访问(1 行) + +样例行: +```groovy +final Object table = group.getField("PM_PROJECT_USERS")?.table; +``` +建议改法:操作原始 Table 列模型(getVisibleColumns/setVisibleColumns);amis 侧改 columnsTogglable/静态列配置 + +### 余留:残留字段句柄链(未覆盖动词)(3 行) + +样例行: +```groovy +final Object table = group.getField("PM_PROJECT_USERS")?.table; +group.getField("PM_PROJECT_USERS").fireValueChange(true); +group.getField("PM_PROJECT_USERS")?.deleteButton.setVisible(false); +``` +建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 + diff --git a/tools/s3_rewriter/output/manual_workpackage/105_PARTIAL_a9abafe3_驾驶员信息.md b/tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_a9abafe3_驾驶员信息.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/105_PARTIAL_a9abafe3_驾驶员信息.md rename to tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_a9abafe3_驾驶员信息.md index 3c2bef4..134c9cc 100644 --- a/tools/s3_rewriter/output/manual_workpackage/105_PARTIAL_a9abafe3_驾驶员信息.md +++ b/tools/s3_rewriter/output/manual_workpackage/094_PARTIAL_a9abafe3_驾驶员信息.md @@ -1,4 +1,4 @@ -# 人工作业单 #105 — PARTIAL +# 人工作业单 #094 — PARTIAL - 模板ID : `a9abafe3-1c68-47dd-9068-63c9eb732673` - 模板名 : 驾驶员信息 diff --git a/tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_b233e091_固定资产变动.md b/tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_b233e091_固定资产变动.md similarity index 99% rename from tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_b233e091_固定资产变动.md rename to tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_b233e091_固定资产变动.md index 1893412..8c34dd8 100644 --- a/tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_b233e091_固定资产变动.md +++ b/tools/s3_rewriter/output/manual_workpackage/095_PARTIAL_b233e091_固定资产变动.md @@ -1,4 +1,4 @@ -# 人工作业单 #106 — PARTIAL +# 人工作业单 #095 — PARTIAL - 模板ID : `b233e091-ae6f-401a-bb5f-b145c8aa9ea4` - 模板名 : 固定资产变动 diff --git a/tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_6c11d228_季度检查整改.md b/tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_6c11d228_季度检查整改.md deleted file mode 100644 index cfe5f28..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_6c11d228_季度检查整改.md +++ /dev/null @@ -1,55 +0,0 @@ -# 人工作业单 #096 — PARTIAL - -- 模板ID : `6c11d228-a9d7-43de-85e4-d56e43cad10c` -- 模板名 : 季度检查整改 -- 脚本序 : 1 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -//检查年月下拉框赋值 -def month = group.getField("CHECKMONTHQUARTERLY"); -month?.removeAllItems(); -def icMonth = month?.getContainerDataSource(); -for(k in [1,2,3,4]){ - icMonth?.addItem(k).getItemProperty("des").setValue(k.toString()); -} -bindField("CHECKYEAR",GetDefaultValueFunction.currentYear()); -bindField("CHECKMONTHQUARTERLY",1); -def depart = group.getField("AUTHENTICATIONPART"); -depart?.comboBox?.removeItem(0);//移除项目部 -``` - -## 2. 已改写部分(自动产出) -```groovy -//检查年月下拉框赋值 - -clearFieldData("CHECKMONTHQUARTERLY"); - -for(k in [1,2,3,4]){ - addFieldOption("CHECKMONTHQUARTERLY", k, k.toString()); -} -bindField("CHECKYEAR",GetDefaultValueFunction.currentYear()); -bindField("CHECKMONTHQUARTERLY",1); - -group.getField("AUTHENTICATIONPART")?.comboBox?.removeItem(0);//移除项目部 -``` - -## 3. 余留模式与建议改法 - -### 余留:raw .comboBox 组件访问(1 行) - -样例行: -```groovy -group.getField("AUTHENTICATIONPART")?.comboBox?.removeItem(0);//移除项目部 -``` -建议改法:直达内嵌 Vaadin ComboBox;amis 侧改用 setValue/setOptions 事件动作,需人工确认语义等价 - -### 余留:残留字段句柄链(未覆盖动词)(1 行) - -样例行: -```groovy -group.getField("AUTHENTICATIONPART")?.comboBox?.removeItem(0);//移除项目部 -``` -建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 - diff --git a/tools/s3_rewriter/output/manual_workpackage/107_PARTIAL_b233e091_固定资产变动.md b/tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_b233e091_固定资产变动.md similarity index 99% rename from tools/s3_rewriter/output/manual_workpackage/107_PARTIAL_b233e091_固定资产变动.md rename to tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_b233e091_固定资产变动.md index 1f2ec1e..942eeac 100644 --- a/tools/s3_rewriter/output/manual_workpackage/107_PARTIAL_b233e091_固定资产变动.md +++ b/tools/s3_rewriter/output/manual_workpackage/096_PARTIAL_b233e091_固定资产变动.md @@ -1,4 +1,4 @@ -# 人工作业单 #107 — PARTIAL +# 人工作业单 #096 — PARTIAL - 模板ID : `b233e091-ae6f-401a-bb5f-b145c8aa9ea4` - 模板名 : 固定资产变动 diff --git a/tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_6c11d228_季度检查整改.md b/tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_6c11d228_季度检查整改.md deleted file mode 100644 index b81a028..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_6c11d228_季度检查整改.md +++ /dev/null @@ -1,59 +0,0 @@ -# 人工作业单 #097 — PARTIAL - -- 模板ID : `6c11d228-a9d7-43de-85e4-d56e43cad10c` -- 模板名 : 季度检查整改 -- 脚本序 : 2 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -//检查年月下拉框赋值 -def value = getFieldValue("CHECKMONTHQUARTERLY"); -def month = group.getField("CHECKMONTHQUARTERLY"); -month?.removeAllItems(); -def icMonth = month?.getContainerDataSource(); -for(k in [1,2,3,4]){ - icMonth?.addItem(k).getItemProperty("des").setValue(k.toString()); -} -month?.comboBox?.setValue(value); - -def depart = group.getField("AUTHENTICATIONPART"); -depart?.comboBox?.removeItem(0);//移除项目部 -``` - -## 2. 已改写部分(自动产出) -```groovy -//检查年月下拉框赋值 -def value = getFieldValue("CHECKMONTHQUARTERLY"); - -clearFieldData("CHECKMONTHQUARTERLY"); - -for(k in [1,2,3,4]){ - addFieldOption("CHECKMONTHQUARTERLY", k, k.toString()); -} -group.getField("CHECKMONTHQUARTERLY")?.comboBox?.setValue(value); - - -group.getField("AUTHENTICATIONPART")?.comboBox?.removeItem(0);//移除项目部 -``` - -## 3. 余留模式与建议改法 - -### 余留:raw .comboBox 组件访问(2 行) - -样例行: -```groovy -group.getField("CHECKMONTHQUARTERLY")?.comboBox?.setValue(value); -group.getField("AUTHENTICATIONPART")?.comboBox?.removeItem(0);//移除项目部 -``` -建议改法:直达内嵌 Vaadin ComboBox;amis 侧改用 setValue/setOptions 事件动作,需人工确认语义等价 - -### 余留:残留字段句柄链(未覆盖动词)(2 行) - -样例行: -```groovy -group.getField("CHECKMONTHQUARTERLY")?.comboBox?.setValue(value); -group.getField("AUTHENTICATIONPART")?.comboBox?.removeItem(0);//移除项目部 -``` -建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 - diff --git a/tools/s3_rewriter/output/manual_workpackage/108_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md b/tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md similarity index 99% rename from tools/s3_rewriter/output/manual_workpackage/108_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md rename to tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md index 7e64ae6..73d4833 100644 --- a/tools/s3_rewriter/output/manual_workpackage/108_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md +++ b/tools/s3_rewriter/output/manual_workpackage/097_PARTIAL_c0684b1a_办公用品库_结账成本汇总.md @@ -1,4 +1,4 @@ -# 人工作业单 #108 — PARTIAL +# 人工作业单 #097 — PARTIAL - 模板ID : `c0684b1a-c91a-4aa1-befe-029340cb67f5` - 模板名 : 办公用品库-结账成本汇总 diff --git a/tools/s3_rewriter/output/manual_workpackage/109_PARTIAL_c0982679_报名申请.md b/tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_c0982679_报名申请.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/109_PARTIAL_c0982679_报名申请.md rename to tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_c0982679_报名申请.md index daf7a65..ae74531 100644 --- a/tools/s3_rewriter/output/manual_workpackage/109_PARTIAL_c0982679_报名申请.md +++ b/tools/s3_rewriter/output/manual_workpackage/098_PARTIAL_c0982679_报名申请.md @@ -1,4 +1,4 @@ -# 人工作业单 #109 — PARTIAL +# 人工作业单 #098 — PARTIAL - 模板ID : `c0982679-2ac1-4be9-8043-cbe47210beee` - 模板名 : 报名申请 diff --git a/tools/s3_rewriter/output/manual_workpackage/110_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md b/tools/s3_rewriter/output/manual_workpackage/099_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/110_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md rename to tools/s3_rewriter/output/manual_workpackage/099_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md index 2125391..7877860 100644 --- a/tools/s3_rewriter/output/manual_workpackage/110_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md +++ b/tools/s3_rewriter/output/manual_workpackage/099_PARTIAL_c3aebaa5_周转_租赁_材料报废_查看.md @@ -1,4 +1,4 @@ -# 人工作业单 #110 — PARTIAL +# 人工作业单 #099 — PARTIAL - 模板ID : `c3aebaa5-f445-423e-9dd6-f217dc9521fa` - 模板名 : 周转(租赁)材料报废(查看) diff --git a/tools/s3_rewriter/output/manual_workpackage/100_PARTIAL_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/100_PARTIAL_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md new file mode 100644 index 0000000..2e969b8 --- /dev/null +++ b/tools/s3_rewriter/output/manual_workpackage/100_PARTIAL_e5a03e54_进项税发票_批量调整抵扣日期_五建定制.md @@ -0,0 +1,353 @@ +# 人工作业单 #100 — PARTIAL + +- 模板ID : `e5a03e54-37b2-4122-971f-7f0ac57c2650` +- 模板名 : 进项税发票(批量调整抵扣日期)-五建定制 +- 脚本序 : 9 +- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) + +## 1. 原文(S3 原始 Groovy) +```groovy +import com.dsasp.server.common.exception.ValidationException; +import com.dsasp.server.common.util.HTTPClientUtils; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + +def transformnum (moneyStr) { + def numericStr = moneyStr.replaceAll(/[^\d.]/, '') // 移除非数字字符:ml-citation{ref="5,11" data="citationList"} + def result = numericStr.isNumber() ? numericStr.toBigDecimal() : null // 高精度转换:ml-citation{ref="9,11" data="citationList"} + return result; +} + + +def invoicelist = group.getField("INVOICELIST"); +def document = group.getField("SELECT"); + +final Button cb = new Button("识别"); +cb?.addClickListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + Object fplists = document?.getValue(); + def documentfp = []; + for (int i = 0; i < fplists.size(); i++) { + def item = fplists.get(i); + if(item.get("DOCUMENT")!=null){ + documentfp.addAll(item.get("DOCUMENT")); + } + }; +// Console.debug(documentfp); + if (documentfp == null || documentfp.size()==0){ + Notification.show("请先上传发票信息!", Type.ERROR_MESSAGE); + return; + }; + if(documentfp && documentfp.size()>0){ + def message = " ";//提示消息 + documentfp.eachWithIndex{it,index-> + //批量选择发票类型后给子表赋值 + if(it && it.get("TEMPFILE")){ + // 表示本地路径 + def filePath = it.get("TEMPFILE"); + //String endpointUrl = "http://192.168.20.63:5020/detection";//内网环境 + String endpointUrl = "http://58.211.166.190:5020/detection";//正式环境 + + //文件流 上传方法 + def responseBody = HTTPClientUtils.getTempFiletoFile(endpointUrl,filePath); +// Console.debug(responseBody); + if(responseBody == null || !responseBody.contains("data")){ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n" + }else{ + def json = HTTPClientUtils.stringToJson(responseBody); + if(json && json.getString("message") && json.get("message")=="ok"){ + def rows = json.get("data"); + def item = rows?.get("data"); + if(rows && item){ + //Console.debug(item); + def fplist = [:]; + + //发票类型 + if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){ + fplist.put("RECEIPTTYPE",rows.get("invoiceType").contains("专用") ? 3 : rows.get("invoiceType").contains("普通") ? 2 : 1); + }else{ + fplist.put("RECEIPTTYPE",null); + }; + + if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){ + fplist.put("PURCHASER",item.get("buyer_name")); + }else{ + fplist.put("PURCHASER",null); + }; + if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){ + fplist.put("SALESPARTY",item.get("seller_name")); + }else{ + fplist.put("SALESPARTY",null); + }; + if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){ + fplist.put("INVOICECODE",item.get("invoice_code")); + }else{ + fplist.put("INVOICECODE", "数电票"); + }; + if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){ + fplist.put("INVOICENO",item.get("invoice_number")); + }else{ + fplist.put("INVOICENO",null); + }; + if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){ + fplist.put("INVOICEMONEY",transformnum(item.getString("money"))); + }else{ + fplist.put("INVOICEMONEY",null); + }; + if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){ + fplist.put("TAX",transformnum(item.getString("tax"))); + }else{ + fplist.put("TAX",null); + }; + if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){ + fplist.put("TOTALMONEY",transformnum(item.getString("price"))); + }else{ + fplist.put("TOTALMONEY",null); + }; + if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){ + def date = item.getString("invoice_date"); + fplist.put("INVOICEDATE",GetValueFunction.toDate(date,"yyyy年MM月dd日")); + }else{ + fplist.put("INVOICEDATE",null); + }; + if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){ + fplist.put("TAXRATE",transformnum(item.getString("tax_rate"))); + }else{ + fplist.put("TAXRATE",null); + }; + if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){ + def electronic_number = item.getString("electronic_number"); + fplist.put("GLFPHM",electronic_number); + }else{ + fplist.put("GLFPHM",null); + }; + if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){ + def buyer_code = item.getString("buyer_code"); + fplist.put("KHSH",buyer_code); + }else{ + fplist.put("KHSH",null); + }; + if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){ + def seller_code = item.getString("seller_code"); + fplist.put("XFSH",seller_code); + }else{ + fplist.put("XFSH",null); + }; + if(fplist!=null){ + def flag = true; + if(invoicelist.getValue() && invoicelist.getValue().size()>0){ + for (int j = 0; j < invoicelist.getValue().size(); j++) { + def tempitem = invoicelist.getValue().get(j); + if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){ + flag = false;; + } + }; + }; + if(flag){ + fplist.put("DOCUMENT",[it]);//附件图片 + invoicelist.addItem(fplist); + }; + } + } + }else{ + if(json && json.getString("message")){ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票"+json.getString("message")+"!\n"; + } else{ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n"; + } + } + } + } + } + if(message.trim()!=""){ + Notification.show(message, Type.ERROR_MESSAGE); + } + } + }; +}); + +//将自定义的按钮添加至 +invoicelist?.addButton(cb, 0); +``` + +## 2. 已改写部分(自动产出) +```groovy +import com.dsasp.server.common.exception.ValidationException; +import com.dsasp.server.common.util.HTTPClientUtils; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + +def transformnum (moneyStr) { + def numericStr = moneyStr.replaceAll(/[^\d.]/, '') // 移除非数字字符:ml-citation{ref="5,11" data="citationList"} + def result = numericStr.isNumber() ? numericStr.toBigDecimal() : null // 高精度转换:ml-citation{ref="9,11" data="citationList"} + return result; +} + + + + + +//将自定义的按钮添加至 +addFieldButton("INVOICELIST", "识别", { +Object fplists = getFieldValue("SELECT"); + def documentfp = []; + for (int i = 0; i < fplists.size(); i++) { + def item = fplists.get(i); + if(item.get("DOCUMENT")!=null){ + documentfp.addAll(item.get("DOCUMENT")); + } + }; +// Console.debug(documentfp); + if (documentfp == null || documentfp.size()==0){ + showToast("请先上传发票信息!", Type.ERROR_MESSAGE); + return; + }; + if(documentfp && documentfp.size()>0){ + def message = " ";//提示消息 + documentfp.eachWithIndex{it,index-> + //批量选择发票类型后给子表赋值 + if(it && it.get("TEMPFILE")){ + // 表示本地路径 + def filePath = it.get("TEMPFILE"); + //String endpointUrl = "http://192.168.20.63:5020/detection";//内网环境 + String endpointUrl = "http://58.211.166.190:5020/detection";//正式环境 + + //文件流 上传方法 + def responseBody = HTTPClientUtils.getTempFiletoFile(endpointUrl,filePath); +// Console.debug(responseBody); + if(responseBody == null || !responseBody.contains("data")){ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n" + }else{ + def json = HTTPClientUtils.stringToJson(responseBody); + if(json && json.getString("message") && json.get("message")=="ok"){ + def rows = json.get("data"); + def item = rows?.get("data"); + if(rows && item){ + //Console.debug(item); + def fplist = [:]; + + //发票类型 + if(rows?.get("invoiceType")!=null && rows?.get("invoiceType")!="null" && rows?.get("invoiceType")!="无"){ + fplist.put("RECEIPTTYPE",rows.get("invoiceType").contains("专用") ? 3 : rows.get("invoiceType").contains("普通") ? 2 : 1); + }else{ + fplist.put("RECEIPTTYPE",null); + }; + + if(item?.get("buyer_name")!=null && item?.getString("buyer_name")!="null" && item?.getString("buyer_name")!="无"){ + fplist.put("PURCHASER",item.get("buyer_name")); + }else{ + fplist.put("PURCHASER",null); + }; + if(item?.get("seller_name")!=null && item?.getString("seller_name")!="null" && item?.getString("seller_name")!="无"){ + fplist.put("SALESPARTY",item.get("seller_name")); + }else{ + fplist.put("SALESPARTY",null); + }; + if(item?.get("invoice_code")!=null && item?.getString("invoice_code")!="null" && item?.getString("invoice_code")!="无"){ + fplist.put("INVOICECODE",item.get("invoice_code")); + }else{ + fplist.put("INVOICECODE", "数电票"); + }; + if(item?.get("invoice_number")!=null && item?.getString("invoice_number")!="null" && item?.getString("invoice_number")!="无"){ + fplist.put("INVOICENO",item.get("invoice_number")); + }else{ + fplist.put("INVOICENO",null); + }; + if(item?.get("money")!=null && item?.getString("money")!="null" && item?.getString("money")!="无"){ + fplist.put("INVOICEMONEY",transformnum(item.getString("money"))); + }else{ + fplist.put("INVOICEMONEY",null); + }; + if(item?.get("tax")!=null && item?.getString("tax")!="null" && item?.getString("tax")!="无"){ + fplist.put("TAX",transformnum(item.getString("tax"))); + }else{ + fplist.put("TAX",null); + }; + if(item?.get("price")!=null && item?.getString("price")!="null" && item?.getString("price")!="无"){ + fplist.put("TOTALMONEY",transformnum(item.getString("price"))); + }else{ + fplist.put("TOTALMONEY",null); + }; + if(item?.get("invoice_date")!=null && item?.getString("invoice_date")!="null" && item?.getString("invoice_date")!="无"){ + def date = item.getString("invoice_date"); + fplist.put("INVOICEDATE",GetValueFunction.toDate(date,"yyyy年MM月dd日")); + }else{ + fplist.put("INVOICEDATE",null); + }; + if(item?.get("tax_rate")!=null && item?.getString("tax_rate")!="null" && item?.getString("tax_rate")!="无"){ + fplist.put("TAXRATE",transformnum(item.getString("tax_rate"))); + }else{ + fplist.put("TAXRATE",null); + }; + if(item?.get("electronic_number")!=null && item?.getString("electronic_number")!="null" && item?.getString("electronic_number")!="无"){ + def electronic_number = item.getString("electronic_number"); + fplist.put("GLFPHM",electronic_number); + }else{ + fplist.put("GLFPHM",null); + }; + if(item?.get("buyer_code")!=null && item?.getString("buyer_code")!="null" && item?.getString("buyer_code")!="无"){ + def buyer_code = item.getString("buyer_code"); + fplist.put("KHSH",buyer_code); + }else{ + fplist.put("KHSH",null); + }; + if(item?.get("seller_code")!=null && item?.getString("seller_code")!="null" && item?.getString("seller_code")!="无"){ + def seller_code = item.getString("seller_code"); + fplist.put("XFSH",seller_code); + }else{ + fplist.put("XFSH",null); + }; + if(fplist!=null){ + def flag = true; + if(getFieldValue("INVOICELIST") && getFieldValue("INVOICELIST").size()>0){ + for (int j = 0; j < getFieldValue("INVOICELIST").size(); j++) { + def tempitem = getFieldValue("INVOICELIST").get(j); + if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){ + flag = false;; + } + }; + }; + if(flag){ + fplist.put("DOCUMENT",[it]);//附件图片 + group.getField("INVOICELIST").addItem(fplist); + }; + } + } + }else{ + if(json && json.getString("message")){ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票"+json.getString("message")+"!\n"; + } else{ + message += "第"+(index+GetValueFunction.toDecimal(1))+"张发票接口请求超时,请检查该发票或联系管理员!\n"; + } + } + } + } + } + if(message.trim()!=""){ + showToast(message, Type.ERROR_MESSAGE); + } + } +}, 0) +``` + +## 3. 余留模式与建议改法 + +### 余留:数据源 addItem(非标准选项 idiom)(1 行) + +样例行: +```groovy +group.getField("INVOICELIST").addItem(fplist); +``` +建议改法:非 addFieldOption 标准链;人工确认填充语义后映射为 setOptions 数组 + +### 余留:残留字段句柄链(未覆盖动词)(1 行) + +样例行: +```groovy +group.getField("INVOICELIST").addItem(fplist); +``` +建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 + diff --git a/tools/s3_rewriter/output/manual_workpackage/112_PARTIAL_e70d25ef_农民工工资发放.md b/tools/s3_rewriter/output/manual_workpackage/101_PARTIAL_e70d25ef_农民工工资发放.md similarity index 97% rename from tools/s3_rewriter/output/manual_workpackage/112_PARTIAL_e70d25ef_农民工工资发放.md rename to tools/s3_rewriter/output/manual_workpackage/101_PARTIAL_e70d25ef_农民工工资发放.md index 23eb000..cd5a241 100644 --- a/tools/s3_rewriter/output/manual_workpackage/112_PARTIAL_e70d25ef_农民工工资发放.md +++ b/tools/s3_rewriter/output/manual_workpackage/101_PARTIAL_e70d25ef_农民工工资发放.md @@ -1,4 +1,4 @@ -# 人工作业单 #112 — PARTIAL +# 人工作业单 #101 — PARTIAL - 模板ID : `e70d25ef-9e82-48ba-bdd2-8150c41121b6` - 模板名 : 农民工工资发放 diff --git a/tools/s3_rewriter/output/manual_workpackage/102_PARTIAL_ee9e2a39_物资采购申请_土建_公司.md b/tools/s3_rewriter/output/manual_workpackage/102_PARTIAL_ee9e2a39_物资采购申请_土建_公司.md new file mode 100644 index 0000000..2b38f05 --- /dev/null +++ b/tools/s3_rewriter/output/manual_workpackage/102_PARTIAL_ee9e2a39_物资采购申请_土建_公司.md @@ -0,0 +1,148 @@ +# 人工作业单 #102 — PARTIAL + +- 模板ID : `ee9e2a39-45e2-434a-b691-a02a2041b7e6` +- 模板名 : 物资采购申请(土建-公司) +- 脚本序 : 1 +- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) + +## 1. 原文(S3 原始 Groovy) +```groovy +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + +def materialList = group.getField("MATERIALDETAILS"); +final Button cb = new Button("复制"); +final Object table = materialList?.table; +table?.setImmediate(true);//设置验证 +final group1 = group; +cb?.addClickListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + Object o = table?.getValue(); + if (o == null){ + Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + + def itemMap = [:]; + itemMap["MATERIALID"] = getFieldValue(o, "MATERIALID");//材料ID + itemMap["MATERIALCODE"] = getFieldValue(o, "MATERIALCODE");//材料编码 + //itemMap["MATERIALALIASID"] = getFieldValue(o, "MATERIALALIASID");//材料别名ID + itemMap["MATERIALNAME"] = getFieldValue(o, "MATERIALNAME");//材料名称 + itemMap["SPECIFICATIONS"] = getFieldValue(o, "SPECIFICATIONS");//规格 + //itemMap["FIGURENO"] = getFieldValue(o, "FIGURENO");//图号编号 + //itemMap["SURFACETREATMENT"] = getFieldValue(o, "SURFACETREATMENT");//表面处理 + //itemMap["COLORNUMBER"] = getFieldValue(o, "COLORNUMBER");//色泽色号 + //itemMap["LENGTH"] = getFieldValue(o, "LENGTH");//长度 + itemMap["NUMBER"] = getFieldValue(o, "NUMBER");//件数 + //itemMap["CHILDUNIT"] = getFieldValue(o, "CHILDUNIT");//子单位 + //itemMap["LENGTHSUM"] = getFieldValue(o, "LENGTHSUM");//总长 + //itemMap["METERWEIGHT"] = getFieldValue(o, "METERWEIGHT");//米重 + itemMap["PURCHASENUM"] = getFieldValue(o, "PURCHASENUM");//数量 + itemMap["UNIT"] = getFieldValue(o, "UNIT");//主单位 + itemMap["REMARK"] = getFieldValue(o, "REMARK");//备注 + + //调用addItem()方法可直接在 + materialList.addItem(itemMap); + table.select(o); + } +}); + +//将自定义的按钮添加至 +materialList?.addButton(group.getField("SELECT"),0); +materialList?.addButton(cb, 1); + +import com.dsasp.client.viewframework.util.TableImportExport; +def tie = new TableImportExport(materialList,"com.dsasp.pm.materialmanagertj.client.MaterialApplyDetailImportOfTJ"); +tie.addImportButton(4); +tie.addExportButton(5); + + + +group.getField("MATERIALDETAILS")?.addButton(group.getField("SELECT"),0); +group.getField("ISPREPARATION")?.setVisible(false); +//group.getField("ISPREPARATION").setCaption("公司备料"); +``` + +## 2. 已改写部分(自动产出) +```groovy +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + + +final Object table = group.getField("MATERIALDETAILS")?.table; +table?.setImmediate(true);//设置验证 +final group1 = group; +//将自定义的按钮添加至 +addSubTableButton("MATERIALDETAILS", "SELECT", 0); +addFieldButton("MATERIALDETAILS", "复制", { +Object o = table?.getValue(); + if (o == null){ + showToast("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + + def itemMap = [:]; + itemMap["MATERIALID"] = getFieldValue(o, "MATERIALID");//材料ID + itemMap["MATERIALCODE"] = getFieldValue(o, "MATERIALCODE");//材料编码 + //itemMap["MATERIALALIASID"] = getFieldValue(o, "MATERIALALIASID");//材料别名ID + itemMap["MATERIALNAME"] = getFieldValue(o, "MATERIALNAME");//材料名称 + itemMap["SPECIFICATIONS"] = getFieldValue(o, "SPECIFICATIONS");//规格 + //itemMap["FIGURENO"] = getFieldValue(o, "FIGURENO");//图号编号 + //itemMap["SURFACETREATMENT"] = getFieldValue(o, "SURFACETREATMENT");//表面处理 + //itemMap["COLORNUMBER"] = getFieldValue(o, "COLORNUMBER");//色泽色号 + //itemMap["LENGTH"] = getFieldValue(o, "LENGTH");//长度 + itemMap["NUMBER"] = getFieldValue(o, "NUMBER");//件数 + //itemMap["CHILDUNIT"] = getFieldValue(o, "CHILDUNIT");//子单位 + //itemMap["LENGTHSUM"] = getFieldValue(o, "LENGTHSUM");//总长 + //itemMap["METERWEIGHT"] = getFieldValue(o, "METERWEIGHT");//米重 + itemMap["PURCHASENUM"] = getFieldValue(o, "PURCHASENUM");//数量 + itemMap["UNIT"] = getFieldValue(o, "UNIT");//主单位 + itemMap["REMARK"] = getFieldValue(o, "REMARK");//备注 + + //调用addItem()方法可直接在 + group.getField("MATERIALDETAILS").addItem(itemMap); + table.select(o); +}, 1) + +import com.dsasp.client.viewframework.util.TableImportExport; +def tie = new TableImportExport(materialList,"com.dsasp.pm.materialmanagertj.client.MaterialApplyDetailImportOfTJ"); +tie.addImportButton(4); +tie.addExportButton(5); + + + +addSubTableButton("MATERIALDETAILS", "SELECT", 0); +setFieldVisible("ISPREPARATION", false); +//setFieldCaption("ISPREPARATION", "公司备料"); +``` + +## 3. 余留模式与建议改法 + +### 余留:raw .table 组件访问(1 行) + +样例行: +```groovy +final Object table = group.getField("MATERIALDETAILS")?.table; +``` +建议改法:操作原始 Table 列模型(getVisibleColumns/setVisibleColumns);amis 侧改 columnsTogglable/静态列配置 + +### 余留:数据源 addItem(非标准选项 idiom)(1 行) + +样例行: +```groovy +group.getField("MATERIALDETAILS").addItem(itemMap); +``` +建议改法:非 addFieldOption 标准链;人工确认填充语义后映射为 setOptions 数组 + +### 余留:残留字段句柄链(未覆盖动词)(2 行) + +样例行: +```groovy +final Object table = group.getField("MATERIALDETAILS")?.table; +group.getField("MATERIALDETAILS").addItem(itemMap); +``` +建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 + diff --git a/tools/s3_rewriter/output/manual_workpackage/113_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/103_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/113_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/103_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md index 4783399..55baecb 100644 --- a/tools/s3_rewriter/output/manual_workpackage/113_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/103_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #113 — PARTIAL +# 人工作业单 #103 — PARTIAL - 模板ID : `f01c2f57-1891-45de-9318-7246f9d6ac97` - 模板名 : 销项税发票(增加审批通过后)-五建定制 diff --git a/tools/s3_rewriter/output/manual_workpackage/104_PARTIAL_92072d44_月度检查整改.md b/tools/s3_rewriter/output/manual_workpackage/104_PARTIAL_92072d44_月度检查整改.md deleted file mode 100644 index 8313d60..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/104_PARTIAL_92072d44_月度检查整改.md +++ /dev/null @@ -1,51 +0,0 @@ -# 人工作业单 #104 — PARTIAL - -- 模板ID : `92072d44-33e8-4110-a8cc-aeb8ae300ef5` -- 模板名 : 月度检查整改 -- 脚本序 : 2 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -//检查年月下拉框赋值 -def value = getFieldValue("CHECKMONTHQUARTERLY"); -def month = group.getField("CHECKMONTHQUARTERLY"); -month?.removeAllItems(); -def icMonth = month?.getContainerDataSource(); -for(k in 1..12){ - icMonth?.addItem(k).getItemProperty("des").setValue(k.toString()); -} -month?.comboBox.setValue(value); -``` - -## 2. 已改写部分(自动产出) -```groovy -//检查年月下拉框赋值 -def value = getFieldValue("CHECKMONTHQUARTERLY"); - -clearFieldData("CHECKMONTHQUARTERLY"); - -for(k in 1..12){ - addFieldOption("CHECKMONTHQUARTERLY", k, k.toString()); -} -group.getField("CHECKMONTHQUARTERLY")?.comboBox.setValue(value); -``` - -## 3. 余留模式与建议改法 - -### 余留:raw .comboBox 组件访问(1 行) - -样例行: -```groovy -group.getField("CHECKMONTHQUARTERLY")?.comboBox.setValue(value); -``` -建议改法:直达内嵌 Vaadin ComboBox;amis 侧改用 setValue/setOptions 事件动作,需人工确认语义等价 - -### 余留:残留字段句柄链(未覆盖动词)(1 行) - -样例行: -```groovy -group.getField("CHECKMONTHQUARTERLY")?.comboBox.setValue(value); -``` -建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 - diff --git a/tools/s3_rewriter/output/manual_workpackage/114_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/104_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/114_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md rename to tools/s3_rewriter/output/manual_workpackage/104_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md index 80cee9a..fe93ccb 100644 --- a/tools/s3_rewriter/output/manual_workpackage/114_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md +++ b/tools/s3_rewriter/output/manual_workpackage/104_PARTIAL_f01c2f57_销项税发票_增加审批通过后_五建定制.md @@ -1,4 +1,4 @@ -# 人工作业单 #114 — PARTIAL +# 人工作业单 #104 — PARTIAL - 模板ID : `f01c2f57-1891-45de-9318-7246f9d6ac97` - 模板名 : 销项税发票(增加审批通过后)-五建定制 diff --git a/tools/s3_rewriter/output/manual_workpackage/116_PARTIAL_f805a46c_项目缴费规则.md b/tools/s3_rewriter/output/manual_workpackage/105_PARTIAL_f805a46c_项目缴费规则.md similarity index 98% rename from tools/s3_rewriter/output/manual_workpackage/116_PARTIAL_f805a46c_项目缴费规则.md rename to tools/s3_rewriter/output/manual_workpackage/105_PARTIAL_f805a46c_项目缴费规则.md index f9813b9..174673d 100644 --- a/tools/s3_rewriter/output/manual_workpackage/116_PARTIAL_f805a46c_项目缴费规则.md +++ b/tools/s3_rewriter/output/manual_workpackage/105_PARTIAL_f805a46c_项目缴费规则.md @@ -1,4 +1,4 @@ -# 人工作业单 #116 — PARTIAL +# 人工作业单 #105 — PARTIAL - 模板ID : `f805a46c-3b12-4462-a3a5-7c7b2d6cea10` - 模板名 : 项目缴费规则 diff --git a/tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_fe20a392_项目人员配置_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_fe20a392_项目人员配置_五建定制.md new file mode 100644 index 0000000..ff5b9ab --- /dev/null +++ b/tools/s3_rewriter/output/manual_workpackage/106_PARTIAL_fe20a392_项目人员配置_五建定制.md @@ -0,0 +1,93 @@ +# 人工作业单 #106 — PARTIAL + +- 模板ID : `fe20a392-d4fd-402f-bbf8-be8cd41ab932` +- 模板名 : 项目人员配置(五建定制) +- 脚本序 : 3 +- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) + +## 1. 原文(S3 原始 Groovy) +```groovy +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + +final user = group.getField("PM_PROJECT_USERS"); +final Button cb = new Button("删除"); + +final Object table = user?.table; +table?.setImmediate(true);//设置验证 +final group1 = group; +cb?.addClickListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + Object o = table?.getValue(); + if (o == null){ + Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + def isLock = getFieldValue(o, "ISLOCK"); + if(isLock == 1){ + Notification.show("已备案人员无法删除!", Type.ERROR_MESSAGE); + }else{ + table.removeItem(o); + table.select(null); + user.fireValueChange(true); + } + } +}); + +//将自定义的按钮添加至 +user?.addButton(cb,"delete.png", 1); +user?.deleteButton.setVisible(false); +``` + +## 2. 已改写部分(自动产出) +```groovy +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + + + +final Object table = group.getField("PM_PROJECT_USERS")?.table; +table?.setImmediate(true);//设置验证 +final group1 = group; +//将自定义的按钮添加至 +addFieldButton("PM_PROJECT_USERS", "删除", { +Object o = table?.getValue(); + if (o == null){ + showToast("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + def isLock = getFieldValue(o, "ISLOCK"); + if(isLock == 1){ + showToast("已备案人员无法删除!", Type.ERROR_MESSAGE); + }else{ + table.removeItem(o); + table.select(null); + group.getField("PM_PROJECT_USERS").fireValueChange(true); + } +}) +group.getField("PM_PROJECT_USERS")?.deleteButton.setVisible(false); +``` + +## 3. 余留模式与建议改法 + +### 余留:raw .table 组件访问(1 行) + +样例行: +```groovy +final Object table = group.getField("PM_PROJECT_USERS")?.table; +``` +建议改法:操作原始 Table 列模型(getVisibleColumns/setVisibleColumns);amis 侧改 columnsTogglable/静态列配置 + +### 余留:残留字段句柄链(未覆盖动词)(3 行) + +样例行: +```groovy +final Object table = group.getField("PM_PROJECT_USERS")?.table; +group.getField("PM_PROJECT_USERS").fireValueChange(true); +group.getField("PM_PROJECT_USERS")?.deleteButton.setVisible(false); +``` +建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 + diff --git a/tools/s3_rewriter/output/manual_workpackage/111_PARTIAL_c7b23419_季度检查.md b/tools/s3_rewriter/output/manual_workpackage/111_PARTIAL_c7b23419_季度检查.md deleted file mode 100644 index d024fae..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/111_PARTIAL_c7b23419_季度检查.md +++ /dev/null @@ -1,53 +0,0 @@ -# 人工作业单 #111 — PARTIAL - -- 模板ID : `c7b23419-22e1-4a5a-aa09-464b3bb2a242` -- 模板名 : 季度检查 -- 脚本序 : 3 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -//检查季度下拉框赋值 -def nullitem ="请选择"; -def value = getFieldValue("CHECKMONORQUA"); -def month = group.getField("CHECKMONORQUA"); -month?.removeAllItems(); -def icMonth = month?.getContainerDataSource(); -for(k in [1,2,3,4]){ - icMonth?.addItem(k).getItemProperty("des").setValue(k.toString()); -} -month?.comboBox.setValue(value); -``` - -## 2. 已改写部分(自动产出) -```groovy -//检查季度下拉框赋值 -def nullitem ="请选择"; -def value = getFieldValue("CHECKMONORQUA"); - -clearFieldData("CHECKMONORQUA"); - -for(k in [1,2,3,4]){ - addFieldOption("CHECKMONORQUA", k, k.toString()); -} -group.getField("CHECKMONORQUA")?.comboBox.setValue(value); -``` - -## 3. 余留模式与建议改法 - -### 余留:raw .comboBox 组件访问(1 行) - -样例行: -```groovy -group.getField("CHECKMONORQUA")?.comboBox.setValue(value); -``` -建议改法:直达内嵌 Vaadin ComboBox;amis 侧改用 setValue/setOptions 事件动作,需人工确认语义等价 - -### 余留:残留字段句柄链(未覆盖动词)(1 行) - -样例行: -```groovy -group.getField("CHECKMONORQUA")?.comboBox.setValue(value); -``` -建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 - diff --git a/tools/s3_rewriter/output/manual_workpackage/115_PARTIAL_f78c44ca_月度检查整改_五建定制.md b/tools/s3_rewriter/output/manual_workpackage/115_PARTIAL_f78c44ca_月度检查整改_五建定制.md deleted file mode 100644 index 20c769e..0000000 --- a/tools/s3_rewriter/output/manual_workpackage/115_PARTIAL_f78c44ca_月度检查整改_五建定制.md +++ /dev/null @@ -1,51 +0,0 @@ -# 人工作业单 #115 — PARTIAL - -- 模板ID : `f78c44ca-4a23-4195-996b-2cd7cf629c41` -- 模板名 : 月度检查整改(五建定制) -- 脚本序 : 2 -- 工时口径: 0.5 人日/条(上界;PARTIAL 多为「仅余几行」,实际远低于此) - -## 1. 原文(S3 原始 Groovy) -```groovy -//检查年月下拉框赋值 -def value = getFieldValue("CHECKMONTHQUARTERLY"); -def month = group.getField("CHECKMONTHQUARTERLY"); -month?.removeAllItems(); -def icMonth = month?.getContainerDataSource(); -for(k in 1..12){ - icMonth?.addItem(k).getItemProperty("des").setValue(k.toString()); -} -month?.comboBox.setValue(value); -``` - -## 2. 已改写部分(自动产出) -```groovy -//检查年月下拉框赋值 -def value = getFieldValue("CHECKMONTHQUARTERLY"); - -clearFieldData("CHECKMONTHQUARTERLY"); - -for(k in 1..12){ - addFieldOption("CHECKMONTHQUARTERLY", k, k.toString()); -} -group.getField("CHECKMONTHQUARTERLY")?.comboBox.setValue(value); -``` - -## 3. 余留模式与建议改法 - -### 余留:raw .comboBox 组件访问(1 行) - -样例行: -```groovy -group.getField("CHECKMONTHQUARTERLY")?.comboBox.setValue(value); -``` -建议改法:直达内嵌 Vaadin ComboBox;amis 侧改用 setValue/setOptions 事件动作,需人工确认语义等价 - -### 余留:残留字段句柄链(未覆盖动词)(1 行) - -样例行: -```groovy -group.getField("CHECKMONTHQUARTERLY")?.comboBox.setValue(value); -``` -建议改法:字段句柄上挂了未登记动词;人工确认动词语义后补登记或手改 - diff --git a/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/3.HARD.groovy index 6c6ba51..825eb58 100644 --- a/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/3.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/3.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同评审(五建定制) // seq : 3 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/4.HARD.groovy b/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/4.HARD.groovy index d47112c..f3d622c 100644 --- a/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/4.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/1a7f5b05-adee-4a67-a311-ac9f76af2c15/4.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同评审(五建定制) // seq : 4 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/1edd6c1c-2d17-4504-8ee5-faf12822c0c2/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/1edd6c1c-2d17-4504-8ee5-faf12822c0c2/2.HARD.groovy index 4ce9f51..6cead41 100644 --- a/tools/s3_rewriter/output/rewritten/1edd6c1c-2d17-4504-8ee5-faf12822c0c2/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/1edd6c1c-2d17-4504-8ee5-faf12822c0c2/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同登记-需要评审 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/1.HARD.groovy index 96d11a7..d735639 100644 --- a/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 劳务分包合同登记-不需要评审 // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/2.HARD.groovy index 32e5e92..9fff707 100644 --- a/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/213d1b7e-e1b7-4ab4-ae4a-181ae4b40461/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 劳务分包合同登记-不需要评审 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/1.HARD.groovy index 0198d1b..463aee2 100644 --- a/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 劳务分包合同登记-不需要评审(五建定制) // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/2.HARD.groovy index a69d27a..ae06b52 100644 --- a/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/2213796d-03b0-4b74-b923-6be0415cd002/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 劳务分包合同登记-不需要评审(五建定制) // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/2.HARD.groovy index ef518f3..686feb7 100644 --- a/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 专业分包合同评审 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/3.HARD.groovy index 13cd68a..3377e3a 100644 --- a/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/3.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/26fe10ae-93a9-45c4-9f58-2183e6050100/3.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 专业分包合同评审 // seq : 3 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/2852ff22-439c-4625-a2c5-c70b547d82ca/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/2852ff22-439c-4625-a2c5-c70b547d82ca/1.HARD.groovy index e98bfd9..fbae8c1 100644 --- a/tools/s3_rewriter/output/rewritten/2852ff22-439c-4625-a2c5-c70b547d82ca/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/2852ff22-439c-4625-a2c5-c70b547d82ca/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 计划成本变更 // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/2852ff22-439c-4625-a2c5-c70b547d82ca/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/2852ff22-439c-4625-a2c5-c70b547d82ca/3.HARD.groovy index 5333769..44801c8 100644 --- a/tools/s3_rewriter/output/rewritten/2852ff22-439c-4625-a2c5-c70b547d82ca/3.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/2852ff22-439c-4625-a2c5-c70b547d82ca/3.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 计划成本变更 // seq : 3 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/292e76e6-df04-4be3-9108-73eaa1565b4c/2.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/292e76e6-df04-4be3-9108-73eaa1565b4c/2.FULL_AUTO.groovy similarity index 55% rename from tools/s3_rewriter/output/rewritten/292e76e6-df04-4be3-9108-73eaa1565b4c/2.PARTIAL.groovy rename to tools/s3_rewriter/output/rewritten/292e76e6-df04-4be3-9108-73eaa1565b4c/2.FULL_AUTO.groovy index 1a26470..6bbe783 100644 --- a/tools/s3_rewriter/output/rewritten/292e76e6-df04-4be3-9108-73eaa1565b4c/2.PARTIAL.groovy +++ b/tools/s3_rewriter/output/rewritten/292e76e6-df04-4be3-9108-73eaa1565b4c/2.FULL_AUTO.groovy @@ -2,9 +2,8 @@ // template_id : 292e76e6-df04-4be3-9108-73eaa1565b4c // template_name: 月度检查 // seq : 2 -// label : PARTIAL -// 余留模式 : raw .comboBox 组件访问; 残留字段句柄链(未覆盖动词) -// 处置 : 大部分已自动改写,余留行人工补全(见作业单) +// label : FULL_AUTO +// 处置 : 全自动改写完成,直接入 P4 转换流水线 //检查年月下拉框赋值 def value = getFieldValue("CHECKMONORQUA"); @@ -13,4 +12,4 @@ clearFieldData("CHECKMONORQUA"); for(k in 1..12){ addFieldOption("CHECKMONORQUA", k, k.toString()); } -group.getField("CHECKMONORQUA")?.comboBox.setValue(value); \ No newline at end of file +setFieldValue("CHECKMONORQUA", value); \ No newline at end of file diff --git a/tools/s3_rewriter/output/rewritten/2cceb83c-4079-43e4-b7b7-c395fd68cbbc/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/2cceb83c-4079-43e4-b7b7-c395fd68cbbc/3.PARTIAL.groovy similarity index 69% rename from tools/s3_rewriter/output/rewritten/2cceb83c-4079-43e4-b7b7-c395fd68cbbc/3.HARD.groovy rename to tools/s3_rewriter/output/rewritten/2cceb83c-4079-43e4-b7b7-c395fd68cbbc/3.PARTIAL.groovy index e378e91..7bf4402 100644 --- a/tools/s3_rewriter/output/rewritten/2cceb83c-4079-43e4-b7b7-c395fd68cbbc/3.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/2cceb83c-4079-43e4-b7b7-c395fd68cbbc/3.PARTIAL.groovy @@ -2,13 +2,10 @@ // template_id : 2cceb83c-4079-43e4-b7b7-c395fd68cbbc // template_name: 建造师注册证 // seq : 3 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) +// label : PARTIAL +// 余留模式 : raw .table 组件访问; 残留字段句柄链(未覆盖动词) +// 处置 : 大部分已自动改写,余留行人工补全(见作业单) -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; import com.vaadin.data.Property.ValueChangeListener; @@ -21,32 +18,30 @@ import com.vaadin.ui.Label; final def professionals = group.getField("PROFESSIONALS"); -final Button but = new Button("注销"); final Object table = professionals?.table; table?.setImmediate(true); final group1 = group; -but?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def id = table?.getValue(); +addFieldButton("PROFESSIONALS", "注销", { +def id = table?.getValue(); if (id == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + showToast("请选择一条记录!", Type.ERROR_MESSAGE); return; } def hr_con_id = id?.getField("HR_CONSTRUCTORREGISTERED_ID")?.getValue(); def islogout = id?.getField("ISLOGOUT")?.getValue(); if(islogout){ - Notification.show("已经注销!", Type.ERROR_MESSAGE); + showToast("已经注销!", Type.ERROR_MESSAGE); return; } final pojo = GetServicesFunction.loadPOJO(hr_con_id,"HR_CONSTRUCTORREGISTERED",false); if(pojo!=null){ if(pojo.get_Value("ISMAINITEMS")){ - Notification.show("如要注销主项注册专业,请注销建造师注册证!", Type.ERROR_MESSAGE); + showToast("如要注销主项注册专业,请注销建造师注册证!", Type.ERROR_MESSAGE); return; } @@ -63,11 +58,8 @@ but?.addClickListener(new ClickListener() { setFieldReadOnly(id,"ISLOGOUT",true); professionals.setValue(new ArrayList(professionals.getValue())); - } - } -}); - -professionals?.addButton(but,0); + } +}, 0) professionals?.showAddButton(false); professionals?.showDeleteButton(false); diff --git a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/2.HARD.groovy index 7d71477..47fa964 100644 --- a/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/2fac21ea-2964-4295-b3e9-cad7c3391ff1/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 合格供方对账(五建-分包合同结算) // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/1.HARD.groovy index 1af31c6..86d399e 100644 --- a/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/35b9139e-a491-44a8-b586-cfa50554377d/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 计划成本申报 // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/6.HARD.groovy b/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/6.HARD.groovy index e2f7ba2..7892149 100644 --- a/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/6.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/4230b669-a107-4ffb-9aae-e814560d8c6e/6.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 员工档案(带证书) // seq : 6 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件; UI.getCurrent() +// 硬 S3 原因 : UI.getCurrent() // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.VerticalLayout; diff --git a/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/1.HARD.groovy index 5cc7056..8125edb 100644 --- a/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同登记-不需要评审 // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")); diff --git a/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/2.HARD.groovy index 20721a1..0ff332a 100644 --- a/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/58684bbb-59e9-4a83-9788-ec91d15ec0e8/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同登记-不需要评审 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/1.HARD.groovy index 8f4855c..a8fda34 100644 --- a/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 文件监控 // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件; 同步确认框 showConfirmDialog +// 硬 S3 原因 : 同步确认框 showConfirmDialog // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/2.HARD.groovy index 2185ab7..f36b592 100644 --- a/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/5a51c93c-a758-413a-b174-63b3ba05efaa/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 文件监控 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件; 同步确认框 showConfirmDialog +// 硬 S3 原因 : 同步确认框 showConfirmDialog // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/1.HARD.groovy index 61ce803..2810a1c 100644 --- a/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 专业分包合同登记_不需要评审 // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.dsasp.client.viewframework.util.TableImportExport; import com.vaadin.ui.Button; diff --git a/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/2.HARD.groovy index d279304..ce29c53 100644 --- a/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/5be37b88-fd93-4070-8060-c5e660372d90/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 专业分包合同登记_不需要评审 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/3.HARD.groovy index 092e995..656abc0 100644 --- a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/3.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/3.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 专业分包合同评审(五建定制) // seq : 3 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/4.HARD.groovy b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/4.HARD.groovy index 6509b86..76bee0e 100644 --- a/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/4.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/5e618173-2ee1-406b-9829-28c58871316e/4.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 专业分包合同评审(五建定制) // seq : 4 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/1.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/1.FULL_AUTO.groovy similarity index 58% rename from tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/1.PARTIAL.groovy rename to tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/1.FULL_AUTO.groovy index bd41634..16c29a6 100644 --- a/tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/1.PARTIAL.groovy +++ b/tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/1.FULL_AUTO.groovy @@ -2,9 +2,8 @@ // template_id : 6c11d228-a9d7-43de-85e4-d56e43cad10c // template_name: 季度检查整改 // seq : 1 -// label : PARTIAL -// 余留模式 : raw .comboBox 组件访问; 残留字段句柄链(未覆盖动词) -// 处置 : 大部分已自动改写,余留行人工补全(见作业单) +// label : FULL_AUTO +// 处置 : 全自动改写完成,直接入 P4 转换流水线 //检查年月下拉框赋值 clearFieldData("CHECKMONTHQUARTERLY"); @@ -15,4 +14,4 @@ for(k in [1,2,3,4]){ bindField("CHECKYEAR",GetDefaultValueFunction.currentYear()); bindField("CHECKMONTHQUARTERLY",1); -group.getField("AUTHENTICATIONPART")?.comboBox?.removeItem(0);//移除项目部 +removeFieldItem("AUTHENTICATIONPART", 0);//移除项目部 diff --git a/tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/2.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/2.FULL_AUTO.groovy similarity index 50% rename from tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/2.PARTIAL.groovy rename to tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/2.FULL_AUTO.groovy index df5dc48..b25e58b 100644 --- a/tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/2.PARTIAL.groovy +++ b/tools/s3_rewriter/output/rewritten/6c11d228-a9d7-43de-85e4-d56e43cad10c/2.FULL_AUTO.groovy @@ -2,9 +2,8 @@ // template_id : 6c11d228-a9d7-43de-85e4-d56e43cad10c // template_name: 季度检查整改 // seq : 2 -// label : PARTIAL -// 余留模式 : raw .comboBox 组件访问; 残留字段句柄链(未覆盖动词) -// 处置 : 大部分已自动改写,余留行人工补全(见作业单) +// label : FULL_AUTO +// 处置 : 全自动改写完成,直接入 P4 转换流水线 //检查年月下拉框赋值 def value = getFieldValue("CHECKMONTHQUARTERLY"); @@ -13,7 +12,7 @@ clearFieldData("CHECKMONTHQUARTERLY"); for(k in [1,2,3,4]){ addFieldOption("CHECKMONTHQUARTERLY", k, k.toString()); } -group.getField("CHECKMONTHQUARTERLY")?.comboBox?.setValue(value); +setFieldValue("CHECKMONTHQUARTERLY", value); -group.getField("AUTHENTICATIONPART")?.comboBox?.removeItem(0);//移除项目部 \ No newline at end of file +removeFieldItem("AUTHENTICATIONPART", 0);//移除项目部 \ No newline at end of file diff --git a/tools/s3_rewriter/output/rewritten/75fb9a46-b874-46b4-a6e5-c12c14ec54b6/1.FULL_AUTO.groovy b/tools/s3_rewriter/output/rewritten/75fb9a46-b874-46b4-a6e5-c12c14ec54b6/1.FULL_AUTO.groovy new file mode 100644 index 0000000..7b11ff4 --- /dev/null +++ b/tools/s3_rewriter/output/rewritten/75fb9a46-b874-46b4-a6e5-c12c14ec54b6/1.FULL_AUTO.groovy @@ -0,0 +1,32 @@ +// === EIP4 P4 脚本迁移产出 === +// template_id : 75fb9a46-b874-46b4-a6e5-c12c14ec54b6 +// template_name: 培训签到 +// seq : 1 +// label : FULL_AUTO +// 处置 : 全自动改写完成,直接入 P4 转换流水线 + +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + + + +//将自定义的按钮添加至 +addSubTableButton("SIGNDETAILS", "SELECT", 0); +addFieldButton("SIGNDETAILS", "全选签到", { +def signDetailsValue = getFieldValue("SIGNDETAILS"); + if(signDetailsValue != null){ + for(sign in signDetailsValue){ + sign.put("ISSIGN",true); + } + setFieldValue("SIGNDETAILS", signDetailsValue); + } +}, 1) +addFieldButton("SIGNDETAILS", "取消全选", { +def signDetailsValue = getFieldValue("SIGNDETAILS"); + if(signDetailsValue != null){ + for(sign in signDetailsValue){ + sign.put("ISSIGN",false); + } + setFieldValue("SIGNDETAILS", signDetailsValue); + } +}, 2) diff --git a/tools/s3_rewriter/output/rewritten/75fb9a46-b874-46b4-a6e5-c12c14ec54b6/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/75fb9a46-b874-46b4-a6e5-c12c14ec54b6/1.HARD.groovy deleted file mode 100644 index 4127c20..0000000 --- a/tools/s3_rewriter/output/rewritten/75fb9a46-b874-46b4-a6e5-c12c14ec54b6/1.HARD.groovy +++ /dev/null @@ -1,46 +0,0 @@ -// === EIP4 P4 脚本迁移产出 === -// template_id : 75fb9a46-b874-46b4-a6e5-c12c14ec54b6 -// template_name: 培训签到 -// seq : 1 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) - -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; - -def signDetails = group.getField("SIGNDETAILS"); - -final Button cb = new Button("全选签到"); -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def signDetailsValue = signDetails?.getValue(); - if(signDetailsValue != null){ - for(sign in signDetailsValue){ - sign.put("ISSIGN",true); - } - signDetails?.setValue(signDetailsValue); - } - } -}); - -final Button cb2 = new Button("取消全选"); -cb2?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def signDetailsValue = signDetails?.getValue(); - if(signDetailsValue != null){ - for(sign in signDetailsValue){ - sign.put("ISSIGN",false); - } - signDetails?.setValue(signDetailsValue); - } - } -}); - -//将自定义的按钮添加至 -signDetails?.addButton(group.getField("SELECT"),0); -signDetails?.addButton(cb, 1); -signDetails?.addButton(cb2, 2); diff --git a/tools/s3_rewriter/output/rewritten/7a0ac7a9-32bc-4d32-9231-4d1bbcd86002/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/7a0ac7a9-32bc-4d32-9231-4d1bbcd86002/3.PARTIAL.groovy similarity index 69% rename from tools/s3_rewriter/output/rewritten/7a0ac7a9-32bc-4d32-9231-4d1bbcd86002/3.HARD.groovy rename to tools/s3_rewriter/output/rewritten/7a0ac7a9-32bc-4d32-9231-4d1bbcd86002/3.PARTIAL.groovy index fbdad1f..08b8935 100644 --- a/tools/s3_rewriter/output/rewritten/7a0ac7a9-32bc-4d32-9231-4d1bbcd86002/3.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/7a0ac7a9-32bc-4d32-9231-4d1bbcd86002/3.PARTIAL.groovy @@ -2,13 +2,10 @@ // template_id : 7a0ac7a9-32bc-4d32-9231-4d1bbcd86002 // template_name: 造价师注册证 // seq : 3 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) +// label : PARTIAL +// 余留模式 : raw .table 组件访问; 残留字段句柄链(未覆盖动词) +// 处置 : 大部分已自动改写,余留行人工补全(见作业单) -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; import com.vaadin.data.Property.ValueChangeListener; @@ -21,32 +18,30 @@ import com.vaadin.ui.Label; final def professionals = group.getField("PROFESSIONALS"); -final Button but = new Button("注销"); final Object table = professionals?.table; table?.setImmediate(true); final group1 = group; -but?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def id = table?.getValue(); +addFieldButton("PROFESSIONALS", "注销", { +def id = table?.getValue(); if (id == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + showToast("请选择一条记录!", Type.ERROR_MESSAGE); return; } def hr_con_id = id?.getField("HR_COSTENGINEERREGISTERED_ID")?.getValue(); def islogout = id?.getField("ISLOGOUT")?.getValue(); if(islogout == 1){ - Notification.show("已经注销!", Type.ERROR_MESSAGE); + showToast("已经注销!", Type.ERROR_MESSAGE); return; } final pojo = GetServicesFunction.loadPOJO(hr_con_id,"HR_COSTENGINEERREGISTERED",false); if(pojo!=null){ if(pojo.get_Value("ISMAINITEMS") == 1){ - Notification.show("如要注销主项注册专业,请注销造价师注册证!", Type.ERROR_MESSAGE); + showToast("如要注销主项注册专业,请注销造价师注册证!", Type.ERROR_MESSAGE); return; } @@ -63,11 +58,8 @@ but?.addClickListener(new ClickListener() { setFieldReadOnly(id,"ISLOGOUT",true); professionals.setValue(new ArrayList(professionals.getValue())); - } - } -}); - -professionals?.addButton(but,0); + } +}, 0) professionals?.showAddButton(false); professionals?.showDeleteButton(false); diff --git a/tools/s3_rewriter/output/rewritten/7d50dd37-9892-410e-9fdc-731f24fbfd80/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/7d50dd37-9892-410e-9fdc-731f24fbfd80/1.HARD.groovy index bc0d551..fca128d 100644 --- a/tools/s3_rewriter/output/rewritten/7d50dd37-9892-410e-9fdc-731f24fbfd80/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/7d50dd37-9892-410e-9fdc-731f24fbfd80/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 项目成本拆分 // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; diff --git a/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/6.HARD.groovy b/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/6.PARTIAL.groovy similarity index 89% rename from tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/6.HARD.groovy rename to tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/6.PARTIAL.groovy index 9408944..6dc09d2 100644 --- a/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/6.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/86c05eb5-753d-46e5-b958-cdbcefe7eabc/6.PARTIAL.groovy @@ -2,14 +2,11 @@ // template_id : 86c05eb5-753d-46e5-b958-cdbcefe7eabc // template_name: 销项税发票 // seq : 6 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) +// label : PARTIAL +// 余留模式 : 数据源 addItem(非标准选项 idiom); 残留字段句柄链(未覆盖动词) +// 处置 : 大部分已自动改写,余留行人工补全(见作业单) import com.dsasp.server.common.exception.ValidationException; import com.dsasp.server.common.util.HTTPClientUtils; -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; @@ -20,13 +17,12 @@ def transformnum (moneyStr) { } -def invoicelist = group.getField("INVOICELIST"); -def document = group.getField("SELECT"); -final Button cb = new Button("识别"); -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object fplists = document?.getValue(); + + +//将自定义的按钮添加至 +addFieldButton("INVOICELIST", "识别", { +Object fplists = getFieldValue("SELECT"); def documentfp = []; for (int i = 0; i < fplists.size(); i++) { def item = fplists.get(i); @@ -36,7 +32,7 @@ cb?.addClickListener(new ClickListener() { }; // Console.debug(documentfp); if (documentfp == null || documentfp.size()==0){ - Notification.show("请先上传发票信息!", Type.ERROR_MESSAGE); + showToast("请先上传发票信息!", Type.ERROR_MESSAGE); return; }; if(documentfp && documentfp.size()>0){ @@ -136,16 +132,16 @@ cb?.addClickListener(new ClickListener() { }; if(fplist!=null){ def flag = true; - if(invoicelist.getValue() && invoicelist.getValue().size()>0){ - for (int j = 0; j < invoicelist.getValue().size(); j++) { - def tempitem = invoicelist.getValue().get(j); + if(getFieldValue("INVOICELIST") && getFieldValue("INVOICELIST").size()>0){ + for (int j = 0; j < getFieldValue("INVOICELIST").size(); j++) { + def tempitem = getFieldValue("INVOICELIST").get(j); if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){ flag = false;; } }; }; if(flag){ - invoicelist.addItem(fplist); + group.getField("INVOICELIST").addItem(fplist); }; } } @@ -160,12 +156,8 @@ cb?.addClickListener(new ClickListener() { } } if(message.trim()!=""){ - Notification.show(message, Type.ERROR_MESSAGE); + showToast(message, Type.ERROR_MESSAGE); } } - }; -}); - -//将自定义的按钮添加至 -invoicelist?.addButton(cb, 0); +}, 0) diff --git a/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.PARTIAL.groovy similarity index 67% rename from tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.HARD.groovy rename to tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.PARTIAL.groovy index f4cb362..52d66b5 100644 --- a/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/884f0dde-564a-4e6e-9a5d-55d12d0a16e1/1.PARTIAL.groovy @@ -2,25 +2,22 @@ // template_id : 884f0dde-564a-4e6e-9a5d-55d12d0a16e1 // template_name: 物资采购申请(土建-项目) // seq : 1 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; +// label : PARTIAL +// 余留模式 : raw .table 组件访问; 数据源 addItem(非标准选项 idiom); 残留字段句柄链(未覆盖动词) +// 处置 : 大部分已自动改写,余留行人工补全(见作业单) import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; -def materialList = group.getField("MATERIALDETAILS"); -final Button cb = new Button("复制"); -final Object table = materialList?.table; + +final Object table = group.getField("MATERIALDETAILS")?.table; table?.setImmediate(true);//设置验证 final group1 = group; -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object o = table?.getValue(); +//将自定义的按钮添加至 +addSubTableButton("MATERIALDETAILS", "SELECT", 0); +addFieldButton("MATERIALDETAILS", "复制", { +Object o = table?.getValue(); if (o == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + showToast("请选择一条记录!", Type.ERROR_MESSAGE); return; } @@ -43,14 +40,9 @@ cb?.addClickListener(new ClickListener() { itemMap["REMARK"] = getFieldValue(o, "REMARK");//备注 //调用addItem()方法可直接在 - materialList.addItem(itemMap); + group.getField("MATERIALDETAILS").addItem(itemMap); table.select(o); - } -}); - -//将自定义的按钮添加至 -materialList?.addButton(group.getField("SELECT"),0); -materialList?.addButton(cb, 1); +}, 1) import com.dsasp.client.viewframework.util.TableImportExport; def tie = new TableImportExport(materialList,"com.dsasp.pm.materialmanagertj.client.MaterialApplyDetailImportOfTJ"); @@ -59,6 +51,6 @@ tie.addExportButton(5); -group.getField("MATERIALDETAILS")?.addButton(group.getField("SELECT"),0); -group.getField("ISPREPARATION")?.setVisible(false); -//group.getField("ISPREPARATION").setCaption("公司备料"); \ No newline at end of file +addSubTableButton("MATERIALDETAILS", "SELECT", 0); +setFieldVisible("ISPREPARATION", false); +//setFieldCaption("ISPREPARATION", "公司备料"); \ No newline at end of file diff --git a/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/2.HARD.groovy index a998207..28ce8f6 100644 --- a/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/8c4a3b9f-0272-4675-8363-dd2f96a4f955/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 专业分包合同登记_需要评审(五建定制) // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/908652e1-fecf-427b-8be2-3da1675bf80d/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/908652e1-fecf-427b-8be2-3da1675bf80d/2.HARD.groovy index 3336be7..a587541 100644 --- a/tools/s3_rewriter/output/rewritten/908652e1-fecf-427b-8be2-3da1675bf80d/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/908652e1-fecf-427b-8be2-3da1675bf80d/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 劳务分包合同登记-需要评审(五建定制) // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/2.HARD.groovy index 1d6dd2e..759cdb5 100644 --- a/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/90ab3b6d-3ea7-45d9-99d3-29740545a842/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同登记-需要评审(五建定制) // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/1.HARD.groovy index 9be0419..ba2df4e 100644 --- a/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同登记-不需要评审(五建定制) // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) bindField("FIRSTPARTY",GetDefaultValueFunction.getConfigValue("com.dsasp.server.organize.COMPANY")); diff --git a/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/2.HARD.groovy index d3d3f79..7467e01 100644 --- a/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/91497e54-702d-47a7-bbcd-3f5d67b6fd91/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同登记-不需要评审(五建定制) // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.FULL_AUTO.groovy similarity index 56% rename from tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.PARTIAL.groovy rename to tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.FULL_AUTO.groovy index e9c8b2c..896a23c 100644 --- a/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.PARTIAL.groovy +++ b/tools/s3_rewriter/output/rewritten/92072d44-33e8-4110-a8cc-aeb8ae300ef5/2.FULL_AUTO.groovy @@ -2,9 +2,8 @@ // template_id : 92072d44-33e8-4110-a8cc-aeb8ae300ef5 // template_name: 月度检查整改 // seq : 2 -// label : PARTIAL -// 余留模式 : raw .comboBox 组件访问; 残留字段句柄链(未覆盖动词) -// 处置 : 大部分已自动改写,余留行人工补全(见作业单) +// label : FULL_AUTO +// 处置 : 全自动改写完成,直接入 P4 转换流水线 //检查年月下拉框赋值 def value = getFieldValue("CHECKMONTHQUARTERLY"); @@ -13,4 +12,4 @@ clearFieldData("CHECKMONTHQUARTERLY"); for(k in 1..12){ addFieldOption("CHECKMONTHQUARTERLY", k, k.toString()); } -group.getField("CHECKMONTHQUARTERLY")?.comboBox.setValue(value); +setFieldValue("CHECKMONTHQUARTERLY", value); diff --git a/tools/s3_rewriter/output/rewritten/9d690abb-916b-427c-9bd6-4a8001ac0813/4.HARD.groovy b/tools/s3_rewriter/output/rewritten/9d690abb-916b-427c-9bd6-4a8001ac0813/4.HARD.groovy index b4212cd..dc5a4ee 100644 --- a/tools/s3_rewriter/output/rewritten/9d690abb-916b-427c-9bd6-4a8001ac0813/4.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/9d690abb-916b-427c-9bd6-4a8001ac0813/4.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 薪资方案 // seq : 4 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/4.HARD.groovy b/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/4.HARD.groovy index 2fb12ee..80c734c 100644 --- a/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/4.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/a0307625-8abc-46b6-b835-93719a881e47/4.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 周转(自购)材料盘点管理 // seq : 4 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件; 同步确认框 showConfirmDialog +// 硬 S3 原因 : 同步确认框 showConfirmDialog // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/a1df0f12-8bfb-4807-882a-ca7b510e10f9/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/a1df0f12-8bfb-4807-882a-ca7b510e10f9/1.HARD.groovy index bbfc90f..3fa9c2f 100644 --- a/tools/s3_rewriter/output/rewritten/a1df0f12-8bfb-4807-882a-ca7b510e10f9/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/a1df0f12-8bfb-4807-882a-ca7b510e10f9/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 专业分包合同登记_不需要评审(五建定制) // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.dsasp.client.viewframework.util.TableImportExport; import com.vaadin.ui.Button; diff --git a/tools/s3_rewriter/output/rewritten/a1df0f12-8bfb-4807-882a-ca7b510e10f9/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/a1df0f12-8bfb-4807-882a-ca7b510e10f9/2.HARD.groovy index 9869d6c..d6fd8a7 100644 --- a/tools/s3_rewriter/output/rewritten/a1df0f12-8bfb-4807-882a-ca7b510e10f9/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/a1df0f12-8bfb-4807-882a-ca7b510e10f9/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 专业分包合同登记_不需要评审(五建定制) // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/a760fba0-693e-4f0a-8007-3bdca7fb0305/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/a760fba0-693e-4f0a-8007-3bdca7fb0305/3.HARD.groovy deleted file mode 100644 index 87dcf61..0000000 --- a/tools/s3_rewriter/output/rewritten/a760fba0-693e-4f0a-8007-3bdca7fb0305/3.HARD.groovy +++ /dev/null @@ -1,40 +0,0 @@ -// === EIP4 P4 脚本迁移产出 === -// template_id : a760fba0-693e-4f0a-8007-3bdca7fb0305 -// template_name: 项目人员配置 -// seq : 3 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; - -final user = group.getField("PM_PROJECT_USERS"); -final Button cb = new Button("删除"); - -final Object table = user?.table; -table?.setImmediate(true);//设置验证 -final group1 = group; -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object o = table?.getValue(); - if (o == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); - return; - } - def isLock = getFieldValue(o, "ISLOCK"); - if(isLock == 1){ - Notification.show("已备案人员无法删除!", Type.ERROR_MESSAGE); - }else{ - table.removeItem(o); - table.select(null); - user.fireValueChange(true); - } - } -}); - -//将自定义的按钮添加至 -user?.addButton(cb,"delete.png", 1); -user?.deleteButton.setVisible(false); diff --git a/tools/s3_rewriter/output/rewritten/a760fba0-693e-4f0a-8007-3bdca7fb0305/3.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/a760fba0-693e-4f0a-8007-3bdca7fb0305/3.PARTIAL.groovy new file mode 100644 index 0000000..1842717 --- /dev/null +++ b/tools/s3_rewriter/output/rewritten/a760fba0-693e-4f0a-8007-3bdca7fb0305/3.PARTIAL.groovy @@ -0,0 +1,32 @@ +// === EIP4 P4 脚本迁移产出 === +// template_id : a760fba0-693e-4f0a-8007-3bdca7fb0305 +// template_name: 项目人员配置 +// seq : 3 +// label : PARTIAL +// 余留模式 : raw .table 组件访问; 残留字段句柄链(未覆盖动词) +// 处置 : 大部分已自动改写,余留行人工补全(见作业单) +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + + + +final Object table = group.getField("PM_PROJECT_USERS")?.table; +table?.setImmediate(true);//设置验证 +final group1 = group; +//将自定义的按钮添加至 +addFieldButton("PM_PROJECT_USERS", "删除", { +Object o = table?.getValue(); + if (o == null){ + showToast("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + def isLock = getFieldValue(o, "ISLOCK"); + if(isLock == 1){ + showToast("已备案人员无法删除!", Type.ERROR_MESSAGE); + }else{ + table.removeItem(o); + table.select(null); + group.getField("PM_PROJECT_USERS").fireValueChange(true); + } +}) +group.getField("PM_PROJECT_USERS")?.deleteButton.setVisible(false); diff --git a/tools/s3_rewriter/output/rewritten/ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3/2.HARD.groovy index 855ba91..ec13812 100644 --- a/tools/s3_rewriter/output/rewritten/ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 劳务分包合同评审 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3/3.HARD.groovy index ad0b0bd..3889b12 100644 --- a/tools/s3_rewriter/output/rewritten/ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3/3.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/ad1ffdd2-3af3-4809-b0d5-2fbbb73e22b3/3.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 劳务分包合同评审 // seq : 3 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/c5b5160e-2289-4b8d-8f8e-57a4801a6e43/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/c5b5160e-2289-4b8d-8f8e-57a4801a6e43/2.HARD.groovy index f60c49e..11aaf91 100644 --- a/tools/s3_rewriter/output/rewritten/c5b5160e-2289-4b8d-8f8e-57a4801a6e43/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/c5b5160e-2289-4b8d-8f8e-57a4801a6e43/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 分包合同结算 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/c752e928-335d-443c-8f2d-9aa8e2630c8e/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/c752e928-335d-443c-8f2d-9aa8e2630c8e/2.HARD.groovy index 6db8301..e792f38 100644 --- a/tools/s3_rewriter/output/rewritten/c752e928-335d-443c-8f2d-9aa8e2630c8e/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/c752e928-335d-443c-8f2d-9aa8e2630c8e/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 劳务分包合同登记-需要评审 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/c7b23419-22e1-4a5a-aa09-464b3bb2a242/3.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/c7b23419-22e1-4a5a-aa09-464b3bb2a242/3.FULL_AUTO.groovy similarity index 57% rename from tools/s3_rewriter/output/rewritten/c7b23419-22e1-4a5a-aa09-464b3bb2a242/3.PARTIAL.groovy rename to tools/s3_rewriter/output/rewritten/c7b23419-22e1-4a5a-aa09-464b3bb2a242/3.FULL_AUTO.groovy index c3866ee..4ce1d71 100644 --- a/tools/s3_rewriter/output/rewritten/c7b23419-22e1-4a5a-aa09-464b3bb2a242/3.PARTIAL.groovy +++ b/tools/s3_rewriter/output/rewritten/c7b23419-22e1-4a5a-aa09-464b3bb2a242/3.FULL_AUTO.groovy @@ -2,9 +2,8 @@ // template_id : c7b23419-22e1-4a5a-aa09-464b3bb2a242 // template_name: 季度检查 // seq : 3 -// label : PARTIAL -// 余留模式 : raw .comboBox 组件访问; 残留字段句柄链(未覆盖动词) -// 处置 : 大部分已自动改写,余留行人工补全(见作业单) +// label : FULL_AUTO +// 处置 : 全自动改写完成,直接入 P4 转换流水线 //检查季度下拉框赋值 def nullitem ="请选择"; def value = getFieldValue("CHECKMONORQUA"); @@ -14,4 +13,4 @@ clearFieldData("CHECKMONORQUA"); for(k in [1,2,3,4]){ addFieldOption("CHECKMONORQUA", k, k.toString()); } -group.getField("CHECKMONORQUA")?.comboBox.setValue(value); +setFieldValue("CHECKMONORQUA", value); diff --git a/tools/s3_rewriter/output/rewritten/cf71f83a-0428-4e69-a736-97c91f998d19/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/cf71f83a-0428-4e69-a736-97c91f998d19/2.HARD.groovy index 89915e9..ca37fb5 100644 --- a/tools/s3_rewriter/output/rewritten/cf71f83a-0428-4e69-a736-97c91f998d19/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/cf71f83a-0428-4e69-a736-97c91f998d19/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同评审-明辉定制 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/cf71f83a-0428-4e69-a736-97c91f998d19/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/cf71f83a-0428-4e69-a736-97c91f998d19/3.HARD.groovy index dcbc440..1b8ea9a 100644 --- a/tools/s3_rewriter/output/rewritten/cf71f83a-0428-4e69-a736-97c91f998d19/3.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/cf71f83a-0428-4e69-a736-97c91f998d19/3.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同评审-明辉定制 // seq : 3 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/d193b838-f8a3-4d72-9fef-300c7a97d23c/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/d193b838-f8a3-4d72-9fef-300c7a97d23c/3.HARD.groovy index 1d51722..8e6e320 100644 --- a/tools/s3_rewriter/output/rewritten/d193b838-f8a3-4d72-9fef-300c7a97d23c/3.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/d193b838-f8a3-4d72-9fef-300c7a97d23c/3.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 劳务分包合同评审(五建定制) // seq : 3 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/d193b838-f8a3-4d72-9fef-300c7a97d23c/4.HARD.groovy b/tools/s3_rewriter/output/rewritten/d193b838-f8a3-4d72-9fef-300c7a97d23c/4.HARD.groovy index 7ca37a7..d5ab124 100644 --- a/tools/s3_rewriter/output/rewritten/d193b838-f8a3-4d72-9fef-300c7a97d23c/4.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/d193b838-f8a3-4d72-9fef-300c7a97d23c/4.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 劳务分包合同评审(五建定制) // seq : 4 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/d41063b3-9189-42ce-8689-8ce022a99fc2/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/d41063b3-9189-42ce-8689-8ce022a99fc2/2.HARD.groovy index 52c4f8d..2340a3c 100644 --- a/tools/s3_rewriter/output/rewritten/d41063b3-9189-42ce-8689-8ce022a99fc2/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/d41063b3-9189-42ce-8689-8ce022a99fc2/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 专业分包合同登记_需要评审 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/e282bd37-a9a7-4390-9c96-4411b2508a33/2.HARD.groovy b/tools/s3_rewriter/output/rewritten/e282bd37-a9a7-4390-9c96-4411b2508a33/2.HARD.groovy index 38f47dd..40e0179 100644 --- a/tools/s3_rewriter/output/rewritten/e282bd37-a9a7-4390-9c96-4411b2508a33/2.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/e282bd37-a9a7-4390-9c96-4411b2508a33/2.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同评审 // seq : 2 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/e282bd37-a9a7-4390-9c96-4411b2508a33/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/e282bd37-a9a7-4390-9c96-4411b2508a33/3.HARD.groovy index b38b2a6..648d792 100644 --- a/tools/s3_rewriter/output/rewritten/e282bd37-a9a7-4390-9c96-4411b2508a33/3.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/e282bd37-a9a7-4390-9c96-4411b2508a33/3.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 物资合同评审 // seq : 3 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/6.HARD.groovy b/tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/6.FULL_AUTO.groovy similarity index 67% rename from tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/6.HARD.groovy rename to tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/6.FULL_AUTO.groovy index cb965a0..c1feeeb 100644 --- a/tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/6.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/6.FULL_AUTO.groovy @@ -2,25 +2,18 @@ // template_id : e5a03e54-37b2-4122-971f-7f0ac57c2650 // template_name: 进项税发票(批量调整抵扣日期)-五建定制 // seq : 6 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) +// label : FULL_AUTO +// 处置 : 全自动改写完成,直接入 P4 转换流水线 -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; -def signDetails = group.getField("TASKS"); -final Button cb0 = new Button("查询"); -cb0?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - - - - def thisuser = GetDefaultValueFunction.getCurrentUserId(); + +//将自定义的按钮添加至 +//addSubTableButton("TASKS", "SELECT", 0); +addFieldButton("TASKS", "查询", { +def thisuser = GetDefaultValueFunction.getCurrentUserId(); def newlist = []; def returncol = ["VIEW_ACT_RU_TASK_ID","PROCESSID","TITLE","TASKNAME","INITUSERID","STARTTIME","ASSIGNEE","DUEDATE","COMMENTTEXT","PROCESSNAME","INITUSERORGID"]; @@ -46,17 +39,10 @@ cb0?.addClickListener(new ClickListener() { }else{ bindField("TASKS",null); bindField("TASKS",newlist); - } - - - } -}); - - -final Button cb = new Button("全选"); -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def details = getFieldValue("TASKS"); + } +}, 0) +addFieldButton("TASKS", "全选", { +def details = getFieldValue("TASKS"); if(details != null){ details.each{ it.put("ISSIGN",true); @@ -64,14 +50,9 @@ cb?.addClickListener(new ClickListener() { bindField("TASKS",null); bindField("TASKS",details); } - } -}); - - -final Button cb2 = new Button("取消全选"); -cb2?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def details = getFieldValue("TASKS"); +}, 1) +addFieldButton("TASKS", "取消全选", { +def details = getFieldValue("TASKS"); if(details != null){ details.each{ it.put("ISSIGN",false); @@ -79,11 +60,4 @@ cb2?.addClickListener(new ClickListener() { bindField("TASKS",null); bindField("TASKS",details); } - } -}); - -//将自定义的按钮添加至 -//signDetails?.addButton(group.getField("SELECT"),0); -signDetails?.addButton(cb0, 0); -signDetails?.addButton(cb, 1); -signDetails?.addButton(cb2, 2); +}, 2) diff --git a/tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/9.HARD.groovy b/tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/9.PARTIAL.groovy similarity index 89% rename from tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/9.HARD.groovy rename to tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/9.PARTIAL.groovy index b3898b4..cac41e0 100644 --- a/tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/9.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/e5a03e54-37b2-4122-971f-7f0ac57c2650/9.PARTIAL.groovy @@ -2,14 +2,11 @@ // template_id : e5a03e54-37b2-4122-971f-7f0ac57c2650 // template_name: 进项税发票(批量调整抵扣日期)-五建定制 // seq : 9 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) +// label : PARTIAL +// 余留模式 : 数据源 addItem(非标准选项 idiom); 残留字段句柄链(未覆盖动词) +// 处置 : 大部分已自动改写,余留行人工补全(见作业单) import com.dsasp.server.common.exception.ValidationException; import com.dsasp.server.common.util.HTTPClientUtils; -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; @@ -20,13 +17,12 @@ def transformnum (moneyStr) { } -def invoicelist = group.getField("INVOICELIST"); -def document = group.getField("SELECT"); -final Button cb = new Button("识别"); -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object fplists = document?.getValue(); + + +//将自定义的按钮添加至 +addFieldButton("INVOICELIST", "识别", { +Object fplists = getFieldValue("SELECT"); def documentfp = []; for (int i = 0; i < fplists.size(); i++) { def item = fplists.get(i); @@ -36,7 +32,7 @@ cb?.addClickListener(new ClickListener() { }; // Console.debug(documentfp); if (documentfp == null || documentfp.size()==0){ - Notification.show("请先上传发票信息!", Type.ERROR_MESSAGE); + showToast("请先上传发票信息!", Type.ERROR_MESSAGE); return; }; if(documentfp && documentfp.size()>0){ @@ -136,9 +132,9 @@ cb?.addClickListener(new ClickListener() { }; if(fplist!=null){ def flag = true; - if(invoicelist.getValue() && invoicelist.getValue().size()>0){ - for (int j = 0; j < invoicelist.getValue().size(); j++) { - def tempitem = invoicelist.getValue().get(j); + if(getFieldValue("INVOICELIST") && getFieldValue("INVOICELIST").size()>0){ + for (int j = 0; j < getFieldValue("INVOICELIST").size(); j++) { + def tempitem = getFieldValue("INVOICELIST").get(j); if((fplist.get("INVOICENO")==null || (fplist.get("INVOICENO")!=null && tempitem.get("INVOICENO") == fplist.get("INVOICENO"))) && (fplist.get("INVOICECODE")==null || (fplist.get("INVOICECODE")!=null && tempitem.get("INVOICECODE") == fplist.get("INVOICECODE")))){ flag = false;; } @@ -146,7 +142,7 @@ cb?.addClickListener(new ClickListener() { }; if(flag){ fplist.put("DOCUMENT",[it]);//附件图片 - invoicelist.addItem(fplist); + group.getField("INVOICELIST").addItem(fplist); }; } } @@ -161,12 +157,8 @@ cb?.addClickListener(new ClickListener() { } } if(message.trim()!=""){ - Notification.show(message, Type.ERROR_MESSAGE); + showToast(message, Type.ERROR_MESSAGE); } } - }; -}); - -//将自定义的按钮添加至 -invoicelist?.addButton(cb, 0); +}, 0) diff --git a/tools/s3_rewriter/output/rewritten/e7670207-9cf7-4db9-a452-884b58408b96/7.HARD.groovy b/tools/s3_rewriter/output/rewritten/e7670207-9cf7-4db9-a452-884b58408b96/7.FULL_AUTO.groovy similarity index 86% rename from tools/s3_rewriter/output/rewritten/e7670207-9cf7-4db9-a452-884b58408b96/7.HARD.groovy rename to tools/s3_rewriter/output/rewritten/e7670207-9cf7-4db9-a452-884b58408b96/7.FULL_AUTO.groovy index d00d0b1..a2c0dd6 100644 --- a/tools/s3_rewriter/output/rewritten/e7670207-9cf7-4db9-a452-884b58408b96/7.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/e7670207-9cf7-4db9-a452-884b58408b96/7.FULL_AUTO.groovy @@ -2,12 +2,8 @@ // template_id : e7670207-9cf7-4db9-a452-884b58408b96 // template_name: 付款确认(五建定制) // seq : 7 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; +// label : FULL_AUTO +// 处置 : 全自动改写完成,直接入 P4 转换流水线 import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; import com.dsasp.server.common.exception.ValidationException; @@ -15,7 +11,7 @@ import com.dsasp.server.common.util.HTTPClientUtils; //选择付款申请按钮 -group.getField("DRAFTLIST")?.addButton(group.getField("SELECT"),0); +addSubTableButton("DRAFTLIST", "SELECT", 0); /** 页面必填项:客户号(默认)、单位编码(默认)、账号集合、交易类型(默认背书转让)、发查标识(宁波银行账号送 1:查询;非宁波银行账号送0:发查时向开户行同步票据信息)、 @@ -29,10 +25,9 @@ def custId = GetDefaultValueFunction.getConfigValue("com.dsasp.pm.bankWJ.custId" def url = GetDefaultValueFunction.getConfigValue("com.dsasp.pm.bankWJ.IPpath");//客户ip接口访问地址 def transType = "4";//交易类型-背书转让 -final Button search = new Button("查询"); -search?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - // 付款确认-批量转账付款 +//将自定义的按钮添加至 +addFieldButton("DETAILS", "查询", { +// 付款确认-批量转账付款 // 验证提醒 def content = ""; def corpCode = getFieldValue("CORPCODE");//客户在财资设置的四位单位编码 @@ -53,7 +48,7 @@ search?.addClickListener(new ClickListener() { } if(content !=null && content !=""){ //throw new ValidationException(content); - Notification.show(content,Type.ERROR_MESSAGE); + showToast(content,Type.ERROR_MESSAGE); return; } @@ -83,18 +78,18 @@ search?.addClickListener(new ClickListener() { def tempdataJson = HTTPClientUtils.jsonToString(tempparams); def tempresponseBody = HTTPClientUtils.sendPostRequest(url,tempdataJson,null,null,null); if(!tempresponseBody.contains("retCode")){ - Notification.show("发查接口请求超时,请联系管理员",Type.ERROR_MESSAGE); + showToast("发查接口请求超时,请联系管理员",Type.ERROR_MESSAGE); } def tempreturnlist = HTTPClientUtils.jsonStringtoMap(tempresponseBody)?.get("data"); Console.debug("发查"+tempreturnlist); if(!tempreturnlist || !tempreturnlist.get("retCode")){ - Notification.show("发查接口请求异常,请联系管理员!",Type.ERROR_MESSAGE); + showToast("发查接口请求异常,请联系管理员!",Type.ERROR_MESSAGE); return; } //得到付款结果 def tempretCode = tempreturnlist.get("retCode"); if(tempretCode && tempretCode != "0000" && tempreturnlist.get("retMsg")){ - Notification.show(tempreturnlist.get("retMsg"),Type.ERROR_MESSAGE); + showToast(tempreturnlist.get("retMsg"),Type.ERROR_MESSAGE); return; } } @@ -109,20 +104,20 @@ search?.addClickListener(new ClickListener() { def signdetails = []; def responseBody = HTTPClientUtils.sendPostRequest(url,dataJson,null,null,null); if(!responseBody.contains("retCode")){ - Notification.show("查询接口请求超时,请联系管理员",Type.ERROR_MESSAGE); + showToast("查询接口请求超时,请联系管理员",Type.ERROR_MESSAGE); } def returnlist = HTTPClientUtils.jsonStringtoMap(responseBody)?.get("data"); Console.debug("查询"+returnlist); if(!returnlist || !returnlist.get("retCode")){ //throw new ValidationException("接口请求异常,请联系管理员!"); - Notification.show("接口请求异常,请联系管理员!",Type.ERROR_MESSAGE); + showToast("接口请求异常,请联系管理员!",Type.ERROR_MESSAGE); return; } //得到付款结果 def retCode = returnlist.get("retCode"); if(retCode && retCode != "0000" && returnlist.get("retMsg")){ //throw new ValidationException(returnlist.get("retMsg")); - Notification.show(returnlist.get("retMsg"),Type.ERROR_MESSAGE); + showToast(returnlist.get("retMsg"),Type.ERROR_MESSAGE); return; }else if(retCode && retCode == "0000"){ //查询票据查询明细表中是否存在该信息,存在则删除后再新增,不存在则新增 @@ -158,8 +153,4 @@ search?.addClickListener(new ClickListener() { } }; bindField("DETAILS",signdetails); - } -}); -//将自定义的按钮添加至 -def details = group.getField("DETAILS"); -details?.addButton(search, 0); \ No newline at end of file +}, 0) diff --git a/tools/s3_rewriter/output/rewritten/ee9e2a39-45e2-434a-b691-a02a2041b7e6/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/ee9e2a39-45e2-434a-b691-a02a2041b7e6/1.PARTIAL.groovy similarity index 67% rename from tools/s3_rewriter/output/rewritten/ee9e2a39-45e2-434a-b691-a02a2041b7e6/1.HARD.groovy rename to tools/s3_rewriter/output/rewritten/ee9e2a39-45e2-434a-b691-a02a2041b7e6/1.PARTIAL.groovy index 2bae657..856e626 100644 --- a/tools/s3_rewriter/output/rewritten/ee9e2a39-45e2-434a-b691-a02a2041b7e6/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/ee9e2a39-45e2-434a-b691-a02a2041b7e6/1.PARTIAL.groovy @@ -2,25 +2,22 @@ // template_id : ee9e2a39-45e2-434a-b691-a02a2041b7e6 // template_name: 物资采购申请(土建-公司) // seq : 1 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; +// label : PARTIAL +// 余留模式 : raw .table 组件访问; 数据源 addItem(非标准选项 idiom); 残留字段句柄链(未覆盖动词) +// 处置 : 大部分已自动改写,余留行人工补全(见作业单) import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; -def materialList = group.getField("MATERIALDETAILS"); -final Button cb = new Button("复制"); -final Object table = materialList?.table; + +final Object table = group.getField("MATERIALDETAILS")?.table; table?.setImmediate(true);//设置验证 final group1 = group; -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object o = table?.getValue(); +//将自定义的按钮添加至 +addSubTableButton("MATERIALDETAILS", "SELECT", 0); +addFieldButton("MATERIALDETAILS", "复制", { +Object o = table?.getValue(); if (o == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); + showToast("请选择一条记录!", Type.ERROR_MESSAGE); return; } @@ -43,14 +40,9 @@ cb?.addClickListener(new ClickListener() { itemMap["REMARK"] = getFieldValue(o, "REMARK");//备注 //调用addItem()方法可直接在 - materialList.addItem(itemMap); + group.getField("MATERIALDETAILS").addItem(itemMap); table.select(o); - } -}); - -//将自定义的按钮添加至 -materialList?.addButton(group.getField("SELECT"),0); -materialList?.addButton(cb, 1); +}, 1) import com.dsasp.client.viewframework.util.TableImportExport; def tie = new TableImportExport(materialList,"com.dsasp.pm.materialmanagertj.client.MaterialApplyDetailImportOfTJ"); @@ -59,6 +51,6 @@ tie.addExportButton(5); -group.getField("MATERIALDETAILS")?.addButton(group.getField("SELECT"),0); -group.getField("ISPREPARATION")?.setVisible(false); -//group.getField("ISPREPARATION").setCaption("公司备料"); \ No newline at end of file +addSubTableButton("MATERIALDETAILS", "SELECT", 0); +setFieldVisible("ISPREPARATION", false); +//setFieldCaption("ISPREPARATION", "公司备料"); \ No newline at end of file diff --git a/tools/s3_rewriter/output/rewritten/f01c2f57-1891-45de-9318-7246f9d6ac97/5.HARD.groovy b/tools/s3_rewriter/output/rewritten/f01c2f57-1891-45de-9318-7246f9d6ac97/5.FULL_AUTO.groovy similarity index 67% rename from tools/s3_rewriter/output/rewritten/f01c2f57-1891-45de-9318-7246f9d6ac97/5.HARD.groovy rename to tools/s3_rewriter/output/rewritten/f01c2f57-1891-45de-9318-7246f9d6ac97/5.FULL_AUTO.groovy index 54ea93e..7641773 100644 --- a/tools/s3_rewriter/output/rewritten/f01c2f57-1891-45de-9318-7246f9d6ac97/5.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/f01c2f57-1891-45de-9318-7246f9d6ac97/5.FULL_AUTO.groovy @@ -2,25 +2,18 @@ // template_id : f01c2f57-1891-45de-9318-7246f9d6ac97 // template_name: 销项税发票(增加审批通过后)-五建定制 // seq : 5 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) +// label : FULL_AUTO +// 处置 : 全自动改写完成,直接入 P4 转换流水线 -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; -def signDetails = group.getField("TASKS"); -final Button cb0 = new Button("查询"); -cb0?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - - - - def thisuser = GetDefaultValueFunction.getCurrentUserId(); + +//将自定义的按钮添加至 +//addSubTableButton("TASKS", "SELECT", 0); +addFieldButton("TASKS", "查询", { +def thisuser = GetDefaultValueFunction.getCurrentUserId(); def newlist = []; def returncol = ["VIEW_ACT_RU_TASK_ID","PROCESSID","TITLE","TASKNAME","INITUSERID","STARTTIME","ASSIGNEE","DUEDATE","COMMENTTEXT","PROCESSNAME","INITUSERORGID"]; @@ -46,17 +39,10 @@ cb0?.addClickListener(new ClickListener() { }else{ bindField("TASKS",null); bindField("TASKS",newlist); - } - - - } -}); - - -final Button cb = new Button("全选"); -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def details = getFieldValue("TASKS"); + } +}, 0) +addFieldButton("TASKS", "全选", { +def details = getFieldValue("TASKS"); if(details != null){ details.each{ it.put("ISSIGN",true); @@ -64,14 +50,9 @@ cb?.addClickListener(new ClickListener() { bindField("TASKS",null); bindField("TASKS",details); } - } -}); - - -final Button cb2 = new Button("取消全选"); -cb2?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - def details = getFieldValue("TASKS"); +}, 1) +addFieldButton("TASKS", "取消全选", { +def details = getFieldValue("TASKS"); if(details != null){ details.each{ it.put("ISSIGN",false); @@ -79,11 +60,4 @@ cb2?.addClickListener(new ClickListener() { bindField("TASKS",null); bindField("TASKS",details); } - } -}); - -//将自定义的按钮添加至 -//signDetails?.addButton(group.getField("SELECT"),0); -signDetails?.addButton(cb0, 0); -signDetails?.addButton(cb, 1); -signDetails?.addButton(cb2, 2); +}, 2) diff --git a/tools/s3_rewriter/output/rewritten/f78c44ca-4a23-4195-996b-2cd7cf629c41/2.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/f78c44ca-4a23-4195-996b-2cd7cf629c41/2.FULL_AUTO.groovy similarity index 57% rename from tools/s3_rewriter/output/rewritten/f78c44ca-4a23-4195-996b-2cd7cf629c41/2.PARTIAL.groovy rename to tools/s3_rewriter/output/rewritten/f78c44ca-4a23-4195-996b-2cd7cf629c41/2.FULL_AUTO.groovy index 2347a74..b174c8e 100644 --- a/tools/s3_rewriter/output/rewritten/f78c44ca-4a23-4195-996b-2cd7cf629c41/2.PARTIAL.groovy +++ b/tools/s3_rewriter/output/rewritten/f78c44ca-4a23-4195-996b-2cd7cf629c41/2.FULL_AUTO.groovy @@ -2,9 +2,8 @@ // template_id : f78c44ca-4a23-4195-996b-2cd7cf629c41 // template_name: 月度检查整改(五建定制) // seq : 2 -// label : PARTIAL -// 余留模式 : raw .comboBox 组件访问; 残留字段句柄链(未覆盖动词) -// 处置 : 大部分已自动改写,余留行人工补全(见作业单) +// label : FULL_AUTO +// 处置 : 全自动改写完成,直接入 P4 转换流水线 //检查年月下拉框赋值 def value = getFieldValue("CHECKMONTHQUARTERLY"); @@ -13,4 +12,4 @@ clearFieldData("CHECKMONTHQUARTERLY"); for(k in 1..12){ addFieldOption("CHECKMONTHQUARTERLY", k, k.toString()); } -group.getField("CHECKMONTHQUARTERLY")?.comboBox.setValue(value); +setFieldValue("CHECKMONTHQUARTERLY", value); diff --git a/tools/s3_rewriter/output/rewritten/fb51a8c9-3bd4-4517-b19f-74edcc34f8f7/1.HARD.groovy b/tools/s3_rewriter/output/rewritten/fb51a8c9-3bd4-4517-b19f-74edcc34f8f7/1.HARD.groovy index f379ccd..9452a3e 100644 --- a/tools/s3_rewriter/output/rewritten/fb51a8c9-3bd4-4517-b19f-74edcc34f8f7/1.HARD.groovy +++ b/tools/s3_rewriter/output/rewritten/fb51a8c9-3bd4-4517-b19f-74edcc34f8f7/1.HARD.groovy @@ -3,7 +3,7 @@ // template_name: 发薪/扣款计划 // seq : 1 // label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 +// 硬 S3 原因 : 动态创建 Vaadin Button(无法自动改写形态) // 处置 : 原文保留,进人工排期(amis dialog/service 重写) import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; diff --git a/tools/s3_rewriter/output/rewritten/fe20a392-d4fd-402f-bbf8-be8cd41ab932/3.HARD.groovy b/tools/s3_rewriter/output/rewritten/fe20a392-d4fd-402f-bbf8-be8cd41ab932/3.HARD.groovy deleted file mode 100644 index 6426669..0000000 --- a/tools/s3_rewriter/output/rewritten/fe20a392-d4fd-402f-bbf8-be8cd41ab932/3.HARD.groovy +++ /dev/null @@ -1,40 +0,0 @@ -// === EIP4 P4 脚本迁移产出 === -// template_id : fe20a392-d4fd-402f-bbf8-be8cd41ab932 -// template_name: 项目人员配置(五建定制) -// seq : 3 -// label : HARD -// 硬 S3 原因 : 动态创建 Vaadin 组件 -// 处置 : 原文保留,进人工排期(amis dialog/service 重写) -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Notification.Type; - -final user = group.getField("PM_PROJECT_USERS"); -final Button cb = new Button("删除"); - -final Object table = user?.table; -table?.setImmediate(true);//设置验证 -final group1 = group; -cb?.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Object o = table?.getValue(); - if (o == null){ - Notification.show("请选择一条记录!", Type.ERROR_MESSAGE); - return; - } - def isLock = getFieldValue(o, "ISLOCK"); - if(isLock == 1){ - Notification.show("已备案人员无法删除!", Type.ERROR_MESSAGE); - }else{ - table.removeItem(o); - table.select(null); - user.fireValueChange(true); - } - } -}); - -//将自定义的按钮添加至 -user?.addButton(cb,"delete.png", 1); -user?.deleteButton.setVisible(false); diff --git a/tools/s3_rewriter/output/rewritten/fe20a392-d4fd-402f-bbf8-be8cd41ab932/3.PARTIAL.groovy b/tools/s3_rewriter/output/rewritten/fe20a392-d4fd-402f-bbf8-be8cd41ab932/3.PARTIAL.groovy new file mode 100644 index 0000000..7700210 --- /dev/null +++ b/tools/s3_rewriter/output/rewritten/fe20a392-d4fd-402f-bbf8-be8cd41ab932/3.PARTIAL.groovy @@ -0,0 +1,32 @@ +// === EIP4 P4 脚本迁移产出 === +// template_id : fe20a392-d4fd-402f-bbf8-be8cd41ab932 +// template_name: 项目人员配置(五建定制) +// seq : 3 +// label : PARTIAL +// 余留模式 : raw .table 组件访问; 残留字段句柄链(未覆盖动词) +// 处置 : 大部分已自动改写,余留行人工补全(见作业单) +import com.vaadin.ui.Notification; +import com.vaadin.ui.Notification.Type; + + + +final Object table = group.getField("PM_PROJECT_USERS")?.table; +table?.setImmediate(true);//设置验证 +final group1 = group; +//将自定义的按钮添加至 +addFieldButton("PM_PROJECT_USERS", "删除", { +Object o = table?.getValue(); + if (o == null){ + showToast("请选择一条记录!", Type.ERROR_MESSAGE); + return; + } + def isLock = getFieldValue(o, "ISLOCK"); + if(isLock == 1){ + showToast("已备案人员无法删除!", Type.ERROR_MESSAGE); + }else{ + table.removeItem(o); + table.select(null); + group.getField("PM_PROJECT_USERS").fireValueChange(true); + } +}) +group.getField("PM_PROJECT_USERS")?.deleteButton.setVisible(false); diff --git a/tools/s3_rewriter/output/stats.json b/tools/s3_rewriter/output/stats.json index b5b81c4..a366c76 100644 --- a/tools/s3_rewriter/output/stats.json +++ b/tools/s3_rewriter/output/stats.json @@ -2,43 +2,46 @@ "total_scripts": 1428, "label_counts": { "NO_S3": 815, - "FULL_AUTO": 497, - "PARTIAL": 30, - "HARD": 86 + "FULL_AUTO": 507, + "PARTIAL": 32, + "HARD": 74 }, "s3_total": 613, - "automation_rate": 81.1, + "automation_rate": 82.7, "rule_hit_counts": { "addFieldOption": 271, "balanced_setFilter": 187, "getContainerDataSource": 159, + "getValue": 134, "removeAllItems": 126, - "getValue": 122, - "addSubTableButton": 108, - "setValue": 73, + "addSubTableButton": 116, + "setValue": 75, "setReadOnly_field": 64, "setConvertedValue": 36, + "dynamic_button": 33, "removeItem": 32, "propertyDataSource_setReadOnly": 30, + "Notification_show": 30, "group_setReadOnly": 28, + "setVisible": 28, + "setCaption": 27, "getDisplay": 27, "reload": 27, - "setVisible": 26, - "setCaption": 25, "setViewWithoutEditor": 16, "setEnabled": 10, "setNullSelectionItemId": 9, - "Notification_show": 7, "setRequired": 6, "showAddButton": 6, + "comboBox_setValue": 5, "setRequiredError": 3, "getModifyButton_setVisible": 3, "getDetailButton_setVisible": 3, - "showDeleteButton": 2 + "showDeleteButton": 2, + "comboBox_removeItem": 2 }, - "manual_workpackage_count": 116, - "manual_partial": 30, - "manual_hard": 86, - "full_auto_index_count": 497, + "manual_workpackage_count": 106, + "manual_partial": 32, + "manual_hard": 74, + "full_auto_index_count": 507, "templates_with_scripts": 721 } \ No newline at end of file