svn commit: r496775 - in /ofbiz/trunk/applications/product: data/ShipmentTypeData.xml entitydef/entitygroup.xml entitydef/entitymodel.xml entitydef/entitymodel_shipment.xml ofbiz-component.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r496775 - in /ofbiz/trunk/applications/product: data/ShipmentTypeData.xml entitydef/entitygroup.xml entitydef/entitymodel.xml entitydef/entitymodel_shipment.xml ofbiz-component.xml

jaz-3
Author: jaz
Date: Tue Jan 16 09:15:15 2007
New Revision: 496775

URL: http://svn.apache.org/viewvc?view=rev&rev=496775
Log:
included work (done quite a while ago) which implements status on picklist items (more following this commit)

Modified:
    ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
    ofbiz/trunk/applications/product/entitydef/entitygroup.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
    ofbiz/trunk/applications/product/ofbiz-component.xml

Modified: ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml?view=diff&rev=496775&r1=496774&r2=496775
==============================================================================
--- ofbiz/trunk/applications/product/data/ShipmentTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ShipmentTypeData.xml Tue Jan 16 09:15:15 2007
@@ -90,13 +90,24 @@
     <StatusType description="Picklist" hasTable="N" parentTypeId="" statusTypeId="PICKLIST_STATUS"/>
     <StatusItem description="Input" sequenceId="01" statusCode="INPUT" statusId="PICKLIST_INPUT" statusTypeId="PICKLIST_STATUS"/>
     <StatusItem description="Assigned" sequenceId="02" statusCode="ASSIGNED" statusId="PICKLIST_ASSIGNED" statusTypeId="PICKLIST_STATUS"/>
-    <StatusItem description="Picked" sequenceId="03" statusCode="PICKED" statusId="PICKLIST_PICKED" statusTypeId="PICKLIST_STATUS"/>
-    <StatusItem description="Packed" sequenceId="04" statusCode="PACKED" statusId="PICKLIST_PACKED" statusTypeId="PICKLIST_STATUS"/>
+    <StatusItem description="Printed" sequenceId="03" statusCode="PRINTED" statusId="PICKLIST_PRINTED" statusTypeId="PICKLIST_STATUS"/>
+    <StatusItem description="Picked" sequenceId="10" statusCode="PICKED" statusId="PICKLIST_PICKED" statusTypeId="PICKLIST_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="PICKLIST_CANCELLED" statusTypeId="PICKLIST_STATUS"/>
     <StatusValidChange condition="" statusId="PICKLIST_INPUT" statusIdTo="PICKLIST_ASSIGNED" transitionName="Assign"/>
+    <StatusValidChange condition="" statusId="PICKLIST_INPUT" statusIdTo="PICKLIST_PRINTED" transitionName="Print"/>
     <StatusValidChange condition="" statusId="PICKLIST_INPUT" statusIdTo="PICKLIST_PICKED" transitionName="Pick"/>
-    <StatusValidChange condition="" statusId="PICKLIST_PICKED" statusIdTo="PICKLIST_PACKED" transitionName="Pack"/>
     <StatusValidChange condition="" statusId="PICKLIST_INPUT" statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>
     <StatusValidChange condition="" statusId="PICKLIST_ASSIGNED" statusIdTo="PICKLIST_PICKED" transitionName="Pick"/>
+    <StatusValidChange condition="" statusId="PICKLIST_ASSIGNED" statusIdTo="PICKLIST_PRINTED" transitionName="Print"/>
     <StatusValidChange condition="" statusId="PICKLIST_ASSIGNED" statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange condition="" statusId="PICKLIST_PRINTED" statusIdTo="PICKLIST_PICKED" transitionName="Pick"/>
+    <StatusValidChange condition="" statusId="PICKLIST_PRINTED" statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>
+
+    <!-- Picklist item status -->
+    <StatusType description="Picklist Item" hasTable="N" parentTypeId="" statusTypeId="PICKITEM_STATUS"/>
+    <StatusItem description="Pending" sequenceId="01" statusCode="PENDING" statusId="PICKITEM_PENDING" statusTypeId="PICKITEM_STATUS"/>
+    <StatusItem description="Completed" sequenceId="50" statusCode="COMPLETED" statusId="PICKITEM_COMPLETED" statusTypeId="PICKITEM_STATUS"/>
+    <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="PICKITEM_CANCELLED" statusTypeId="PICKITEM_STATUS"/>
+    <StatusValidChange condition="" statusId="PICKITEM_PENDING" statusIdTo="PICKITEM_COMPLETED" transitionName="Complete"/>
+    <StatusValidChange condition="" statusId="PICKITEM_PENDING" statusIdTo="PICKITEM_CANCELLED" transitionName="Cancel"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup.xml?view=diff&rev=496775&r1=496774&r2=496775
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Tue Jan 16 09:15:15 2007
@@ -276,6 +276,7 @@
     <entity-group group="org.ofbiz" entity="PicklistAndBinAndItem" />
     <entity-group group="org.ofbiz" entity="PicklistBin" />
     <entity-group group="org.ofbiz" entity="PicklistItem" />
+    <entity-group group="org.ofbiz" entity="PicklistItemAndBin" />
     <entity-group group="org.ofbiz" entity="PicklistRole" />
     <entity-group group="org.ofbiz" entity="PicklistStatusHistory" />
 
@@ -319,13 +320,5 @@
     <entity-group group="org.ofbiz" entity="ShipmentType" />
     <entity-group group="org.ofbiz" entity="ShipmentTypeAttr" />
     <entity-group group="org.ofbiz" entity="ShippingDocument" />
-
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.odbc.shipment -->
-  <!-- ========================================================= -->
-
-    <entity-group group="org.ofbiz.odbc" entity="OdbcPackageOut" />
-    <entity-group group="org.ofbiz.odbc" entity="OdbcShipmentOut" />
-    <entity-group group="org.ofbiz.odbc" entity="OdbcPackageIn" />
 </entitygroup>
 

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=496775&r1=496774&r2=496775
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Tue Jan 16 09:15:15 2007
@@ -1858,6 +1858,7 @@
       <field name="includeInPromotions" type="indicator"></field>
       <field name="isVirtual" type="indicator"></field>
       <field name="isVariant" type="indicator"></field>
+      <field name="originGeoId" type="id"></field>
       <field name="requirementMethodEnumId" type="id"></field>
       <field name="billOfMaterialLevel" type="numeric"></field>
       <field name="reservMaxPersons" type="floating-point"><description>maximum number of persons who can rent this asset at the same time</description></field>
@@ -1906,6 +1907,9 @@
       </relation>
       <relation type="one" fk-name="PROD_RQMT_ENUM" title="RequirementMethod" rel-entity-name="Enumeration">
         <key-map field-name="requirementMethodEnumId" rel-field-name="enumId"/>
+      </relation>
+      <relation type="one" fk-name="PROD_ORG_GEO" title="Origin" rel-entity-name="Geo">
+          <key-map field-name="originGeoId" rel-field-name="geoId"/>
       </relation>
       <relation type="one" fk-name="PROD_CB_USERLOGIN" title="CreatedBy" rel-entity-name="UserLogin">
         <key-map field-name="createdByUserLogin" rel-field-name="userLoginId"/>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?view=diff&rev=496775&r1=496774&r2=496775
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Tue Jan 16 09:15:15 2007
@@ -183,6 +183,7 @@
       <field name="orderItemSeqId" type="id-ne"></field>
       <field name="shipGroupSeqId" type="id-ne"></field>
       <field name="inventoryItemId" type="id-ne"></field>
+      <field name="itemStatusId" type="id-ne"></field>
       <field name="quantity" type="floating-point"></field>
       <prim-key field="picklistBinId"/>
       <prim-key field="orderId"/>
@@ -203,6 +204,9 @@
       <relation type="one-nofk" rel-entity-name="OrderHeader">
         <key-map field-name="orderId"/>
       </relation>
+      <relation type="one" fk-name="PICKLST_ITM_STTS" rel-entity-name="StatusItem">
+        <key-map field-name="itemStatusId" rel-field-name="statusId"/>
+      </relation>
       <relation type="one" fk-name="PCKLST_ITM_INV" rel-entity-name="InventoryItem">
         <key-map field-name="inventoryItemId"/>
       </relation>
@@ -223,6 +227,17 @@
         <key-map field-name="inventoryItemId"/>
       </relation>
     </entity>
+    <view-entity entity-name="PicklistItemAndBin"
+                 package-name="org.ofbiz.shipment.picklist"
+                 title="Picklist Item and Bin View Entity">
+      <member-entity entity-alias="PB" entity-name="PicklistBin"/>
+      <member-entity entity-alias="PI" entity-name="PicklistItem"/>
+      <alias-all entity-alias="PB"/>
+      <alias-all entity-alias="PI"/>
+      <view-link entity-alias="PB" rel-entity-alias="PI">
+        <key-map field-name="picklistBinId"/>
+      </view-link>
+    </view-entity>
     <entity entity-name="PicklistRole"
             package-name="org.ofbiz.shipment.picklist"
             title="Picklist Role Entity">
@@ -499,6 +514,7 @@
       <field name="statusId" type="id-ne"></field>
       <field name="primaryOrderId" type="id"></field>
       <field name="primaryShipGroupSeqId" type="id"></field>
+      <field name="picklistBinId" type="id"></field>
       <field name="estimatedReadyDate" type="date-time"></field>
       <field name="estimatedShipDate" type="date-time"></field>
       <field name="estimatedShipWorkEffId" type="id"></field>
@@ -564,6 +580,9 @@
       <relation type="one" fk-name="SHPMNT_PODR" title="Primary" rel-entity-name="OrderHeader">
         <key-map field-name="primaryOrderId" rel-field-name="orderId"/>
       </relation>
+      <relation type="one" rel-entity-name="PicklistBin">
+          <key-map field-name="picklistBinId"/>
+      </relation>
       <relation type="one-nofk" title="Primary" rel-entity-name="OrderItemShipGroup">
         <key-map field-name="primaryOrderId" rel-field-name="orderId"/>
         <key-map field-name="primaryShipGroupSeqId" rel-field-name="shipGroupSeqId"/>
@@ -1141,7 +1160,7 @@
       </relation>
     </entity>
     <view-entity entity-name="ShipmentPackageRouteDetail"
-            package-name="org.ofbiz.shipment.picklist"
+            package-name="org.ofbiz.shipment.shipment"
             title="Shipment Package Route Detail View Entity">
       <description>View to list information about individual packages with route information, for getting the carrier labels for a package.</description>
       <member-entity entity-alias="SPRS" entity-name="ShipmentPackageRouteSeg"/>

Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?view=diff&rev=496775&r1=496774&r2=496775
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Tue Jan 16 09:15:15 2007
@@ -25,7 +25,6 @@
     <classpath type="jar" location="build/lib/*"/>
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
-    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_odbc.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_shipment.xml"/>
     <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup.xml"/>
     <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>