@things-factory/worksheet-base 4.3.46 → 4.3.50

package/server/controllers/inbound/unloading-worksheet-controller.ts

@@ -47,33 +47,37 @@ export type UnloadingWorksheetDetail = Partial<WorksheetDetail> & {
 
 export class UnloadingWorksheetController extends VasWorksheetController {
   async generateUnloadingWorksheet(arrivalNoticeNo: string, bufferLocationId: string): Promise<Worksheet> {
-    let arrivalNotice: ArrivalNotice = await this.findRefOrder(
-      ArrivalNotice,
-      {
-        domain: this.domain,
-        name: arrivalNoticeNo,
-        status: ORDER_STATUS.ARRIVED
-      },
-      ['bizplace', 'orderProducts', 'orderVass']
-    )
-    const orderProducts: OrderProduct[] = arrivalNotice.orderProducts
-    const orderVASs: OrderVas[] = arrivalNotice.orderVass
-    const bufferLocation: Location = await this.trxMgr.getRepository(Location).findOne(bufferLocationId)
-
-    const worksheet: Worksheet = await this.generateWorksheet(
-      WORKSHEET_TYPE.UNLOADING,
-      arrivalNotice,
-      orderProducts,
-      ORDER_STATUS.READY_TO_UNLOAD,
-      ORDER_PRODUCT_STATUS.READY_TO_UNLOAD,
-      { bufferLocation }
-    )
+    try {
+      let arrivalNotice: ArrivalNotice = await this.findRefOrder(
+        ArrivalNotice,
+        {
+          domain: this.domain,
+          name: arrivalNoticeNo,
+          status: ORDER_STATUS.ARRIVED
+        },
+        ['bizplace', 'orderProducts', 'orderVass']
+      )
+      const orderProducts: OrderProduct[] = arrivalNotice.orderProducts
+      const orderVASs: OrderVas[] = arrivalNotice.orderVass
+      const bufferLocation: Location = await this.trxMgr.getRepository(Location).findOne(bufferLocationId)
 
-    if (orderVASs?.length > 0) {
-      await this.generateVasWorksheet(arrivalNotice)
-    }
+      const worksheet: Worksheet = await this.generateWorksheet(
+        WORKSHEET_TYPE.UNLOADING,
+        arrivalNotice,
+        orderProducts,
+        ORDER_STATUS.READY_TO_UNLOAD,
+        ORDER_PRODUCT_STATUS.READY_TO_UNLOAD,
+        { bufferLocation }
+      )
 
-    return worksheet
+      if (orderVASs?.length > 0) {
+        await this.generateVasWorksheet(arrivalNotice)
+      }
+
+      return worksheet
+    } catch (e) {
+      throw new Error(e)
+    }
   }
 
   async unload(worksheetDetailName: string, inventory: Partial<Inventory>, productBarcode: string): Promise<void> {
@@ -396,7 +400,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       foundInventory = await this.trxMgr.getRepository(Inventory).save(newInventory)
     } else {
       const updatedQty: number = foundInventory.qty + qty
-      foundInventory.expirationDate = new Date(foundInventory.expirationDate)
+      foundInventory.expirationDate = foundInventory.expirationDate ? new Date(foundInventory.expirationDate) : null
       foundInventory.qty = updatedQty
       foundInventory.uomValue +=
         Math.round(
@@ -613,7 +617,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       await this.trxMgr.getRepository(Inventory).save(newInventory)
     } else {
       const updatedQty: number = foundInventory.qty + qty
-      foundInventory.expirationDate = new Date(foundInventory.expirationDate)
+      foundInventory.expirationDate = foundInventory.expirationDate ? new Date(foundInventory.expirationDate) : null
       foundInventory.qty = updatedQty
       foundInventory.uomValue +=
         Math.round(

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.ts

@@ -6,35 +6,43 @@ import { PickingWorksheetController, UnloadingWorksheetController } from '../../
 import { Worksheet } from '../../../../entities'
 
 export const generateArrivalNoticeWorksheetResolver = {
-  async generateArrivalNoticeWorksheet(_: any, { arrivalNoticeNo, bufferLocation }, context: any) {
+  async generateArrivalNoticeWorksheet(_: any, { arrivalNoticeNos, bufferLocation }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    let unloadingWorksheet = await generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation)
-
-    if (!unloadingWorksheet.arrivalNotice?.id) {
-      unloadingWorksheet = await tx.getRepository(Worksheet).findOne({
-        where: unloadingWorksheet,
-        relations: ['arrivalNotice']
+    await Promise.all(
+      arrivalNoticeNos.map(async arrivalNoticeNo => {
+        try {
+          let unloadingWorksheet = await generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation)
+
+          if (!unloadingWorksheet.arrivalNotice?.id) {
+            unloadingWorksheet = await tx.getRepository(Worksheet).findOne({
+              where: unloadingWorksheet,
+              relations: ['arrivalNotice']
+            })
+          }
+
+          let arrivalNotice: ArrivalNotice = unloadingWorksheet.arrivalNotice
+          const crossDocking: boolean = unloadingWorksheet.arrivalNotice.crossDocking
+
+          if (crossDocking) {
+            arrivalNotice = await tx
+              .getRepository(ArrivalNotice)
+              .findOne({ where: { domain: domain, name: arrivalNoticeNo }, relations: ['releaseGood'] })
+
+            const releaseGoodNo: string = arrivalNotice.releaseGood.name
+            const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
+            await pickingWSCtrl.generatePickingWorksheet(releaseGoodNo)
+          }
+
+          const vasWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
+            where: { domain: domain, arrivalNotice }
+          })
+
+          return { unloadingWorksheet, vasWorksheet }
+        } catch (e) {
+          throw new Error(e)
+        }
       })
-    }
-
-    let arrivalNotice: ArrivalNotice = unloadingWorksheet.arrivalNotice
-    const crossDocking: boolean = unloadingWorksheet.arrivalNotice.crossDocking
-
-    if (crossDocking) {
-      arrivalNotice = await tx
-        .getRepository(ArrivalNotice)
-        .findOne({ where: { domain: domain, name: arrivalNoticeNo }, relations: ['releaseGood'] })
-
-      const releaseGoodNo: string = arrivalNotice.releaseGood.name
-      const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-      await pickingWSCtrl.generatePickingWorksheet(releaseGoodNo)
-    }
-
-    const vasWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
-      where: { domain: domain, arrivalNotice }
-    })
-
-    return { unloadingWorksheet, vasWorksheet }
+    )
   }
 }
 

package/server/graphql/resolvers/worksheet/loading/complete-loading.ts

@@ -74,14 +74,14 @@ export async function completeLoading(
         where: { domain, outboundOrderId: releaseGood.id }
       })
 
-      if (responseFileTypes.enableShipment) {
-        let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
-          releaseGood,
-          orderInventories: targetInventories,
-          sftp: customerAvailableSftp
-        })
-        customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
-      }
+      // if (responseFileTypes.enableShipment) {
+      //   let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
+      //     releaseGood,
+      //     orderInventories: targetInventories,
+      //     sftp: customerAvailableSftp
+      //   })
+      //   customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
+      // }
 
       if (responseFileTypes.enableSerialNumber) {
         let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {

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

@@ -36,6 +36,7 @@ export const worksheetResolver = {
         'releaseGood',
         'releaseGood.arrivalNotice',
         'releaseGood.shippingOrder',
+        'releaseGood.manifest',
         'returnOrder',
         'inventoryCheck',
         'vasOrder',
@@ -121,7 +122,11 @@ export const worksheetResolver = {
             let inventory: Inventory = wsd.targetInventory.inventory
 
             let foundUnloadedHistory: InventoryHistory = await getRepository(InventoryHistory).findOne({
-              where: { inventory, refOrderId: worksheet.arrivalNotice.id, status: INVENTORY_STATUS.UNLOADED },
+              where: [
+                { inventory, refOrderId: worksheet.arrivalNotice.id, status: INVENTORY_STATUS.UNLOADED },
+                { inventory, refOrderId: worksheet.arrivalNotice.id, status: INVENTORY_STATUS.PARTIALLY_UNLOADED },
+                { inventory, refOrderId: worksheet.arrivalNotice.id, status: INVENTORY_STATUS.CHECKED }
+              ],
               relations: ['location', 'product']
             })
 

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

@@ -94,12 +94,20 @@ export const worksheetsResolver = {
       }
 
       ////For outbound worksheet filter
+      let outboundOrderInfoFilter
+      const outboundOrderInfoParamIdx = params.filters.findIndex(param => param.name === 'outboundOrderInfo')
+      if (outboundOrderInfoParamIdx >= 0) {
+        outboundOrderInfoFilter = params.filters[outboundOrderInfoParamIdx].value.toLowerCase().split(',').join('|')
+
+        params.filters.splice(outboundOrderInfoParamIdx, 1)
+      }
       const releaseGoodParam = params.filters.find(param => param.name === 'releaseGoodNo')
       const releaseGoodRefNoParam = params.filters.find(param => param.name === 'releaseGoodRefNo')
       const releaseGoodCrossDockingParam = params.filters.find(param => param.name === 'crossDocking')
       const releaseGoodCourierOptionParam = params.filters.find(param => param.name === 'courierOption')
       const releaseGoodPackingOptionParam = params.filters.find(param => param.name === 'packingOption')
       const orderRemarkParam = params.filters.find(param => param.name === 'orderRemark')
+      const manifestParam = params.filters.find(param => param.name === 'manifest')
 
       const releaseGoodPickerOptionParam = params.filters.find(param => param.name === 'assignee')
       if (
@@ -107,8 +115,7 @@ export const worksheetsResolver = {
         releaseGoodRefNoParam ||
         releaseGoodCrossDockingParam ||
         releaseGoodCourierOptionParam ||
-        releaseGoodPackingOptionParam ||
-        orderRemarkParam
+        releaseGoodPackingOptionParam
       ) {
         let arrFilters = []
         if (releaseGoodParam) {
@@ -151,19 +158,6 @@ export const worksheetsResolver = {
           arrFilters.push({ ...releaseGoodPackingOptionParam, name: 'packingOption' })
         }
 
-        if (orderRemarkParam) {
-          params.filters.splice(
-            params.filters.findIndex(item => item.name == 'orderRemark'),
-            1
-          )
-
-          if (orderRemarkParam?.value == true) {
-            arrFilters.push({ operator: 'is_not_null', name: 'remark' })
-          } else if (orderRemarkParam?.value == false) {
-            arrFilters.push({ operator: 'is_null', name: 'remark' })
-          }
-        }
-
         const foundReleaseGoods: ReleaseGood[] = await getRepository(ReleaseGood).find({
           ...convertListParams({ filters: arrFilters })
         })
@@ -295,6 +289,20 @@ export const worksheetsResolver = {
         }
       }
 
+      //check packing worksheet checkbox filter
+      if (manifestParam) {
+        params.filters.splice(
+          params.filters.findIndex(item => item.name == 'manifest'),
+          1
+        )
+      }
+
+      if (orderRemarkParam) {
+        params.filters.splice(
+          params.filters.findIndex(item => item.name == 'orderRemark'),
+          1
+        )
+      }
       ////Set default bizplace filter
       const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
       if (!bizplaceFilter && typeParam.value[0] !== WORKSHEET_TYPE.BATCH_PICKING) {
@@ -331,6 +339,39 @@ export const worksheetsResolver = {
         )
       }
 
+      if (outboundOrderInfoFilter) {
+        qb.andWhere(
+          '(releaseGood.name ~* :outboundOrderInfoFilter or releaseGood.ref_no ~* :outboundOrderInfoFilter or releaseGood.ref_no_2 ~* :outboundOrderInfoFilter or releaseGood.ref_no_3 ~* :outboundOrderInfoFilter)',
+          { outboundOrderInfoFilter }
+        )
+      }
+
+      if (manifestParam) {
+        params.filters.splice(
+          params.filters.findIndex(item => item.name == 'manifest'),
+          1
+        )
+
+        if (manifestParam?.value == true) {
+          qb.andWhere('releaseGood.manifest_id is not null')
+        } else if (manifestParam?.value == false) {
+          qb.andWhere('releaseGood.manifest_id is null')
+        }
+      }
+
+      if (orderRemarkParam) {
+        params.filters.splice(
+          params.filters.findIndex(item => item.name == 'orderRemark'),
+          1
+        )
+
+        if (orderRemarkParam?.value == true) {
+          qb.andWhere('releaseGood.remark is not null')
+        } else if (orderRemarkParam?.value == false) {
+          qb.andWhere('releaseGood.remark is null')
+        }
+      }
+
       qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
       qb.leftJoinAndSelect('ws.domain', 'domain')
       qb.leftJoinAndSelect('ws.bizplace', 'bizplace')

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

@@ -25,7 +25,6 @@ import { WorksheetPatch } from './worksheet-patch'
 import { WorksheetWithPagination } from './worksheet-with-pagination'
 import { DeliveryOrderRO } from './delivery-order-ro'
 
-
 export const Mutation = /* GraphQL */ `
   createWorksheet (
     worksheet: NewWorksheet!
@@ -41,7 +40,7 @@ export const Mutation = /* GraphQL */ `
   ): Boolean @privilege(category: "worksheet", privilege: "mutation") @transaction
 
   generateArrivalNoticeWorksheet (
-    arrivalNoticeNo: String!
+    arrivalNoticeNos: [String!]
     bufferLocation: ObjectRef!
   ): ArrivalNoticeWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
@@ -713,7 +712,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,