Merge branch 'master' of https://git.2fi-solutions.com/derek/FPSMS-frontend

# Conflicts:
#	src/app/api/pickOrder/actions.ts

src/app/api/pickOrder/actions.ts

@@ -94,6 +94,7 @@ export interface GetPickOrderInfo {
   targetDate: string;
   type: string;
   status: string;
+  assignTo: number;
   pickOrderLines: GetPickOrderLineInfo[];
 }
 
@@ -142,17 +143,7 @@ export interface PickOrderLotDetailResponse {
   lotAvailability: 'available' | 'insufficient_stock' | 'expired' | 'status_unavailable';
 }
 
-export interface GetPickOrderLineInfo {
-  id: number;
-  itemId: number;
-  itemCode: string;
-  itemName: string;
-  availableQty: number | null;
-  requiredQty: number;
-  uomCode: string;
-  uomDesc: string;
-  suggestedList: any[];
-}
+
 export const fetchAllPickOrderDetails = cache(async () => {
   return serverFetchJson<GetPickOrderInfoResponse>(
     `${BASE_API_URL}/pickOrder/detail`,