Skip to content

Commit 28e650a

Browse files
author
jenkins
committed
Merge branch 'dev'
2 parents ddc7f14 + f2db5de commit 28e650a

File tree

10 files changed

+123
-738
lines changed

10 files changed

+123
-738
lines changed

‎mes-application/src/main/resources/schema/aps_db_en.sql

Lines changed: 15 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -6051,7 +6051,7 @@ CREATE TABLE public.arch_materialflowresources_position (
60516051
qualityrating character varying(255),
60526052
pickingdate timestamp without time zone,
60536053
pickingworker_id bigint,
6054-
wmsposition_id bigint,
6054+
documentpart_id bigint,
60556055
archived boolean DEFAULT false
60566056
);
60576057

@@ -20824,7 +20824,7 @@ CREATE TABLE public.materialflowresources_position (
2082420824
qualityrating character varying(255),
2082520825
pickingdate timestamp without time zone,
2082620826
pickingworker_id bigint,
20827-
wmsposition_id bigint
20827+
documentpart_id bigint
2082820828
);
2082920829

2083020830

@@ -22025,7 +22025,8 @@ CREATE TABLE public.mobilewms_wmsdocumentpart (
2202522025
pickingworker character varying(255),
2202622026
document_id bigint,
2202722027
parts integer,
22028-
type character varying(255) NOT NULL
22028+
type character varying(255) NOT NULL,
22029+
documentdate timestamp without time zone
2202922030
);
2203022031

2203122032

@@ -22048,46 +22049,6 @@ CREATE SEQUENCE public.mobilewms_wmsdocumentpart_id_seq
2204822049
ALTER SEQUENCE public.mobilewms_wmsdocumentpart_id_seq OWNED BY public.mobilewms_wmsdocumentpart.id;
2204922050

2205022051

22051-
--
22052-
-- Name: mobilewms_wmsposition; Type: TABLE; Schema: public; Owner: -
22053-
--
22054-
22055-
CREATE TABLE public.mobilewms_wmsposition (
22056-
id bigint NOT NULL,
22057-
productnumber character varying(255),
22058-
storagelocationnumber character varying(255),
22059-
batchnumber character varying(255),
22060-
cartons numeric(14,5),
22061-
rest numeric(14,5),
22062-
quantity numeric(14,5),
22063-
conversion numeric(12,5),
22064-
unit character varying(255),
22065-
pickingdate timestamp without time zone,
22066-
documentpart_id bigint NOT NULL,
22067-
locationnumber character varying(255),
22068-
productname character varying(1024)
22069-
);
22070-
22071-
22072-
--
22073-
-- Name: mobilewms_wmsposition_id_seq; Type: SEQUENCE; Schema: public; Owner: -
22074-
--
22075-
22076-
CREATE SEQUENCE public.mobilewms_wmsposition_id_seq
22077-
START WITH 1
22078-
INCREMENT BY 1
22079-
NO MINVALUE
22080-
NO MAXVALUE
22081-
CACHE 1;
22082-
22083-
22084-
--
22085-
-- Name: mobilewms_wmsposition_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
22086-
--
22087-
22088-
ALTER SEQUENCE public.mobilewms_wmsposition_id_seq OWNED BY public.mobilewms_wmsposition.id;
22089-
22090-
2209122052
--
2209222053
-- Name: model_card_number_seq; Type: SEQUENCE; Schema: public; Owner: -
2209322054
--
@@ -35950,13 +35911,6 @@ ALTER TABLE ONLY public.materialrequirements_materialrequirementproduct ALTER CO
3595035911
ALTER TABLE ONLY public.mobilewms_wmsdocumentpart ALTER COLUMN id SET DEFAULT nextval('public.mobilewms_wmsdocumentpart_id_seq'::regclass);
3595135912

3595235913

35953-
--
35954-
-- Name: mobilewms_wmsposition id; Type: DEFAULT; Schema: public; Owner: -
35955-
--
35956-
35957-
ALTER TABLE ONLY public.mobilewms_wmsposition ALTER COLUMN id SET DEFAULT nextval('public.mobilewms_wmsposition_id_seq'::regclass);
35958-
35959-
3596035914
--
3596135915
-- Name: nutritionfacts_nutrientcalculation id; Type: DEFAULT; Schema: public; Owner: -
3596235916
--
@@ -38057,7 +38011,7 @@ COPY public.arch_materialflowresources_documentstatechange (id, dateandtime, doc
3805738011
-- Data for Name: arch_materialflowresources_position; Type: TABLE DATA; Schema: public; Owner: -
3805838012
--
3805938013

38060-
COPY public.arch_materialflowresources_position (id, document_id, product_id, quantity, price, productiondate, expirationdate, number, resource_id, givenunit, givenquantity, entityversion, storagelocation_id, conversion, palletnumber_id, typeofpallet, waste, resourcereceiptdocument, lastresource, resourcenumber, externaldocumentnumber, orderid, sellingprice, batch_id, qualityrating, pickingdate, pickingworker_id, wmsposition_id, archived) FROM stdin;
38014+
COPY public.arch_materialflowresources_position (id, document_id, product_id, quantity, price, productiondate, expirationdate, number, resource_id, givenunit, givenquantity, entityversion, storagelocation_id, conversion, palletnumber_id, typeofpallet, waste, resourcereceiptdocument, lastresource, resourcenumber, externaldocumentnumber, orderid, sellingprice, batch_id, qualityrating, pickingdate, pickingworker_id, documentpart_id, archived) FROM stdin;
3806138015
\.
3806238016

3806338017

@@ -42415,7 +42369,7 @@ COPY public.materialflowresources_palletmovehelper (id) FROM stdin;
4241542369
-- Data for Name: materialflowresources_position; Type: TABLE DATA; Schema: public; Owner: -
4241642370
--
4241742371

42418-
COPY public.materialflowresources_position (id, document_id, product_id, quantity, price, productiondate, expirationdate, number, resource_id, givenunit, givenquantity, entityversion, storagelocation_id, conversion, palletnumber_id, typeofpallet, waste, resourcereceiptdocument, lastresource, resourcenumber, externaldocumentnumber, orderid, sellingprice, batch_id, qualityrating, pickingdate, pickingworker_id, wmsposition_id) FROM stdin;
42372+
COPY public.materialflowresources_position (id, document_id, product_id, quantity, price, productiondate, expirationdate, number, resource_id, givenunit, givenquantity, entityversion, storagelocation_id, conversion, palletnumber_id, typeofpallet, waste, resourcereceiptdocument, lastresource, resourcenumber, externaldocumentnumber, orderid, sellingprice, batch_id, qualityrating, pickingdate, pickingworker_id, documentpart_id) FROM stdin;
4241942373
\.
4242042374

4242142375

@@ -42591,15 +42545,7 @@ COPY public.materialrequirements_materialrequirementproduct (id, materialrequire
4259142545
-- Data for Name: mobilewms_wmsdocumentpart; Type: TABLE DATA; Schema: public; Owner: -
4259242546
--
4259342547

42594-
COPY public.mobilewms_wmsdocumentpart (id, number, part, company, stateinwms, pickingworker, document_id, parts, type) FROM stdin;
42595-
\.
42596-
42597-
42598-
--
42599-
-- Data for Name: mobilewms_wmsposition; Type: TABLE DATA; Schema: public; Owner: -
42600-
--
42601-
42602-
COPY public.mobilewms_wmsposition (id, productnumber, storagelocationnumber, batchnumber, cartons, rest, quantity, conversion, unit, pickingdate, documentpart_id, locationnumber, productname) FROM stdin;
42548+
COPY public.mobilewms_wmsdocumentpart (id, number, part, company, stateinwms, pickingworker, document_id, parts, type, documentdate) FROM stdin;
4260342549
\.
4260442550

4260542551

@@ -48427,13 +48373,6 @@ SELECT pg_catalog.setval('public.materialrequirements_materialrequirementproduct
4842748373
SELECT pg_catalog.setval('public.mobilewms_wmsdocumentpart_id_seq', 1, false);
4842848374

4842948375

48430-
--
48431-
-- Name: mobilewms_wmsposition_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
48432-
--
48433-
48434-
SELECT pg_catalog.setval('public.mobilewms_wmsposition_id_seq', 1, false);
48435-
48436-
4843748376
--
4843848377
-- Name: model_card_number_seq; Type: SEQUENCE SET; Schema: public; Owner: -
4843948378
--
@@ -52997,14 +52936,6 @@ ALTER TABLE ONLY public.mobilewms_wmsdocumentpart
5299752936
ADD CONSTRAINT esilco_wmsdocumentpart_pkey PRIMARY KEY (id);
5299852937

5299952938

53000-
--
53001-
-- Name: mobilewms_wmsposition esilco_wmsposition_pkey; Type: CONSTRAINT; Schema: public; Owner: -
53002-
--
53003-
53004-
ALTER TABLE ONLY public.mobilewms_wmsposition
53005-
ADD CONSTRAINT esilco_wmsposition_pkey PRIMARY KEY (id);
53006-
53007-
5300852939
--
5300952940
-- Name: goodfood_extrusionprotocol extrusionprotocol_externalnumber_unique; Type: CONSTRAINT; Schema: public; Owner: -
5301052941
--
@@ -64084,6 +64015,14 @@ ALTER TABLE ONLY public.materialflowresources_position
6408464015
ADD CONSTRAINT position_document_fkey FOREIGN KEY (document_id) REFERENCES public.materialflowresources_document(id) DEFERRABLE;
6408564016

6408664017

64018+
--
64019+
-- Name: materialflowresources_position position_documentpart_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
64020+
--
64021+
64022+
ALTER TABLE ONLY public.materialflowresources_position
64023+
ADD CONSTRAINT position_documentpart_fkey FOREIGN KEY (documentpart_id) REFERENCES public.mobilewms_wmsdocumentpart(id) DEFERRABLE;
64024+
64025+
6408764026
--
6408864027
-- Name: materialflowresources_position position_palletnumber_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
6408964028
--
@@ -64140,14 +64079,6 @@ ALTER TABLE ONLY public.masterorders_position_warehousestatehelper
6414064079
ADD CONSTRAINT position_warehousestatehelper_product_fkey FOREIGN KEY (product_id) REFERENCES public.basic_product(id) DEFERRABLE;
6414164080

6414264081

64143-
--
64144-
-- Name: materialflowresources_position position_wmsposition_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
64145-
--
64146-
64147-
ALTER TABLE ONLY public.materialflowresources_position
64148-
ADD CONSTRAINT position_wmsposition_fkey FOREIGN KEY (wmsposition_id) REFERENCES public.mobilewms_wmsposition(id) DEFERRABLE;
64149-
64150-
6415164082
--
6415264083
-- Name: materialflowresources_positionattributevalue positionattributevalue_attribute_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
6415364084
--
@@ -67820,14 +67751,6 @@ ALTER TABLE ONLY public.mobilewms_wmsdocumentpart
6782067751
ADD CONSTRAINT wmsdocumentpart_document_fkey FOREIGN KEY (document_id) REFERENCES public.materialflowresources_document(id) DEFERRABLE;
6782167752

6782267753

67823-
--
67824-
-- Name: mobilewms_wmsposition wmsposition_documentpart_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
67825-
--
67826-
67827-
ALTER TABLE ONLY public.mobilewms_wmsposition
67828-
ADD CONSTRAINT wmsposition_documentpart_fkey FOREIGN KEY (documentpart_id) REFERENCES public.mobilewms_wmsdocumentpart(id) DEFERRABLE;
67829-
67830-
6783167754
--
6783267755
-- Name: cmmsmachineparts_staffworktime worker_maintenanceevent_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
6783367756
--

‎mes-application/src/main/resources/schema/aps_db_pl.sql

Lines changed: 15 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -6051,7 +6051,7 @@ CREATE TABLE public.arch_materialflowresources_position (
60516051
qualityrating character varying(255),
60526052
pickingdate timestamp without time zone,
60536053
pickingworker_id bigint,
6054-
wmsposition_id bigint,
6054+
documentpart_id bigint,
60556055
archived boolean DEFAULT false
60566056
);
60576057

@@ -20824,7 +20824,7 @@ CREATE TABLE public.materialflowresources_position (
2082420824
qualityrating character varying(255),
2082520825
pickingdate timestamp without time zone,
2082620826
pickingworker_id bigint,
20827-
wmsposition_id bigint
20827+
documentpart_id bigint
2082820828
);
2082920829

2083020830

@@ -22025,7 +22025,8 @@ CREATE TABLE public.mobilewms_wmsdocumentpart (
2202522025
pickingworker character varying(255),
2202622026
document_id bigint,
2202722027
parts integer,
22028-
type character varying(255) NOT NULL
22028+
type character varying(255) NOT NULL,
22029+
documentdate timestamp without time zone
2202922030
);
2203022031

2203122032

@@ -22048,46 +22049,6 @@ CREATE SEQUENCE public.mobilewms_wmsdocumentpart_id_seq
2204822049
ALTER SEQUENCE public.mobilewms_wmsdocumentpart_id_seq OWNED BY public.mobilewms_wmsdocumentpart.id;
2204922050

2205022051

22051-
--
22052-
-- Name: mobilewms_wmsposition; Type: TABLE; Schema: public; Owner: -
22053-
--
22054-
22055-
CREATE TABLE public.mobilewms_wmsposition (
22056-
id bigint NOT NULL,
22057-
productnumber character varying(255),
22058-
storagelocationnumber character varying(255),
22059-
batchnumber character varying(255),
22060-
cartons numeric(14,5),
22061-
rest numeric(14,5),
22062-
quantity numeric(14,5),
22063-
conversion numeric(12,5),
22064-
unit character varying(255),
22065-
pickingdate timestamp without time zone,
22066-
documentpart_id bigint NOT NULL,
22067-
locationnumber character varying(255),
22068-
productname character varying(1024)
22069-
);
22070-
22071-
22072-
--
22073-
-- Name: mobilewms_wmsposition_id_seq; Type: SEQUENCE; Schema: public; Owner: -
22074-
--
22075-
22076-
CREATE SEQUENCE public.mobilewms_wmsposition_id_seq
22077-
START WITH 1
22078-
INCREMENT BY 1
22079-
NO MINVALUE
22080-
NO MAXVALUE
22081-
CACHE 1;
22082-
22083-
22084-
--
22085-
-- Name: mobilewms_wmsposition_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
22086-
--
22087-
22088-
ALTER SEQUENCE public.mobilewms_wmsposition_id_seq OWNED BY public.mobilewms_wmsposition.id;
22089-
22090-
2209122052
--
2209222053
-- Name: model_card_number_seq; Type: SEQUENCE; Schema: public; Owner: -
2209322054
--
@@ -35950,13 +35911,6 @@ ALTER TABLE ONLY public.materialrequirements_materialrequirementproduct ALTER CO
3595035911
ALTER TABLE ONLY public.mobilewms_wmsdocumentpart ALTER COLUMN id SET DEFAULT nextval('public.mobilewms_wmsdocumentpart_id_seq'::regclass);
3595135912

3595235913

35953-
--
35954-
-- Name: mobilewms_wmsposition id; Type: DEFAULT; Schema: public; Owner: -
35955-
--
35956-
35957-
ALTER TABLE ONLY public.mobilewms_wmsposition ALTER COLUMN id SET DEFAULT nextval('public.mobilewms_wmsposition_id_seq'::regclass);
35958-
35959-
3596035914
--
3596135915
-- Name: nutritionfacts_nutrientcalculation id; Type: DEFAULT; Schema: public; Owner: -
3596235916
--
@@ -38057,7 +38011,7 @@ COPY public.arch_materialflowresources_documentstatechange (id, dateandtime, doc
3805738011
-- Data for Name: arch_materialflowresources_position; Type: TABLE DATA; Schema: public; Owner: -
3805838012
--
3805938013

38060-
COPY public.arch_materialflowresources_position (id, document_id, product_id, quantity, price, productiondate, expirationdate, number, resource_id, givenunit, givenquantity, entityversion, storagelocation_id, conversion, palletnumber_id, typeofpallet, waste, resourcereceiptdocument, lastresource, resourcenumber, externaldocumentnumber, orderid, sellingprice, batch_id, qualityrating, pickingdate, pickingworker_id, wmsposition_id, archived) FROM stdin;
38014+
COPY public.arch_materialflowresources_position (id, document_id, product_id, quantity, price, productiondate, expirationdate, number, resource_id, givenunit, givenquantity, entityversion, storagelocation_id, conversion, palletnumber_id, typeofpallet, waste, resourcereceiptdocument, lastresource, resourcenumber, externaldocumentnumber, orderid, sellingprice, batch_id, qualityrating, pickingdate, pickingworker_id, documentpart_id, archived) FROM stdin;
3806138015
\.
3806238016

3806338017

@@ -42415,7 +42369,7 @@ COPY public.materialflowresources_palletmovehelper (id) FROM stdin;
4241542369
-- Data for Name: materialflowresources_position; Type: TABLE DATA; Schema: public; Owner: -
4241642370
--
4241742371

42418-
COPY public.materialflowresources_position (id, document_id, product_id, quantity, price, productiondate, expirationdate, number, resource_id, givenunit, givenquantity, entityversion, storagelocation_id, conversion, palletnumber_id, typeofpallet, waste, resourcereceiptdocument, lastresource, resourcenumber, externaldocumentnumber, orderid, sellingprice, batch_id, qualityrating, pickingdate, pickingworker_id, wmsposition_id) FROM stdin;
42372+
COPY public.materialflowresources_position (id, document_id, product_id, quantity, price, productiondate, expirationdate, number, resource_id, givenunit, givenquantity, entityversion, storagelocation_id, conversion, palletnumber_id, typeofpallet, waste, resourcereceiptdocument, lastresource, resourcenumber, externaldocumentnumber, orderid, sellingprice, batch_id, qualityrating, pickingdate, pickingworker_id, documentpart_id) FROM stdin;
4241942373
\.
4242042374

4242142375

@@ -42591,15 +42545,7 @@ COPY public.materialrequirements_materialrequirementproduct (id, materialrequire
4259142545
-- Data for Name: mobilewms_wmsdocumentpart; Type: TABLE DATA; Schema: public; Owner: -
4259242546
--
4259342547

42594-
COPY public.mobilewms_wmsdocumentpart (id, number, part, company, stateinwms, pickingworker, document_id, parts, type) FROM stdin;
42595-
\.
42596-
42597-
42598-
--
42599-
-- Data for Name: mobilewms_wmsposition; Type: TABLE DATA; Schema: public; Owner: -
42600-
--
42601-
42602-
COPY public.mobilewms_wmsposition (id, productnumber, storagelocationnumber, batchnumber, cartons, rest, quantity, conversion, unit, pickingdate, documentpart_id, locationnumber, productname) FROM stdin;
42548+
COPY public.mobilewms_wmsdocumentpart (id, number, part, company, stateinwms, pickingworker, document_id, parts, type, documentdate) FROM stdin;
4260342549
\.
4260442550

4260542551

@@ -48427,13 +48373,6 @@ SELECT pg_catalog.setval('public.materialrequirements_materialrequirementproduct
4842748373
SELECT pg_catalog.setval('public.mobilewms_wmsdocumentpart_id_seq', 1, false);
4842848374

4842948375

48430-
--
48431-
-- Name: mobilewms_wmsposition_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
48432-
--
48433-
48434-
SELECT pg_catalog.setval('public.mobilewms_wmsposition_id_seq', 1, false);
48435-
48436-
4843748376
--
4843848377
-- Name: model_card_number_seq; Type: SEQUENCE SET; Schema: public; Owner: -
4843948378
--
@@ -52997,14 +52936,6 @@ ALTER TABLE ONLY public.mobilewms_wmsdocumentpart
5299752936
ADD CONSTRAINT esilco_wmsdocumentpart_pkey PRIMARY KEY (id);
5299852937

5299952938

53000-
--
53001-
-- Name: mobilewms_wmsposition esilco_wmsposition_pkey; Type: CONSTRAINT; Schema: public; Owner: -
53002-
--
53003-
53004-
ALTER TABLE ONLY public.mobilewms_wmsposition
53005-
ADD CONSTRAINT esilco_wmsposition_pkey PRIMARY KEY (id);
53006-
53007-
5300852939
--
5300952940
-- Name: goodfood_extrusionprotocol extrusionprotocol_externalnumber_unique; Type: CONSTRAINT; Schema: public; Owner: -
5301052941
--
@@ -64084,6 +64015,14 @@ ALTER TABLE ONLY public.materialflowresources_position
6408464015
ADD CONSTRAINT position_document_fkey FOREIGN KEY (document_id) REFERENCES public.materialflowresources_document(id) DEFERRABLE;
6408564016

6408664017

64018+
--
64019+
-- Name: materialflowresources_position position_documentpart_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
64020+
--
64021+
64022+
ALTER TABLE ONLY public.materialflowresources_position
64023+
ADD CONSTRAINT position_documentpart_fkey FOREIGN KEY (documentpart_id) REFERENCES public.mobilewms_wmsdocumentpart(id) DEFERRABLE;
64024+
64025+
6408764026
--
6408864027
-- Name: materialflowresources_position position_palletnumber_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
6408964028
--
@@ -64140,14 +64079,6 @@ ALTER TABLE ONLY public.masterorders_position_warehousestatehelper
6414064079
ADD CONSTRAINT position_warehousestatehelper_product_fkey FOREIGN KEY (product_id) REFERENCES public.basic_product(id) DEFERRABLE;
6414164080

6414264081

64143-
--
64144-
-- Name: materialflowresources_position position_wmsposition_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
64145-
--
64146-
64147-
ALTER TABLE ONLY public.materialflowresources_position
64148-
ADD CONSTRAINT position_wmsposition_fkey FOREIGN KEY (wmsposition_id) REFERENCES public.mobilewms_wmsposition(id) DEFERRABLE;
64149-
64150-
6415164082
--
6415264083
-- Name: materialflowresources_positionattributevalue positionattributevalue_attribute_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
6415364084
--
@@ -67820,14 +67751,6 @@ ALTER TABLE ONLY public.mobilewms_wmsdocumentpart
6782067751
ADD CONSTRAINT wmsdocumentpart_document_fkey FOREIGN KEY (document_id) REFERENCES public.materialflowresources_document(id) DEFERRABLE;
6782167752

6782267753

67823-
--
67824-
-- Name: mobilewms_wmsposition wmsposition_documentpart_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
67825-
--
67826-
67827-
ALTER TABLE ONLY public.mobilewms_wmsposition
67828-
ADD CONSTRAINT wmsposition_documentpart_fkey FOREIGN KEY (documentpart_id) REFERENCES public.mobilewms_wmsdocumentpart(id) DEFERRABLE;
67829-
67830-
6783167754
--
6783267755
-- Name: cmmsmachineparts_staffworktime worker_maintenanceevent_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
6783367756
--

0 commit comments

Comments
 (0)