diff --git a/com.connor.chint.wuhan/bin/.gitignore b/com.connor.chint.wuhan/bin/.gitignore
deleted file mode 100644
index fcae520..0000000
--- a/com.connor.chint.wuhan/bin/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/com/
-/mes/
-/nc/
-/plm/
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
new file mode 100644
index 0000000..6f79955
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
new file mode 100644
index 0000000..ca27f2b
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/SearchSapResultPanel.fxml
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapDetailPanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapDetailPanel.fxml
new file mode 100644
index 0000000..c89bc99
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapDetailPanel.fxml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel - 副本.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel - 副本.fxml
new file mode 100644
index 0000000..ad72ffd
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel - 副本.fxml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel.fxml
new file mode 100644
index 0000000..2433a8d
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult9/SearchSapResultPanel.fxml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdPane.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdPane.fxml
new file mode 100644
index 0000000..b85884d
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdPane.fxml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/ChangeNoticePanel.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/ChangeNoticePanel.fxml
new file mode 100644
index 0000000..8d56061
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/ChangeNoticePanel.fxml
@@ -0,0 +1,285 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateApplyPane.fxml b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateApplyPane.fxml
new file mode 100644
index 0000000..a50bae2
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/RelateApplyPane.fxml
@@ -0,0 +1,187 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createbomdifference/Message_zh_CN.properties b/com.connor.chint.wuhan/bin/com/chint/plm/createbomdifference/Message_zh_CN.properties
new file mode 100644
index 0000000..b97fb23
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/chint/plm/createbomdifference/Message_zh_CN.properties
@@ -0,0 +1,3 @@
+ERROR_NOT_CHANGE=\u8BF7\u9009\u62E9\u66F4\u6539\u901A\u77E5\u5355\u5BF9\u8C61
+ERROR_NO_CHANGE=\u672A\u627E\u5230\u53D8\u66F4\u524D\u540E\u5BF9\u8C61,\u65E0\u6CD5\u63D0\u53D6\u5DEE\u5F02\u9879\uFF01
+SUCC_CHANGE=\u63D0\u53D6\u5B8C\u6210
\ No newline at end of file
diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/JDBPackage/DesignChangePanel.fxml b/com.connor.chint.wuhan/bin/com/connor/chint/JDBPackage/DesignChangePanel.fxml
new file mode 100644
index 0000000..528f24d
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/chint/JDBPackage/DesignChangePanel.fxml
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/dbcp.properties b/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/dbcp.properties
new file mode 100644
index 0000000..35e40be
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/dbcp.properties
@@ -0,0 +1,19 @@
+#\u6570\u636E\u5E93\u9A71\u52A8
+driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
+#\u6570\u636E\u5E93\u8FDE\u63A5\u5730\u5740
+url=jdbc:sqlserver://10.128.10.135:1433;DatabaseName=CHINT_DB
+#\u7528\u6237\u540D
+username=PLMUser
+#\u5BC6\u7801
+password=PLMUser
+ #\u8FDE\u63A5\u6C60\u7684\u6700\u5927\u6570\u636E\u5E93\u8FDE\u63A5\u6570\u3002\u8BBE\u4E3A0\u8868\u793A\u65E0\u9650\u5236
+maxActive=30
+#\u6700\u5927\u7A7A\u95F2\u6570\uFF0C\u6570\u636E\u5E93\u8FDE\u63A5\u7684\u6700\u5927\u7A7A\u95F2\u65F6\u95F4\u3002\u8D85\u8FC7\u7A7A\u95F2\u65F6\u95F4\uFF0C\u6570\u636E\u5E93\u8FDE
+#\u63A5\u5C06\u88AB\u6807\u8BB0\u4E3A\u4E0D\u53EF\u7528\uFF0C\u7136\u540E\u88AB\u91CA\u653E\u3002\u8BBE\u4E3A0\u8868\u793A\u65E0\u9650\u5236
+maxIdle=10
+#\u6700\u5927\u5EFA\u7ACB\u8FDE\u63A5\u7B49\u5F85\u65F6\u95F4\u3002\u5982\u679C\u8D85\u8FC7\u6B64\u65F6\u95F4\u5C06\u63A5\u5230\u5F02\u5E38\u3002\u8BBE\u4E3A-1\u8868\u793A\u65E0\u9650\u5236
+maxWait=1000
+ #\u8D85\u8FC7removeAbandonedTimeout\u65F6\u95F4\u540E\uFF0C\u662F\u5426\u8FDB \u884C\u6CA1\u7528\u8FDE\u63A5\uFF08\u5E9F\u5F03\uFF09\u7684\u56DE\u6536\uFF08\u9ED8\u8BA4\u4E3Afalse\uFF0C\u8C03\u6574\u4E3Atrue)
+removeAbandoned=true
+#\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\uFF0C\u56DE\u6536\u6CA1\u6709\u7528(\u5E9F\u5F03)\u7684\u8FDE\u63A5\uFF08\u9ED8\u8BA4\u4E3A 300\u79D2\uFF0C\u8C03\u6574\u4E3A180\uFF09
+removeAbandonedTimeout=180
diff --git a/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/util.properties b/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/util.properties
new file mode 100644
index 0000000..19c2332
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/chint/sap2/util/util.properties
@@ -0,0 +1,41 @@
+SQL.URL=jdbc:sqlserver://10.128.20.35:1433;DatabaseName=BDP2020
+SQL.DRIVER=com.microsoft.sqlserver.jdbc.SQLServerDriver
+SQL.USER=PLMUser
+SQL.PASSWORD=PLMUser
+
+#\u4F4E\u538B\u8BDA\u521B
+SQL.CC.URL=jdbc:sqlserver://10.128.10.135:1433;DatabaseName=CHINT_DB
+SQL.CC.DRIVER=com.microsoft.sqlserver.jdbc.SQLServerDriver
+SQL.CC.USER=PLMUser
+SQL.CC.PASSWORD=PLMUser
+
+# Test
+#SQL.SH.URL=jdbc:sqlserver://10.128.155.236:1433;DatabaseName=ISP.CADAssistant
+#SQL.SH.DRIVER=com.microsoft.sqlserver.jdbc.SQLServerDriver
+#SQL.SH.USER=sa
+#SQL.SH.PASSWORD=2wsx#EDC
+#
+SQL.SH.URL=jdbc:sqlserver://10.128.155.140:1433;DatabaseName=ISP.CADAssistant
+SQL.SH.DRIVER=com.microsoft.sqlserver.jdbc.SQLServerDriver
+SQL.SH.USER=sa
+SQL.SH.PASSWORD=2wsx#EDC
+
+SQL.TC.URL=jdbc:oracle:thin:@10.128.10.207:1521:tcprod
+SQL.TC.DRIVER=oracle.jdbc.driver.OracleDriver
+SQL.TC.USER=infodba
+SQL.TC.PASSWORD=infodba
+
+
+
+
+#SQL.TCDATA.URL=jdbc:oracle:thin:@192.168.0.103:1521:TC
+SQL.TCDATA.URL=jdbc:oracle:thin:@10.128.18.139:1521:testdb
+SQL.TCDATA.DRIVER=oracle.jdbc.driver.OracleDriver
+SQL.TCDATA.USER=infodba
+SQL.TCDATA.PASSWORD=infodba
+
+SQL.TEMPLATE_TREE=select t.PmpcCode, t.PmpcCompanyCode, t.PmpcName, t.PmpcUpperCode, t.PmpcItem, t.PmpcPrhCode, t.PmpcEnd,t.PmpcCanzz,t.PmpcPType,t.PmpcMType from CcemVW_Pmpc t;
+SQL.TEMPLATE=select t.PrhName,t.PrdLine,t.PrdNo,t.PrdFeatureCode,t.FeatureName,t.PrdCanInput,t.PrdSign from CcemVW_Prd t where t.prhcode = ? order by t.PrdNo
+SQL.LOV=select t.PrddNo,t.PrddFeatureCode,t.PrddValue from CcemVW_Prdd t where t.PrddCode = ? and PrddLine = ? order by t.PrddNo
+SQL.FEATURE=select t.FeatureCode,t.FeatureName from CcemVW_Feature t
+SQL.GROUP=select t.ProductGroupCode,t.ProductGroupName from CcemVW_ProductGroup t
\ No newline at end of file
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview.fxml b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview.fxml
new file mode 100644
index 0000000..65aaaf8
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview.fxml
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview1.fxml b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview1.fxml
new file mode 100644
index 0000000..1ff9eaf
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview1.fxml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview2.fxml b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview2.fxml
new file mode 100644
index 0000000..b821cf1
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/CreateOuotation/PersonOverview2.fxml
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a - 副本.fxml b/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a - 副本.fxml
new file mode 100644
index 0000000..d38317f
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a - 副本.fxml
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a.fxml b/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a.fxml
new file mode 100644
index 0000000..2d5bcbd
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/GZXQ/a.fxml
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale.properties b/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale.properties
new file mode 100644
index 0000000..ba94edb
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale.properties
@@ -0,0 +1,24 @@
+preferr=\u9996\u9009\u9879\u914D\u7F6E\u4E0D\u6B63\u786E
+err=\u9519\u8BEF\uFF1A
+#ProcessCheckDialog
+title=\u5DE5\u827A\u8DEF\u7EBF\u9F50\u5957\u6027\u68C0\u67E5
+cols=\u5E8F\u53F7;\u7269\u6599\u7F16\u7801;\u7269\u6599\u540D\u79F0;\u662F\u5426\u5173\u8054\u5DE5\u827A\u8DEF\u7EBF
+xmzx=\u9879\u76EE\u6267\u884C
+zztz=13-\u603B\u88C5\u56FE\u7EB8
+msg1=\u8BF7\u9009\u62E9\u9879\u76EE\u5BF9\u8C61
+msg2=\u672A\u627E\u5230\u603B\u88C5\u56FE\u7EB8
+yes=\u662F
+no=\u5426
+#AssProcessAutoFeedingCommand
+cpxh=\u4EA7\u54C1\u578B\u53F7
+info1=\u8BF7\u767B\u5F55\u6B63\u786E\u7EC4
+info2=\u8BF7\u9009\u62E9BOM\u884C\u6216\u8005\u7248\u672C\u5BF9\u8C61
+info3=\u8BF7\u9009\u62E9PBOM\u5BF9\u8C61
+info4=\u672A\u627E\u5230\u4EA7\u6210\u54C1\u6587\u4EF6\u5939\uFF0C\u8BF7\u68C0\u67E5
+info5=\u5B58\u5728\u9876\u5C42P\u7269\u6599\u6CA1\u6709\u5173\u8054\u56FE\u7EB8\uFF0C\u8BF7\u68C0\u67E5
+info6=\u5F53\u524D\u4EA7\u54C1\u578B\u53F7\u672A\u7EF4\u62A4\uFF0C\u8BF7\u9009\u62E9\u5BF9\u5E94\u4EA7\u54C1\u65CF
+info7=\u6B63\u5728\u8FDB\u884C\u4E00\u952E\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF......
+info8=\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF\u5B58\u5728\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\uFF1A\n
+info9=\u6B63\u5728\u8FDB\u884C\u81EA\u52A8\u6295\u6599......
+info10=\u81EA\u52A8\u6295\u6599\u5B58\u5728\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\uFF1A\n
+info11=\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF\u4E0E\u81EA\u52A8\u6295\u6599\u5B8C\u6210
diff --git a/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale_zh_CN.properties b/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale_zh_CN.properties
new file mode 100644
index 0000000..f574841
--- /dev/null
+++ b/com.connor.chint.wuhan/bin/com/connor/plm/process/process_locale_zh_CN.properties
@@ -0,0 +1,24 @@
+preferr=\u9996\u9009\u9879\u914D\u7F6E\u4E0D\u6B63\u786E
+#ProcessCheckDialog
+err=\u9519\u8BEF\uFF1A
+title=\u5DE5\u827A\u8DEF\u7EBF\u9F50\u5957\u6027\u68C0\u67E5
+cols=\u5E8F\u53F7;\u7269\u6599\u7F16\u7801;\u7269\u6599\u540D\u79F0;\u662F\u5426\u5173\u8054\u5DE5\u827A\u8DEF\u7EBF
+xmzx=\u9879\u76EE\u6267\u884C
+zztz=13-\u603B\u88C5\u56FE\u7EB8
+msg1=\u8BF7\u9009\u62E9\u9879\u76EE\u5BF9\u8C61
+msg2=\u672A\u627E\u5230\u603B\u88C5\u56FE\u7EB8
+yes=\u662F
+no=\u5426
+#AssProcessAutoFeedingCommand
+cpxh=\u4EA7\u54C1\u578B\u53F7
+info1=\u8BF7\u767B\u5F55\u6B63\u786E\u7EC4
+info2=\u8BF7\u9009\u62E9BOM\u884C\u6216\u8005\u7248\u672C\u5BF9\u8C61
+info3=\u8BF7\u9009\u62E9PBOM\u5BF9\u8C61
+info4=\u672A\u627E\u5230\u4EA7\u6210\u54C1\u6587\u4EF6\u5939\uFF0C\u8BF7\u68C0\u67E5
+info5=\u5B58\u5728\u9876\u5C42P\u7269\u6599\u6CA1\u6709\u5173\u8054\u56FE\u7EB8\uFF0C\u8BF7\u68C0\u67E5
+info6=\u5F53\u524D\u4EA7\u54C1\u578B\u53F7\u672A\u7EF4\u62A4\uFF0C\u8BF7\u9009\u62E9\u5BF9\u5E94\u4EA7\u54C1\u65CF
+info7=\u6B63\u5728\u8FDB\u884C\u4E00\u952E\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF......
+info8=\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF\u5B58\u5728\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\uFF1A\n
+info9=\u6B63\u5728\u8FDB\u884C\u81EA\u52A8\u6295\u6599......
+info10=\u81EA\u52A8\u6295\u6599\u5B58\u5728\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\uFF1A\n
+info11=\u6307\u6D3E\u5DE5\u827A\u8DEF\u7EBF\u4E0E\u81EA\u52A8\u6295\u6599\u5B8C\u6210
diff --git a/com.connor.chint.wuhan/plugin.xml b/com.connor.chint.wuhan/plugin.xml
index 64fc2de..95e27f0 100644
--- a/com.connor.chint.wuhan/plugin.xml
+++ b/com.connor.chint.wuhan/plugin.xml
@@ -87,6 +87,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -680,8 +702,8 @@
-
-
+
+
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/ApplyMatnrOp.java b/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/ApplyMatnrOp.java
index 43f862b..60f8281 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/ApplyMatnrOp.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/ApplyMatnrOp.java
@@ -207,7 +207,7 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
// 220103001 CHINT_MadMaterialApply
for(ApplyBean bean:beans) {
- if(bean.getIdType().equals("1ZD")) {
+ if(bean.getIdType().equals("1ZD") || bean.getIdType().equals("6ZD")) {
m_code1 = bean.getmCode();
}else {
m_code2 = bean.getmCode();
@@ -388,7 +388,7 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
for(TCComponentItemRevision generalRev:general_maps.keySet()) {
String item_id = generalRev.getStringProperty("item_id");
String stringProperty = generalRev.getStringProperty("object_name");
- if(item_id.startsWith("1ZD")) {
+ if(item_id.startsWith("1ZD") || item_id.startsWith("6ZD")) {
if(!nameList.contains(stringProperty)) {
errBuff.append(generalRev.toString()).append("\n");
}
@@ -830,7 +830,7 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
}
String bpNo = properties[0];//rev.getProperty("item_id"); // DZ
String zt2_DrawingNo = properties[2];//rev.getProperty("zt2_DrawingNo");
- if (!KUtil.isEmpty(zt2_DrawingNo)&& !stuf.equalsIgnoreCase("1ZD")) {
+ if (!KUtil.isEmpty(zt2_DrawingNo) && !stuf.equalsIgnoreCase("1ZD") && !stuf.equalsIgnoreCase("6ZD")) {
if (!bpNo.equals(zt2_DrawingNo))
bpNo = zt2_DrawingNo;
}
@@ -984,7 +984,7 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
}
String bpNo = properties[0].toString();// rev.getProperty("item_id"); // DZ
String zt2_DrawingNo = properties[2];// rev.getProperty("zt2_DrawingNo");
- if (!KUtil.isEmpty(zt2_DrawingNo) && !stuf.equalsIgnoreCase("1ZD")) {
+ if (!KUtil.isEmpty(zt2_DrawingNo) && !stuf.equalsIgnoreCase("1ZD") && !stuf.equalsIgnoreCase("6ZD")) {
if (!bpNo.equals(zt2_DrawingNo))
bpNo = zt2_DrawingNo;
}
@@ -1094,7 +1094,8 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
String item_id = revProperties[0];
if (item_id.length() >= 3) {
String stuf = item_id.substring(0, 3);
- if (stuf.equalsIgnoreCase("2ZD") || stuf.equalsIgnoreCase("4ZD") || stuf.equalsIgnoreCase("1ZD")) {
+ if (stuf.equalsIgnoreCase("2ZD") || stuf.equalsIgnoreCase("4ZD")
+ || stuf.equalsIgnoreCase("1ZD") || stuf.equalsIgnoreCase("6ZD")) {
// flag = false;
// ʼͨüжǷҪ
String zt2_TYJSpec = line.getProperty("ZT2_TYSpecifications");
@@ -1175,7 +1176,8 @@ public class ApplyMatnrOp extends AbstractAIFOperation {
String bpNo = item_id;
//String zt2_DrawingNo = rev.getProperty("zt2_DrawingNo");
String zt2_DrawingNo = revProperties[2];
- if (!KUtil.isEmpty(zt2_DrawingNo) && !stuf.equalsIgnoreCase("1ZD")) {
+ if (!KUtil.isEmpty(zt2_DrawingNo) && !stuf.equalsIgnoreCase("1ZD")
+ && !stuf.equalsIgnoreCase("6ZD")) {
if (!item_id.equals(zt2_DrawingNo))
bpNo = zt2_DrawingNo;
}
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/RemarkUtil.java b/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/RemarkUtil.java
index baf9742..32a75a4 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/RemarkUtil.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/applyMatnr/RemarkUtil.java
@@ -4,7 +4,6 @@ import java.util.Map;
import com.teamcenter.rac.kernel.TCComponentBOMLine;
import com.teamcenter.rac.kernel.TCComponentItem;
import com.teamcenter.rac.kernel.TCComponentItemType;
-import com.teamcenter.rac.kernel.TCProperty;
import com.teamcenter.rac.kernel.TCSession;
public class RemarkUtil {
@@ -14,11 +13,31 @@ public class RemarkUtil {
int len =0;
try {
String[] split = itemId.split("-");
- String topId = "1ZDB300000P-"+split[1];
- System.out.println("topId:" + topId);
+ String id4 = itemId.substring(0, 4);
+ //lidy20250423
+ String[] ids = session.getPreferenceService().getStringValues("CHINT_FindDrawing");
+ String topId = "";//"1ZDB300000P-" + split[1];
+ for(String s : ids) {
+ if(s.substring(0, 4).equalsIgnoreCase(id4)) {
+ topId = s + split[1];
+ break;
+ }
+ }
TCComponentItemType partType = (TCComponentItemType) session.getTypeComponent("ZT2_Design3D");
- TCComponentItem find = partType.findItems(topId)[0];
- Map classificationAttributes = find.getClassificationAttributes();
+ TCComponentItem[] find = null;
+ if(topId.isEmpty()) {
+ for(String s : ids) {
+ topId = s + split[1];
+ find = partType.findItems(topId);
+ if(find != null && find.length > 0)
+ break;
+ }
+ }else {
+ find = partType.findItems(topId);
+ }
+ System.out.println("topId:" + topId);
+// TCComponentItem find = partType.findItems(topId)[0];
+ Map classificationAttributes = find[0].getClassificationAttributes();
// System.out.println(classificationAttributes.toString());
for(String key : classificationAttributes.keySet()) {
diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java b/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java
index b18010b..f8f29e8 100644
--- a/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java
+++ b/com.connor.chint.wuhan/src/com/chint/plm/createKjBom/KjController.java
@@ -672,10 +672,10 @@ public class KjController {
}
saveList.add(dataMap);
}
- for(TCComponentBOMLine subLine : useLines) {
- CloneStructureSaveAsIn dataMap = getDataMap(subLine, 1, session);
- saveList.add(dataMap);
- }
+// for(TCComponentBOMLine subLine : useLines) {
+// CloneStructureSaveAsIn dataMap = getDataMap(subLine, 1, session);
+// saveList.add(dataMap);
+// }
com.teamcenter.services.rac.structuremanagement._2014_10.Structure.CloneStructureDefaultNaming naming =
new com.teamcenter.services.rac.structuremanagement._2014_10.Structure.CloneStructureDefaultNaming();
CloneStructureSaveAsIn[] array = saveList.toArray(new CloneStructureSaveAsIn[saveList.size()]);
diff --git a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomDcSapOp.java b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomDcSapOp.java
index 2c1e02d..e005ceb 100644
--- a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomDcSapOp.java
+++ b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomDcSapOp.java
@@ -63,30 +63,50 @@ public class BomDcSapOp extends AbstractAIFOperation {
List itemList = new ArrayList<>();
List itemPList = new ArrayList<>();
- String id = "1ZDB300000P-";
- if(rev2.getType().equals("Part Revision")) {
- String desc = rev2.getStringProperty("object_desc");
- String[] split = desc.split(" ");
- if(split.length>=2) {
- String[] split2 = split[1].split("-");
- if(split2.length==2) {
- id = id + split2[1];
- }else if(split2.length==3) {
- id = id + split2[2];
+ //lidy20250423 1ZDB300000P-
+ String[] ids = session.getPreferenceService().getStringValues("CHINT_FindDrawing");
+ String id = "", idl = "";
+ if (rev2.getType().equals("Part Revision")) {
+ String desc = rev2.getStringProperty("object_desc");
+ String[] split = desc.split(" ");
+ if (split.length >= 2) {
+ String[] split2 = split[1].split("-");
+ if (split2.length == 2) {
+ idl = split2[1];
+ } else if (split2.length == 3) {
+ idl = split2[2];
+ }
+ }
+ } else if (rev2.getType().equals("ZT2_Design3DRevision")) {
+ String desc = rev2.getStringProperty("item_id");
+ String[] split2 = desc.split("-");
+ if (split2.length == 2) {
+ idl = split2[1];
+ } else if (split2.length == 3) {
+ idl = split2[2];
+ }
+ String id4 = desc.substring(0, 4);
+ for(String s : ids) {
+ if(s.substring(0, 4).equalsIgnoreCase(id4)) {
+ id = s + idl;
+ break;
}
}
- }else if(rev2.getType().equals("ZT2_Design3DRevision")) {
- String desc = rev2.getStringProperty("item_id");
- String[] split2 = desc.split("-");
- if(split2.length==2) {
- id = id + split2[1];
- }else if(split2.length==3) {
- id = id + split2[2];
+ }
+ TCComponentItem[] find = null;
+ if(id.isEmpty()) {
+ for(String s : ids) {
+ id = s + idl;
+ find = ccomponentitemtype.findItems(id);
+ if(find != null && find.length > 0)
+ break;
}
+ }else {
+ find = ccomponentitemtype.findItems(id);
}
- System.out.print("id===>"+id);
- TCComponentItem find = ccomponentitemtype.findItems(id)[0];
- TCComponentItemRevision zztRev = find.getLatestItemRevision();
+ System.out.print("id===>" + id);
+// TCComponentItem find = ccomponentitemtype.findItems(id)[0];
+ TCComponentItemRevision zztRev = find[0].getLatestItemRevision();
TCComponent[] matnrs = zztRev.getRelatedComponents("representation_for");
for(TCComponent matnr:matnrs) {
String[] properties = matnr.getProperties(new String[]{"zt2_ifpbom"});
diff --git a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSapWhBjOp.java b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSapWhBjOp.java
index abbf814..2d03393 100644
--- a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSapWhBjOp.java
+++ b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/BomSapWhBjOp.java
@@ -65,30 +65,50 @@ public class BomSapWhBjOp extends AbstractAIFOperation {
List itemList = new ArrayList<>();
List itemPList = new ArrayList<>();
- String id = "1ZDB300000P-";
+ //lidy20250423 1ZDB300000P-
+ String[] ids = session.getPreferenceService().getStringValues("CHINT_FindDrawing");
+ String id = "", idl = "";
if (rev2.getType().equals("Part Revision")) {
String desc = rev2.getStringProperty("object_desc");
String[] split = desc.split(" ");
if (split.length >= 2) {
String[] split2 = split[1].split("-");
if (split2.length == 2) {
- id = id + split2[1];
+ idl = split2[1];
} else if (split2.length == 3) {
- id = id + split2[2];
+ idl = split2[2];
}
}
} else if (rev2.getType().equals("ZT2_Design3DRevision")) {
String desc = rev2.getStringProperty("item_id");
String[] split2 = desc.split("-");
if (split2.length == 2) {
- id = id + split2[1];
+ idl = split2[1];
} else if (split2.length == 3) {
- id = id + split2[2];
+ idl = split2[2];
}
+ String id4 = desc.substring(0, 4);
+ for(String s : ids) {
+ if(s.substring(0, 4).equalsIgnoreCase(id4)) {
+ id = s + idl;
+ break;
+ }
+ }
}
+ TCComponentItem[] find = null;
+ if(id.isEmpty()) {
+ for(String s : ids) {
+ id = s + idl;
+ find = ccomponentitemtype.findItems(id);
+ if(find != null && find.length > 0)
+ break;
+ }
+ }else {
+ find = ccomponentitemtype.findItems(id);
+ }
System.out.print("id===>" + id);
- TCComponentItem find = ccomponentitemtype.findItems(id)[0];
- TCComponentItemRevision zztRev = find.getLatestItemRevision();
+// TCComponentItem find = ccomponentitemtype.findItems(id)[0];
+ TCComponentItemRevision zztRev = find[0].getLatestItemRevision();
TCComponent[] matnrs = zztRev.getRelatedComponents("representation_for");
for (TCComponent matnr : matnrs) {
String[] properties = matnr.getProperties(new String[] { "zt2_ifpbom" });
diff --git a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java
index d0014d1..a87a6ec 100644
--- a/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java
+++ b/com.connor.chint.wuhan/src/com/connor/chint/yunpi/command/DbomToECommand.java
@@ -64,12 +64,35 @@ public class DbomToECommand extends KCommand {
String itemId = rev.getProperty("item_id");
String[] split = itemId.split("-");
if(split.length>=2) {
- String topId = "1ZDB300000P-"+split[1];
+// String topId = "1ZDB300000P-"+split[1];
+ String id4 = itemId.substring(0, 4);
+ //lidy20250423
+ String[] ids = session.getPreferenceService().getStringValues("CHINT_FindDrawing");
+ String topId = "";//"1ZDB300000P-" + split[1];
+ for(String s : ids) {
+ if(s.substring(0, 4).equalsIgnoreCase(id4)) {
+ topId = s + split[1];
+ break;
+ }
+ }
+// TCComponentItemType itemType = (TCComponentItemType) session.getTypeComponent("ZT2_Design3D");
+// TCComponentItem find = itemType.find(topId);
TCComponentItemType itemType = (TCComponentItemType) session.getTypeComponent("ZT2_Design3D");
- TCComponentItem find = itemType.find(topId);
- if(find!=null) {
+ TCComponentItem[] find = null;
+ if(topId.isEmpty()) {
+ for(String s : ids) {
+ topId = s + split[1];
+ find = itemType.findItems(topId);
+ if(find != null && find.length > 0)
+ break;
+ }
+ }else {
+ find = itemType.findItems(topId);
+ }
+ System.out.println("topId:" + topId);
+ if(find != null && find.length > 0) {
//boolean equals = find.getLatestItemRevision().getProperty("zt2_SapState").equals("Ѵ");
- boolean equals = find.getProperty("zt2_kjbomstate").equals("Ѵ");
+ boolean equals = find[0].getProperty("zt2_kjbomstate").equals("Ѵ");
if(!equals) {
MessageBox.post("ϵ贫ݿBOM.", "", MessageBox.ERROR);
return;
diff --git a/com.connor.chint.wuhan/src/com/connor/plm/txdp/TXDPFram.java b/com.connor.chint.wuhan/src/com/connor/plm/txdp/TXDPFram.java
index 7b5f898..535d02c 100644
--- a/com.connor.chint.wuhan/src/com/connor/plm/txdp/TXDPFram.java
+++ b/com.connor.chint.wuhan/src/com/connor/plm/txdp/TXDPFram.java
@@ -201,70 +201,76 @@ public class TXDPFram extends JFrame implements ActionListener {
System.out.println("updateSql=======" + updateSql);
SqlUtil.update(updateSql);
if(mom) {
- String[] pref = ChintPreferenceUtil.getPreference("CHINT_GetCoreLaminationStacK", session)
- .split("=");
- if(pref[0].equals("MOM:1")) {
- JSONArray classParameter = new JSONArray();
- selectSql = "select distinct a.\"class_number\",a.\"thickness_perstage\","
- + "a.\"yoke_offset\",a.\"oil_passage\",a.\"jetthickness\",a.\"number_pieces\","
- + "decode(b.\"d\",'',b.\"a\",b.\"d\") as d,b.\"b\" as b,c.\"b\" as b,"
- + "d.\"c\" as c,d.\"b\" as b "
- + "from CHINT_IRON_CORE_SUM_DETIALS a,CHINT_IRON_CORE_DETIALS b,"
- + "CHINT_IRON_CORE_DETIALS c,CHINT_IRON_CORE_DETIALS d "
- + "where a.\"drawingno\"=b.\"drawingno\" and a.\"class_number\"=b.\"class_number\" "
- + "and b.\"classification\"='' and a.\"drawingno\"=c.\"drawingno\" "
- + "and a.\"class_number\"=c.\"class_number\" and c.\"classification\"='' "
- + "and a.\"drawingno\"=d.\"drawingno\" and a.\"class_number\"=d.\"class_number\" "
- + "and d.\"classification\"='' and a.\"producttype\"='' and a.\"drawingno\"='"
- + gcth + "' order by to_number(a.\"class_number\")";
- System.out.println("selectSql=======" + selectSql);
- rs = SqlUtil.read(selectSql);
- while(rs.next()) {
- JSONObject js = new JSONObject();
- String oil_passage = rs.getString(4);
- if(oil_passage.isEmpty()) {
- js.put("OilTunnel", "0");
- }else {
- js.put("OilTunnel", "1");
- }
- js.put("bJet", "0");
- js.put("ClassNumber", rs.getString(1));
- js.put("ClassThickness", rs.getString(2));
- js.put("OilTunnelThickness", oil_passage);
- js.put("OutDistance", rs.getString(3));
- js.put("JetThickness", rs.getString(5));
- js.put("ActualLayersEach", rs.getString(6));
- js.put("LengthM", rs.getString(7));
- js.put("WidthM", rs.getString(8));
- js.put("WidthLeft", rs.getString(9));
- js.put("LengthDown", rs.getString(10));
- js.put("WidthDown", rs.getString(11));
-
- classParameter.add(js);
- }
- json.put("ClassParameter", classParameter);
- System.out.println("json==>" + json);
- OkHttpClient client = new OkHttpClient();
- MediaType mediaType = MediaType.parse("application/json");
- RequestBody body = RequestBody.create(mediaType, json.toString());
- Builder builder = new Request.Builder()
- .url(pref[1])
- .method("POST", body)
- .addHeader("Content-Type", "application/json");
- if (pref[1].contains("10.128.11.12")) {
- builder.addHeader("Authorization", "Basic MTQyODI0Mjg2NDU2ODMwNzcxNDpkREF3TWpveE1EQXg=");
- } else {
- builder.addHeader("Authorization", "Basic MTcxNDkwNTkyNTc2MjUzNTQyNjpkREF3TWpveE1EQXg=");
- }
- Request request = builder.build();
- Response response = client.newCall(request).execute();
- String string = response.body().string();
- System.out.println("response==>" + string);
- JSONObject result = JSONObject.fromObject(string);
- if(!result.get("status").equals("S")) {
- MessageBox.post("MOMϵͳʧܣϵԱ\n룺" + result.get("code")
- + "Ϣ" + result.get("msg"), "ʾ", MessageBox.WARNING);
- return;
+ String group = SAPUtil.getGroupID(session);
+ System.out.println("group==>" + group);
+ String[] prefs = ChintPreferenceUtil.getPreferences("CHINT_GetCoreLaminationStacK", session);
+ for(String s : prefs) {
+ System.out.println("prefs==>" + s);
+ String[] pref = s.split("=");
+ if(pref[0].startsWith(group + ":")) {
+ JSONArray classParameter = new JSONArray();
+ selectSql = "select distinct a.\"class_number\",a.\"thickness_perstage\","
+ + "a.\"yoke_offset\",a.\"oil_passage\",a.\"jetthickness\",a.\"number_pieces\","
+ + "decode(b.\"d\",'',b.\"a\",b.\"d\") as d,b.\"b\" as b,c.\"b\" as b,"
+ + "d.\"c\" as c,d.\"b\" as b "
+ + "from CHINT_IRON_CORE_SUM_DETIALS a,CHINT_IRON_CORE_DETIALS b,"
+ + "CHINT_IRON_CORE_DETIALS c,CHINT_IRON_CORE_DETIALS d "
+ + "where a.\"drawingno\"=b.\"drawingno\" and a.\"class_number\"=b.\"class_number\" "
+ + "and b.\"classification\"='' and a.\"drawingno\"=c.\"drawingno\" "
+ + "and a.\"class_number\"=c.\"class_number\" and c.\"classification\"='' "
+ + "and a.\"drawingno\"=d.\"drawingno\" and a.\"class_number\"=d.\"class_number\" "
+ + "and d.\"classification\"='' and a.\"producttype\"='' and a.\"drawingno\"='"
+ + gcth + "' order by to_number(a.\"class_number\")";
+ System.out.println("selectSql=======" + selectSql);
+ rs = SqlUtil.read(selectSql);
+ while(rs.next()) {
+ JSONObject js = new JSONObject();
+ String oil_passage = rs.getString(4);
+ if(oil_passage.isEmpty()) {
+ js.put("OilTunnel", "0");
+ }else {
+ js.put("OilTunnel", "1");
+ }
+ js.put("bJet", "0");
+ js.put("ClassNumber", rs.getString(1));
+ js.put("ClassThickness", rs.getString(2));
+ js.put("OilTunnelThickness", oil_passage);
+ js.put("OutDistance", rs.getString(3));
+ js.put("JetThickness", rs.getString(5));
+ js.put("ActualLayersEach", rs.getString(6));
+ js.put("LengthM", rs.getString(7));
+ js.put("WidthM", rs.getString(8));
+ js.put("WidthLeft", rs.getString(9));
+ js.put("LengthDown", rs.getString(10));
+ js.put("WidthDown", rs.getString(11));
+
+ classParameter.add(js);
+ }
+ json.put("ClassParameter", classParameter);
+ System.out.println("json==>" + json);
+ OkHttpClient client = new OkHttpClient();
+ MediaType mediaType = MediaType.parse("application/json");
+ RequestBody body = RequestBody.create(mediaType, json.toString());
+ Builder builder = new Request.Builder()
+ .url(pref[1])
+ .method("POST", body)
+ .addHeader("Content-Type", "application/json");
+ if (pref[1].contains("10.128.11.12")) {
+ builder.addHeader("Authorization", "Basic MTQyODI0Mjg2NDU2ODMwNzcxNDpkREF3TWpveE1EQXg=");
+ } else {
+ builder.addHeader("Authorization", "Basic MTcxNDkwNTkyNTc2MjUzNTQyNjpkREF3TWpveE1EQXg=");
+ }
+ Request request = builder.build();
+ Response response = client.newCall(request).execute();
+ String string = response.body().string();
+ System.out.println("response==>" + string);
+ JSONObject result = JSONObject.fromObject(string);
+ if(!result.get("status").equals("S")) {
+ MessageBox.post("MOMϵͳʧܣϵԱ\n룺" + result.get("code")
+ + "Ϣ" + result.get("msg"), "ʾ", MessageBox.WARNING);
+ return;
+ }
+ break;
}
}
}
@@ -314,8 +320,6 @@ public class TXDPFram extends JFrame implements ActionListener {
}
if(producttype.equals("")) {
- String[] pref = ChintPreferenceUtil.getPreference("CHINT_GetCoreLaminationStacK", session)
- .split("=");
JSONObject json = new JSONObject();
JSONArray classParameter = new JSONArray();
LinkedHashMap map = new LinkedHashMap<>();
@@ -604,37 +608,54 @@ public class TXDPFram extends JFrame implements ActionListener {
}
uploadFile(name, pathJTextFieldStr);
//TODO ĵƬݵMOMϵͳ
- if(pref[0].equals("MOM:1")) {
- for(String class_number : map.keySet()) {
- JSONObject js = map.get(class_number);
- classParameter.add(js);
- }
- json.put("ClassParameter", classParameter);
- System.out.println("json==>" + json);
- OkHttpClient client = new OkHttpClient();
- MediaType mediaType = MediaType.parse("application/json");
- RequestBody body = RequestBody.create(mediaType, json.toString());
- Builder builder = new Request.Builder()
- .url(pref[1])
- .method("POST", body)
- .addHeader("Content-Type", "application/json");
- if (pref[1].contains("10.128.11.12")) {
- builder.addHeader("Authorization", "Basic MTQyODI0Mjg2NDU2ODMwNzcxNDpkREF3TWpveE1EQXg=");
- } else {
- builder.addHeader("Authorization", "Basic MTcxNDkwNTkyNTc2MjUzNTQyNjpkREF3TWpveE1EQXg=");
- }
- Request request = builder.build();
- Response response = client.newCall(request).execute();
- String string = response.body().string();
- System.out.println("response==>" + string);
- JSONObject result = JSONObject.fromObject(string);
- if(result.get("status").equals("S")) {
- MessageBox.post("ɹ", "ʾ", MessageBox.INFORMATION);
- }else {
- MessageBox.post("MOMϵͳʧܣϵԱ\n룺" + result.get("code")
- + "Ϣ" + result.get("msg"), "ʾ", MessageBox.WARNING);
+ String group = SAPUtil.getGroupID(session);
+ System.out.println("group==>" + group);
+// String[] pref = ChintPreferenceUtil.getPreference("CHINT_GetCoreLaminationStacK", session)
+// .split("=");
+ String[] prefs = ChintPreferenceUtil.getPreferences("CHINT_GetCoreLaminationStacK", session);
+ boolean flag = true;
+ for(String s : prefs) {
+ System.out.println("prefs==>" + s);
+ String[] pref = s.split("=");
+ if(pref[0].startsWith(group + ":")) {
+ flag = false;
+ for(String class_number : map.keySet()) {
+ JSONObject js = map.get(class_number);
+ classParameter.add(js);
+ }
+ json.put("ClassParameter", classParameter);
+ System.out.println("json==>" + json);
+ OkHttpClient client = new OkHttpClient();
+ MediaType mediaType = MediaType.parse("application/json");
+ RequestBody body = RequestBody.create(mediaType, json.toString());
+ Builder builder = new Request.Builder()
+ .url(pref[1])
+ .method("POST", body)
+ .addHeader("Content-Type", "application/json");
+ if (pref[1].contains("10.128.11.12")) {
+ builder.addHeader("Authorization", "Basic MTQyODI0Mjg2NDU2ODMwNzcxNDpkREF3TWpveE1EQXg=");
+ } else {
+ builder.addHeader("Authorization", "Basic MTcxNDkwNTkyNTc2MjUzNTQyNjpkREF3TWpveE1EQXg=");
+ }
+ Request request = builder.build();
+ Response response = client.newCall(request).execute();
+ String string = response.body().string();
+ System.out.println("response==>" + string);
+ JSONObject result = JSONObject.fromObject(string);
+ if(result.get("status").equals("S")) {
+ System.out.println("ɹݳɹ");
+ MessageBox.post("ɹ", "ʾ", MessageBox.INFORMATION);
+ }else {
+ String err = "MOMϵͳʧܣϵԱ\n룺" + result.get("code") +
+ " Ϣ" + result.get("msg");
+ System.out.println(err);
+ MessageBox.post(err, "ʾ", MessageBox.WARNING);
+ }
+ break;
}
- }else {
+ }
+ if(flag) {
+ System.out.println("ɹδ");
MessageBox.post("ɹ", "ʾ", MessageBox.INFORMATION);
}
}else if(producttype.equals("")) {