@things-factory/worksheet-base 4.0.35 → 4.0.39

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-worksheet.ts

@@ -35,15 +35,15 @@ export const generatePartialPutawayWorksheetResolver = {
     const wsdStatus: string = remainPalletCnt >= 0 ? WORKSHEET_STATUS.PARTIALLY_UNLOADED : WORKSHEET_STATUS.EXECUTING
 
     const worksheetDetails: WorksheetDetail[] = unloadingWorksheet.worksheetDetails
-    const nonStartedWorksheetDetails: WorksheetDetail[] = worksheetDetails
-      .filter((wsd: WorksheetDetail) => wsd.targetInventory?.inventory?.status !== INVENTORY_STATUS.PARTIALLY_UNLOADED)
-      .map((wsd: WorksheetDetail) => {
-        wsd.status = wsdStatus
-        wsd.updater = user
-        return wsd
-      })
+    // const nonStartedWorksheetDetails: WorksheetDetail[] = worksheetDetails
+    //   .filter((wsd: WorksheetDetail) => wsd.targetInventory?.inventory?.status !== INVENTORY_STATUS.PARTIALLY_UNLOADED)
+    //   .map((wsd: WorksheetDetail) => {
+    //     wsd.status = wsdStatus
+    //     wsd.updater = user
+    //     return wsd
+    //   })
 
-    await tx.getRepository(WorksheetDetail).save(nonStartedWorksheetDetails)
+    // await tx.getRepository(WorksheetDetail).save(nonStartedWorksheetDetails)
   }
 }
 

package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts

@@ -125,7 +125,7 @@ export const inventoriesByPalletResolver = {
 
 async function getRemainAmount(inventory: Inventory): Promise<{ remainQty: number; remainUomValue: number }> {
   return {
-    remainQty: inventory.qty - inventory.lockedQty,
-    remainUomValue: inventory.uomValue - inventory.lockedUomValue
+    remainQty: inventory.qty - (inventory.lockedQty || 0),
+    remainUomValue: inventory.uomValue - (inventory.lockedUomValue || 0)
   }
 }

package/server/graphql/resolvers/worksheet/unloading/complete-unloading-partially.ts

@@ -16,7 +16,7 @@ export async function completeUnloadingPartially(
   domain: Domain,
   user: User,
   arrivalNoticeNo: string,
-  unloadingWorksheetDetail: Partial<WorksheetDetail>
+  unloadingWorksheetDetail: Partial<WorksheetDetail>[]
 ): Promise<void> {
   const worksheetController: UnloadingWorksheetController = new UnloadingWorksheetController(tx, domain, user)
   await worksheetController.completeUnloadingPartially(arrivalNoticeNo, unloadingWorksheetDetail)

package/server/graphql/resolvers/worksheet/unloading-return/complete-unload-return-partially.ts

@@ -16,7 +16,7 @@ export async function completeUnloadReturnPartially(
   domain: Domain,
   user: User,
   returnOrderNo: string,
-  unloadingWorksheetDetail: Partial<WorksheetDetail>
+  unloadingWorksheetDetail: Partial<WorksheetDetail>[]
 ): Promise<void> {
   const worksheetController: UnloadingReturningWorksheetController = new UnloadingReturningWorksheetController(
     tx,

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

@@ -197,12 +197,12 @@ export const Mutation = /* GraphQL */ `
 
   completeUnloadingPartially (
     arrivalNoticeNo: String!
-    worksheetDetail: WorksheetDetailPatch!
+    worksheetDetail: [WorksheetDetailPatch!]
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   completeUnloadReturnPartially (
     returnOrderNo: String!
-    worksheetDetail: WorksheetDetailPatch!
+    worksheetDetail: [WorksheetDetailPatch!]
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   completeUnloading (

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

@@ -23,5 +23,6 @@ export const WorksheetDetailPatch = gql`
     remark: String
     issue: String
     cuFlag: String
+    actualPackQty: Int
   }
 `

package/server/utils/inventory-util.ts

@@ -10,7 +10,8 @@ import {
   InventoryHistory,
   InventoryNoGenerator,
   Location,
-  LOCATION_STATUS
+  LOCATION_STATUS,
+  LOCATION_TYPE
 } from '@things-factory/warehouse-base'
 
 /**
@@ -246,8 +247,8 @@ export async function inventoriesByStrategy(
   trxMgr: EntityManager
 ) {
   const qb = await trxMgr.getRepository(Inventory).createQueryBuilder('INV')
-  qb.leftJoinAndSelect('INV.product', 'PROD')
-    .leftJoinAndSelect('INV.location', 'LOC')
+  qb.innerJoinAndSelect('INV.product', 'PROD')
+    .innerJoinAndSelect('INV.location', 'LOC')
     .addSelect(subQuery =>
       subQuery
         .select('COALESCE(SUM(release_qty), 0)', 'releaseQty')
@@ -270,6 +271,7 @@ export async function inventoriesByStrategy(
     .andWhere('"INV"."packing_size" = :packingSize')
     .andWhere('"INV"."uom" = :uom')
     .andWhere('"INV"."status" = :status', { status: 'STORED' })
+    .andWhere('"LOC"."type" NOT IN (:...locationTypes)', { locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE] })
     .setParameters({
       domainId: domain.id,
       productId,