@things-factory/worksheet-base 5.0.0-alpha.22 → 5.0.0-alpha.23

package/dist-server/index.js

@@ -21,9 +21,8 @@ __exportStar(require("./graphql"), exports);
 __exportStar(require("./graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet"), exports);
 __exportStar(require("./graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details"), exports);
 __exportStar(require("./graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet"), exports);
+__exportStar(require("./graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details"), exports);
 __exportStar(require("./graphql/resolvers/worksheet/unloading/activate-unloading"), exports);
 __exportStar(require("./graphql/resolvers/worksheet/picking/activate-picking"), exports);
-__exportStar(require("./graphql/resolvers/worksheet/worksheets"), exports);
-__exportStar(require("./graphql/resolvers/worksheet/worksheet"), exports);
 __exportStar(require("./migrations"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,mHAAgG;AAChG,+GAA4F;AAC5F,qHAAkG;AAClG,6FAA0E;AAC1E,yFAAsE;AACtE,2EAAwD;AACxD,0EAAuD;AACvD,+CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,mHAAgG;AAChG,+GAA4F;AAC5F,qHAAkG;AAClG,+GAA4F;AAC5F,6FAA0E;AAC1E,yFAAsE;AACtE,+CAA4B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "5.0.0-alpha.22",
+  "version": "5.0.0-alpha.23",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,21 +24,21 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^5.0.0-alpha.22",
-    "@things-factory/biz-base": "^5.0.0-alpha.22",
-    "@things-factory/document-template-base": "^5.0.0-alpha.22",
-    "@things-factory/id-rule-base": "^5.0.0-alpha.22",
-    "@things-factory/integration-lmd": "^5.0.0-alpha.22",
-    "@things-factory/integration-marketplace": "^5.0.0-alpha.22",
-    "@things-factory/integration-sellercraft": "^5.0.0-alpha.22",
-    "@things-factory/integration-sftp": "^5.0.0-alpha.22",
-    "@things-factory/marketplace-base": "^5.0.0-alpha.22",
-    "@things-factory/notification": "^5.0.0-alpha.22",
-    "@things-factory/sales-base": "^5.0.0-alpha.22",
-    "@things-factory/setting-base": "^5.0.0-alpha.22",
-    "@things-factory/shell": "^5.0.0-alpha.22",
-    "@things-factory/transport-base": "^5.0.0-alpha.22",
-    "@things-factory/warehouse-base": "^5.0.0-alpha.22"
+    "@things-factory/auth-base": "^5.0.0-alpha.23",
+    "@things-factory/biz-base": "^5.0.0-alpha.23",
+    "@things-factory/document-template-base": "^5.0.0-alpha.23",
+    "@things-factory/id-rule-base": "^5.0.0-alpha.23",
+    "@things-factory/integration-lmd": "^5.0.0-alpha.23",
+    "@things-factory/integration-marketplace": "^5.0.0-alpha.23",
+    "@things-factory/integration-sellercraft": "^5.0.0-alpha.23",
+    "@things-factory/integration-sftp": "^5.0.0-alpha.23",
+    "@things-factory/marketplace-base": "^5.0.0-alpha.23",
+    "@things-factory/notification": "^5.0.0-alpha.23",
+    "@things-factory/sales-base": "^5.0.0-alpha.23",
+    "@things-factory/setting-base": "^5.0.0-alpha.23",
+    "@things-factory/shell": "^5.0.0-alpha.23",
+    "@things-factory/transport-base": "^5.0.0-alpha.23",
+    "@things-factory/warehouse-base": "^5.0.0-alpha.23"
   },
-  "gitHead": "8e06de9c59237f1800b2ff4f1c53162a0228342a"
+  "gitHead": "2be04b72d722f690fac58a3698ddaed5cc616959"
 }

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

@@ -17,68 +17,37 @@ interface WorksheetInterface extends Worksheet {
 
 export const worksheetResolver = {
   async worksheet(_: any, { name }, context: any) {
-    return await worksheet(name, context)
-  }
-}
-
-export async function worksheet(name: string, context: any) {
-  const { domain }: { domain: Domain } = context.state
-  let worksheet: WorksheetInterface
-  worksheet = (await getRepository(Worksheet).findOne({
-    where: {
-      domain,
-      name
-    },
-    relations: [
-      'domain',
-      'bizplace',
-      'bizplace.domain',
-      'bufferLocation',
-      'bufferLocation.warehouse',
-      'arrivalNotice',
-      'arrivalNotice.releaseGood',
-      'releaseGood',
-      'releaseGood.arrivalNotice',
-      'releaseGood.shippingOrder',
-      'returnOrder',
-      'inventoryCheck',
-      'vasOrder',
-      'assignee',
-      'worksheetDetails',
-      'worksheetDetails.toLocation',
-      'worksheetDetails.targetProduct',
-      'worksheetDetails.targetProduct.product',
-      'worksheetDetails.targetVas',
-      'worksheetDetails.targetVas.vas',
-      'worksheetDetails.targetVas.inventory',
-      'worksheetDetails.targetVas.inventory.location',
-      'worksheetDetails.targetVas.targetProduct',
-      'worksheetDetails.targetInventory',
-      'worksheetDetails.targetInventory.releaseGood',
-      'worksheetDetails.targetInventory.product',
-      'worksheetDetails.targetInventory.inventory',
-      'worksheetDetails.targetInventory.inventory.product',
-      'worksheetDetails.targetInventory.inventory.warehouse',
-      'worksheetDetails.targetInventory.inventory.location',
-      'worksheetDetails.targetInventory.inspectedLocation',
-      'creator',
-      'updater'
-    ]
-  })) as WorksheetInterface
-
-  if (!worksheet) {
+    const { domain }: { domain: Domain } = context.state
+    let worksheet: WorksheetInterface
     worksheet = (await getRepository(Worksheet).findOne({
       where: {
         domain,
-        arrivalNotice: name
+        name
       },
       relations: [
         'domain',
         'bizplace',
         'bizplace.domain',
+        'bufferLocation',
+        'bufferLocation.warehouse',
+        'arrivalNotice',
+        'arrivalNotice.releaseGood',
+        'releaseGood',
+        'releaseGood.arrivalNotice',
+        'releaseGood.shippingOrder',
+        'returnOrder',
+        'inventoryCheck',
+        'vasOrder',
+        'assignee',
         'worksheetDetails',
+        'worksheetDetails.toLocation',
         'worksheetDetails.targetProduct',
         'worksheetDetails.targetProduct.product',
+        'worksheetDetails.targetVas',
+        'worksheetDetails.targetVas.vas',
+        'worksheetDetails.targetVas.inventory',
+        'worksheetDetails.targetVas.inventory.location',
+        'worksheetDetails.targetVas.targetProduct',
         'worksheetDetails.targetInventory',
         'worksheetDetails.targetInventory.releaseGood',
         'worksheetDetails.targetInventory.product',
@@ -91,169 +60,196 @@ export async function worksheet(name: string, context: any) {
         'updater'
       ]
     })) as WorksheetInterface
-  }
-
-  let pWorksheetPickingItemSorting = getRepository(Setting).findOne({
-    where: { domain, category: 'location', name: 'rule-for-worksheet-release-goods-item' }
-  })
 
-  if (worksheet?.arrivalNotice?.id) {
-    worksheet.orderProducts = await getRepository(OrderProduct).find({
-      where: {
-        domain,
-        bizplace: worksheet.bizplace,
-        arrivalNotice: worksheet.arrivalNotice
-      }
-    })
+    if (!worksheet) {
+      worksheet = (await getRepository(Worksheet).findOne({
+        where: {
+          domain,
+          arrivalNotice: name
+        },
+        relations: [
+          'domain',
+          'bizplace',
+          'bizplace.domain',
+          'worksheetDetails',
+          'worksheetDetails.targetProduct',
+          'worksheetDetails.targetProduct.product',
+          'worksheetDetails.targetInventory',
+          'worksheetDetails.targetInventory.releaseGood',
+          'worksheetDetails.targetInventory.product',
+          'worksheetDetails.targetInventory.inventory',
+          'worksheetDetails.targetInventory.inventory.product',
+          'worksheetDetails.targetInventory.inventory.warehouse',
+          'worksheetDetails.targetInventory.inventory.location',
+          'worksheetDetails.targetInventory.inspectedLocation',
+          'creator',
+          'updater'
+        ]
+      })) as WorksheetInterface
+    }
 
-    worksheet.orderVass = await getRepository(OrderVas).find({
-      where: {
-        domain,
-        bizplace: worksheet.bizplace,
-        arrivalNotice: worksheet.arrivalNotice
-      },
-      relations: ['targetProduct']
+    let pWorksheetPickingItemSorting = getRepository(Setting).findOne({
+      where: { domain, category: 'location', name: 'rule-for-worksheet-release-goods-item' }
     })
-  }
 
-  if (worksheet.type === WORKSHEET_TYPE.BATCH_PICKING) {
-    let qbOrderInventories = getRepository(OrderInventory)
-      .createQueryBuilder('oi')
-      .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
-      .leftJoinAndSelect('oi.inventory', 'inventory')
-      .leftJoinAndSelect('oi.product', 'product')
-      .leftJoinAndSelect('inventory.location', 'location')
-      .leftJoinAndSelect('oi.bizplace', 'bizplace')
-      .where('"oi"."domain_id" = :domain')
-      .andWhere('"oi"."bizplace_id" = :bizplace')
-      .andWhere('"oi"."ref_worksheet_id" = :refWorksheetId')
-      .setParameters({
-        domain: domain.id,
-        bizplace: worksheet.bizplace.id,
-        refWorksheetId: worksheet.id
+    if (worksheet?.arrivalNotice?.id) {
+      worksheet.orderProducts = await getRepository(OrderProduct).find({
+        where: {
+          domain,
+          bizplace: worksheet.bizplace,
+          arrivalNotice: worksheet.arrivalNotice
+        }
       })
 
-    let sortingSetting: Setting = await pWorksheetPickingItemSorting
-    if (sortingSetting?.value) {
-      let settingValue = JSON.parse(sortingSetting.value)
-      for (const key in settingValue) {
-        qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
-      }
-    }
-
-    let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
-    worksheet.orderInventories = orderInventories
-  }
-
-  if (worksheet?.releaseGood?.id) {
-    let qbOrderInventories = getRepository(OrderInventory)
-      .createQueryBuilder('oi')
-      .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
-      .leftJoinAndSelect('oi.inventory', 'inventory')
-      .leftJoinAndSelect('oi.product', 'product')
-      .leftJoinAndSelect('inventory.location', 'location')
-      .leftJoinAndSelect('oi.bizplace', 'bizplace')
-      .where('"oi"."domain_id" = :domain')
-      .andWhere('"oi"."bizplace_id" = :bizplace')
-      .andWhere('"oi"."release_good_id" = :releaseGood')
-      .andWhere('"oi"."status" NOT IN (:...statuses)')
-      .setParameters({
-        domain: domain.id,
-        bizplace: worksheet.bizplace.id,
-        releaseGood: worksheet.releaseGood.id,
-        statuses: [ORDER_INVENTORY_STATUS.CANCELLED, ORDER_INVENTORY_STATUS.REPLACED]
+      worksheet.orderVass = await getRepository(OrderVas).find({
+        where: {
+          domain,
+          bizplace: worksheet.bizplace,
+          arrivalNotice: worksheet.arrivalNotice
+        },
+        relations: ['targetProduct']
       })
-
-    let sortingSetting: Setting = await pWorksheetPickingItemSorting
-    if (sortingSetting?.value) {
-      let settingValue = JSON.parse(sortingSetting.value)
-      for (const key in settingValue) {
-        qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
-      }
     }
 
-    let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
-    worksheet.orderInventories = orderInventories
+    if (worksheet.type === WORKSHEET_TYPE.BATCH_PICKING) {
+      let qbOrderInventories = getRepository(OrderInventory)
+        .createQueryBuilder('oi')
+        .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
+        .leftJoinAndSelect('oi.inventory', 'inventory')
+        .leftJoinAndSelect('oi.product', 'product')
+        .leftJoinAndSelect('inventory.location', 'location')
+        .leftJoinAndSelect('oi.bizplace', 'bizplace')
+        .where('"oi"."domain_id" = :domain')
+        .andWhere('"oi"."bizplace_id" = :bizplace')
+        .andWhere('"oi"."ref_worksheet_id" = :refWorksheetId')
+        .setParameters({
+          domain: domain.id,
+          bizplace: worksheet.bizplace.id,
+          refWorksheetId: worksheet.id
+        })
+
+      let sortingSetting: Setting = await pWorksheetPickingItemSorting
+      if (sortingSetting?.value) {
+        let settingValue = JSON.parse(sortingSetting.value)
+        for (const key in settingValue) {
+          qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
+        }
+      }
 
-    if (worksheet.releaseGood.type == 'b2c') {
-      worksheet.marketplaceOrder = await getRepository(MarketplaceOrder).findOne({
-        where: { orderNo: worksheet.releaseGood.refNo },
-        relations: ['marketplaceOrderItems', 'marketplaceStore']
-      })
+      let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
+      worksheet.orderInventories = orderInventories
+    }
 
-      if (worksheet.marketplaceOrder) {
-        let marketplaceOrderShipping: MarketplaceOrderShipping
-        if (worksheet.marketplaceOrder.isSplitted) {
-          marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
-            where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
-          })
-        } else {
-          marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
-            where: { orderNoRef: worksheet.releaseGood.refNo }
-          })
+    if (worksheet?.releaseGood?.id) {
+      let qbOrderInventories = getRepository(OrderInventory)
+        .createQueryBuilder('oi')
+        .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
+        .leftJoinAndSelect('oi.inventory', 'inventory')
+        .leftJoinAndSelect('oi.product', 'product')
+        .leftJoinAndSelect('inventory.location', 'location')
+        .leftJoinAndSelect('oi.bizplace', 'bizplace')
+        .where('"oi"."domain_id" = :domain')
+        .andWhere('"oi"."bizplace_id" = :bizplace')
+        .andWhere('"oi"."release_good_id" = :releaseGood')
+        .andWhere('"oi"."status" NOT IN (:...statuses)')
+        .setParameters({
+          domain: domain.id,
+          bizplace: worksheet.bizplace.id,
+          releaseGood: worksheet.releaseGood.id,
+          statuses: [ORDER_INVENTORY_STATUS.CANCELLED, ORDER_INVENTORY_STATUS.REPLACED]
+        })
+
+      let sortingSetting: Setting = await pWorksheetPickingItemSorting
+      if (sortingSetting?.value) {
+        let settingValue = JSON.parse(sortingSetting.value)
+        for (const key in settingValue) {
+          qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
         }
+      }
 
-        worksheet.marketplaceOrder.trackingNo = marketplaceOrderShipping.ownTrackingNo
-          ? marketplaceOrderShipping.ownTrackingNo
-          : marketplaceOrderShipping.trackingNo
-        worksheet.marketplaceOrder.shippingProvider = marketplaceOrderShipping.ownTransporter
-          ? marketplaceOrderShipping.ownTransporter
-          : marketplaceOrderShipping.transporter
+      let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
+      worksheet.orderInventories = orderInventories
+
+      if (worksheet.releaseGood.type == 'b2c') {
+        worksheet.marketplaceOrder = await getRepository(MarketplaceOrder).findOne({
+          where: { orderNo: worksheet.releaseGood.refNo },
+          relations: ['marketplaceOrderItems', 'marketplaceStore']
+        })
+
+        if (worksheet.marketplaceOrder) {
+          let marketplaceOrderShipping: MarketplaceOrderShipping
+          if (worksheet.marketplaceOrder.isSplitted) {
+            marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
+              where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
+            })
+          } else {
+            marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
+              where: { orderNoRef: worksheet.releaseGood.refNo }
+            })
+          }
+
+          worksheet.marketplaceOrder.trackingNo = marketplaceOrderShipping.ownTrackingNo
+            ? marketplaceOrderShipping.ownTrackingNo
+            : marketplaceOrderShipping.trackingNo
+          worksheet.marketplaceOrder.shippingProvider = marketplaceOrderShipping.ownTransporter
+            ? marketplaceOrderShipping.ownTransporter
+            : marketplaceOrderShipping.transporter
+        }
       }
+
+      worksheet.orderVass = await getRepository(OrderVas).find({
+        where: {
+          domain,
+          bizplace: worksheet.bizplace,
+          releaseGood: worksheet.releaseGood
+        },
+        relations: ['targetProduct']
+      })
     }
 
-    worksheet.orderVass = await getRepository(OrderVas).find({
-      where: {
-        domain,
-        bizplace: worksheet.bizplace,
-        releaseGood: worksheet.releaseGood
-      },
-      relations: ['targetProduct']
-    })
-  }
+    if (worksheet?.returnOrder?.id) {
+      worksheet.orderInventories = await getRepository(OrderInventory).find({
+        where: {
+          domain,
+          bizplace: worksheet.bizplace,
+          returnOrder: worksheet.returnOrder,
+          status: Not(Equal(ORDER_INVENTORY_STATUS.CANCELLED))
+        },
+        relations: ['product', 'inventory', 'inventory.location']
+      })
 
-  if (worksheet?.returnOrder?.id) {
-    worksheet.orderInventories = await getRepository(OrderInventory).find({
-      where: {
-        domain,
-        bizplace: worksheet.bizplace,
-        returnOrder: worksheet.returnOrder,
-        status: Not(Equal(ORDER_INVENTORY_STATUS.CANCELLED))
-      },
-      relations: ['product', 'inventory', 'inventory.location']
-    })
+      worksheet.orderVass = await getRepository(OrderVas).find({
+        where: {
+          domain,
+          bizplace: worksheet.bizplace,
+          returnOrder: worksheet.returnOrder
+        },
+        relations: ['targetProduct']
+      })
+    }
 
-    worksheet.orderVass = await getRepository(OrderVas).find({
-      where: {
-        domain,
-        bizplace: worksheet.bizplace,
-        returnOrder: worksheet.returnOrder
-      },
-      relations: ['targetProduct']
-    })
-  }
+    if (worksheet?.inventoryCheck?.id) {
+      worksheet.orderInventories = await getRepository(OrderInventory).find({
+        where: {
+          domain,
+          bizplace: worksheet.bizplace,
+          inventoryCheck: worksheet.inventoryCheck
+        },
+        relations: ['product', 'inventory', 'inventory.location']
+      })
+    }
 
-  if (worksheet?.inventoryCheck?.id) {
-    worksheet.orderInventories = await getRepository(OrderInventory).find({
-      where: {
-        domain,
-        bizplace: worksheet.bizplace,
-        inventoryCheck: worksheet.inventoryCheck
-      },
-      relations: ['product', 'inventory', 'inventory.location']
-    })
-  }
+    if (worksheet?.vasOrder?.id) {
+      worksheet.orderVass = await getRepository(OrderVas).find({
+        where: {
+          domain,
+          bizplace: worksheet.bizplace,
+          vasOrder: worksheet.vasOrder
+        },
+        relations: ['targetProduct']
+      })
+    }
 
-  if (worksheet?.vasOrder?.id) {
-    worksheet.orderVass = await getRepository(OrderVas).find({
-      where: {
-        domain,
-        bizplace: worksheet.bizplace,
-        vasOrder: worksheet.vasOrder
-      },
-      relations: ['targetProduct']
-    })
+    return worksheet
   }
-
-  return worksheet
 }