diff --git a/com.connor.jd/bin/com/connor/jd/derive/deriveCenterHandler.class b/com.connor.jd/bin/com/connor/jd/derive/deriveCenterHandler.class index a1cbe6e..0f7779b 100644 Binary files a/com.connor.jd/bin/com/connor/jd/derive/deriveCenterHandler.class and b/com.connor.jd/bin/com/connor/jd/derive/deriveCenterHandler.class differ diff --git a/com.connor.jd/bin/com/connor/jd/derive/deriveMBOMHandler.class b/com.connor.jd/bin/com/connor/jd/derive/deriveMBOMHandler.class index cb521f7..ae46004 100644 Binary files a/com.connor.jd/bin/com/connor/jd/derive/deriveMBOMHandler.class and b/com.connor.jd/bin/com/connor/jd/derive/deriveMBOMHandler.class differ diff --git a/com.connor.jd/bin/com/connor/jd/derive/deriveOpertion.class b/com.connor.jd/bin/com/connor/jd/derive/deriveOpertion.class index 2c444cc..5705367 100644 Binary files a/com.connor.jd/bin/com/connor/jd/derive/deriveOpertion.class and b/com.connor.jd/bin/com/connor/jd/derive/deriveOpertion.class differ diff --git a/com.connor.jd/bin/com/connor/jd/erp/erpIntegrationHandler.class b/com.connor.jd/bin/com/connor/jd/erp/erpIntegrationHandler.class index 57c4303..0914b8a 100644 Binary files a/com.connor.jd/bin/com/connor/jd/erp/erpIntegrationHandler.class and b/com.connor.jd/bin/com/connor/jd/erp/erpIntegrationHandler.class differ diff --git a/com.connor.jd/bin/com/connor/jd/erp/erpIntegrationOpertaion.class b/com.connor.jd/bin/com/connor/jd/erp/erpIntegrationOpertaion.class index 02cb2d3..bd2d604 100644 Binary files a/com.connor.jd/bin/com/connor/jd/erp/erpIntegrationOpertaion.class and b/com.connor.jd/bin/com/connor/jd/erp/erpIntegrationOpertaion.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/CodeApplyHandler.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/CodeApplyHandler.class index 158533e..99b64bb 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/CodeApplyHandler.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/CodeApplyHandler.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/CodeApplyOperation.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/CodeApplyOperation.class index 025e039..d0efac3 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/CodeApplyOperation.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/CodeApplyOperation.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$1.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$1.class deleted file mode 100644 index a68557d..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$1.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$2$1.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$2$1.class deleted file mode 100644 index 41fb3e7..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$2$1.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$2.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$2.class deleted file mode 100644 index c260af0..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$2.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$3.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$3.class deleted file mode 100644 index 996df23..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog$3.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog.class index 09c1f0f..ff3ed3b 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartDialog.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartHandler.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartHandler.class index f03a1fc..057378c 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartHandler.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/DesignToPartHandler.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$1.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$1.class deleted file mode 100644 index 8bb162c..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$1.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$2$1.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$2$1.class deleted file mode 100644 index af7cc7f..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$2$1.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$2.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$2.class deleted file mode 100644 index 02dadce..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$2.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$3.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$3.class deleted file mode 100644 index f8872d6..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog$3.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog.class index f35a458..52a2c3b 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyDialog.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyHandler.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyHandler.class index 0fea2dd..29fd2c2 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyHandler.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/DrawingNoApplyHandler.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$1.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$1.class deleted file mode 100644 index d46f493..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$1.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$2.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$2.class deleted file mode 100644 index ad18bbb..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$2.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$3.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$3.class deleted file mode 100644 index f616f8e..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$3.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$4.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$4.class deleted file mode 100644 index a078c5e..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$4.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$5.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$5.class deleted file mode 100644 index 0c9e9a5..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$5.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$6.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$6.class deleted file mode 100644 index 5e14a63..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$6.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$7.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$7.class deleted file mode 100644 index 4a517ec..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$7.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$1.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$1.class deleted file mode 100644 index c6fdfaa..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$1.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$2.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$2.class deleted file mode 100644 index 12f28ca..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$2.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$3.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$3.class deleted file mode 100644 index 7d8381c..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$3.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$4.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$4.class deleted file mode 100644 index d706cb9..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$4.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$5.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$5.class deleted file mode 100644 index c2a885d..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$5.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$6.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$6.class deleted file mode 100644 index 3b6178b..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog$6.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog.class index f38dfdb..b1df55a 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog$IPDialog.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog.class index 57bbb2b..9104b79 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetDialog.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetHandler$1.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetHandler$1.class index bb97a58..ae44186 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetHandler$1.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/LoginIPSetHandler$1.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$1.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$1.class index c9b9d6f..bf9b012 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$1.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$1.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$2.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$2.class index a864f09..7b907af 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$2.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$2.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$3.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$3.class index e0b161c..2b29b48 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$3.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$3.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$4.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$4.class index 5c5cf28..59d7aba 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$4.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$4.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$5.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$5.class deleted file mode 100644 index 7b9d4c1..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog$5.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog.class index 9d544d4..6e87b57 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardDialog.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardHandler.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardHandler.class index 626e322..117e1c3 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardHandler.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/StandardHandler.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog$1.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog$1.class deleted file mode 100644 index 871ba57..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog$1.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog$2.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog$2.class deleted file mode 100644 index 82445e2..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog$2.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog$3.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog$3.class deleted file mode 100644 index b1e70bb..0000000 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog$3.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog.class index 2ee8174..86fdf44 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyDialog.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyHandler.class b/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyHandler.class index c782ba4..a927d85 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyHandler.class and b/com.connor.jd/bin/com/connor/jingdiao/handlers/WlbmApplyHandler.class differ diff --git a/com.connor.jd/bin/com/connor/jingdiao/util/TCUtil.class b/com.connor.jd/bin/com/connor/jingdiao/util/TCUtil.class index fe1ff0b..281968a 100644 Binary files a/com.connor.jd/bin/com/connor/jingdiao/util/TCUtil.class and b/com.connor.jd/bin/com/connor/jingdiao/util/TCUtil.class differ diff --git a/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomCommand$1.class b/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomCommand$1.class deleted file mode 100644 index 732ad52..0000000 Binary files a/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomCommand$1.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomCommand.class b/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomCommand.class index 80ee6a7..579e172 100644 Binary files a/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomCommand.class and b/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomCommand.class differ diff --git a/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog$1.class b/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog$1.class deleted file mode 100644 index 163bd57..0000000 Binary files a/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog$1.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog.class b/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog.class index 3fd891b..a4c8be1 100644 Binary files a/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog.class and b/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog.class differ diff --git a/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomHandler.class b/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomHandler.class index aefcfae..eb24aaf 100644 Binary files a/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomHandler.class and b/com.connor.jd/bin/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomHandler.class differ diff --git a/com.connor.jd/bin/com/connor/ml/tcm/outfile/util/MethodUtil.class b/com.connor.jd/bin/com/connor/ml/tcm/outfile/util/MethodUtil.class index a2969ec..2237fae 100644 Binary files a/com.connor.jd/bin/com/connor/ml/tcm/outfile/util/MethodUtil.class and b/com.connor.jd/bin/com/connor/ml/tcm/outfile/util/MethodUtil.class differ diff --git a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$1.class b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$1.class index 6489b1e..51b3d73 100644 Binary files a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$1.class and b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$1.class differ diff --git a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$2.class b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$2.class index 856e51d..903e6b6 100644 Binary files a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$2.class and b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$2.class differ diff --git a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$3.class b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$3.class index 0088906..69b76f8 100644 Binary files a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$3.class and b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$3.class differ diff --git a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$4.class b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$4.class index 878b8b9..73a0e8e 100644 Binary files a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$4.class and b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$4.class differ diff --git a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$5.class b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$5.class deleted file mode 100644 index fc82996..0000000 Binary files a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$5.class and /dev/null differ diff --git a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$TextAreaRenderer.class b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$TextAreaRenderer.class index 0fcc246..8ad12c6 100644 Binary files a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$TextAreaRenderer.class and b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog$TextAreaRenderer.class differ diff --git a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog.class b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog.class index 6d6018d..6849379 100644 Binary files a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog.class and b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeDialog.class differ diff --git a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeHandler.class b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeHandler.class index cbd6a2e..8777608 100644 Binary files a/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeHandler.class and b/com.connor.jd/bin/com/connor/processAttributeModification/ProcessAttriChangeHandler.class differ diff --git a/com.connor.jd/plugin.xml b/com.connor.jd/plugin.xml index 54da789..0365972 100644 --- a/com.connor.jd/plugin.xml +++ b/com.connor.jd/plugin.xml @@ -9,10 +9,10 @@ - + - + @@ -22,7 +22,7 @@ - + @@ -36,10 +36,10 @@ BOM转换 --> - + - + diff --git a/com.connor.jd/src/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog.java b/com.connor.jd/src/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog.java index 3bfb89f..53ffe96 100644 --- a/com.connor.jd/src/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog.java +++ b/com.connor.jd/src/com/connor/ml/tcm/outfile/ML_01/DbomTransitionToEbomDialog.java @@ -4,10 +4,8 @@ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; -import java.awt.Robot; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.util.ArrayList; @@ -15,6 +13,8 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; + import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JFrame; @@ -229,52 +229,33 @@ public class DbomTransitionToEbomDialog extends JFrame implements ActionListener try { DefaultMutableTreeTableNode parentNode = (DefaultMutableTreeTableNode) node.getParent(); - String status = nodeBean.getRefreshStatus(); - if(!status.equals("Է") && !status.equals("") && !status.isEmpty() - && getChildRefresh(parentNode, false)) { - MessageBox.post("²ѹѡϲ㲻ѡѷûȨ޶", "", MessageBox.ERROR); - return; - }else if(!acs.checkAccessorsPrivilege(user, nodeBean.getTcComponent(), "WRITE") - && getChildRefresh(parentNode, false)) { - MessageBox.post("²ѹѡϲ㲻ѡѷûȨ޶", "", MessageBox.ERROR); - return; - } - if(getTopRefresh(node)) { - MessageBox.post("ϲѹѡȨ޵Ķ²㲻ѡ", "", MessageBox.ERROR); - return; - } - -// if(getTopProcessRefresh(node)) { -// MessageBox.post("ϲѹѡеĶ²㲻ѡ", "", MessageBox.ERROR); -// return; -// } - - if(parentNode != null) { -// DefaultMutableTreeTableNode rootNode = (DefaultMutableTreeTableNode) parentNode.getParent(); -// NodeBean rootNodeBean = (NodeBean) rootNode.getUserObject(); - - -// if(!rootNodeBean.getDbom().equals("") && !getTop(node) && nodeBean.getLabel().equals("0") ) { -// MessageBox.post("ϲδѡ²㲻ѡ", "", MessageBox.ERROR); -// return; -// } - } -// TCComponentItemType itemType = (TCComponentItemType) session.getTypeComponent("Item"); //TODO ѡ¼ if(nodeBean.getLabel().equals("0")) { + String status = nodeBean.getRefreshStatus(); + boolean access = !acs.checkAccessorsPrivilege(user, nodeBean.getTcComponent(), "WRITE") + || !status.equals("Է") && !status.equals("") && !status.isEmpty(); + if(access && getChildRefresh(parentNode, false)) { + MessageBox.post("²ѹѡϲ㲻ѡѷûȨ޶", "", MessageBox.ERROR); + return; + } + if(getTopRefresh(node)) { + MessageBox.post("ϲѹѡȨ޵Ķ²㲻ѡ", "", MessageBox.ERROR); + return; + } //жͬһǷѹѡ if(parentNode != null) { for (int i = 0; i < parentNode.getChildCount(); i++) { DefaultMutableTreeTableNode childNode = (DefaultMutableTreeTableNode) parentNode.getChildAt(i); +// for (DefaultMutableTreeTableNode childNode : backMap.get(parentNode)) { NodeBean childBean = (NodeBean) childNode.getUserObject(); if(childBean.getLabel().equals("1") && !childBean.getEbom().isEmpty() && !nodeBean.getEbom().isEmpty()) { - MessageBox.post("ͬһ㼶ֻѡһ", "", MessageBox.ERROR); + MessageBox.post(this, "ͬһ㼶ֻѡһ", "", MessageBox.ERROR); return; } } } nodeBean.setLabel("1"); - if(parentNode != null) + if(!access && parentNode != null) autoCheck(parentNode, "1"); //isHaveBom(node, nodeBean.getEbomId(), "1", itemType); }else if(nodeBean.getLabel().equals("1")) { @@ -283,9 +264,10 @@ public class DbomTransitionToEbomDialog extends JFrame implements ActionListener autoCheck(parentNode, "0"); //isHaveBom(node, nodeBean.getEbomId(), "0", itemType); } - Robot robot = new Robot(); - robot.keyPress(KeyEvent.VK_TAB); - robot.keyRelease(KeyEvent.VK_TAB); + this.repaint(); +// Robot robot = new Robot(); +// robot.keyPress(KeyEvent.VK_TAB); +// robot.keyRelease(KeyEvent.VK_TAB); } catch (Exception e2) { // : handle exception e2.printStackTrace(); @@ -445,22 +427,23 @@ public class DbomTransitionToEbomDialog extends JFrame implements ActionListener boolean change = true; NodeBean eBean = null; for (int j = 0; j < node.getChildCount(); j++) { - DefaultMutableTreeTableNode childNode = (DefaultMutableTreeTableNode) parentNode.getChildAt(i); + DefaultMutableTreeTableNode childNode = (DefaultMutableTreeTableNode) node.getChildAt(j); NodeBean childBean = (NodeBean) childNode.getUserObject(); if(!childBean.getEbom().isEmpty()) { - if(eBean == null) { + if(val.equals("0")) { + childBean.setLabel(val); + }else if(eBean == null) { eBean = childBean; }else { change = false; } - }else if(!childBean.getDbom().isEmpty()) { - autoCheck(childNode, val); } } System.out.println("autoCheck" + bean.getDbom() + "==" + change + "==" + eBean + ">>" + val); - if(eBean != null && (change || val.equals("0"))) { + if(val.equals("1") && eBean != null && change) { eBean.setLabel(val); } + autoCheck(node, val); } } } @@ -724,18 +707,20 @@ public class DbomTransitionToEbomDialog extends JFrame implements ActionListener if(num == null || num.isEmpty() || num.equals("0")) { num = "1"; } - TCComponentItemRevision latestItemRevision = item.getLatestItemRevision(); +// TCComponentItemRevision latestItemRevision = item.getLatestItemRevision(); TCComponentItemRevision pRev = childNodeBean.getpRev(); System.out.println("pRev" + pRev); if(dbom.isPacked() && bomValMap.containsKey(pRev)) { List list = bomValMap.get(pRev); - childMap.put(latestItemRevision, list); + childMap.put(nodeComp, list); + }else if(childMap.containsKey(nodeComp)) {//TODO lidy20250221 + childMap.get(nodeComp).add(pValBean); }else { - //TODO lidy20241211 + // lidy20241211 List list = new ArrayList<>(); list.add(pValBean); - childMap.put(latestItemRevision, list); + childMap.put(nodeComp, list); } TCComponent tcComponent = childNodeBean.getTcComponent(); @@ -808,7 +793,7 @@ public class DbomTransitionToEbomDialog extends JFrame implements ActionListener TCComponentBOMLine topline = bomWindow.setWindowTopLine(topLineItem, topLineItem.getLatestItemRevision(), null, null); bomWindow.lock(); - recreateBom2(topLineItem, map2, topline); + recreateBom2(topLineItem, map2, topline, bomWindow); }catch(Exception e) { e.printStackTrace(); } @@ -821,6 +806,7 @@ public class DbomTransitionToEbomDialog extends JFrame implements ActionListener } /** * ´BOM + * @param bomWindow * * @param item * @param itemlists @@ -828,7 +814,7 @@ public class DbomTransitionToEbomDialog extends JFrame implements ActionListener */ @SuppressWarnings("deprecation") private void recreateBom2(TCComponentItem topItem, - Map> map2,TCComponentBOMLine topline) + Map> map2, TCComponentBOMLine topline, TCComponentBOMWindow bomWindow) throws Exception { // TCComponentBOMWindow bomWindow = null; try { @@ -836,6 +822,7 @@ public class DbomTransitionToEbomDialog extends JFrame implements ActionListener topline.lock(); System.out.println("items==>" + items.toString()); List bomLines = new ArrayList(); + Set set = map2.keySet(); if (topline.hasChildren()) { System.out.println(topItem); @@ -861,12 +848,19 @@ public class DbomTransitionToEbomDialog extends JFrame implements ActionListener bomLines.add(bLine); } } + }else if(set.size() > 0) {//lidy20250225 BOMͼ汾޷þȷ + TCComponentItemRevision rev = (TCComponentItemRevision) set.toArray()[0]; + TCComponentItem item = rev.getItem(); + TCComponentBOMLine line = topline.add(item, rev, null, false, ""); + bomWindow.save(); + line.cut(); + bomWindow.save(); } String maxSeq = ""; System.out.println("topline===>" + topline); topline.setPrecision(true); - for(TCComponentItemRevision rev : map2.keySet()) { + for(TCComponentItemRevision rev : set) { List list = map2.get(rev); System.out.println("list===>" + list.toString()); for(BomValBean bean : list) { @@ -888,7 +882,7 @@ public class DbomTransitionToEbomDialog extends JFrame implements ActionListener add.unlock(); if(bomStructMap.containsKey(item)) { Map> map3 = bomStructMap.get(item); - recreateBom2(item, map3, add); + recreateBom2(item, map3, add, bomWindow); } } diff --git a/com.connor.jd/src/com/connor/processAttributeModification/ProcessAttriChangeDialog.java b/com.connor.jd/src/com/connor/processAttributeModification/ProcessAttriChangeDialog.java index 3745f26..a658bd9 100644 --- a/com.connor.jd/src/com/connor/processAttributeModification/ProcessAttriChangeDialog.java +++ b/com.connor.jd/src/com/connor/processAttributeModification/ProcessAttriChangeDialog.java @@ -66,6 +66,7 @@ import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.util.MessageBox; import com.teamcenter.rac.util.PropertyLayout; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ArrayUtil; public class ProcessAttriChangeDialog extends JDialog { @@ -81,6 +82,10 @@ public class ProcessAttriChangeDialog extends JDialog { private JButton closeBtn; private JTable impTable; private DefaultTableModel impModel; + /** + * ޸ + */ + private JPanel propertyPanel; private ArrayList revlist; /** * ݣ[rev,object_name] ͣ @@ -120,22 +125,35 @@ public class ProcessAttriChangeDialog extends JDialog { * @param task ڵ * @param ruleOpsMap keyΪ()valueΪһString[]飬String["item/rev","object_name"] * @param cols + * @param chooseRows2 * @throws Exception */ - public ProcessAttriChangeDialog(TCSession session, TCComponent[] models, TCComponentTask task, LinkedHashMap ruleOpsMap, int[] cols) + public ProcessAttriChangeDialog( + TCSession session, + TCComponent[] models, + TCComponentTask task, + LinkedHashMap ruleOpsMap, + int[] cols, List chooseRowsA, + List targetRevisionA) throws Exception { super(AIFUtility.getActiveDesktop()); this.session = session; this.modelsF = models; this.taskF = task; this.ruleOpsMapF = ruleOpsMap; - System.out.println("ʼѡJd_Standard_UI_Process_AttributeϢĹ캯ruleOpsMap"); - for (String key : ruleOpsMap.keySet()){ - System.out.println(key+":"+Arrays.toString(ruleOpsMap.get(key))); + this.chooseRows = chooseRowsA; + this.targetRevision = targetRevisionA; + if (chooseRowsA != null && chooseRowsA.size()>0) { + System.out.println("캯ProcessAttriChangeDialogchooseRowsA:"+chooseRowsA.toString()); + }else { + if (this.chooseRows != null) { + System.out.println("this.chooseRows:["+this.chooseRows.size()+"]"); + } + System.out.println("캯ProcessAttriChangeDialogchooseRowsAΪգ"); } this.colsF = cols; this.argMap = getHandlerArgs(task); - initUi( modelsF, taskF, ruleOpsMapF, colsF,null); + initUi( modelsF, taskF, ruleOpsMapF, colsF,chooseRowsA); } /** @@ -148,7 +166,10 @@ public class ProcessAttriChangeDialog extends JDialog { * @param chooseRows ʼʱЯѡ * @throws Exception */ - private void initUi(TCComponent[] models, TCComponentTask task, LinkedHashMap ruleOpsMapI, int[] cols, List chooseRows2) throws Exception { + private void initUi(TCComponent[] models, + TCComponentTask task, + LinkedHashMap ruleOpsMapI, + int[] cols, List chooseRows2) throws Exception { // this.chooseRows.addAll(chooseRows2); if (chooseRows2 != null && chooseRows2.size()>0) { System.out.println("ǰѡ="+Arrays.toString(chooseRows2.toArray())); @@ -159,95 +180,7 @@ public class ProcessAttriChangeDialog extends JDialog { System.out.println("ʼʼ/ˢ塤"); setTitle("༭ڵ"); remarkBtn = new JButton("޸"); - remarkBtn.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) {//޸԰ť - System.out.println("޸¼~"); - try { -// chooseRow = impTable.getSelectedRow(); - System.out.println("ǰѡУ" + impTable.getSelectedRow()); - for (int i = 0; i < chooseRows.size(); i++) { - System.out.println("޸-ѡУ" + chooseRows.get(i)); - } - if(chooseRows.size() <= 0) { - MessageBox.post(ProcessAttriChangeDialog.this, "ѡҪ༭У", "ERROR", MessageBox.ERROR); - return; - } - for (String key : textAreaMap.keySet()){ -// String text = textAreaMap.get(key).getText();//ȡеֵ - // - Object component = textAreaMap.get(key); - String text = getValueByAreaType(component); - if (text == null){ - System.out.println("infoȡֵ쳣"); - } - - String showAttr = argMap.get(key);//ȡ̲value - if(text.getBytes().length > 1024) { - MessageBox.post(ProcessAttriChangeDialog.this, showAttr+"дȹ޷޸ģ", "ERROR", MessageBox.ERROR); - return; - }else { - //ȡ - for (int t = 0; t < tableHeaderList.size(); t++){ - if (tableHeaderList.get(t).equals(showAttr)){ - for (int i = 0; i < chooseRows.size(); i++) { - impTable.setValueAt(text, chooseRows.get(i), t); - } - break; - } - } - - } - } - - for (int i = 0; i < chooseRows.size(); i++) { - TCComponentItemRevision rev = revlist.get(chooseRows.get(i)); - TCComponentItem item = rev.getItem(); - if(mark[0].equals("item") && item.isCheckedOut()) { - MessageBox.post(ProcessAttriChangeDialog.this, item+" ǩ޷޸ģ", "ERROR", MessageBox.ERROR); - return; - }else if(mark[0].equals("rev") && rev.isCheckedOut()) { - MessageBox.post(ProcessAttriChangeDialog.this, rev+" ǩ޷޸ģ", "E RROR", MessageBox.ERROR); - return; - } - MethodUtil.openByPass(session); - if(mark[0].equals("item")) { - for (String key : textAreaMap.keySet()){ -// String value = textAreaMap.get(key).getText(); - Object component = textAreaMap.get(key); - String inputValue = getValueByAreaType(component); - if (inputValue == null){ - System.out.println("infoȡֵ쳣"); - } - - item.setProperty(key, inputValue); - } - }else if(mark[0].equals("rev")) { - for (String key : textAreaMap.keySet()){ -// String value = textAreaMap.get(key).getText(); - Object component = textAreaMap.get(key); - String inputValue = getValueByAreaType(component); - if (inputValue == null){ - System.out.println("infoȡֵ쳣"); - } - rev.setProperty(key, inputValue); - } - } - } - - MethodUtil.closeByPass(session); - }catch(Exception e1) { - e1.printStackTrace(); - MessageBox.post(ProcessAttriChangeDialog.this, ""+e1.getMessage(), "ERROR", MessageBox.ERROR); - }finally { - try { - MethodUtil.closeByPass(session); - }catch(Exception e1) { - e1.printStackTrace(); - } - } - } - }); + exportBtn = new JButton("Excel"); closeBtn = new JButton("ر"); JPanel btnPanel = new JPanel(new FlowLayout()); @@ -255,7 +188,6 @@ public class ProcessAttriChangeDialog extends JDialog { btnPanel.add(exportBtn); btnPanel.add(closeBtn); -// JPanel topPanel = new JPanel(new BorderLayout()); if (topPanel == null) { topPanel = new JPanel(new BorderLayout()); @@ -269,86 +201,87 @@ public class ProcessAttriChangeDialog extends JDialog { return; } // - JPanel propertyPanel = new JPanel(new PropertyLayout()); - int k = 0; - for (String key : this.argMap.keySet()) {//õȾ - k++; - String value = this.argMap.get(key);//ʾ - System.out.println("ϢKey: " + key + ", Value: " + value); - String labLocation = String.valueOf(k)+".1.left.top"; - String fieldLocation = String.valueOf(k)+".2.left.top"; - propertyPanel.add(labLocation,new JLabel(value)); - - //TODO ߼عݲͬͣȾͬ - String[] attrs = ruleOpsMapI.get(value); - if (attrs == null || attrs.length == 0){ - System.out.println("infoʾֶΡ"+value+"ȡϢʧܣѡã"); - } - String currentAttributeValue = null;//ǰԵֵȾ - System.out.println("===================================================================="); - if (this.targetRevision != null && this.targetRevision.size() > 0){ - System.out.println("infoѡж󣬿ʼѡжȾ"); - - //ѡжʱĬϽǰѡеĵһΪĬֵȾԱ༭ - TCComponentItem targetItem = this.targetRevision.get(0).getItem(); - //ƻȡͣitem/rev - String itemType = attrs[0];//item/rev - String propertyName = attrs[1];//ʵ - if (itemType.equals("item")){ - currentAttributeValue = targetItem.getProperty(propertyName);//ȡǰԵֵ - - }else { - currentAttributeValue = targetRevision.get(0).getProperty(propertyName);//ȡǰԵֵ - - } - // - if (isLovType(propertyName)){ - System.out.println("ԡ"+propertyName+"ΪLOV"); - - Map lovList = getUnitValue_display(session,propertyName); - // б - JComboBox comboBox = new JComboBox<>(); - - // lovListеvalueֵӵб - for (String lovValue : lovList.values()) { - comboBox.addItem(lovValue); - } - // ĬʾֵdefaultValueϣĬʾѡ - comboBox.setSelectedItem(currentAttributeValue); - propertyPanel.add(fieldLocation, comboBox); - this.textAreaMap.put(propertyName, comboBox); // - }else {// - System.out.println("ԡ"+ propertyName+"ͷLOV "); - - JTextArea textArea = new JTextArea(); // JTextArea - textArea.setColumns(20); // - textArea.setLineWrap(true); // Զ - textArea.setWrapStyleWord(true); // ʻ - JScrollPane scrollPane = new JScrollPane(textArea); - System.out.println("KUMA=" + value); - if (value != null && (value.trim().contains("ע") || "ע".equals(value.trim()))){//ע⴦Ӹ߶ - System.out.println("KUMA:ֶ⴦"); - scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); - textArea.setRows(3); - scrollPane.setPreferredSize(scrollPane.getPreferredSize()); // JScrollPane ѡߴ - } - //ֵtextArea - textArea.setText(currentAttributeValue); - propertyPanel.add(fieldLocation, scrollPane); - this.textAreaMap.put(key, textArea); // JTextArea浽Map - } + propertyPanel = new JPanel(new PropertyLayout()); +// int k = 0; +// for (String key : this.argMap.keySet()) {//õȾ +// k++; +// String value = this.argMap.get(key);//ʾ +// System.out.println("ϢKey: " + key + ", Value: " + value); +// String labLocation = String.valueOf(k)+".1.left.top"; +// String fieldLocation = String.valueOf(k)+".2.left.top"; +// propertyPanel.add(labLocation,new JLabel(value)); +// +// //TODO ߼عݲͬͣȾͬ +// String[] attrs = ruleOpsMapI.get(value); +// if (attrs == null || attrs.length == 0){ +// System.out.println("infoʾֶΡ"+value+"ȡϢʧܣѡã"); +// } +// String currentAttributeValue = null;//ǰԵֵȾ +// System.out.println("===================================================================="); +// if (this.targetRevision != null && this.targetRevision.size() > 0){ +// System.out.println("infoѡж󣬿ʼѡжȾ"); +// +// //ѡжʱĬϽǰѡеĵһΪĬֵȾԱ༭ +// TCComponentItem targetItem = this.targetRevision.get(0).getItem(); +// //ƻȡͣitem/rev +// String itemType = attrs[0];//item/rev +// String propertyName = attrs[1];//ʵ +// if (itemType.equals("item")){ +// currentAttributeValue = targetItem.getProperty(propertyName);//ȡǰԵֵ +// +// }else { +// currentAttributeValue = targetRevision.get(0).getProperty(propertyName);//ȡǰԵֵ +// +// } +// // +// if (isLovType(propertyName)){ +// System.out.println("ԡ"+propertyName+"ΪLOV"); +// +// Map lovList = getUnitValue_display(session,propertyName); +// // б +// JComboBox comboBox = new JComboBox<>(); +// +// // lovListеvalueֵӵб +// for (String lovValue : lovList.values()) { +// comboBox.addItem(lovValue); +// } +// // ĬʾֵdefaultValueϣĬʾѡ +// comboBox.setSelectedItem(currentAttributeValue); +// propertyPanel.add(fieldLocation, comboBox); +// this.textAreaMap.put(propertyName, comboBox); // +// }else {// +// System.out.println("ԡ"+ propertyName+"ͷLOV "); +// +// JTextArea textArea = new JTextArea(); // JTextArea +// textArea.setColumns(20); // +// textArea.setLineWrap(true); // Զ +// textArea.setWrapStyleWord(true); // ʻ +// JScrollPane scrollPane = new JScrollPane(textArea); +// System.out.println("KUMA=" + value); +// if (value != null && (value.trim().contains("ע") || "ע".equals(value.trim()))){//ע⴦Ӹ߶ +// System.out.println("KUMA:ֶ⴦"); +// scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); +// textArea.setRows(3); +// scrollPane.setPreferredSize(scrollPane.getPreferredSize()); // JScrollPane ѡߴ +// } +// //ֵtextArea +// textArea.setText(currentAttributeValue); +// propertyPanel.add(fieldLocation, scrollPane); +// this.textAreaMap.put(key, textArea); // JTextArea浽Map +// } +// +// }else { +// System.out.println("infoδѡκУ޷ȡѡжȾĬ"); +// //ȾĬ +// JTextArea textArea = new JTextArea(); // JTextArea +// textArea.setColumns(20); // +// textArea.setLineWrap(true); // Զ +// textArea.setWrapStyleWord(true); // ʻ +// propertyPanel.add(fieldLocation, new JScrollPane(textArea)); +// this.textAreaMap.put(key, textArea); // JTextArea浽Map +// } +// } - }else { - System.out.println("infoδѡκУ޷ȡѡжȾĬ"); - //ȾĬ - JTextArea textArea = new JTextArea(); // JTextArea - textArea.setColumns(20); // - textArea.setLineWrap(true); // Զ - textArea.setWrapStyleWord(true); // ʻ - propertyPanel.add(fieldLocation, new JScrollPane(textArea)); - this.textAreaMap.put(key, textArea); // JTextArea浽Map - } - } // λãbtnPanel ϱߣײ topPanel.add(propertyPanel, BorderLayout.CENTER); topPanel.add(btnPanel, BorderLayout.SOUTH); @@ -356,6 +289,7 @@ public class ProcessAttriChangeDialog extends JDialog { topPanel.revalidate(); topPanel.repaint(); + //ͷ String[] tableHeader = new String[ruleOpsMapI.size() + 1]; tableHeader[0] = ""; int h = 1; @@ -383,56 +317,7 @@ public class ProcessAttriChangeDialog extends JDialog { impTable.setModel(impModel); impTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - impTable.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) {// - System.out.println("ѡ¼~"); - try { -// chooseRow= impTable.getSelectedRows(); - int[] selectedRows = impTable.getSelectedRows(); - - - if(selectedRows.length <= 0) { - System.out.println("ǰδѡκζ "); - return; - } - //ѡ -// List chooseRowTemp = new ArrayList(); - chooseRows.clear();//µѡǰѡм - targetRevision.clear(); - - System.out.println("ǰѡУ"); - - for (int i = 0; i < selectedRows.length; i++) { - //ѡ֮һ - int selectPartRowNum = selectedRows[i]; - System.out.println("=>"+selectPartRowNum+" ;"); - if (revlist != null && revlist.size() > 0) { - TCComponentItemRevision selectRevision = revlist.get(selectPartRowNum);//ѡеţrevlistлȡжӦİ汾 - if (selectRevision != null) { - targetRevision.add(selectRevision); - chooseRows.add(selectPartRowNum); - } - - }else { - System.out.println("汾listΪգ"); - } - - } - - if (targetRevision != null && targetRevision.size() > 0) { - System.out.println("ȾǰѡУ"+Arrays.toString(chooseRows.toArray())); - initUi(modelsF, taskF, ruleOpsMapF, colsF, chooseRows); - System.out.println("ȾѡУ"+Arrays.toString(chooseRows.toArray())); - } - - } catch (Exception e1) { - e1.printStackTrace(); - MessageBox.post(ProcessAttriChangeDialog.this, "" + e1.getMessage(), "ERROR", MessageBox.ERROR); - } - } - }); - + for (int i = 1; i < impModel.getColumnCount(); i++) { TableColumn col = impTable.getColumnModel().getColumn(i); col.setCellRenderer(new TextAreaRenderer()); @@ -444,7 +329,7 @@ public class ProcessAttriChangeDialog extends JDialog { // for (MouseListener listener : impTable.getMouseListeners()) { // impTable.removeMouseListener(listener); // } -// addActionListener(models, cols); + addActionListener(models, cols); setLayout(new BorderLayout()); topPanel.setPreferredSize(new Dimension(260, getHeight())); // ÿ @@ -461,13 +346,13 @@ public class ProcessAttriChangeDialog extends JDialog { //ѡУtableѡжӦ״̬ if (chooseRows != null && chooseRows.size() > 0) { System.out.println("¼ɣǰѡУʼtableѡ״̬"); - List uniqueRows = new ArrayList<>(new HashSet<>(chooseRows2)); // ȥ + List uniqueRows = new ArrayList<>(new HashSet<>(chooseRows)); // ȥ Collections.sort(uniqueRows); // for (int row : uniqueRows) { impTable.addRowSelectionInterval(row, row); } }else{ - System.out.println("ǰδѡκУ¼tableѡ״̬"); + System.out.println("¼ɣǰδѡκУ¼tableѡ״̬"); } } @@ -486,6 +371,7 @@ public class ProcessAttriChangeDialog extends JDialog { if (lov.length > 0) return true; } catch (TCException e) { + System.out.println("ȡLOV쳣"); e.printStackTrace(); } return false; @@ -638,6 +524,106 @@ public class ProcessAttriChangeDialog extends JDialog { } } + /** + * Ա༭Panel + * @throws TCException + * + */ + private void updatePropertyPanel(LinkedHashMap ruleOpsMapI) throws TCException { + System.out.println("updatePropertyPanel~"); + //1.ǰPanel + propertyPanel.removeAll(); + topPanel.remove(propertyPanel); + propertyPanel = new JPanel(new PropertyLayout()); + + int k = 0; + for (String key : this.argMap.keySet()) {//õȾ + k++; + String value = this.argMap.get(key);//ʾ + System.out.println("ϢKey: " + key + ", Value: " + value); + String labLocation = String.valueOf(k)+".1.left.top"; + String fieldLocation = String.valueOf(k)+".2.left.top"; + propertyPanel.add(labLocation,new JLabel(value)); + + //TODO ߼عݲͬͣȾͬ + String[] attrs = ruleOpsMapI.get(value); + if (attrs == null || attrs.length == 0){ + System.out.println("infoʾֶΡ"+value+"ȡϢʧܣѡã"); + } + String currentAttributeValue = null;//ǰԵֵȾ + System.out.println("===================================================================="); + if (this.targetRevision != null && this.targetRevision.size() > 0){ + System.out.println("infoѡж󣬿ʼѡжȾ"); + + //ѡжʱĬϽǰѡеĵһΪĬֵȾԱ༭ + TCComponentItem targetItem = this.targetRevision.get(0).getItem(); + //ƻȡͣitem/rev + String itemType = attrs[0];//item/rev + String propertyName = attrs[1];//ʵ + if (itemType.equals("item")){ + currentAttributeValue = targetItem.getProperty(propertyName);//ȡǰԵֵ + + }else { + currentAttributeValue = targetRevision.get(0).getProperty(propertyName);//ȡǰԵֵ + + } + // + if (isLovType(propertyName)){ + System.out.println("ԡ"+propertyName+"ΪLOV"); + + Map lovList = getUnitValue_display(session,propertyName); + // б + JComboBox comboBox = new JComboBox<>(); + + // lovListеvalueֵӵб + for (String lovValue : lovList.values()) { + comboBox.addItem(lovValue); + } + // ĬʾֵdefaultValueϣĬʾѡ + comboBox.setSelectedItem(currentAttributeValue); + propertyPanel.add(fieldLocation, comboBox); + this.textAreaMap.put(propertyName, comboBox); // + }else {// + System.out.println("ԡ"+ propertyName+"ͷLOV "); + + JTextArea textArea = new JTextArea(); // JTextArea + textArea.setColumns(20); // + textArea.setLineWrap(true); // Զ + textArea.setWrapStyleWord(true); // ʻ + JScrollPane scrollPane = new JScrollPane(textArea); + System.out.println("KUMA=" + value); + if (value != null && (value.trim().contains("ע") || "ע".equals(value.trim()))){//ע⴦Ӹ߶ + System.out.println("KUMA:ֶ⴦"); + scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); + textArea.setRows(3); + scrollPane.setPreferredSize(scrollPane.getPreferredSize()); // JScrollPane ѡߴ + } + //ֵtextArea + textArea.setText(currentAttributeValue); + propertyPanel.add(fieldLocation, scrollPane); + this.textAreaMap.put(key, textArea); // JTextArea浽Map + } + + }else { + System.out.println("infoδѡκУ޷ȡѡжȾĬ"); + //ȾĬ + JTextArea textArea = new JTextArea(); // JTextArea + textArea.setColumns(20); // + textArea.setLineWrap(true); // Զ + textArea.setWrapStyleWord(true); // ʻ + propertyPanel.add(fieldLocation, new JScrollPane(textArea)); + this.textAreaMap.put(key, textArea); // JTextArea浽Map + } + } + + + + + topPanel.add(propertyPanel, BorderLayout.CENTER); + topPanel.revalidate(); + topPanel.repaint();//Panel + } + /** * ¼ * @param models @@ -649,18 +635,27 @@ public class ProcessAttriChangeDialog extends JDialog { public void mouseClicked(MouseEvent e) {// System.out.println("ѡ¼~"); try { -// chooseRow= impTable.getSelectedRows(); int[] selectedRows = impTable.getSelectedRows(); + int length = selectedRows.length; - - if(selectedRows.length <= 0) { - System.out.println("ǰδѡκζ "); + if(length <= 0) { + System.out.println("ǰѡеijΪ"+length+"δѡκζ "); return; + }else { + System.out.println("ǰѡУ"+ArrayUtil.toString(selectedRows)); } //ѡ -// List chooseRowTemp = new ArrayList(); - chooseRows.clear();//µѡǰѡм - targetRevision.clear(); + if (chooseRows != null && chooseRows.size() > 0) { + chooseRows.clear();//µѡǰѡм + }else { + chooseRows = new ArrayList (); + } + + if (targetRevision != null && targetRevision.size() > 0) { + targetRevision.clear(); + }else { + targetRevision = new ArrayList(); + } System.out.println("ǰѡУ"); @@ -683,7 +678,10 @@ public class ProcessAttriChangeDialog extends JDialog { if (targetRevision != null && targetRevision.size() > 0) { System.out.println("ȾǰѡУ"+Arrays.toString(chooseRows.toArray())); - initUi(modelsF, taskF, ruleOpsMapF, colsF, chooseRows); +// initUi(modelsF, taskF, ruleOpsMapF, colsF, chooseRows); +// ProcessAttriChangeDialog.this.dispose(); +// new ProcessAttriChangeDialog(session, models, taskF, ruleOpsMapF, colsF, chooseRows, targetRevision); + updatePropertyPanel(ruleOpsMapF); System.out.println("ȾѡУ"+Arrays.toString(chooseRows.toArray())); } diff --git a/com.connor.jd/src/com/connor/processAttributeModification/ProcessAttriChangeHandler.java b/com.connor.jd/src/com/connor/processAttributeModification/ProcessAttriChangeHandler.java index f2af05f..23606d7 100644 --- a/com.connor.jd/src/com/connor/processAttributeModification/ProcessAttriChangeHandler.java +++ b/com.connor.jd/src/com/connor/processAttributeModification/ProcessAttriChangeHandler.java @@ -70,7 +70,7 @@ public class ProcessAttriChangeHandler extends AbstractHandler implements IHandl MessageBox.post(desktop, "ѡj6_Standard_puidòȷ", "ERROR", MessageBox.ERROR);//QiAAAI4S5kSPsC return null; } - new ProcessAttriChangeDialog(session, datasets, task, ruleOpsMap, cols); + new ProcessAttriChangeDialog(session, datasets, task, ruleOpsMap, cols, null, null); }catch(Exception e) { e.printStackTrace(); MessageBox.post(desktop, ""+e.getMessage(), "ERROR", MessageBox.ERROR);