diff --git a/b6/commander4j.jar b/b6/commander4j.jar index 7bb0c7e537..e6918e7282 100644 Binary files a/b6/commander4j.jar and b/b6/commander4j.jar differ diff --git a/b6/src/com/commander4j/cfg/JDialogDMLErrors.java b/b6/src/com/commander4j/cfg/JDialogDMLErrors.java index 6161615811..70703bd1ca 100755 --- a/b6/src/com/commander4j/cfg/JDialogDMLErrors.java +++ b/b6/src/com/commander4j/cfg/JDialogDMLErrors.java @@ -221,6 +221,7 @@ public Boolean saveAs(String filename, Component parent) fw.write("Updating from Schema Version "+String.valueOf(updateRequest.schema_CURVersion+" to "+String.valueOf(updateRequest.schema_NEWVersion))+"\n"); fw.write("*********************************************************************************************************************************************************\n\n\n"); fw.write("---------------------------------------------------------------------------------------------------------------------------------------------------------\n"); + int errCount = 0; for (int x = 0; x < ddlLocal.size();x++) { if (ddlLocal.get(x).getError().equals("Success")==false) @@ -231,9 +232,11 @@ public Boolean saveAs(String filename, Component parent) fw.write("Error Message : " + ddlLocal.get(x).getError()+"\n"); fw.write("---------------------------------------------------------------------------------------------------------------------------------------------------------\n"); fw.flush(); + errCount ++; } } - fw.write("\nNo of Errors : " +String.valueOf(ddlLocal.size())+"\n"); + fw.write("\nNo of Commands : " +String.valueOf(ddlLocal.size())+"\n"); + fw.write("\nNo of Errors : " +String.valueOf(errCount)+"\n"); fw.flush(); fw.close(); diff --git a/b6/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml b/b6/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml index e0cd53d824..7018fd3eee 100644 --- a/b6/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml +++ b/b6/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml @@ -77,8 +77,7 @@ CREATE TABLE `APP_MATERIAL_BATCH` ( `STATUS` varchar(15) DEFAULT NULL, `EXPIRY_DATE` datetime DEFAULT NULL, PRIMARY KEY (`MATERIAL`,`BATCH_NUMBER`), - UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`), - CONSTRAINT `sys_c004058` FOREIGN KEY (`material`) REFERENCES `APP_MATERIAL` (`MATERIAL`) ON DELETE NO ACTION ON UPDATE NO ACTION + UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`) ) ENGINE=InnoDB; diff --git a/b6/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml b/b6/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml index 775c8ed99f..e6fa19d98d 100644 --- a/b6/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml +++ b/b6/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml @@ -643,8 +643,5 @@ insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_F insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_FRM_ADMIN_AUTO_LAB_EDIT','IT','Add or Update a Production Line',''); - -ALTER TABLE `APP_MATERIAL_BATCH` DROP FOREIGN KEY `sys_c004058` ; - diff --git a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml index 1e622fce8e..a49d39349d 100644 --- a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml +++ b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml @@ -7,11 +7,12 @@ - ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011435" PRIMARY KEY("MODULE_ID","WORKSTATION_ID") + ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_PK" PRIMARY KEY("MODULE_ID","WORKSTATION_ID") - ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011433" CHECK ("MODULE_ID" IS NOT NULL) ENABLE ADD CONSTRAINT "SYS_C0011434" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE + ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_MOD_ID_CHK" CHECK ("MODULE_ID" IS NOT NULL) ENABLE + ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_WKS_ID_CHK" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE diff --git a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml index 16bbeced3f..df731f82b8 100644 --- a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml +++ b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml @@ -10,11 +10,11 @@ - ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008116 PRIMARY KEY (CONTAINER_CODE) + ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_PK PRIMARY KEY (CONTAINER_CODE) - ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008115 CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_CHK CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -29,11 +29,11 @@ - ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008118 PRIMARY KEY (PRODUCT_GROUP) + ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_PK PRIMARY KEY (PRODUCT_GROUP) - ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008117 CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_CHK CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -53,19 +53,15 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008255 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - - - + - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008257 CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SEQ_CHK CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE) + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE) @@ -98,15 +94,15 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008127 PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE) + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE) - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008125 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008126 CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_DATE_CHK CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -119,11 +115,11 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008124 PRIMARY KEY (SAMPLE_POINT) + ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_PK PRIMARY KEY (SAMPLE_POINT) - ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008123 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -143,11 +139,11 @@ - ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008129 PRIMARY KEY (SCALE_ID) + ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_PK PRIMARY KEY (SCALE_ID) - ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008128 CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_ID_CHK CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -161,15 +157,15 @@ - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008132 PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM) + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_PK PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM) - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008130 CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_NOMINAL_CHK CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008131 CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_UOM_CHK CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -184,11 +180,11 @@ - ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008134 PRIMARY KEY (WORKSTATION_ID) + ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_PK PRIMARY KEY (WORKSTATION_ID) - ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008133 CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_ID_CHK CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml index 4678d3a8f3..0d095fd899 100644 --- a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml +++ b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml @@ -25,11 +25,11 @@ - ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010582" PRIMARY KEY ("PANEL_ID") + ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_PK" PRIMARY KEY ("PANEL_ID") - ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010581" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -53,15 +53,15 @@ - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010585" PRIMARY KEY ("PANEL_ID", "TRAY_ID") + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PK" PRIMARY KEY ("PANEL_ID", "TRAY_ID") - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010583" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010584" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_ID_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -85,19 +85,19 @@ - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010593" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID") + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID") - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010590" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010591" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010592" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_SEQ_CHK" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -123,19 +123,19 @@ - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010589" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID") + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID") - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010586" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010587" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010588" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_USER_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -158,11 +158,11 @@ - ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010617" PRIMARY KEY ("USER_ID") + ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_PK" PRIMARY KEY ("USER_ID") - ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010616" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_ID_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml index ba6128dedc..61826092d4 100644 --- a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml +++ b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml @@ -25,11 +25,11 @@ - ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008882" PRIMARY KEY ("PACKING_LINE_ID") + ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_PK" PRIMARY KEY ("PACKING_LINE_ID") - ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008881" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_ID_CHK" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar index 7bb0c7e537..e6918e7282 100644 Binary files a/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar and b/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar differ diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml b/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml index e0cd53d824..7018fd3eee 100644 --- a/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml +++ b/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml @@ -77,8 +77,7 @@ CREATE TABLE `APP_MATERIAL_BATCH` ( `STATUS` varchar(15) DEFAULT NULL, `EXPIRY_DATE` datetime DEFAULT NULL, PRIMARY KEY (`MATERIAL`,`BATCH_NUMBER`), - UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`), - CONSTRAINT `sys_c004058` FOREIGN KEY (`material`) REFERENCES `APP_MATERIAL` (`MATERIAL`) ON DELETE NO ACTION ON UPDATE NO ACTION + UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`) ) ENGINE=InnoDB; diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml b/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml index 775c8ed99f..e6fa19d98d 100644 --- a/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml +++ b/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml @@ -643,8 +643,5 @@ insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_F insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_FRM_ADMIN_AUTO_LAB_EDIT','IT','Add or Update a Production Line',''); - -ALTER TABLE `APP_MATERIAL_BATCH` DROP FOREIGN KEY `sys_c004058` ; - diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml b/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml index 1e622fce8e..a49d39349d 100644 --- a/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml +++ b/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml @@ -7,11 +7,12 @@ - ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011435" PRIMARY KEY("MODULE_ID","WORKSTATION_ID") + ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_PK" PRIMARY KEY("MODULE_ID","WORKSTATION_ID") - ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011433" CHECK ("MODULE_ID" IS NOT NULL) ENABLE ADD CONSTRAINT "SYS_C0011434" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE + ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_MOD_ID_CHK" CHECK ("MODULE_ID" IS NOT NULL) ENABLE + ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_WKS_ID_CHK" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml b/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml index 16bbeced3f..df731f82b8 100644 --- a/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml +++ b/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml @@ -10,11 +10,11 @@ - ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008116 PRIMARY KEY (CONTAINER_CODE) + ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_PK PRIMARY KEY (CONTAINER_CODE) - ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008115 CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_CHK CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -29,11 +29,11 @@ - ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008118 PRIMARY KEY (PRODUCT_GROUP) + ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_PK PRIMARY KEY (PRODUCT_GROUP) - ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008117 CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_CHK CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -53,19 +53,15 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008255 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - - - + - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008257 CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SEQ_CHK CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE) + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE) @@ -98,15 +94,15 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008127 PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE) + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE) - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008125 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008126 CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_DATE_CHK CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -119,11 +115,11 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008124 PRIMARY KEY (SAMPLE_POINT) + ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_PK PRIMARY KEY (SAMPLE_POINT) - ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008123 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -143,11 +139,11 @@ - ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008129 PRIMARY KEY (SCALE_ID) + ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_PK PRIMARY KEY (SCALE_ID) - ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008128 CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_ID_CHK CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -161,15 +157,15 @@ - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008132 PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM) + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_PK PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM) - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008130 CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_NOMINAL_CHK CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008131 CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_UOM_CHK CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -184,11 +180,11 @@ - ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008134 PRIMARY KEY (WORKSTATION_ID) + ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_PK PRIMARY KEY (WORKSTATION_ID) - ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008133 CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_ID_CHK CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml b/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml index 4678d3a8f3..0d095fd899 100644 --- a/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml +++ b/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml @@ -25,11 +25,11 @@ - ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010582" PRIMARY KEY ("PANEL_ID") + ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_PK" PRIMARY KEY ("PANEL_ID") - ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010581" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -53,15 +53,15 @@ - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010585" PRIMARY KEY ("PANEL_ID", "TRAY_ID") + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PK" PRIMARY KEY ("PANEL_ID", "TRAY_ID") - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010583" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010584" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_ID_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -85,19 +85,19 @@ - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010593" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID") + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID") - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010590" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010591" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010592" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_SEQ_CHK" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -123,19 +123,19 @@ - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010589" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID") + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID") - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010586" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010587" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010588" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_USER_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -158,11 +158,11 @@ - ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010617" PRIMARY KEY ("USER_ID") + ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_PK" PRIMARY KEY ("USER_ID") - ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010616" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_ID_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml b/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml index ba6128dedc..61826092d4 100644 --- a/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml +++ b/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml @@ -25,11 +25,11 @@ - ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008882" PRIMARY KEY ("PACKING_LINE_ID") + ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_PK" PRIMARY KEY ("PACKING_LINE_ID") - ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008881" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_ID_CHK" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war b/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war index afa390f08f..f2386d90cc 100644 Binary files a/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war and b/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war differ diff --git a/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar index 7bb0c7e537..e6918e7282 100644 Binary files a/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar and b/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar differ diff --git a/b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml b/b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml index e0cd53d824..7018fd3eee 100644 --- a/b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml +++ b/b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml @@ -77,8 +77,7 @@ CREATE TABLE `APP_MATERIAL_BATCH` ( `STATUS` varchar(15) DEFAULT NULL, `EXPIRY_DATE` datetime DEFAULT NULL, PRIMARY KEY (`MATERIAL`,`BATCH_NUMBER`), - UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`), - CONSTRAINT `sys_c004058` FOREIGN KEY (`material`) REFERENCES `APP_MATERIAL` (`MATERIAL`) ON DELETE NO ACTION ON UPDATE NO ACTION + UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`) ) ENGINE=InnoDB; diff --git a/b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml b/b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml index 775c8ed99f..e6fa19d98d 100644 --- a/b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml +++ b/b6web_t10_react/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml @@ -643,8 +643,5 @@ insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_F insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_FRM_ADMIN_AUTO_LAB_EDIT','IT','Add or Update a Production Line',''); - -ALTER TABLE `APP_MATERIAL_BATCH` DROP FOREIGN KEY `sys_c004058` ; - diff --git a/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml b/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml index 1e622fce8e..a49d39349d 100644 --- a/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml +++ b/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml @@ -7,11 +7,12 @@ - ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011435" PRIMARY KEY("MODULE_ID","WORKSTATION_ID") + ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_PK" PRIMARY KEY("MODULE_ID","WORKSTATION_ID") - ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011433" CHECK ("MODULE_ID" IS NOT NULL) ENABLE ADD CONSTRAINT "SYS_C0011434" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE + ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_MOD_ID_CHK" CHECK ("MODULE_ID" IS NOT NULL) ENABLE + ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_WKS_ID_CHK" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE diff --git a/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml b/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml index 16bbeced3f..df731f82b8 100644 --- a/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml +++ b/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml @@ -10,11 +10,11 @@ - ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008116 PRIMARY KEY (CONTAINER_CODE) + ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_PK PRIMARY KEY (CONTAINER_CODE) - ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008115 CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_CHK CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -29,11 +29,11 @@ - ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008118 PRIMARY KEY (PRODUCT_GROUP) + ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_PK PRIMARY KEY (PRODUCT_GROUP) - ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008117 CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_CHK CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -53,19 +53,15 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008255 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - - - + - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008257 CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SEQ_CHK CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE) + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE) @@ -98,15 +94,15 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008127 PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE) + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE) - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008125 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008126 CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_DATE_CHK CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -119,11 +115,11 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008124 PRIMARY KEY (SAMPLE_POINT) + ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_PK PRIMARY KEY (SAMPLE_POINT) - ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008123 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -143,11 +139,11 @@ - ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008129 PRIMARY KEY (SCALE_ID) + ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_PK PRIMARY KEY (SCALE_ID) - ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008128 CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_ID_CHK CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -161,15 +157,15 @@ - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008132 PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM) + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_PK PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM) - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008130 CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_NOMINAL_CHK CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008131 CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_UOM_CHK CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -184,11 +180,11 @@ - ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008134 PRIMARY KEY (WORKSTATION_ID) + ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_PK PRIMARY KEY (WORKSTATION_ID) - ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008133 CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_ID_CHK CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml b/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml index 4678d3a8f3..0d095fd899 100644 --- a/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml +++ b/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml @@ -25,11 +25,11 @@ - ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010582" PRIMARY KEY ("PANEL_ID") + ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_PK" PRIMARY KEY ("PANEL_ID") - ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010581" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -53,15 +53,15 @@ - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010585" PRIMARY KEY ("PANEL_ID", "TRAY_ID") + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PK" PRIMARY KEY ("PANEL_ID", "TRAY_ID") - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010583" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010584" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_ID_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -85,19 +85,19 @@ - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010593" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID") + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID") - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010590" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010591" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010592" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_SEQ_CHK" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -123,19 +123,19 @@ - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010589" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID") + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID") - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010586" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010587" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010588" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_USER_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -158,11 +158,11 @@ - ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010617" PRIMARY KEY ("USER_ID") + ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_PK" PRIMARY KEY ("USER_ID") - ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010616" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_ID_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml b/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml index ba6128dedc..61826092d4 100644 --- a/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml +++ b/b6web_t10_react/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml @@ -25,11 +25,11 @@ - ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008882" PRIMARY KEY ("PACKING_LINE_ID") + ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_PK" PRIMARY KEY ("PACKING_LINE_ID") - ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008881" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_ID_CHK" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6web_t10_react/dist/b6web_t10_react.war b/b6web_t10_react/dist/b6web_t10_react.war index aa9620d61d..76805ceb55 100644 Binary files a/b6web_t10_react/dist/b6web_t10_react.war and b/b6web_t10_react/dist/b6web_t10_react.war differ diff --git a/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar index 7bb0c7e537..e6918e7282 100644 Binary files a/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar and b/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar differ diff --git a/b6web_t10_wm_eb18/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml b/b6web_t10_wm_eb18/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml index e0cd53d824..7018fd3eee 100644 --- a/b6web_t10_wm_eb18/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml +++ b/b6web_t10_wm_eb18/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml @@ -77,8 +77,7 @@ CREATE TABLE `APP_MATERIAL_BATCH` ( `STATUS` varchar(15) DEFAULT NULL, `EXPIRY_DATE` datetime DEFAULT NULL, PRIMARY KEY (`MATERIAL`,`BATCH_NUMBER`), - UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`), - CONSTRAINT `sys_c004058` FOREIGN KEY (`material`) REFERENCES `APP_MATERIAL` (`MATERIAL`) ON DELETE NO ACTION ON UPDATE NO ACTION + UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`) ) ENGINE=InnoDB; diff --git a/b6web_t10_wm_eb18/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml b/b6web_t10_wm_eb18/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml index 775c8ed99f..e6fa19d98d 100644 --- a/b6web_t10_wm_eb18/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml +++ b/b6web_t10_wm_eb18/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml @@ -643,8 +643,5 @@ insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_F insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_FRM_ADMIN_AUTO_LAB_EDIT','IT','Add or Update a Production Line',''); - -ALTER TABLE `APP_MATERIAL_BATCH` DROP FOREIGN KEY `sys_c004058` ; - diff --git a/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml b/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml index 1e622fce8e..a49d39349d 100644 --- a/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml +++ b/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml @@ -7,11 +7,12 @@ - ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011435" PRIMARY KEY("MODULE_ID","WORKSTATION_ID") + ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_PK" PRIMARY KEY("MODULE_ID","WORKSTATION_ID") - ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011433" CHECK ("MODULE_ID" IS NOT NULL) ENABLE ADD CONSTRAINT "SYS_C0011434" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE + ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_MOD_ID_CHK" CHECK ("MODULE_ID" IS NOT NULL) ENABLE + ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_WKS_ID_CHK" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE diff --git a/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml b/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml index 16bbeced3f..df731f82b8 100644 --- a/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml +++ b/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml @@ -10,11 +10,11 @@ - ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008116 PRIMARY KEY (CONTAINER_CODE) + ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_PK PRIMARY KEY (CONTAINER_CODE) - ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008115 CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_CHK CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -29,11 +29,11 @@ - ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008118 PRIMARY KEY (PRODUCT_GROUP) + ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_PK PRIMARY KEY (PRODUCT_GROUP) - ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008117 CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_CHK CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -53,19 +53,15 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008255 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - - - + - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008257 CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SEQ_CHK CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE) + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE) @@ -98,15 +94,15 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008127 PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE) + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE) - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008125 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008126 CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_DATE_CHK CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -119,11 +115,11 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008124 PRIMARY KEY (SAMPLE_POINT) + ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_PK PRIMARY KEY (SAMPLE_POINT) - ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008123 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -143,11 +139,11 @@ - ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008129 PRIMARY KEY (SCALE_ID) + ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_PK PRIMARY KEY (SCALE_ID) - ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008128 CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_ID_CHK CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -161,15 +157,15 @@ - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008132 PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM) + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_PK PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM) - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008130 CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_NOMINAL_CHK CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008131 CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_UOM_CHK CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -184,11 +180,11 @@ - ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008134 PRIMARY KEY (WORKSTATION_ID) + ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_PK PRIMARY KEY (WORKSTATION_ID) - ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008133 CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_ID_CHK CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml b/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml index 4678d3a8f3..0d095fd899 100644 --- a/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml +++ b/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml @@ -25,11 +25,11 @@ - ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010582" PRIMARY KEY ("PANEL_ID") + ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_PK" PRIMARY KEY ("PANEL_ID") - ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010581" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -53,15 +53,15 @@ - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010585" PRIMARY KEY ("PANEL_ID", "TRAY_ID") + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PK" PRIMARY KEY ("PANEL_ID", "TRAY_ID") - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010583" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010584" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_ID_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -85,19 +85,19 @@ - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010593" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID") + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID") - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010590" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010591" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010592" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_SEQ_CHK" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -123,19 +123,19 @@ - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010589" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID") + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID") - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010586" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010587" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010588" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_USER_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -158,11 +158,11 @@ - ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010617" PRIMARY KEY ("USER_ID") + ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_PK" PRIMARY KEY ("USER_ID") - ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010616" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_ID_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml b/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml index ba6128dedc..61826092d4 100644 --- a/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml +++ b/b6web_t10_wm_eb18/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml @@ -25,11 +25,11 @@ - ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008882" PRIMARY KEY ("PACKING_LINE_ID") + ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_PK" PRIMARY KEY ("PACKING_LINE_ID") - ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008881" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_ID_CHK" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war b/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war index 3fd440a0e9..67d573ab93 100644 Binary files a/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war and b/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war differ diff --git a/c4jWS/src/main/webapp/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml b/c4jWS/src/main/webapp/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml index e0cd53d824..7018fd3eee 100644 --- a/c4jWS/src/main/webapp/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml +++ b/c4jWS/src/main/webapp/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml @@ -77,8 +77,7 @@ CREATE TABLE `APP_MATERIAL_BATCH` ( `STATUS` varchar(15) DEFAULT NULL, `EXPIRY_DATE` datetime DEFAULT NULL, PRIMARY KEY (`MATERIAL`,`BATCH_NUMBER`), - UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`), - CONSTRAINT `sys_c004058` FOREIGN KEY (`material`) REFERENCES `APP_MATERIAL` (`MATERIAL`) ON DELETE NO ACTION ON UPDATE NO ACTION + UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`) ) ENGINE=InnoDB; diff --git a/c4jWS/src/main/webapp/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml b/c4jWS/src/main/webapp/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml index 775c8ed99f..e6fa19d98d 100644 --- a/c4jWS/src/main/webapp/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml +++ b/c4jWS/src/main/webapp/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml @@ -643,8 +643,5 @@ insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_F insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_FRM_ADMIN_AUTO_LAB_EDIT','IT','Add or Update a Production Line',''); - -ALTER TABLE `APP_MATERIAL_BATCH` DROP FOREIGN KEY `sys_c004058` ; - diff --git a/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml b/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml index 1e622fce8e..a49d39349d 100644 --- a/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml +++ b/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml @@ -7,11 +7,12 @@ - ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011435" PRIMARY KEY("MODULE_ID","WORKSTATION_ID") + ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_PK" PRIMARY KEY("MODULE_ID","WORKSTATION_ID") - ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011433" CHECK ("MODULE_ID" IS NOT NULL) ENABLE ADD CONSTRAINT "SYS_C0011434" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE + ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_MOD_ID_CHK" CHECK ("MODULE_ID" IS NOT NULL) ENABLE + ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_WKS_ID_CHK" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE diff --git a/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml b/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml index 16bbeced3f..df731f82b8 100644 --- a/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml +++ b/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml @@ -10,11 +10,11 @@ - ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008116 PRIMARY KEY (CONTAINER_CODE) + ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_PK PRIMARY KEY (CONTAINER_CODE) - ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008115 CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_CHK CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -29,11 +29,11 @@ - ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008118 PRIMARY KEY (PRODUCT_GROUP) + ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_PK PRIMARY KEY (PRODUCT_GROUP) - ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008117 CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_CHK CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -53,19 +53,15 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008255 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - - - + - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008257 CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SEQ_CHK CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE) + ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE) @@ -98,15 +94,15 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008127 PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE) + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE) - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008125 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008126 CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_DATE_CHK CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -119,11 +115,11 @@ - ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008124 PRIMARY KEY (SAMPLE_POINT) + ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_PK PRIMARY KEY (SAMPLE_POINT) - ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008123 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -143,11 +139,11 @@ - ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008129 PRIMARY KEY (SCALE_ID) + ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_PK PRIMARY KEY (SCALE_ID) - ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008128 CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_ID_CHK CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -161,15 +157,15 @@ - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008132 PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM) + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_PK PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM) - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008130 CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_NOMINAL_CHK CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008131 CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_UOM_CHK CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -184,11 +180,11 @@ - ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008134 PRIMARY KEY (WORKSTATION_ID) + ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_PK PRIMARY KEY (WORKSTATION_ID) - ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008133 CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_ID_CHK CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml b/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml index 4678d3a8f3..0d095fd899 100644 --- a/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml +++ b/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml @@ -25,11 +25,11 @@ - ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010582" PRIMARY KEY ("PANEL_ID") + ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_PK" PRIMARY KEY ("PANEL_ID") - ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010581" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -53,15 +53,15 @@ - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010585" PRIMARY KEY ("PANEL_ID", "TRAY_ID") + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PK" PRIMARY KEY ("PANEL_ID", "TRAY_ID") - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010583" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010584" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_ID_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -85,19 +85,19 @@ - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010593" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID") + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID") - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010590" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010591" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010592" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_SEQ_CHK" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -123,19 +123,19 @@ - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010589" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID") + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID") - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010586" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010587" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE - ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010588" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_USER_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE @@ -158,11 +158,11 @@ - ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010617" PRIMARY KEY ("USER_ID") + ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_PK" PRIMARY KEY ("USER_ID") - ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010616" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_ID_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml b/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml index ba6128dedc..61826092d4 100644 --- a/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml +++ b/c4jWS/src/main/webapp/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml @@ -25,11 +25,11 @@ - ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008882" PRIMARY KEY ("PACKING_LINE_ID") + ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_PK" PRIMARY KEY ("PACKING_LINE_ID") - ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008881" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE + ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_ID_CHK" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE diff --git a/c4jWS/target/c4jWS.war b/c4jWS/target/c4jWS.war index d73ecbbbb0..cb35c12716 100644 Binary files a/c4jWS/target/c4jWS.war and b/c4jWS/target/c4jWS.war differ