Thanks Jacques, added reference ticketId in log message for more details regarding design and requirement.
Thanks & Regards --- Arun Patidar Director of Information SystemsHotWax Commerce <http://www.hotwax.co> On Sat, Dec 22, 2018 at 6:34 PM Jacques Le Roux < [email protected]> wrote: > Hi Arun, > > I did not have enough time test, but I guess it's an excellent work > > I though think a short explanation with a reference to OFBIZ-6964 would > fit here. > > Like, > > Here are high level design notes based on the requirement specified > under OFBIZ-7355 to support the product level replenishment from > any intra-company facility before raising the ordering from an outside > vendor. > > or more ;) > > Thanks > > Jacques > > Le 22/12/2018 à 13:19, [email protected] a écrit : > > Author: arunpatidar > > Date: Sat Dec 22 12:19:19 2018 > > New Revision: 1849547 > > > > URL: http://svn.apache.org/viewvc?rev=1849547&view=rev > > Log: > > Added: Demo Data based on the propsed design to support replenishment > planning through any inter-company facility. > > (OFBIZ-7357) > > Thanks Swapnil and Yashwant for your contribution. > > > > Modified: > > > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml > > > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/ProductDemoData.xml > > > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ManufacturingSeedData.xml > > > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml > > > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ProductSeedData.xml > > > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml > > > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml > > > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml > > > > Modified: > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml > > URL: > http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml?rev=1849547&r1=1849546&r2=1849547&view=diff > > > ============================================================================== > > --- > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml > (original) > > +++ > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml > Sat Dec 22 12:19:19 2018 > > @@ -186,6 +186,14 @@ under the License. > > <FacilityLocationGeoPoint facilityId="WebStoreWarehouse" > locationSeqId="TLTLTLUL02" geoPointId="9000" fromDate="2009-01-09 > 00:00:00.000"/> > > <FacilityLocationGeoPoint facilityId="WebStoreWarehouse" > locationSeqId="TLTLTLLL03" geoPointId="9000" fromDate="2009-01-09 > 00:00:00.000"/> > > <FacilityLocationGeoPoint facilityId="WebStoreWarehouse" > locationSeqId="TLTLTLUL04" geoPointId="9000" fromDate="2009-01-09 > 00:00:00.000"/> > > + <FacilityLocation facilityId="RegionalWarehouse1" > locationSeqId="TLTLTLUL01" locationTypeEnumId="FLT_BULK" areaId="TL" > aisleId="TL" sectionId="TL" levelId="UL" positionId="05"/> > > + <FacilityLocation facilityId="RegionalWarehouse1" > locationSeqId="TLTLTLUL01" locationTypeEnumId="FLT_PICKLOC" areaId="TL" > aisleId="TL" sectionId="TL" levelId="UL" positionId="06"/> > > + <FacilityLocation facilityId="RegionalWarehouse2" > locationSeqId="TLTLTLUL01" locationTypeEnumId="FLT_BULK" areaId="TL" > aisleId="TL" sectionId="TL" levelId="UL" positionId="05"/> > > + <FacilityLocation facilityId="RegionalWarehouse2" > locationSeqId="TLTLTLUL01" locationTypeEnumId="FLT_PICKLOC" areaId="TL" > aisleId="TL" sectionId="TL" levelId="UL" positionId="06"/> > > + <FacilityLocation facilityId="StoreWarehouse1" > locationSeqId="TLTLTLUL01" locationTypeEnumId="FLT_BULK" areaId="TL" > aisleId="TL" sectionId="TL" levelId="UL" positionId="05"/> > > + <FacilityLocation facilityId="StoreWarehouse1" > locationSeqId="TLTLTLUL01" locationTypeEnumId="FLT_PICKLOC" areaId="TL" > aisleId="TL" sectionId="TL" levelId="UL" positionId="06"/> > > + <FacilityLocation facilityId="StoreWarehouse2" > locationSeqId="TLTLTLUL01" locationTypeEnumId="FLT_BULK" areaId="TL" > aisleId="TL" sectionId="TL" levelId="UL" positionId="05"/> > > + <FacilityLocation facilityId="StoreWarehouse2" > locationSeqId="TLTLTLUL01" locationTypeEnumId="FLT_PICKLOC" areaId="TL" > aisleId="TL" sectionId="TL" levelId="UL" positionId="06"/> > > > > <ProductStore productStoreId="9000" storeName="OFBiz E-Commerce > Store" companyName="Open For Business" title="Open For Commerce" > > subtitle="Part of the Apache OFBiz Family of Open > Source Software" payToPartyId="Company" daysToCancelNonPay="30" > prorateShipping="Y" prorateTaxes="Y" > > @@ -274,6 +282,11 @@ under the License. > > <WebAnalyticsConfig webSiteId="WebStore" > webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="//-- enter here your > analytic script code --"/> > > > > <ProductStoreFacility productStoreId="9000" > facilityId="WebStoreWarehouse" fromDate="2001-05-13 12:00:00.0"/> > > + <ProductStoreFacility productStoreId="9000" > facilityId="RegionalWarehouse1" fromDate="2001-05-13 12:00:00.0"/> > > + <ProductStoreFacility productStoreId="9000" > facilityId="RegionalWarehouse2" fromDate="2001-05-13 12:00:00.0"/> > > + <ProductStoreFacility productStoreId="9000" > facilityId="StoreWarehouse1" fromDate="2001-05-13 12:00:00.0"/> > > + <ProductStoreFacility productStoreId="9000" > facilityId="StoreWarehouse2" fromDate="2001-05-13 12:00:00.0"/> > > + > > <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" > productStoreId="9000" fromDate="2001-05-13 12:00:00.0"/> > > <ProductStoreKeywordOvrd productStoreId="9000" keyword="gizmo" > fromDate="2001-05-13 12:00:00.0" target="100" > targetTypeEnumId="KOTT_PRODCAT"/> > > > > @@ -1229,6 +1242,10 @@ under the License. > > <ProductFacility productId="GZ-1001" > facilityId="WebStoreWarehouse" minimumStock="2" reorderQuantity="10" > daysToShip="1"/> > > <ProductFacility productId="GZ-1004" > facilityId="WebStoreWarehouse" minimumStock="2" reorderQuantity="10" > daysToShip="1"/> > > <ProductFacility productId="SV-1001" > facilityId="WebStoreWarehouse" minimumStock="2" reorderQuantity="10" > daysToShip="1"/> > > + <ProductFacility productId="GZ-8544" > facilityId="RegionalWarehouse1" minimumStock="20" reorderQuantity="50" > daysToShip="1"/> > > + <ProductFacility productId="GZ-8544" > facilityId="RegionalWarehouse2" minimumStock="20" reorderQuantity="50" > daysToShip="1"/> > > + <ProductFacility productId="GZ-8544" facilityId="StoreWarehouse1" > minimumStock="20" reorderQuantity="50" daysToShip="1"/> > > + <ProductFacility productId="GZ-8544" facilityId="StoreWarehouse2" > minimumStock="20" reorderQuantity="50" daysToShip="1"/> > > > > <ProductFacilityLocation productId="GZ-2644" > facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01"/> > > <ProductFacilityLocation productId="GZ-2644" > facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL01" minimumStock="2" > moveQuantity="5"/> > > @@ -1242,6 +1259,17 @@ under the License. > > <ProductFacilityLocation productId="GZ-1001" > facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL02" minimumStock="5" > moveQuantity="20"/> > > <ProductFacilityLocation productId="GZ-1004" > facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL04" minimumStock="5" > moveQuantity="20"/> > > <ProductFacilityLocation productId="SV-1001" > facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL04" minimumStock="5" > moveQuantity="20"/> > > + <ProductFacilityLocation productId="GZ-8544" > facilityId="RegionalWarehouse1" locationSeqId="TLTLTLUL01"/> > > + <ProductFacilityLocation productId="GZ-8544" > facilityId="RegionalWarehouse2" locationSeqId="TLTLTLUL01"/> > > + <ProductFacilityLocation productId="GZ-8544" > facilityId="StoreWarehouse1" locationSeqId="TLTLTLUL01"/> > > + <ProductFacilityLocation productId="GZ-8544" > facilityId="StoreWarehouse2" locationSeqId="TLTLTLUL01"/> > > + > > + <ProductFacilityAssoc productId="GZ-8544" facilityId > ="StoreWarehouse1" facilityIdTo="RegionalWarehouse1" > facilityAssocTypeId="BACKUP_WAREHOUSE" sequenceNum="01" > fromDate="2001-01-01 12:00:00" transitTime="03"/> > > + <ProductFacilityAssoc productId="GZ-8544" facilityId > ="RegionalWarehouse1" facilityIdTo="WebStoreWarehouse" > facilityAssocTypeId="BACKUP_WAREHOUSE" sequenceNum="01" > fromDate="2001-01-01 12:00:00" transitTime="03"/> > > + <ProductFacilityAssoc productId="GZ-8544" facilityId > ="StoreWarehouse1" facilityIdTo="WebStoreWarehouse" > facilityAssocTypeId="BACKUP_WAREHOUSE" sequenceNum="01" > fromDate="2001-01-01 12:00:00" transitTime="00"/> > > + <ProductFacilityAssoc productId="GZ-8544" facilityId > ="StoreWarehouse2" facilityIdTo="RegionalWarehouse2" > facilityAssocTypeId="BACKUP_WAREHOUSE" sequenceNum="01" > fromDate="2001-01-01 12:00:00" transitTime="00"/> > > + <ProductFacilityAssoc productId="GZ-8544" facilityId > ="RegionalWarehouse2" facilityIdTo="WebStoreWarehouse" > facilityAssocTypeId="BACKUP_WAREHOUSE" sequenceNum="01" > fromDate="2001-01-01 12:00:00" transitTime="03"/> > > + <ProductFacilityAssoc productId="GZ-8544" facilityId > ="StoreWarehouse2" facilityIdTo="WebStoreWarehouse" > facilityAssocTypeId="BACKUP_WAREHOUSE" sequenceNum="01" > fromDate="2001-01-01 12:00:00" transitTime="03"/> > > > > <!-- some default inventory quantities, things are a bit > underutilized without these... --> > > <InventoryItem facilityId="WebStoreWarehouse" > locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000" > > @@ -1293,6 +1321,18 @@ under the License. > > <InventoryItem facilityId="WebStoreWarehouse" > inventoryItemId="9028" inventoryItemTypeId="NON_SERIAL_INV_ITEM" > datetimeReceived="2008-08-01 08:00:00.000" productId="GZ-1004" > ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/> > > <InventoryItemDetail inventoryItemId="9028" > inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" > availableToPromiseDiff="8" quantityOnHandDiff="8" > accountingQuantityDiff="8"/> > > > > + <InventoryItem facilityId="RegionalWarehouse1" > locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000" > > + inventoryItemId="GZ9001" > inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-8544" > ownerPartyId="Company" currencyUomId="USD" unitCost="3.0"/> > > + <InventoryItemDetail inventoryItemId="GZ9001" > inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" > availableToPromiseDiff="100" quantityOnHandDiff="100" > accountingQuantityDiff="100"/> > > + <InventoryItem facilityId="RegionalWarehouse2" > locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000" > > + inventoryItemId="GZ9002" > inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-8544" > ownerPartyId="Company" currencyUomId="USD" unitCost="3.0"/> > > + <InventoryItemDetail inventoryItemId="GZ9002" > inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" > availableToPromiseDiff="100" quantityOnHandDiff="100" > accountingQuantityDiff="100"/> > > + <InventoryItem facilityId="StoreWarehouse1" > locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000" > > + inventoryItemId="GZ9003" > inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-8544" > ownerPartyId="Company" currencyUomId="USD" unitCost="3.0"/> > > + <InventoryItemDetail inventoryItemId="GZ9003" > inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" > availableToPromiseDiff="100" quantityOnHandDiff="100" > accountingQuantityDiff="100"/> > > + <InventoryItem facilityId="StoreWarehouse2" > locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000" > > + inventoryItemId="GZ9003" > inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-8544" > ownerPartyId="Company" currencyUomId="USD" unitCost="3.0"/> > > + <InventoryItemDetail inventoryItemId="GZ9003" > inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" > availableToPromiseDiff="100" quantityOnHandDiff="100" > accountingQuantityDiff="100"/> > > > > <!-- Some additional test promotions --> > > <!-- GWP example on >$100 purchase --> > > > > Modified: > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/ProductDemoData.xml > > URL: > http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/ProductDemoData.xml?rev=1849547&r1=1849546&r2=1849547&view=diff > > > ============================================================================== > > --- > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/ProductDemoData.xml > (original) > > +++ > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/ProductDemoData.xml > Sat Dec 22 12:19:19 2018 > > @@ -79,7 +79,12 @@ under the License. > > <!-- Product Demo Data --> > > <Facility facilityId="WebStoreWarehouse" > facilityTypeId="WAREHOUSE" facilityName="Web Store Warehouse" > > description="Warehouse exclusively for the Web Store " > ownerPartyId="Company" > > - defaultInventoryItemTypeId="NON_SERIAL_INV_ITEM" > defaultWeightUomId="WT_lb" defaultDaysToShip="25" geoPointId="9000"/> > > + defaultInventoryItemTypeId="NON_SERIAL_INV_ITEM" > defaultWeightUomId="WT_lb" defaultDaysToShip="25" geoPointId="9000" > facilityLevel="0"/> > > + <Facility facilityId="RegionalWarehouse1" > facilityTypeId="WAREHOUSE" facilityName="Regional Warehouse1" > description="Warehouse exclusively for the Web Store " > ownerPartyId="Company" defaultInventoryItemTypeId="NON_SERIAL_INV_ITEM" > defaultWeightUomId="WT_lb" defaultDaysToShip="25" facilityLevel="1"/> > > + <Facility facilityId="RegionalWarehouse2" > facilityTypeId="WAREHOUSE" facilityName="Regional Warehouse2" > description="Warehouse exclusively for the Web Store " > ownerPartyId="Company" defaultInventoryItemTypeId="NON_SERIAL_INV_ITEM" > defaultWeightUomId="WT_lb" defaultDaysToShip="25" facilityLevel="1"/> > > + <Facility facilityId="StoreWarehouse1" facilityTypeId="WAREHOUSE" > facilityName="Store Warehouse1" description="Warehouse exclusively for the > Web Store " ownerPartyId="Company" > defaultInventoryItemTypeId="NON_SERIAL_INV_ITEM" defaultWeightUomId="WT_lb" > defaultDaysToShip="25" facilityLevel="2"/> > > + <Facility facilityId="StoreWarehouse2" facilityTypeId="WAREHOUSE" > facilityName="Store Warehouse2" description="Warehouse exclusively for the > Web Store " ownerPartyId="Company" > defaultInventoryItemTypeId="NON_SERIAL_INV_ITEM" defaultWeightUomId="WT_lb" > defaultDaysToShip="25" facilityLevel="2"/> > > + > > <!-- Limited user demo --> > > <UserLoginSecurityGroup groupId="CATALOGADMIN_LTD" > userLoginId="ltdadmin" fromDate="2001-01-01 12:00:00.0"/> > > <UserLoginSecurityGroup groupId="CATALOGADMIN_LTD" > userLoginId="ltdadmin1" fromDate="2001-01-01 12:00:00.0"/> > > > > Modified: > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ManufacturingSeedData.xml > > URL: > http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ManufacturingSeedData.xml?rev=1849547&r1=1849546&r2=1849547&view=diff > > > ============================================================================== > > --- > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ManufacturingSeedData.xml > (original) > > +++ > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ManufacturingSeedData.xml > Sat Dec 22 12:19:19 2018 > > @@ -31,6 +31,7 @@ under the License. > > <MrpEventType mrpEventTypeId="SALES_ORDER_SHIP" description="Sales > order shipment"/> > > <MrpEventType mrpEventTypeId="SALES_FORECAST" description="Sales > Forecast"/> > > <MrpEventType mrpEventTypeId="ERROR" description="Error"/> > > + <MrpEventType mrpEventTypeId="PROP_TRANSFER_RECP" > description="Proposed Transfer receipt"/> > > > > <TechDataCalendarWeek calendarWeekId="SUPPLIER" > description="8hours/days, currently the Re-Order Process convert day to mms > with 8h/days" mondayStartTime="08:30:00" mondayCapacity="2.88E7" > tuesdayStartTime="08:30:00" tuesdayCapacity="2.88E7" > wednesdayStartTime="08:30:00" wednesdayCapacity="2.88E7" > thursdayStartTime="08:30:00" thursdayCapacity="2.88E7" > fridayStartTime="08:30:00" fridayCapacity="2.88E7"/> > > <TechDataCalendar calendarId="SUPPLIER" description="Calendar used > for Re-Order date calculation for bought product" > calendarWeekId="SUPPLIER"/> > > > > Modified: > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml > > URL: > http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml?rev=1849547&r1=1849546&r2=1849547&view=diff > > > ============================================================================== > > --- > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml > (original) > > +++ > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml > Sat Dec 22 12:19:19 2018 > > @@ -100,6 +100,7 @@ under the License. > > <RequirementType description="Internal Requirement" hasTable="N" > requirementTypeId="INTERNAL_REQUIREMENT"/> > > <RequirementType description="Product Requirement" hasTable="N" > requirementTypeId="PRODUCT_REQUIREMENT"/> > > <RequirementType description="Work Requirement" hasTable="N" > requirementTypeId="WORK_REQUIREMENT"/> > > + <RequirementType description="Inter Facility Transfer Requirement" > requirementTypeId="TRANSFER_REQUIREMENT"/> > > > > <ShoppingListType description="Wish List" > shoppingListTypeId="SLT_WISH_LIST"/> > > <ShoppingListType description="Gift Registry" > shoppingListTypeId="SLT_GIFT_REG"/> > > > > Modified: > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ProductSeedData.xml > > URL: > http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ProductSeedData.xml?rev=1849547&r1=1849546&r2=1849547&view=diff > > > ============================================================================== > > --- > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ProductSeedData.xml > (original) > > +++ > ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ProductSeedData.xml > Sat Dec 22 12:19:19 2018 > > @@ -426,6 +426,8 @@ under the License. > > <FacilityType description="Retail Store" > facilityTypeId="RETAIL_STORE" hasTable="N"/> > > <FacilityType description="Warehouse" facilityTypeId="WAREHOUSE" > hasTable="N"/> > > > > + <FacilityAssocType facilityAssocTypeId="BACKUP_WAREHOUSE" > description="Facility that serves another facility in terms of inventory"/> > > + > > <FacilityGroupType description="Management Structure" > facilityGroupTypeId="MGMT_STRUCTURE"/> > > <FacilityGroupType description="Pricing Group" > facilityGroupTypeId="PRICING_GROUP"/> > > > > @@ -780,4 +782,5 @@ under the License. > > <CustomMethod customMethodId="SHIP_EST_USPS" > customMethodTypeId="SHIP_EST" customMethodName="uspsRateInquire" > description="USPS rate estimate"/> > > <CustomMethod customMethodId="SHIP_EST_USPS_INT" > customMethodTypeId="SHIP_EST" > customMethodName="uspsInternationalRateInquire" description="USPS rate > estimate international"/> > > > > + <Enumeration description="Direct Store Delivery" > enumCode="DIRECT_STORE_DELIVRY" enumId="DIRECT_STORE_DELIVRY" > sequenceId="01"/> > > </entity-engine-xml> > > > > Modified: > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml > > URL: > http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml?rev=1849547&r1=1849546&r2=1849547&view=diff > > > ============================================================================== > > --- > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml > (original) > > +++ > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml > Sat Dec 22 12:19:19 2018 > > @@ -175,6 +175,7 @@ under the License. > > <field name="quantity" type="floating-point"></field> > > <field name="eventName" type="very-long"></field> > > <field name="isLate" type="indicator"></field> > > + <field name="facilityIdTo" type="id"></field> > > <prim-key field="mrpId"/> > > <prim-key field="productId"/> > > <prim-key field="eventDate"/> > > > > Modified: > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml > > URL: > http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml?rev=1849547&r1=1849546&r2=1849547&view=diff > > > ============================================================================== > > --- > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml > (original) > > +++ > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml > Sat Dec 22 12:19:19 2018 > > @@ -2173,6 +2173,7 @@ under the License. > > <field name="createdByUserLogin" type="id-vlong"></field> > > <field name="lastModifiedDate" type="date-time"></field> > > <field name="lastModifiedByUserLogin" type="id-vlong"></field> > > + <field name="facilityIdTo" type="id"></field> > > <prim-key field="requirementId"/> > > <relation type="one" fk-name="REQ_TYPE" > rel-entity-name="RequirementType"> > > <key-map field-name="requirementTypeId"/> > > > > Modified: > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml > > URL: > http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml?rev=1849547&r1=1849546&r2=1849547&view=diff > > > ============================================================================== > > --- > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml > (original) > > +++ > ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml > Sat Dec 22 12:19:19 2018 > > @@ -1010,6 +1010,7 @@ under the License. > > <field name="defaultDimensionUomId" > type="id"><description>This field store the unit of measurement of > dimension (length, width and height)</description></field> > > <field name="defaultWeightUomId" type="id"></field> > > <field name="geoPointId" type="id"></field> > > + <field name="facilityLevel" type="numeric"><description>This > field will define the level of facility.</description></field> > > <prim-key field="facilityId"/> > > <relation type="one" fk-name="FACILITY_FCTYP" > rel-entity-name="FacilityType"> > > <key-map field-name="facilityTypeId"/> > > @@ -1432,6 +1433,7 @@ under the License. > > <field name="minimumStock" type="fixed-point"></field> > > <field name="reorderQuantity" type="fixed-point"></field> > > <field name="daysToShip" type="numeric"></field> > > + <field name="replenishMethodEnumId" type="id"></field> > > <field name="lastInventoryCount" > type="fixed-point"><description>This field represents > availableToPromiseTotal of a product at a certain point of time and is > being updated regularly by a schedule service every > hour</description></field> > > <field name="requirementMethodEnumId" type="id"></field> > > <prim-key field="productId"/> > > @@ -1445,6 +1447,43 @@ under the License. > > <relation type="one" fk-name="PROD_FAC_ENUM" > title="RequirementMethod" rel-entity-name="Enumeration"> > > <key-map field-name="requirementMethodEnumId" > rel-field-name="enumId"/> > > </relation> > > + <relation type="one" fk-name="PROD_FAC_ENUM" > rel-entity-name="Enumeration"> > > + <key-map field-name="replenishMethodEnumId" > rel-field-name="enumId"/> > > + </relation> > > + </entity> > > + > > + <entity entity-name="FacilityAssocType" > package-name="org.apache.ofbiz.product.facility" title="Define associations > between facilities"> > > + <field name="facilityAssocTypeId" type="id"/> > > + <field name="description" type="description"/> > > + <prim-key field="facilityAssocTypeId"/> > > + </entity> > > + <entity entity-name="ProductFacilityAssoc" > package-name="org.apache.ofbiz.product.facility" title="Define associations > between Product facilities"> > > + <field name="productId" type="id"/> > > + <field name="facilityId" type="id"/> > > + <field name="facilityIdTo" type="id"/> > > + <field name="facilityAssocTypeId" type="id"/> > > + <field name="fromDate" type="date-time"/> > > + <field name="thruDate" type="date-time"/> > > + <field name="sequenceNum" type="numeric"/> > > + <field name="transitTime" type="numeric"/> > > + <prim-key field="productId"/> > > + <prim-key field="facilityId"/> > > + <prim-key field="facilityIdTo"/> > > + <prim-key field="facilityAssocTypeId"/> > > + <prim-key field="fromDate"/> > > + > > + <relation type="one" fk-name="PRFACASSOC_PRO" > rel-entity-name="Product"> > > + <key-map field-name="productId"/> > > + </relation> > > + <relation type="one" fk-name="PRFACASSOC_FAC" title="From" > rel-entity-name="Facility"> > > + <key-map field-name="facilityId"/> > > + </relation> > > + <relation type="one" fk-name="PRFACASSOC_FACTO" title="To" > rel-entity-name="Facility"> > > + <key-map field-name="facilityIdTo" > rel-field-name="facilityId"/> > > + </relation> > > + <relation type="one" fk-name="PRFACASSOC_TYPE" > rel-entity-name="FacilityAssocType"> > > + <key-map field-name="facilityAssocTypeId"/> > > + </relation> > > </entity> > > <view-entity entity-name="ProductFacilityAndPostalAddress" > > package-name="org.apache.ofbiz.product.facility" > > > > > > >
