@things-factory/worksheet-base 4.3.387 → 4.3.390

package/server/graphql/resolvers/worksheet/cycle-count-worksheet-for-carton.ts

@@ -34,6 +34,7 @@ export const cycleCountWorksheetForCartonResolver = {
     qb.leftJoinAndSelect('WSD.targetInventoryCheckItem', 'T_INV')
       .leftJoinAndSelect('T_INV.inventory', 'INV')
       .leftJoinAndSelect('T_INV.inspectedLocation', 'INS_LOC')
+      .leftJoinAndSelect('T_INV.originLocation', 'ORG_LOC')
       .leftJoinAndSelect('INV.location', 'LOC_INV')
       .leftJoinAndSelect('T_INV.product', 'PROD')
       .leftJoinAndSelect('INV.product', 'PROD_INV')
@@ -51,7 +52,10 @@ export const cycleCountWorksheetForCartonResolver = {
     }
 
     if (locationName) {
-      qb.andWhere('("LOC_INV"."name" = :locationName OR "INS_LOC"."name" = :locationName)', { locationName })
+      qb.andWhere(
+        '("ORG_LOC"."name" = :locationName OR "LOC_INV"."name" = :locationName OR "INS_LOC"."name" = :locationName',
+        { locationName }
+      )
     }
 
     if (cartonId) {
@@ -93,6 +97,7 @@ export const cycleCountWorksheetForCartonResolver = {
             qty: inventory?.qty,
             uomValue: inventory?.uomValue,
             uom: inventory?.uom,
+            originLocation: targetInventoryCheckItem?.originLocation,
             inspectedQty: targetInventoryCheckItem?.inspectedQty,
             inspectedUomValue: targetInventoryCheckItem?.inspectedUomValue,
             inspectedLocation: targetInventoryCheckItem?.inspectedLocation,

package/server/graphql/resolvers/worksheet/cycle-count-worksheet-for-pallet.ts

@@ -35,6 +35,7 @@ export const cycleCountWorksheetForPalletResolver = {
     qb.leftJoinAndSelect('WSD.targetInventoryCheckItem', 'T_INV')
       .leftJoinAndSelect('T_INV.inventory', 'INV')
       .leftJoinAndSelect('T_INV.inspectedLocation', 'INS_LOC')
+      .leftJoinAndSelect('T_INV.originLocation', 'ORG_LOC')
       .leftJoinAndSelect('INV.location', 'LOC_INV')
       .leftJoinAndSelect('T_INV.product', 'PROD')
       .leftJoinAndSelect('INV.product', 'PROD_INV')
@@ -52,7 +53,10 @@ export const cycleCountWorksheetForPalletResolver = {
     }
 
     if (locationName) {
-      qb.andWhere('("LOC_INV"."name" = :locationName OR "INS_LOC"."name" = :locationName)', { locationName })
+      qb.andWhere(
+        '("ORG_LOC"."name" = :locationName OR "LOC_INV"."name" = :locationName OR "INS_LOC"."name" = :locationName',
+        { locationName }
+      )
     }
 
     if (cartonId) {
@@ -94,6 +98,7 @@ export const cycleCountWorksheetForPalletResolver = {
             qty: inventory?.qty,
             uomValue: inventory?.uomValue,
             uom: inventory?.uom,
+            originLocation: targetInventoryCheckItem?.originLocation,
             inspectedQty: targetInventoryCheckItem?.inspectedQty,
             inspectedUomValue: targetInventoryCheckItem?.inspectedUomValue,
             inspectedLocation: targetInventoryCheckItem?.inspectedLocation,
@@ -101,7 +106,11 @@ export const cycleCountWorksheetForPalletResolver = {
             status: cycleCountWSD.status,
             targetName: targetInventoryCheckItem?.name,
             packingType: inventory?.packingType ? inventory.packingType : productDetails.packingType,
-            location: inventory?.location ? inventory.location : targetInventoryCheckItem.inspectedLocation,
+            location: targetInventoryCheckItem?.originLocation
+              ? targetInventoryCheckItem.originLocation
+              : inventory?.location
+              ? inventory.location
+              : targetInventoryCheckItem.inspectedLocation,
             relatedInvCheckItem: targetInventoryCheckItem
           }
         })

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

@@ -529,12 +529,12 @@ async function queryPackingWorksheet(tx, domain, assignee, binLocation) {
     .innerJoinAndSelect('rg.orderInventories', 'oi')
     .innerJoinAndSelect('oi.binLocation', 'l')
     .leftJoinAndSelect('rg.orderPackages', 'op')
-    .innerJoinAndSelect('op.orderPackageItems', 'opi')
-    .innerJoinAndSelect('opi.orderProduct', 'opr')
-    .innerJoinAndSelect('opi.productDetail', 'pd')
-    .innerJoinAndSelect('pd.product', 'p')
-    .innerJoinAndSelect('p.productDetails', 'pd2')
-    .innerJoinAndSelect('pd2.productBarcodes', 'pb')
+    .leftJoinAndSelect('op.orderPackageItems', 'opi')
+    .leftJoinAndSelect('opi.orderProduct', 'opr')
+    .leftJoinAndSelect('opi.productDetail', 'pd')
+    .leftJoinAndSelect('pd.product', 'p')
+    .leftJoinAndSelect('p.productDetails', 'pd2')
+    .leftJoinAndSelect('pd2.productBarcodes', 'pb')
     .innerJoin('worksheets', 'w', 'w.release_good_id = rg.id')
     .where('rg.domain_id = :domainId', { domainId: domain.id })
     .andWhere('oi.status IN (:...orderInventoryStatus)', {
@@ -555,19 +555,6 @@ async function queryPackingWorksheet(tx, domain, assignee, binLocation) {
     .addOrderBy('rg.status', 'ASC')
     .addOrderBy('w.created_at', 'ASC')
 
-  if (assignee) {
-    qb.andWhere('ws.assignee_id = :assigneeId', { assigneeId: assignee.id })
-  } else {
-    qb.andWhere('ws.assignee_id is null')
-  }
-
-  qb.orderBy('releaseGood.status', 'ASC')
-    .addOrderBy('ws.created_at', 'ASC')
-    .addOrderBy('releaseGood.name', 'ASC')
-    .groupBy('ws.created_at')
-    .addGroupBy('releaseGood.name')
-    .addGroupBy('releaseGood.id')
-
   let releaseGood = await qb.getOne()
 
   if (!releaseGood) {

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

@@ -73,5 +73,6 @@ export const WorksheetDetailInfo = gql`
     reusablePalletName: String
     expirationPeriod: Int
     productDetail: ProductDetail
+    originLocation: Location
   }
 `

package/server/utils/lmd-util.ts

@@ -123,7 +123,7 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
         address3: releaseGood?.deliveryAddress3,
         ward: releaseGood?.ward?.toUpperCase(), //only for viettel lmd
         city: releaseGood.city?.toUpperCase(),
-        postcode: releaseGood.postalCode,
+        postcode: releaseGood?.postalCode,
         district: releaseGood?.district?.toUpperCase() || releaseGood.city?.toUpperCase(),
         state:
           releaseGood?.state?.toUpperCase() ||