Author: jaz
Date: Tue Jan 16 09:24:07 2007
New Revision: 496783
URL: http://svn.apache.org/viewvc?view=rev&rev=496783
Log:
updated pick list screens to show status of items; also added a UI which shows
all orders which WOULD be added to the pick list if ran (on the options screen)
Some i18n work is still needed here for this fragment.
Modified:
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
Modified:
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl?view=diff&rev=496783&r1=496782&r2=496783
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
Tue Jan 16 09:24:07 2007
@@ -13,6 +13,7 @@
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
+
-->
<div class="screenlet">
@@ -31,8 +32,8 @@
<#-- Picklist -->
<div class="tabletext">
- <b>${uiLabelMap.ProductPickList}</b> <span
class="head2">${picklist.picklistId}</span>
- <b>${uiLabelMap.CommonDate}</b> ${picklist.picklistDate}
+ <b>Picklist</b> <span
class="head2">${picklist.picklistId}</span>
+ <b>date</b> ${picklist.picklistDate}
<form method="post"
action="<@ofbizUrl>updatePicklist</@ofbizUrl>" style="display: inline;">
<input type="hidden" name="facilityId"
value="${facilityId}"/>
<input type="hidden" name="picklistId"
value="${picklist.picklistId}"/>
@@ -40,12 +41,12 @@
<option
value="${picklistInfo.statusItem.statusId}"
selected>${picklistInfo.statusItem.get("description",locale)}</option>
<option
value="${picklistInfo.statusItem.statusId}">---</option>
<#list picklistInfo.statusValidChangeToDetailList
as statusValidChangeToDetail>
- <option
value="${statusValidChangeToDetail.statusIdTo}">${statusValidChangeToDetail.get("description",locale)}
(${statusValidChangeToDetail.transitionName})</option>
+ <option
value="${statusValidChangeToDetail.statusIdTo}">${statusValidChangeToDetail.description}
(${statusValidChangeToDetail.transitionName})</option>
</#list>
</select>
<input type="submit"
value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
</form>
-
<b>${uiLabelMap.ProductCreatedByUserLogin}/${uiLabelMap.ProductLastModifiedByUserLogin}</b>
${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin}
+ <b>created/modified by</b>
${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin}
<a
href="<@ofbizUrl>PicklistReport.pdf?picklistId=${picklist.picklistId}</@ofbizUrl>"
target="_blank"
class="buttontext">[${uiLabelMap.ProductPick}/${uiLabelMap.ProductPacking}
${uiLabelMap.CommonReports}]</a>
</div>
<#if picklistInfo.shipmentMethodType?has_content>
@@ -58,12 +59,11 @@
<#list picklistInfo.picklistRoleInfoList?if_exists as
picklistRoleInfo>
<div class="tabletext" style="margin-left: 15px;">
<b>${uiLabelMap.PartyParty}</b>
${picklistRoleInfo.partyNameView.firstName?if_exists}
${picklistRoleInfo.partyNameView.middleName?if_exists}
${picklistRoleInfo.partyNameView.lastName?if_exists}
${picklistRoleInfo.partyNameView.groupName?if_exists}
- <b>${uiLabelMap.PartyRole}</b>
${picklistRoleInfo.roleType.get("description",locale)}
+ <b>${uiLabelMap.PartyRole}</b>
${picklistRoleInfo.roleType.description}
<b>${uiLabelMap.CommonFrom}</b>
${picklistRoleInfo.picklistRole.fromDate}
- <#if
picklistRoleInfo.picklistRole.thruDate?exists><b>${uiLabelMap.CommonThru}</b>
${picklistRoleInfo.picklistRole.thruDate}</#if>
+ <#if
picklistRoleInfo.picklistRole.thruDate?exists><b>thru</b>
${picklistRoleInfo.picklistRole.thruDate}</#if>
</div>
</#list>
- <#if !(picklistInfo.statusItem.statusId == "PICKLIST_PICKED")>
<div class="tabletext" style="margin-left: 15px;">
<b>${uiLabelMap.ProductAssignPicker}:</b>
<form method="post"
action="<@ofbizUrl>createPicklistRole</@ofbizUrl>" style="display: inline;">
@@ -78,13 +78,12 @@
<input type="submit" value="${uiLabelMap.CommonAdd}"
class="smallSubmit"/>
</form>
</div>
- </#if>
<#-- PicklistStatusHistory -->
<#list picklistInfo.picklistStatusHistoryInfoList?if_exists as
picklistStatusHistoryInfo>
<div class="tabletext" style="margin-left: 15px;">
<b>${uiLabelMap.CommonStatus}</b>
${uiLabelMap.CommonChange} ${uiLabelMap.CommonFrom}
${picklistStatusHistoryInfo.statusItem.get("description",locale)}
- ${uiLabelMap.CommonTo}
${picklistStatusHistoryInfo.statusItemTo.get("description",locale)}
+ ${uiLabelMap.CommonTo}
${picklistStatusHistoryInfo.statusItemTo.description}
${uiLabelMap.CommonOn}
${picklistStatusHistoryInfo.picklistStatusHistory.changeDate}
${uiLabelMap.CommonBy}
${picklistStatusHistoryInfo.picklistStatusHistory.changeUserLoginId}
</div>
@@ -92,53 +91,51 @@
<#-- PicklistBin -->
<#list picklistInfo.picklistBinInfoList?if_exists as
picklistBinInfo>
- <div class="tabletext" style="margin-left: 15px;">
- <b>${uiLabelMap.ProductBinNum}</b>
${picklistBinInfo.picklistBin.binLocationNumber}
- <#if
picklistBinInfo.primaryOrderHeader?exists><b>${uiLabelMap.ProductPrimaryOrderId}</b>
${picklistBinInfo.primaryOrderHeader.orderId}</#if>
- <#if picklistBinInfo.primaryOrderItemShipGroup?exists
&& picklistInfo.statusItem.statusId.equals("PICKLIST_PICKED")>
- <b>${uiLabelMap.ProductPrimaryShipGroupSeqId}</b>
${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}
- <a
href="<@ofbizUrl>PackOrder?facilityId=${facilityId?if_exists}&orderId=${picklistBinInfo.primaryOrderHeader.orderId}&shipGroupSeqId=${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductPackOrder}</a>
- </#if>
- </div>
- <#if
picklistInfo.statusItem.statusId.equals("PICKLIST_INPUT")>
- <div class="tabletext" style="margin-left: 30px;">
- <b>${uiLabelMap.CommonUpdate}
${uiLabelMap.ProductBinNum}:</b>
- <form method="post"
action="<@ofbizUrl>updatePicklistBin</@ofbizUrl>" style="display: inline;">
- <input type="hidden" name="facilityId"
value="${facilityId}"/>
- <input type="hidden" name="picklistBinId"
value="${picklistBinInfo.picklistBin.picklistBinId}"/>
- ${uiLabelMap.ProductLocation}#:
- <input type"text" size="2"
name="binLocationNumber"
value="${picklistBinInfo.picklistBin.binLocationNumber}"/>
- ${uiLabelMap.PageTitlePickList}:
- <select name="picklistId" class="smallSelect">
- <#list picklistActiveList?if_exists as
picklistActive>
- <#assign picklistActiveStatusItem =
picklistActive.getRelatedOneCache("StatusItem")>
- <option
value="${picklistActive.picklistId}"<#if picklistActive.picklistId ==
picklist.picklistId> selected</#if>>${picklistActive.picklistId}
[${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.get("description",locale)}]</option>
- </#list>
- </select>
- <input type="submit"
value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
- </form>
- </div>
- </#if>
- <#list picklistBinInfo.picklistItemInfoList?if_exists as
picklistItemInfo>
- <#assign picklistItem = picklistItemInfo.picklistItem>
- <#assign inventoryItemAndLocation =
picklistItemInfo.inventoryItemAndLocation>
+ <#assign isBinComplete =
Static["org.ofbiz.shipment.picklist.PickListServices"].isBinComplete(delegator,
picklistBinInfo.picklistBin.picklistBinId)/>
+ <#if (!isBinComplete)>
+ <div class="tabletext" style="margin-left: 15px;">
+ <b>${uiLabelMap.ProductBinNum}</b>
${picklistBinInfo.picklistBin.binLocationNumber} (${picklistBinInfo.picklistBin.picklistBinId})
+ <#if
picklistBinInfo.primaryOrderHeader?exists><b>${uiLabelMap.ProductPrimaryOrderId}</b>
${picklistBinInfo.primaryOrderHeader.orderId}</#if>
+ <#if
picklistBinInfo.primaryOrderItemShipGroup?exists><b>${uiLabelMap.ProductPrimaryShipGroupSeqId}</b>
${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</#if>
+ </div>
<div class="tabletext" style="margin-left: 30px;">
-
<b>${uiLabelMap.ProductOrderId}:${uiLabelMap.OrderShipGroup}:${uiLabelMap.ProductOrderItem}</b>
${picklistItem.orderId}:${picklistItem.shipGroupSeqId}:${picklistItem.orderItemSeqId}
- <b>${uiLabelMap.ProductProduct}</b>
${picklistItemInfo.orderItem.productId}
- <b>${uiLabelMap.ProductInventoryItem}</b>
${inventoryItemAndLocation.inventoryItemId}
- <b>${uiLabelMap.ProductLocation}</b>
${inventoryItemAndLocation.areaId?if_exists}-${inventoryItemAndLocation.aisleId?if_exists}-${inventoryItemAndLocation.sectionId?if_exists}-${inventoryItemAndLocation.levelId?if_exists}-${inventoryItemAndLocation.positionId?if_exists}
- <b>${uiLabelMap.ProductQuantity}</b>
${picklistItem.quantity}<#-- of ${picklistItemInfo.orderItem.quantity}-->
+ <b>${uiLabelMap.CommonUpdate}
${uiLabelMap.ProductBinNum}:</b>
+ <form method="post"
action="<@ofbizUrl>updatePicklistBin</@ofbizUrl>" style="display: inline;">
+ <input type="hidden" name="facilityId"
value="${facilityId}"/>
+ <input type="hidden" name="picklistBinId"
value="${picklistBinInfo.picklistBin.picklistBinId}"/>
+ ${uiLabelMap.ProductLocation}#:
+ <input type"text" size="2"
name="binLocationNumber"
value="${picklistBinInfo.picklistBin.binLocationNumber}"/>
+ ${uiLabelMap.PageTitlePickList}:
+ <select name="picklistId" class="smallSelect">
+ <#list picklistActiveList as
picklistActive>
+ <#assign picklistActiveStatusItem =
picklistActive.getRelatedOneCache("StatusItem")>
+ <option
value="${picklistActive.picklistId}"<#if picklistActive.picklistId ==
picklist.picklistId> selected</#if>>${picklistActive.picklistId}
[${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.description}]</option>
+ </#list>
+ </select>
+ <input type="submit"
value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
+ </form>
</div>
- <#-- picklistItem.orderItemShipGrpInvRes (do we want
to display any of this info?) -->
- <#-- picklistItemInfo.itemIssuanceList -->
- <#list picklistItemInfo.itemIssuanceList?if_exists as
itemIssuance>
- <div class="tabletext" style="margin-left: 40px;">
- <b>${uiLabelMap.ProductIssue}
${uiLabelMap.CommonTo} ${uiLabelMap.ProductShipmentItemSeqId}:</b>
${itemIssuance.shipmentId}:${itemIssuance.shipmentItemSeqId}
- <b>${uiLabelMap.ProductQuantity}:</b>
${itemIssuance.quantity}
- <b>${uiLabelMap.CommonDate}: </b>
${itemIssuance.issuedDateTime}
+ <#list picklistBinInfo.picklistItemInfoList?if_exists
as picklistItemInfo>
+ <#assign picklistItem =
picklistItemInfo.picklistItem>
+ <#assign inventoryItemAndLocation =
picklistItemInfo.inventoryItemAndLocation>
+ <div class="tabletext" style="margin-left: 30px;">
+
<b>${uiLabelMap.ProductOrderId}:${uiLabelMap.OrderShipGroup}:${uiLabelMap.ProductOrderItem}</b>
${picklistItem.orderId}:${picklistItem.shipGroupSeqId}:${picklistItem.orderItemSeqId}
+ <b>${uiLabelMap.ProductProduct}</b>
${picklistItemInfo.orderItem.productId}
+ <b>${uiLabelMap.ProductInventoryItem}</b>
${inventoryItemAndLocation.inventoryItemId}
+ <b>${uiLabelMap.ProductLocation}</b>
${inventoryItemAndLocation.areaId?if_exists}-${inventoryItemAndLocation.aisleId?if_exists}-${inventoryItemAndLocation.sectionId?if_exists}-${inventoryItemAndLocation.levelId?if_exists}-${inventoryItemAndLocation.positionId?if_exists}
+ <b>${uiLabelMap.ProductQuantity}</b>
${picklistItem.quantity}<#-- of ${picklistItemInfo.orderItem.quantity}-->
</div>
+ <#-- picklistItem.orderItemShipGrpInvRes (do we
want to display any of this info?) -->
+ <#-- picklistItemInfo.itemIssuanceList -->
+ <#list picklistItemInfo.itemIssuanceList?if_exists
as itemIssuance>
+ <div class="tabletext" style="margin-left:
40px;">
+ <b>${uiLabelMap.ProductIssue}
${uiLabelMap.CommonTo} ${uiLabelMap.ProductShipmentItemSeqId}:</b>
${itemIssuance.shipmentId}:${itemIssuance.shipmentItemSeqId}
+ <b>${uiLabelMap.ProductQuantity}:</b>
${itemIssuance.quantity}
+ <b>${uiLabelMap.CommonDate}: </b>
${itemIssuance.issuedDateTime}
+ </div>
+ </#list>
</#list>
- </#list>
+ </#if>
</#list>
<#if picklistInfo_has_next>
Modified:
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl?view=diff&rev=496783&r1=496782&r2=496783
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
Tue Jan 16 09:24:07 2007
@@ -13,6 +13,7 @@
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
+
-->
<div class="screenlet">
@@ -61,7 +62,7 @@
<#assign orderReadyToPickInfoListSizeTotal = 0>
<#assign orderNeedsStockMoveInfoListSizeTotal = 0>
<#list pickMoveByShipmentMethodInfoList as
pickMoveByShipmentMethodInfo>
- <#assign shipmentMethodType =
pickMoveByShipmentMethodInfo.shipmentMethodType>
+ <#assign shipmentMethodType =
pickMoveByShipmentMethodInfo.shipmentMethodType?if_exists>
<#assign orderReadyToPickInfoList =
pickMoveByShipmentMethodInfo.orderReadyToPickInfoList?if_exists>
<#assign orderNeedsStockMoveInfoList =
pickMoveByShipmentMethodInfo.orderNeedsStockMoveInfoList?if_exists>
<#assign orderReadyToPickInfoListSize =
(orderReadyToPickInfoList.size())?default(0)>
@@ -69,7 +70,7 @@
<#assign orderReadyToPickInfoListSizeTotal =
orderReadyToPickInfoListSizeTotal + orderReadyToPickInfoListSize>
<#assign orderNeedsStockMoveInfoListSizeTotal =
orderNeedsStockMoveInfoListSizeTotal + orderNeedsStockMoveInfoListSize>
<tr>
- <td><div
class="tabletext">${shipmentMethodType.description}</div></td>
+ <td><a
href="<@ofbizUrl>PicklistOptions?viewDetail=${shipmentMethodType.shipmentMethodTypeId?if_exists}&facilityId=${facilityId?if_exists}</@ofbizUrl>"
class="linktext"><#if shipmentMethodType?exists &&
shipmentMethodType?has_content>${shipmentMethodType.description}<#else>${groupName?if_exists}</#if></a></td>
<td><div
class="tabletext">${orderReadyToPickInfoListSize}</div></td>
<td><div
class="tabletext">${orderNeedsStockMoveInfoListSize}</div></td>
<td>
@@ -77,7 +78,15 @@
<#if orderReadyToPickInfoList?has_content>
<form method="post"
action="<@ofbizUrl>createPicklistFromOrders</@ofbizUrl>">
<input type="hidden" name="facilityId"
value="${facilityId}"/>
+ <#if shipmentMethodType?exists &&
shipmentMethodType?has_content>
<input type="hidden"
name="shipmentMethodTypeId" value="${shipmentMethodType.shipmentMethodTypeId}"/>
+ <#else>
+ <input type="hidden"
name="orderIdList" value=""/>
+ <#assign orderIdsForPickList =
orderReadyToPickInfoList?if_exists>
+ <#list orderIdsForPickList as
orderIdForPickList>
+ <input type="hidden"
name="orderIdList" value="${orderIdForPickList.orderHeader.orderId}"/>
+ </#list>
+ </#if>
${uiLabelMap.ProductPickFirst}:<input
type="text" size="4" name="maxNumberOfOrders" value="20" class="inputBox"/>
<input type="submit"
value="${uiLabelMap.ProductCreatePicklist}" class="smallSubmit"/>
</form>
@@ -112,3 +121,57 @@
</table>
</div>
</div>
+<br/>
+
+<#assign viewDetail = requestParameters.viewDetail?if_exists>
+<#if viewDetail?has_content>
+ <#list pickMoveByShipmentMethodInfoList as pickMoveByShipmentMethodInfo>
+ <#assign shipmentMethodType =
pickMoveByShipmentMethodInfo.shipmentMethodType?if_exists>
+ <#if shipmentMethodType?if_exists.shipmentMethodTypeId == viewDetail>
+ <#assign toPickList =
pickMoveByShipmentMethodInfo.orderReadyToPickInfoList?if_exists>
+ </#if>
+ </#list>
+</#if>
+
+<#if toPickList?has_content>
+<div class="screenlet">
+ <div class="screenlet-header">
+ <div class="boxhead">${shipmentMethodType.description?if_exists}
Detail</div>
+ </div>
+ <div class="screenlet-body">
+ <table border="1" cellspacing="0" cellpadding="2">
+ <tr>
+ <#-- todo: internationalize -->
+ <td><div class="tableheadtext">Order ID</div></td>
+ <td><div class="tableheadtext">Order Date</div></td>
+ <td><div class="tableheadtext">Channel</div></td>
+ <td><div class="tableheadtext">Order Item ID</div></td>
+ <td><div class="tableheadtext">Description</div></td>
+ <td><div class="tableheadtext">Ship Grp ID</div></td>
+ <td><div class="tableheadtext">Quantity</div></td>
+ </tr>
+ <#list toPickList as toPick>
+ <#assign oiasgal = toPick.orderItemAndShipGroupAssocList>
+ <#assign header = toPick.orderHeader>
+ <#assign channel =
header.getRelatedOne("SalesChannelEnumeration")?if_exists>
+
+ <#list oiasgal as oiasga>
+ <#assign product =
oiasga.getRelatedOne("Product")?if_exists>
+ <tr>
+ <td><a
href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${externalKeyParam}"
class="linktext" target="_blank">${oiasga.orderId}</a></td>
+ <td><div
class="tabletext">${header.orderDate?string}</div></td>
+ <td><div
class="tabletext">${(channel.description)?if_exists}</div></td>
+ <td><div
class="tabletext">${oiasga.orderItemSeqId}</div></td>
+ <td><a
href="/catalog/control/EditProduct?productId=${oiasga.productId?if_exists}${externalKeyParam}"
class="linktext" target="_blank">${(product.internalName)?if_exists}</a></td>
+ <td><div
class="tabletext">${oiasga.shipGroupSeqId}</div></td>
+ <td><div
class="tabletext">${oiasga.quantity}</div></td>
+ </tr>
+ </#list>
+ <tr>
+ <td colspan="7" bgcolor="#CCCCCC"> </td>
+ </tr>
+ </#list>
+ </table>
+ </div>
+</div>
+</#if>
