@things-factory/worksheet-base 4.0.36 → 4.0.40

package/dist-server/graphql/resolvers/worksheet/unloading/complete-unloading.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.completeUnloading = exports.completeUnloadingResolver = void 0;
+const typeorm_1 = require("typeorm");
 const integration_marketplace_1 = require("@things-factory/integration-marketplace");
 const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
 const sales_base_1 = require("@things-factory/sales-base");
@@ -29,7 +30,7 @@ exports.completeUnloadingResolver = {
         const putawayWSCtrl = new controllers_1.PutawayWorksheetController(tx, domain, user);
         let putawayWorksheet;
         const inventories = await tx.getRepository(warehouse_base_1.Inventory).find({
-            where: { domain, refOrderId: arrivalNotice.id, status: warehouse_base_1.INVENTORY_STATUS.UNLOADED }
+            where: { domain, refOrderId: arrivalNotice.id, status: (0, typeorm_1.In)([warehouse_base_1.INVENTORY_STATUS.UNLOADED, warehouse_base_1.INVENTORY_STATUS.CHECKED]) }
         });
         // search for any active marketplace connection
         const companyDomain = arrivalNotice.bizplace.company.domain;

package/dist-server/graphql/resolvers/worksheet/unloading/complete-unloading.js.map

@@ -1 +1 @@
-{"version":3,"file":"complete-unloading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/complete-unloading.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"complete-unloading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/complete-unloading.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAI3C,qFAA0E;AAC1E,qFAAwF;AACxF,2DAAqF;AAErF,mEAA4E;AAE5E,qDAAwD;AACxD,yDAAkG;AAClG,iEAA8F;AAGjF,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,gBAAgB,EAAE,EAAE,OAAY;QACjF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAA;QAE5E,MAAM,aAAa,GAAkB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAC,OAAO,CAAC;YACjF,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE;YACxC,SAAS,EAAE;gBACT,eAAe;gBACf,UAAU;gBACV,iBAAiB;gBACjB,kBAAkB;gBAClB,yBAAyB;gBACzB,eAAe;gBACf,uBAAuB;gBACvB,sCAAsC;gBACtC,yDAAyD;aAC1D;SACF,CAAC,CAAA;QAEF,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAClG,IAAI,gBAA2B,CAAA;QAE/B,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,IAAI,CAAC;YACtE,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,iCAAgB,CAAC,QAAQ,EAAE,iCAAgB,CAAC,OAAO,CAAC,CAAC,EAAE;SACnH,CAAC,CAAA;QAEF,+CAA+C;QAC/C,MAAM,aAAa,GAAW,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAA;QACnE,MAAM,cAAc,GAAW,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAA;QAC5D,MAAM,iBAAiB,GAAuB,MAAM,EAAE,CAAC,aAAa,CAAC,0CAAgB,CAAC,CAAC,IAAI,CAAC;YAC1F,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;YAC9E,SAAS,EAAE,CAAC,yBAAyB,CAAC;SACvC,CAAC,CAAA;QAEF,MAAM,WAAW,GAAgB,MAAM,EAAE;aACtC,aAAa,CAAC,qCAAW,CAAC;aAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;QAExE,IAAI,WAAW,EAAE;YACf,MAAM,eAAe,GAA0B,IAAI,iCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAC1F,MAAM,eAAe,CAAC,sBAAsB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAA;SACzE;QAED,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,KAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;YAC5F,MAAM,aAAa,GAAwB,IAAI,+BAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YACpF,MAAM,aAAa,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,aAAa,CAAC,aAAa,EAAE,aAAa,CAAC,CAAA;SAC/G;QAED,gBAAgB,GAAG,MAAM,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;QAEhG,IAAI,gBAAgB,CAAC,MAAM,KAAK,4BAAgB,CAAC,WAAW,EAAE;YAC5D,MAAM,aAAa,CAAC,eAAe,CAAC,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;SAC9F;QAED,MAAM,UAAU,GAAa,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAA;QACtD,MAAM,IAAA,sCAAyB,EAAC,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QAEnG,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC5G,mBAAmB,CAAC,mBAAmB,CAAC;YACtC,KAAK,EAAE,wBAAwB,aAAa,CAAC,QAAQ,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,GAAG;YACpF,IAAI,EAAE,GAAG,aAAa,CAAC,IAAI,uBAAuB;YAClD,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;YAC3B,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE;SACtC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,iBAAiB,CACrC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,yBAAqD;IAErD,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,MAAM,mBAAmB,CAAC,iBAAiB,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAA;AACzF,CAAC;AATD,8CASC"}

package/dist-server/routes.js

@@ -10,6 +10,7 @@ const render_orientage_do_1 = require("./controllers/render-orientage-do");
 const render_orientage_grn_1 = require("./controllers/render-orientage-grn");
 const render_ro_do_1 = require("./controllers/render-ro-do");
 const render_seebuu_grn_1 = require("./controllers/render-seebuu-grn");
+const render_invoices_1 = require("./controllers/render-invoices");
 process.on('bootstrap-module-domain-private-route', (app, routes) => {
     routes.get('/view_document_ro_do/:doNo', async (context, next) => {
         context.body = await (0, render_ro_do_1.renderRODO)(context.params, context);
@@ -41,5 +42,12 @@ process.on('bootstrap-module-domain-private-route', (app, routes) => {
     routes.get('/view_manifest/:manifestNo', async (context, next) => {
         context.body = await (0, render_manifest_1.renderManifest)(context.params, context);
     });
+    routes.post('/view_invoices/:timezoneOffSet', async (context, next) => {
+        let req = context.request.body || {};
+        let timezoneOffSet = context.params.timezoneOffSet || 0;
+        let data = await (0, render_invoices_1.renderInvoices)({ req, timezoneOffSet }, context);
+        context.type = 'application/json';
+        context.body = data;
+    });
 });
 //# sourceMappingURL=routes.js.map

package/dist-server/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":";;AAAA,qEAA+D;AAC/D,yDAAoD;AACpD,qEAA+D;AAC/D,uEAAiE;AACjE,mEAA8D;AAC9D,qEAA+D;AAC/D,2EAAqE;AACrE,6EAAuE;AACvE,6DAAuD;AACvD,uEAAiE;AAEjE,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;IACzE,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC/D,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,yBAAU,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC1D,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,GAAG,CAAC,mCAAmC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACtE,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,uCAAiB,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACjE,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,GAAG,CAAC,gCAAgC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACnE,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,iCAAc,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC3D,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,iCAAc,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,GAAG,CAAC,kCAAkC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACrE,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,sBAAS,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,GAAG,CAAC,yCAAyC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC5E,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,mCAAe,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC/D,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,yCAAkB,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAClE,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,GAAG,CAAC,yBAAyB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC5D,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,mCAAe,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,GAAG,CAAC,wCAAwC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC3E,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,iCAAc,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC/D,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,gCAAc,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.0.36",
+  "version": "4.0.40",
   "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": "^4.0.36",
-    "@things-factory/biz-base": "^4.0.36",
-    "@things-factory/document-template-base": "^4.0.36",
-    "@things-factory/id-rule-base": "^4.0.36",
-    "@things-factory/integration-lmd": "^4.0.36",
-    "@things-factory/integration-marketplace": "^4.0.36",
-    "@things-factory/integration-sellercraft": "^4.0.36",
-    "@things-factory/integration-sftp": "^4.0.36",
-    "@things-factory/marketplace-base": "^4.0.36",
-    "@things-factory/notification": "^4.0.36",
-    "@things-factory/sales-base": "^4.0.36",
-    "@things-factory/setting-base": "^4.0.36",
-    "@things-factory/shell": "^4.0.36",
-    "@things-factory/transport-base": "^4.0.36",
-    "@things-factory/warehouse-base": "^4.0.36"
+    "@things-factory/auth-base": "^4.0.40",
+    "@things-factory/biz-base": "^4.0.40",
+    "@things-factory/document-template-base": "^4.0.40",
+    "@things-factory/id-rule-base": "^4.0.40",
+    "@things-factory/integration-lmd": "^4.0.40",
+    "@things-factory/integration-marketplace": "^4.0.40",
+    "@things-factory/integration-sellercraft": "^4.0.40",
+    "@things-factory/integration-sftp": "^4.0.40",
+    "@things-factory/marketplace-base": "^4.0.40",
+    "@things-factory/notification": "^4.0.40",
+    "@things-factory/sales-base": "^4.0.40",
+    "@things-factory/setting-base": "^4.0.40",
+    "@things-factory/shell": "^4.0.40",
+    "@things-factory/transport-base": "^4.0.40",
+    "@things-factory/warehouse-base": "^4.0.40"
   },
-  "gitHead": "132ab9f8af8c34f73bcd81a9776769a6929e13ee"
+  "gitHead": "f0697b5ab411e4aa1a52de19a6c135f39686eca1"
 }

package/server/constants/template.ts

@@ -4,6 +4,7 @@ export const TEMPLATE_TYPE = {
   GRN_TEMPLATE: 'GRN_TEMPLATE',
   JOB_TEMPLATE: 'JOB_TEMPLATE',
   MANIFEST_TEMPLATE: 'MANIFEST_TEMPLATE',
+  INVOICE_TEMPLATE: 'INVOICE_TEMPLATE',
   COP: 'COP',
   SIGNATURE: 'SIGNATURE',
   LOGO: 'LOGO'

package/server/controllers/ecommerce/sellercraft-controller.ts

@@ -13,6 +13,32 @@ import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/ware
 import { WorksheetController } from '../worksheet-controller'
 
 export class SellercraftController extends WorksheetController {
+  async packOrder(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
+    const orderProducts: OrderProduct[] = releaseGood.orderProducts
+    let sellercraftOPs: any[] = []
+
+    sellercraftOPs = orderProducts.map(orderProduct => {
+      const product: Product = orderProduct.product
+
+      return {
+        sku: product.sku,
+        releaseQty: orderProduct.releaseQty,
+        uom: 'EA'
+      }
+    })
+
+    const orderInformation: any = {
+      accountId: sellercraft.accountId,
+      orderId: releaseGood.refNo2,
+      sellercraftOPs
+    }
+    const packageId: string = await SellercraftAPI.packMarketplaceOrder(sellercraft, { ...orderInformation })
+
+    releaseGood.packageId = packageId
+    releaseGood.updater = this.user
+    return releaseGood
+  }
+
   async registerProductInbound(sellercraft: Sellercraft, arrivalNotice: ArrivalNotice): Promise<void> {
     const orderProducts: OrderProduct[] = arrivalNotice.orderProducts
     const purchaseOrder: PurchaseOrder = arrivalNotice.purchaseOrder
@@ -87,12 +113,20 @@ export class SellercraftController extends WorksheetController {
 
         return {
           sku: product.sku,
+          productName: product.name,
+          gtin: defaultProductDetail.gtin,
           purchaseOrderQty: orderInventory.returnQty * packingSize,
           receivedQty: orderInventory.returnQty * packingSize,
           uom: 'EA',
           batchId: orderInventory.batchId,
           forceCreateProduct: false,
-          expiryTime: 0
+          expiryTime: 0,
+          weight: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
+          packageDimension: {
+            length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
+            width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
+            height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
+          }
         }
       })
     )
@@ -174,6 +208,8 @@ export class SellercraftController extends WorksheetController {
   }
 
   async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
+    if (!releaseGood?.packageId) throw new Error('Order package id is not found')
+
     const orderInformation: any = {
       accountId: sellercraft.accountId,
       orderId: releaseGood.refNo2,

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

@@ -222,7 +222,7 @@ export class UnloadingReturningWorksheetController extends VasWorksheetControlle
       where: {
         domain: this.domain,
         refOrderId: returnOrder.id,
-        status: INVENTORY_STATUS.UNLOADED
+        status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED])
       }
     })
 

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

@@ -578,7 +578,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           oi =>
             oi.batchId == inventory.batchId &&
             oi.packingType == inventory.packingType &&
-            oi.product.id == inventory.product.id
+            oi.product.id == inventory.product.id &&
+            oi.packingSize === inventory.packingSize
         )
         if (inventory.status == INVENTORY_STATUS.UNLOADED) {
           targetInventory.actualPackQty -= qty
@@ -621,6 +622,9 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           inventory.qty = 0
           inventory.uomValue = 0
           inventory.updater = this.user
+          targetProduct.actualPalletQty--
+
+          await this.updateOrderTargets([targetProduct])
 
           await this.trxMgr.getRepository(InventoryHistory).update({ inventory }, { inventory: null })
 
@@ -822,7 +826,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
 
   async completeUnloadingPartially(
     arrivalNoticeNo: string,
-    unloadingWorksheetDetail: Partial<WorksheetDetail>
+    unloadingWorksheetDetail: Partial<WorksheetDetail>[]
   ): Promise<Worksheet> {
     const arrivalNotice: ArrivalNotice = await this.findRefOrder(ArrivalNotice, {
       name: arrivalNoticeNo,
@@ -835,25 +839,28 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     ])
     this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
 
-    let worksheetDetail: WorksheetDetail = worksheet.worksheetDetails.find(
-      (wsd: WorksheetDetail) => wsd.name === unloadingWorksheetDetail.name
+    let worksheetDetails = worksheet.worksheetDetails.filter(({ name: itm1 }) =>
+      unloadingWorksheetDetail.some(({ name: itm2 }) => itm2 === itm1)
     )
-    worksheetDetail.status = WORKSHEET_STATUS.PARTIALLY_UNLOADED
-    worksheetDetail.issue = unloadingWorksheetDetail.issue || worksheetDetail.issue
-    worksheetDetail.updater = this.user
-    worksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
 
-    let targetProduct: OrderProduct = worksheetDetail.targetProduct
-    targetProduct.status = ORDER_PRODUCT_STATUS.PARTIALLY_UNLOADED
-    targetProduct.issue = worksheetDetail.issue
-    await this.updateOrderTargets([targetProduct])
+    worksheetDetails.forEach((wsds: WorksheetDetail) => {
+      wsds.status = WORKSHEET_STATUS.PARTIALLY_UNLOADED
+      wsds.updater = this.user
+    })
+
+    worksheetDetails = await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetails)
+
+    for (let i = 0; i < worksheetDetails.length; i++) {
+      worksheetDetails[i].targetProduct.status = ORDER_PRODUCT_STATUS.PARTIALLY_UNLOADED
+      worksheetDetails[i].targetProduct.remark = worksheetDetails[i].issue || worksheetDetails[i].targetProduct.remark
+      await this.updateOrderTargets([worksheetDetails[i].targetProduct])
+    }
 
     let inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
       where: {
         domain: this.domain,
         refOrderId: arrivalNotice.id,
-        orderProductId: targetProduct.id,
-        status: INVENTORY_STATUS.UNLOADED
+        status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED])
       }
     })
 

package/server/controllers/outbound/sorting-worksheet-controller.ts

@@ -90,6 +90,7 @@ export class SortingWorksheetController extends VasWorksheetController {
       const matchingProductDetail: ProductDetail = productDetails.find(
         (productDetail: ProductDetail) => productDetail.gtin === productBarcode
       )
+      if (!matchingProductDetail) throw new Error('Unable to find product barcode.')
       const packingType: string = matchingProductDetail.packingType
       const packingSize: number = matchingProductDetail.packingSize
       if (!matchingProductDetail)

package/server/controllers/render-grn.ts

@@ -194,6 +194,7 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
         product_type: item.packingType,
         product_size: item.packingSize,
         product_batch: item.batchId,
+        batch_id_ref: item?.batchIdRef ? item.batchIdRef : '',
         pallet_qty: item.actualPalletQty,
         product_qty: unloadInvHistory.qty || item.actualPackQty,
         product_unit_uom_value: `${Math.round(item.uomValue * 100) / 100}`,

package/server/controllers/render-invoices.ts

@@ -0,0 +1,154 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { getRepository } from 'typeorm'
+
+import { Attachment, STORAGE } from '@things-factory/attachment-base'
+import { Bizplace } from '@things-factory/biz-base'
+import { config } from '@things-factory/env'
+import { Invoice, ReleaseGood } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+
+import { TEMPLATE_TYPE } from '../constants'
+import { DateTimeConverter } from '../utils/datetime-util'
+
+const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
+
+export async function renderInvoices({ req, timezoneOffSet }, context: any) {
+  try {
+    const domain: Domain = await getRepository(Domain).findOne({
+      where: { id: context.state.domain.id }
+    })
+
+    let result = await Promise.all(
+      req.roIds.map(async roId => {
+        try {
+          const foundReleaseGoods: ReleaseGood = await getRepository(ReleaseGood).findOne({
+            where: { domain, id: roId },
+            relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
+          })
+
+          if (foundReleaseGoods) {
+            const foundInvoice: Invoice = await getRepository(Invoice).findOne({
+              where: { releaseGood: foundReleaseGoods },
+              relations: ['invoiceProducts', 'invoiceProducts.product', 'domain', 'creator', 'updater']
+            })
+
+            const partnerBiz: Bizplace = foundReleaseGoods.bizplace
+
+            const partnerCompanyDomain: Domain = foundReleaseGoods.bizplace.company.domain
+
+            const foundTemplate: Attachment = await getRepository(Attachment).findOne({
+              where: { domain: partnerCompanyDomain, category: TEMPLATE_TYPE.INVOICE_TEMPLATE }
+            })
+
+            const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
+
+            let fullBillingAddress = [
+              foundInvoice.billingAddress1,
+              foundInvoice.billingAddress2,
+              foundInvoice.billingAddress3,
+              foundInvoice.billingAddress4,
+              foundInvoice.billingAddress5
+            ]
+
+            let fullDeliveryAddress = [
+              foundInvoice.deliveryAddress1,
+              foundInvoice.deliveryAddress2,
+              foundInvoice.deliveryAddress3,
+              foundInvoice.deliveryAddress4,
+              foundInvoice.deliveryAddress5
+            ]
+
+            let date = DateTimeConverter.date(
+              new Date((foundInvoice.issuedOn || foundInvoice.createdAt) - timezoneOffSet)
+            )
+            const data = {
+              order_no: foundReleaseGoods.name,
+              ref_no: foundReleaseGoods.refNo,
+              deliver_to: foundInvoice.deliverTo,
+              deliver_to_phone: foundInvoice.deliverToPhone || '',
+              bill_to: foundInvoice.billTo,
+              bill_to_phone: foundInvoice.billToPhone || '',
+              customer_address: partnerBiz.address,
+              delivery_date: date,
+              store_name: foundInvoice.from,
+              billing_address_1: foundInvoice.billingAddress1,
+              billing_address_2: foundInvoice.billingAddress2,
+              billing_address_3: foundInvoice.billingAddress3,
+              billing_address_4: foundInvoice.billingAddress4,
+              billing_address_5: foundInvoice.billingAddress5,
+              billing_postcode: foundInvoice.billingPostcode,
+              billing_city: foundInvoice.billingCity,
+              billing_state: foundInvoice.billingState,
+              billing_country: foundInvoice.billingCountry,
+              full_billing_address: fullBillingAddress
+                .reduce((acc, itm) => {
+                  if (itm && itm.trim() != '') {
+                    acc.push(itm)
+                  }
+
+                  return acc
+                }, [])
+                .join(' '),
+              delivery_address_1: foundInvoice.deliveryAddress1,
+              delivery_address_2: foundInvoice.deliveryAddress2,
+              delivery_address_3: foundInvoice.deliveryAddress3,
+              delivery_address_4: foundInvoice.deliveryAddress4,
+              delivery_address_5: foundInvoice.deliveryAddress5,
+              delivery_postcode: foundInvoice.deliveryPostcode,
+              delivery_city: foundInvoice.deliveryCity,
+              delivery_state: foundInvoice.deliveryState,
+              delivery_country: foundInvoice.deliveryCountry,
+              full_delivery_address: fullDeliveryAddress
+                .reduce((acc, itm) => {
+                  if (itm && itm.trim() != '') {
+                    acc.push(itm)
+                  }
+
+                  return acc
+                }, [])
+                .join(' '),
+              product_list: foundInvoice.invoiceProducts.map((item, idx) => {
+                return {
+                  list_no: idx + 1,
+                  product_sku: item.sku,
+                  product_name: item.name,
+                  product_desc: item.description,
+                  product_qty: item.qty,
+                  product_other_charges: item.otherCharges,
+                  product_paid_price: parseFloat(item.paidPrice || item.unitPrice).toFixed(2),
+                  product_unit_price: parseFloat(item.unitPrice).toFixed(2),
+                  product_total_paid_price: (
+                    parseFloat(item.paidPrice || item.unitPrice) * parseFloat(item.qty)
+                  ).toFixed(2),
+                  product_total_unit_price: (parseFloat(item.unitPrice) * parseFloat(item.qty)).toFixed(2)
+                }
+              })
+            }
+
+            const formData = new FormData()
+            formData.append('template', template)
+            formData.append('jsonString', JSON.stringify(data))
+
+            const response = await fetch(REPORT_API_URL, {
+              method: 'POST',
+              body: formData
+            })
+
+            return await response.text()
+          }
+          return ''
+        } catch (ex) {
+          return ''
+        }
+      })
+    )
+
+    if (result.length <= 0) {
+      throw Error('No invoice found!')
+    }
+    return result.join()
+  } catch (ex) {
+    throw ex
+  }
+}

package/server/controllers/render-ro-do.ts

@@ -143,6 +143,7 @@ export async function renderRODO({ doNo }, context: any) {
         product_type: inventory.packingType,
         product_size: matchedProductDetail ? matchedProductDetail.packingSize : inventory.packingSize,
         product_batch: inventory.batchId,
+        product_batch_ref: inventory.batchIdRef,
         product_qty: targetInventory.releaseQty,
         product_weight: targetInventory.releaseWeight,
         product_gross_weight: inventory.product.grossWeight,
@@ -159,6 +160,7 @@ export async function renderRODO({ doNo }, context: any) {
         newItem =>
           newItem.product_name === item.product_name &&
           newItem.product_batch === item.product_batch &&
+          newItem.product_batch_ref === item.product_batch_ref &&
           newItem.cross_docking === item.cross_docking &&
           newItem.pallet === item.pallet
       )
@@ -169,6 +171,7 @@ export async function renderRODO({ doNo }, context: any) {
           product_type: item.product_type,
           product_size: item.product_size,
           product_batch: item.product_batch,
+          product_batch_ref: item.product_batch_ref,
           product_qty: item.product_qty,
           product_weight: item.product_weight,
           product_gross_weight: item.product_gross_weight,
@@ -190,6 +193,7 @@ export async function renderRODO({ doNo }, context: any) {
           if (
             ni.product_name === item.product_name &&
             ni.product_batch === item.product_batch &&
+            ni.product_batch_ref === item.product_batch_ref &&
             ni.cross_docking === item.cross_docking &&
             ni.pallet === item.pallet
           ) {
@@ -268,7 +272,8 @@ export async function renderRODO({ doNo }, context: any) {
           : prod.pallet === ''
           ? `${prod.palletQty} PALLET(S)`
           : `${prod.palletQty} PALLET(S) (${prod.pallet})`,
-        inventory_remark: prod?.inventory_remark ? prod.inventory_remark : ''
+        inventory_remark: prod?.inventory_remark ? prod.inventory_remark : '',
+        batch_id_ref: prod.product_batch_ref
       }
     })
   } //.. make data from do

package/server/graphql/resolvers/worksheet/find-release-orders-by-task-no.ts

@@ -1,17 +1,22 @@
-import { Domain } from '@things-factory/shell'
-import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { EntityManager, SelectQueryBuilder } from 'typeorm'
-import { Worksheet as WorksheetEntity, WorksheetDetail as WorksheetDetailEntity } from '../../../entities'
+
 import {
-  ReleaseGood as ReleaseGoodEntity,
+  ORDER_STATUS,
   OrderInventory as OrderInventoryEntity,
-  ORDER_STATUS
+  ReleaseGood as ReleaseGoodEntity
 } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+
+import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
+import { Worksheet as WorksheetEntity, WorksheetDetail as WorksheetDetailEntity } from '../../../entities'
 
 export const findReleaseOrdersByTaskNoResolver = {
   async findReleaseOrdersByTaskNo(_: any, { taskNo }, context: any) {
     const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
-    if (!taskNo) throw new Error('Unable to find task no.')
+    let task = await tx.getRepository(WorksheetEntity).findOne({
+      where: { taskNo, status: WORKSHEET_STATUS.EXECUTING, type: WORKSHEET_TYPE.SORTING }
+    })
+    if (!task) throw new Error('Unable to find task no.')
 
     const qb: SelectQueryBuilder<WorksheetEntity> = tx
       .getRepository(WorksheetEntity)

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/picking/complete-batch-picking.ts

@@ -64,7 +64,18 @@ export async function completeBatchPicking(
     await Promise.all(
       uniqueReleaseGoods.map(async releaseGood => {
         const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-        await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
+
+        let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+          where: { id: releaseGood.id },
+          relations: ['orderProducts', 'orderProducts.product', 'orderProducts.product.productDetails']
+        })
+
+        if (!foundReleaseGood?.packageId) {
+          foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
+        }
+
+        foundReleaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood)
+        await sellercraftCtrl.initiateOrderDocument(sellercraft, foundReleaseGood)
       })
     )
   }