Skip to content
Snippets Groups Projects
Commit 79eea903 authored by FrankR's avatar FrankR
Browse files

intermediate state orderpicker

parent e0bce37b
Branches
No related tags found
No related merge requests found
......@@ -77,7 +77,8 @@ sourceSets {
main {
proto {
srcDirs "models/interfaces/GenericSensor",
"models/interfaces/SimpleScene"
"models/interfaces/SimpleScene",
"models/interfaces/OFBizOrderpicker"
// srcDir "src/main/resources"
}
java {
......
This diff is collapsed.
......@@ -128,22 +128,6 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="zonedescriptors" upperBound="-1"
eType="#//ZoneDescriptor"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TrackingRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="MonitoringRequest">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="frameIds" eType="#//StringList"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="delta" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="updateFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//StringList"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="#//StringList"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="fusionStrategy" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="exitNotification" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="properties" eType="#//StringList"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringTaskId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="requestorProtocol" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="serializationType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="WorldModelUpdateRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="DataStorageRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="EventFilterConfiguration">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="positionAmbiguityStrategy"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
......@@ -163,11 +147,6 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="eventfiltercondition" upperBound="-1"
eType="#//EventFilterCondition"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="WorldModelQueryRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="DataStorageQueryRequest">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="trackingTaskId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AgentRegistrationRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="MonitoringTask">
<eStructuralFeatures xsi:type="ecore:EReference" name="eventfilterconfiguration"
lowerBound="1" eType="#//EventFilterConfiguration"/>
......@@ -203,7 +182,6 @@
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="UWB" eSuperTypes="#//Beacon"/>
<eClassifiers xsi:type="ecore:EClass" name="SensorConfigurationRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="OtherBeacon" eSuperTypes="#//Beacon">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="data" transient="true">
<eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
......@@ -262,4 +240,57 @@
eType="#//PositionEvent"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="trackingTaskId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eSubpackages name="OFBiz" nsURI="ofbiz" nsPrefix="ofbiz">
<eClassifiers xsi:type="ecore:EClass" name="Picklist">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="picklistId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="picklistRoles" upperBound="-1"
eType="#//OFBiz/PicklistRole"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="picklistBins" upperBound="-1"
eType="#//OFBiz/PicklistBin"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="PicklistBin">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="picklistId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="binLocationNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="picklistItems" upperBound="-1"
eType="#//OFBiz/PicklistItem"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="PicklistItem">
<eStructuralFeatures xsi:type="ecore:EReference" name="inventoryItem" lowerBound="1"
eType="#//OFBiz/InventoryItem"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="InventoryItem">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="inventoryItemId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="containerId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="productId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="PicklistRole">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="picklistId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="partyId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="roleTypeId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
</eSubpackages>
<eSubpackages name="IPosDevKit" nsURI="IDK" nsPrefix="IDK">
<eClassifiers xsi:type="ecore:EClass" name="TrackingRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="MonitoringRequest">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="frameIds" eType="#//StringList"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="delta" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="updateFrequency" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//StringList"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="#//StringList"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="fusionStrategy" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="exitNotification" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="properties" eType="#//StringList"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringTaskId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="requestorProtocol" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="serializationType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="WorldModelUpdateRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="DataStorageRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="WorldModelQueryRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="DataStorageQueryRequest">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="trackingTaskId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AgentRegistrationRequest"/>
<eClassifiers xsi:type="ecore:EClass" name="SensorConfigurationRequest"/>
</eSubpackages>
</ecore:EPackage>
......@@ -118,33 +118,12 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//PositionEvent/lObjectId"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iPos_Datamodel.ecore#//PositionEvent/zonedescriptors"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//TrackingRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//MonitoringRequest">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/frameIds"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/delta"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/updateFrequency"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/type"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/id"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/fusionStrategy"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/exitNotification"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/properties"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/monitoringTaskId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/requestorProtocol"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//MonitoringRequest/serializationType"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//WorldModelUpdateRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//DataStorageRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//EventFilterConfiguration">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterConfiguration/positionAmbiguityStrategy"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterConfiguration/positionAmbiguityParameters"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterConfiguration/filterCriteria"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iPos_Datamodel.ecore#//EventFilterConfiguration/eventfiltercondition"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//WorldModelQueryRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//DataStorageQueryRequest">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//DataStorageQueryRequest/trackingTaskId"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//AgentRegistrationRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//MonitoringTask">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iPos_Datamodel.ecore#//MonitoringTask/eventfilterconfiguration"/>
</genClasses>
......@@ -165,7 +144,6 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//Bluetooth/rss"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//UWB"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//SensorConfigurationRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//OtherBeacon">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//OtherBeacon/data"/>
</genClasses>
......@@ -195,5 +173,58 @@
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iPos_Datamodel.ecore#//DataStorageQueryResponse/positionEvents"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//DataStorageQueryResponse/trackingTaskId"/>
</genClasses>
<nestedGenPackages prefix="OFBiz" disposableProviderFactory="true" ecorePackage="iPos_Datamodel.ecore#//OFBiz">
<genClasses ecoreClass="iPos_Datamodel.ecore#//OFBiz/Picklist">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//OFBiz/Picklist/picklistId"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true"
ecoreFeature="ecore:EReference iPos_Datamodel.ecore#//OFBiz/Picklist/picklistRoles"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true"
ecoreFeature="ecore:EReference iPos_Datamodel.ecore#//OFBiz/Picklist/picklistBins"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//OFBiz/PicklistBin">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//OFBiz/PicklistBin/picklistId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//OFBiz/PicklistBin/binLocationNumber"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true"
ecoreFeature="ecore:EReference iPos_Datamodel.ecore#//OFBiz/PicklistBin/picklistItems"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//OFBiz/PicklistItem">
<genFeatures notify="false" createChild="false" propertySortChoices="true"
ecoreFeature="ecore:EReference iPos_Datamodel.ecore#//OFBiz/PicklistItem/inventoryItem"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//OFBiz/InventoryItem">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//OFBiz/InventoryItem/inventoryItemId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//OFBiz/InventoryItem/containerId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//OFBiz/InventoryItem/productId"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//OFBiz/PicklistRole">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//OFBiz/PicklistRole/picklistId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//OFBiz/PicklistRole/partyId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//OFBiz/PicklistRole/roleTypeId"/>
</genClasses>
</nestedGenPackages>
<nestedGenPackages prefix="IPosDevKit" disposableProviderFactory="true" ecorePackage="iPos_Datamodel.ecore#//IPosDevKit">
<genClasses ecoreClass="iPos_Datamodel.ecore#//IPosDevKit/TrackingRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/frameIds"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/delta"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/updateFrequency"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/type"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/id"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/fusionStrategy"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/exitNotification"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/properties"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/monitoringTaskId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/requestorProtocol"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/MonitoringRequest/serializationType"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//IPosDevKit/WorldModelUpdateRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//IPosDevKit/DataStorageRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//IPosDevKit/WorldModelQueryRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//IPosDevKit/DataStorageQueryRequest">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//IPosDevKit/DataStorageQueryRequest/trackingTaskId"/>
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//IPosDevKit/AgentRegistrationRequest"/>
<genClasses ecoreClass="iPos_Datamodel.ecore#//IPosDevKit/SensorConfigurationRequest"/>
</nestedGenPackages>
</genPackages>
</genmodel:GenModel>
emf_datamodel/model/iPos_Datamodel.jpg

3.64 MiB

logging:
level:
ipos: DEBUG
config: .\logback-spring.xml
config: logback-spring.xml
server:
port: 7071
......@@ -13,12 +13,12 @@ mqtt:
connectionTimeout: 20
clientId: ipos.project.fw
# hostname: 192.168.0.111 # ceti-laptop robolab
# hostname: broker.hivemq.com # online
hostname: 192.168.0.143 # Frank-laptop robolab
hostname: broker.hivemq.com # online
# hostname: 192.168.0.143 # Frank-laptop robolab
# hostname: localhost
port: 1883
spring:
activemq:
packages:
trusted: ipos.models, com.google.protobuf
\ No newline at end of file
trusted: ipos.models, com.google.protobuf # JMS serializes just trusted classes
\ No newline at end of file
{"picklists" : [{ "picklistId" : "picklist_1", "picklistRoles" : [ { "picklistId" : "Picklist_1", "partyId" : "Employee_1", "roleTypeId" : "picker" } ], "picklistBins" : [ { "picklistId" : "picklist_1", "binLocationNumber" : 4, "picklistItems" : [ { "inventoryItem" : { "inventoryItemId" : "invit1", "containerId" : "box_1", "productId" : "Rasierer" } } ] }, { "picklistId" : "picklist_1", "binLocationNumber" : 3, "picklistItems" : [ { "inventoryItem" : { "inventoryItemId" : "invit2", "containerId" : "box_3", "productId" : "Smartphone" } }, { "inventoryItem" : { "inventoryItemId" : "invit3", "containerId" : "box_5", "productId" : "Bohrmaschine" } }, { "inventoryItem" : { "inventoryItemId" : "invit4", "containerId" : "box_2", "productId" : "Hammer" } } ] } ] }]}
\ No newline at end of file
{"picklists" : [{
"picklistId" : "picklist_1",
"picklistRoles" : [
{ "picklistId" : "Picklist_1",
"partyId" : "Employee_1",
"roleTypeId" : "picker"
}
],
"picklistBins" : [
{
"picklistId" : "picklist_1",
"binLocationNumber" : 4,
"picklistItems" : [
{
"inventoryItem" :
{
"inventoryItemId" : "invit1",
"containerId" : "box_1",
"productId" : "Rasierer"
}
}
]
},
{
"picklistId" : "picklist_1",
"binLocationNumber" : 3,
"picklistItems" : [
{
"inventoryItem" :
{
"inventoryItemId" : "invit2",
"containerId" : "box_3",
"productId" : "Smartphone"
}
},
{
"inventoryItem" :
{
"inventoryItemId" : "invit3",
"containerId" : "box_5",
"productId" : "Bohrmaschine"
}
},
{
"inventoryItem" :
{
"inventoryItemId" : "invit4",
"containerId" : "box_2",
"productId" : "Hammer"
}
}
]
}
]
}]}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment