@things-factory/worksheet-base 4.3.37 → 4.3.40

package/server/graphql/resolvers/worksheet/index.ts

@@ -8,6 +8,7 @@ import { cycleCountAdjustmentResolver } from './cycle-count-adjustment'
 import { cycleCountWorksheetResolver } from './cycle-count-worksheet'
 import { deleteWorksheet } from './delete-worksheet'
 import { deliveryOrderByWorksheetResolver } from './delivery-order-by-worksheet'
+import { fetchDeliveryOrderROResolver } from './fetch-delivery-order-ro'
 import { fetchSellercraftAirwayBillResolver } from './fetch-sellercraft-airway-bill'
 import { findReleaseOrdersByTaskNoResolver } from './find-release-orders-by-task-no'
 import { Mutations as GenerateWorksheetMutations } from './generate-worksheet'
@@ -98,7 +99,8 @@ export const Query = {
   ...myPickingAssignmentStatusResolver,
   ...recommendPutawayLocationResolver,
   ...sortingWorksheetResolver,
-  ...findReleaseOrdersByTaskNoResolver
+  ...findReleaseOrdersByTaskNoResolver,
+  ...fetchDeliveryOrderROResolver
 }
 
 export const Mutation = {

package/server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts

@@ -55,6 +55,7 @@ export const pendingCancellationReleaseOrder = {
       pickingOIs = targetOIs
         .filter(
           (oi: OrderInventory) =>
+            oi.status === ORDER_INVENTORY_STATUS.ASSIGNED ||
             oi.status === ORDER_INVENTORY_STATUS.PICKING ||
             oi.status === ORDER_INVENTORY_STATUS.READY_TO_PICK ||
             oi.status === ORDER_INVENTORY_STATUS.PENDING_SPLIT ||

package/server/graphql/resolvers/worksheet/reject-cancellation-release-order.ts

@@ -33,6 +33,7 @@ export const rejectCancellationReleaseOrder = {
     let foundOVs: OrderVas[] = foundRO.orderVass
     let isDeactivatedPicking = false
 
+    foundRO.status = ORDER_STATUS.PENDING_WORKSHEET
     // get the worksheet based on RO number
     let foundWS: Worksheet[] = await tx.getRepository(Worksheet).find({
       where: {
@@ -72,13 +73,13 @@ export const rejectCancellationReleaseOrder = {
 
     // check if the worksheet is in Loading stage
     const isLoadingStage = foundWS.some((ws: Worksheet) => ws.type === WORKSHEET_TYPE.LOADING)
-    
+
     // change the order inventory status accordingly
     let newOrderInventories: OrderInventory[] = targetOIs.map(
       (oi: OrderInventory) => {
         if (isLoadingStage && oi.deliveryOrder && oi.status === ORDER_INVENTORY_STATUS.PENDING_REVERSE)
           oi.status = ORDER_INVENTORY_STATUS.LOADED
-            
+
         else if (isLoadingStage && !oi.deliveryOrder && oi.status === ORDER_INVENTORY_STATUS.PENDING_REVERSE)
           oi.status = ORDER_INVENTORY_STATUS.LOADING
 
@@ -98,14 +99,14 @@ export const rejectCancellationReleaseOrder = {
           ...oi,
           updater: user
         }
-    })
+      })
     await tx.getRepository(OrderInventory).save(newOrderInventories)
 
     // find the worksheet details based on order inventories
     let foundWSD: WorksheetDetail[] = await tx.getRepository(WorksheetDetail).find({
       where: {
         domain,
-        targetInventory: In(newOrderInventories.map((oi: OrderInventory) => oi.id ))
+        targetInventory: In(newOrderInventories.map((oi: OrderInventory) => oi.id))
       },
       relations: ['targetInventory']
     })
@@ -115,7 +116,7 @@ export const rejectCancellationReleaseOrder = {
 
         //change the worksheet details status accordingly
         newOrderInventories.forEach((oi: OrderInventory) => {
-          
+
           if (wsd.targetInventory?.id === oi.id && wsd.type === WORKSHEET_TYPE.PICKING) {
             switch (oi.status) {
               case ORDER_INVENTORY_STATUS.READY_TO_PICK:
@@ -156,7 +157,7 @@ export const rejectCancellationReleaseOrder = {
             }
           }
         })
-        
+
         return {
           ...wsd,
           updater: user
@@ -172,10 +173,10 @@ export const rejectCancellationReleaseOrder = {
       foundOVs = foundOVs.map((orderVas: OrderVas) => {
         if (!isLoadingStage)
           orderVas.status = ORDER_VAS_STATUS.READY_TO_PROCESS
-        
+
         else
           orderVas.status = ORDER_VAS_STATUS.COMPLETED
-        
+
         return {
           ...orderVas,
           updater: user
@@ -211,33 +212,33 @@ export const rejectCancellationReleaseOrder = {
       foundRO.status = ORDER_STATUS.LOADING
 
     else {
-      var isReadyToLoadRO = foundWS.some((ws: Worksheet) => 
+      var isReadyToLoadRO = foundWS.some((ws: Worksheet) =>
         ws.type === WORKSHEET_TYPE.LOADING &&
         ws.status === WORKSHEET_STATUS.DEACTIVATED
       )
     }
 
-    if (isReadyToLoadRO) 
+    if (isReadyToLoadRO)
       foundRO.status = ORDER_STATUS.READY_TO_LOAD
 
     else {
-      var isPickingRO = foundWS.some((ws: Worksheet) => 
+      var isPickingRO = foundWS.some((ws: Worksheet) =>
         ws.type === WORKSHEET_TYPE.PICKING &&
         ws.status === WORKSHEET_STATUS.EXECUTING
       )
     }
-    
-    if (isPickingRO) 
+
+    if (isPickingRO)
       foundRO.status = ORDER_STATUS.PICKING
 
     else {
-      var isReadyToPickRO = foundWS.some((ws: Worksheet) => 
+      var isReadyToPickRO = foundWS.some((ws: Worksheet) =>
         ws.type === WORKSHEET_TYPE.PICKING &&
         ws.status === WORKSHEET_STATUS.DEACTIVATED
       )
     }
 
-    if (isReadyToPickRO) 
+    if (isReadyToPickRO)
       foundRO.status = ORDER_STATUS.READY_TO_PICK
 
     await tx.getRepository(ReleaseGood).save({

package/server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts

@@ -51,7 +51,8 @@ export const generatePalletIdResolver = {
                   bizplace: foundWSD.bizplace,
                   orderProductRemark: foundWSD.targetProduct.remark,
                   purchaseOrderNo: foundWSD.targetProduct.arrivalNotice?.purchaseOrder?.name || '',
-                  arrivalNoticeRefNo: foundWSD.targetProduct.arrivalNotice?.refNo || ''
+                  arrivalNoticeRefNo: foundWSD.targetProduct.arrivalNotice?.refNo || '',
+                  arrivalNoticeNo: foundWSD.targetProduct.arrivalNotice?.name || ''
                 }
               } else if (foundWSD.targetInventory) {
                 result = {

package/server/graphql/types/worksheet/delivery-order-ro.ts

@@ -0,0 +1,15 @@
+import { gql } from 'apollo-server-koa'
+
+export const DeliveryOrderRO = gql`
+  type DeliveryOrderRO {
+    roNo: String
+    doNo: String
+    roRef: String
+    roRef2: String
+    roRef3: String
+    companyDomain: String
+    recipientBiz: String
+    doDate: String
+    productList:[Product]
+  }
+`

package/server/graphql/types/worksheet/index.ts

@@ -23,6 +23,8 @@ import { WorksheetInfo } from './worksheet-info'
 import { WorksheetList } from './worksheet-list'
 import { WorksheetPatch } from './worksheet-patch'
 import { WorksheetWithPagination } from './worksheet-with-pagination'
+import { DeliveryOrderRO } from './delivery-order-ro'
+
 
 export const Mutation = /* GraphQL */ `
   createWorksheet (
@@ -627,6 +629,10 @@ export const Query = /* GraphQL */ `
     name: String!
   ): GoodsDeliveryNote @privilege(category: "worksheet", privilege: "query")
 
+  fetchDeliveryOrderRO (
+    name: String!
+  ): DeliveryOrderRO @privilege(category: "worksheet", privilege: "query")
+
   batchPickingWorksheet (
     taskNo: String!, locationSortingRules: [Sorting]
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
@@ -707,7 +713,7 @@ export const Query = /* GraphQL */ `
   findReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
 `
 
-export const Types = /* GraphQL */ [
+export const Types = /* GraphQL */[
   Worksheet,
   AirwayBill,
   NewWorksheet,
@@ -732,5 +738,6 @@ export const Types = /* GraphQL */ [
   WorksheetWithPagination,
   PickingAssignmentStatus,
   MyPickingAssignmentStatus,
-  FindReleaseOrdersByTaskNo
+  FindReleaseOrdersByTaskNo,
+  DeliveryOrderRO
 ]

package/server/graphql/types/worksheet-detail/inventory-detail.ts

@@ -34,5 +34,6 @@ export const InventoryDetail = gql`
     orderProductRemark: String
     purchaseOrderNo: String
     arrivalNoticeRefNo: String
+    arrivalNoticeNo: String
   }
 `