@things-factory/worksheet-base 3.8.24 → 3.8.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/dist-server/controllers/ecommerce/sellercraft-controller.js +49 -16
  2. package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
  3. package/dist-server/controllers/render-grn.js +1 -0
  4. package/dist-server/controllers/render-grn.js.map +1 -1
  5. package/dist-server/controllers/render-ro-do.js +5 -1
  6. package/dist-server/controllers/render-ro-do.js.map +1 -1
  7. package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +10 -1
  8. package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
  9. package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +90 -76
  10. package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
  11. package/package.json +11 -11
  12. package/server/controllers/ecommerce/sellercraft-controller.ts +59 -20
  13. package/server/controllers/render-grn.ts +1 -0
  14. package/server/controllers/render-ro-do.ts +6 -1
  15. package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +12 -1
  16. package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +96 -79
package/dist-server/controllers/ecommerce/sellercraft-controller.js CHANGED
@@ -6,6 +6,27 @@ const sales_base_1 = require("@things-factory/sales-base");
6
6
  const warehouse_base_1 = require("@things-factory/warehouse-base");
7
7
  const worksheet_controller_1 = require("../worksheet-controller");
8
8
  class SellercraftController extends worksheet_controller_1.WorksheetController {
9
+ async packOrder(sellercraft, releaseGood) {
10
+ const orderProducts = releaseGood.orderProducts;
11
+ let sellercraftOPs = [];
12
+ sellercraftOPs = orderProducts.map(orderProduct => {
13
+ const product = orderProduct.product;
14
+ return {
15
+ sku: product.sku,
16
+ releaseQty: orderProduct.releaseQty,
17
+ uom: 'EA'
18
+ };
19
+ });
20
+ const orderInformation = {
21
+ accountId: sellercraft.accountId,
22
+ orderId: releaseGood.refNo2,
23
+ sellercraftOPs
24
+ };
25
+ const packageId = await integration_sellercraft_1.SellercraftAPI.packMarketplaceOrder(sellercraft, Object.assign({}, orderInformation));
26
+ releaseGood.packageId = packageId;
27
+ releaseGood.updater = this.user;
28
+ return releaseGood;
29
+ }
9
30
  async registerProductInbound(sellercraft, arrivalNotice) {
10
31
  const orderProducts = arrivalNotice.orderProducts;
11
32
  const purchaseOrder = arrivalNotice.purchaseOrder;
@@ -61,12 +82,20 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
61
82
  }
62
83
  return {
63
84
  sku: product.sku,
85
+ productName: product.name,
86
+ gtin: defaultProductDetail.gtin,
64
87
  purchaseOrderQty: orderInventory.returnQty * packingSize,
65
88
  receivedQty: orderInventory.returnQty * packingSize,
66
89
  uom: 'EA',
67
90
  batchId: orderInventory.batchId,
68
91
  forceCreateProduct: false,
69
- expiryTime: 0
92
+ expiryTime: 0,
93
+ weight: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
94
+ packageDimension: {
95
+ length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
96
+ width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
97
+ height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
98
+ }
70
99
  };
71
100
  }));
72
101
  const returnInbound = {
@@ -95,21 +124,23 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
95
124
  locationTypes: [warehouse_base_1.LOCATION_TYPE.QUARANTINE, warehouse_base_1.LOCATION_TYPE.RESERVE]
96
125
  });
97
126
  let inventories = await qb.getMany();
98
- let defaultProductDetail;
99
- const sellercraftInvs = await Promise.all(inventories.map(async (inventory) => {
100
- const inventoryPackingType = inventory.packingType;
101
- defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault);
102
- let packingSize = 1;
103
- if (inventoryPackingType !== defaultProductDetail.packingType) {
104
- const unmatchingProductDetail = product.productDetails.find(productDetail => productDetail.packingType === inventoryPackingType);
105
- packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail);
106
- }
107
- return { quantity: inventory.qty * packingSize - inventory.lockedQty * packingSize };
108
- }));
109
- let inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
110
- total += currentValue.quantity;
111
- return total;
112
- }, 0);
127
+ let inventoryTotalQty = 0;
128
+ let defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault);
129
+ if ((inventories === null || inventories === void 0 ? void 0 : inventories.length) > 0) {
130
+ const sellercraftInvs = await Promise.all(inventories.map(async (inventory) => {
131
+ const inventoryPackingType = inventory.packingType;
132
+ let packingSize = 1;
133
+ if (inventoryPackingType !== defaultProductDetail.packingType) {
134
+ const unmatchingProductDetail = product.productDetails.find(productDetail => productDetail.packingType === inventoryPackingType);
135
+ packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail);
136
+ }
137
+ return { quantity: inventory.qty * packingSize - inventory.lockedQty * packingSize };
138
+ }));
139
+ inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
140
+ total += currentValue.quantity;
141
+ return total;
142
+ }, 0);
143
+ }
113
144
  const sellercraftInv = [
114
145
  {
115
146
  sku: product.sku,
@@ -129,6 +160,8 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
129
160
  await integration_sellercraft_1.SellercraftAPI.updateProduct(sellercraft, { accountId: sellercraft.accountId, sellercraftInv });
130
161
  }
131
162
  async initiateOrderShipment(sellercraft, releaseGood) {
163
+ if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId))
164
+ throw new Error('Order package id is not found');
132
165
  const orderInformation = {
133
166
  accountId: sellercraft.accountId,
134
167
  orderId: releaseGood.refNo2,
package/dist-server/controllers/ecommerce/sellercraft-controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":";;;AAAA,qFAAqF;AAErF,2DAOmC;AACnC,mEAA2F;AAE3F,kEAA6D;AAE7D,MAAa,qBAAsB,SAAQ,0CAAmB;IAC5D,KAAK,CAAC,sBAAsB,CAAC,WAAwB,EAAE,aAA4B;QACjF,MAAM,aAAa,GAAmB,aAAa,CAAC,aAAa,CAAA;QACjE,MAAM,aAAa,GAAkB,aAAa,CAAC,aAAa,CAAA;QAChE,MAAM,cAAc,GAAU,MAAM,OAAO,CAAC,GAAG,CAC7C,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,YAA0B,EAAE,EAAE;YACrD,MAAM,OAAO,GAAY,YAAY,CAAC,OAAO,CAAA;YAC7C,MAAM,cAAc,GAAoB,OAAO,CAAC,cAAc,CAAA;YAC9D,MAAM,mBAAmB,GAAW,YAAY,CAAC,WAAW,CAAA;YAC5D,MAAM,oBAAoB,GAAkB,OAAO,CAAC,cAAc,CAAC,IAAI,CACrE,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,SAAS,CACzC,CAAA;YAED,IAAI,WAAW,GAAW,CAAC,CAAA;YAC3B,IAAI,mBAAmB,KAAK,oBAAoB,CAAC,WAAW,EAAE;gBAC5D,MAAM,uBAAuB,GAAkB,OAAO,CAAC,cAAc,CAAC,IAAI,CACxE,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,WAAW,KAAK,mBAAmB,CACnE,CAAA;gBAED,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,oBAAoB,EAAE,uBAAuB,CAAC,CAAA;aAC5G;YAED,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,gBAAgB,EAAE,YAAY,CAAC,OAAO,GAAG,WAAW;gBACpD,WAAW,EAAE,YAAY,CAAC,aAAa,GAAG,WAAW;gBACrD,GAAG,EAAE,IAAI;gBACT,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,WAAW,EAAE,OAAO,CAAC,IAAI;gBACzB,IAAI,EAAE,oBAAoB,CAAC,IAAI;gBAC/B,kBAAkB,EAAE,KAAK;gBACzB,UAAU,EAAE,CAAC;gBACb,MAAM,EAAE,oBAAoB,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,UAAU;gBACjF,gBAAgB,EAAE;oBAChB,MAAM,EAAE,oBAAoB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK;oBACvE,KAAK,EAAE,oBAAoB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK;oBACtE,MAAM,EAAE,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM;iBAC1E;aACF,CAAA;QACH,CAAC,CAAC,CACH,CAAA;QAED,MAAM,YAAY,GAAQ;YACxB,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,SAAS,EAAE,aAAa,CAAC,IAAI;YAC7B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;YAC3E,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,eAAe;YAC/D,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YACxD,cAAc;SACf,CAAA;QACD,MAAM,wCAAc,CAAC,eAAe,CAAC,WAAW,oBAAO,YAAY,EAAG,CAAA;IACxE,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,WAAwB,EAAE,WAAwB;QAC5E,MAAM,gBAAgB,GAAqB,WAAW,CAAC,gBAAgB,CAAA;QACvE,MAAM,cAAc,GAAU,MAAM,OAAO,CAAC,GAAG,CAC7C,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,cAA8B,EAAE,EAAE;YAC5D,MAAM,OAAO,GAAY,cAAc,CAAC,OAAO,CAAA;YAC/C,MAAM,cAAc,GAAoB,OAAO,CAAC,cAAc,CAAA;YAC9D,MAAM,mBAAmB,GAAW,cAAc,CAAC,WAAW,CAAA;YAC9D,MAAM,oBAAoB,GAAkB,OAAO,CAAC,cAAc,CAAC,IAAI,CACrE,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,SAAS,CACzC,CAAA;YAED,IAAI,WAAW,GAAW,CAAC,CAAA;YAC3B,IAAI,mBAAmB,KAAK,oBAAoB,CAAC,WAAW,EAAE;gBAC5D,MAAM,uBAAuB,GAAkB,OAAO,CAAC,cAAc,CAAC,IAAI,CACxE,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,WAAW,KAAK,mBAAmB,CACnE,CAAA;gBAED,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,oBAAoB,EAAE,uBAAuB,CAAC,CAAA;aAC5G;YAED,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,gBAAgB,EAAE,cAAc,CAAC,SAAS,GAAG,WAAW;gBACxD,WAAW,EAAE,cAAc,CAAC,SAAS,GAAG,WAAW;gBACnD,GAAG,EAAE,IAAI;gBACT,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,kBAAkB,EAAE,KAAK;gBACzB,UAAU,EAAE,CAAC;aACd,CAAA;QACH,CAAC,CAAC,CACH,CAAA;QAED,MAAM,aAAa,GAAQ;YACzB,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,SAAS,EAAE,WAAW,CAAC,IAAI;YAC3B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;YACzE,eAAe,EAAE,EAAE;YACnB,WAAW,EAAE,cAAc;YAC3B,cAAc;SACf,CAAA;QACD,MAAM,wCAAc,CAAC,eAAe,CAAC,WAAW,oBAAO,aAAa,EAAG,CAAA;IACzE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,WAAwB,EAAE,SAAoB;QACzE,IAAI,OAAO,GAAY,SAAS,CAAC,OAAO,CAAA;QACxC,MAAM,cAAc,GAAoB,OAAO,CAAC,cAAc,CAAA;QAC9D,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;QAC7E,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC;aACxC,QAAQ,CAAC,+BAA+B,CAAC;aACzC,QAAQ,CAAC,iCAAiC,CAAC;aAC3C,QAAQ,CAAC,2BAA2B,CAAC;aACrC,QAAQ,CAAC,yCAAyC,CAAC;aACnD,aAAa,CAAC;YACb,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;YACxB,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,MAAM,EAAE,iCAAgB,CAAC,UAAU;YACnC,aAAa,EAAE,CAAC,8BAAa,CAAC,UAAU,EAAE,8BAAa,CAAC,OAAO,CAAC;SACjE,CAAC,CAAA;QAEJ,IAAI,WAAW,GAAgB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;QAEjD,IAAI,oBAAmC,CAAA;QACvC,MAAM,eAAe,GAAU,MAAM,OAAO,CAAC,GAAG,CAC9C,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,SAAoB,EAAE,EAAE;YAC7C,MAAM,oBAAoB,GAAW,SAAS,CAAC,WAAW,CAAA;YAC1D,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;YAE5F,IAAI,WAAW,GAAW,CAAC,CAAA;YAC3B,IAAI,oBAAoB,KAAK,oBAAoB,CAAC,WAAW,EAAE;gBAC7D,MAAM,uBAAuB,GAAkB,OAAO,CAAC,cAAc,CAAC,IAAI,CACxE,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,WAAW,KAAK,oBAAoB,CACpE,CAAA;gBAED,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,oBAAoB,EAAE,uBAAuB,CAAC,CAAA;aAC5G;YAED,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,GAAG,WAAW,GAAG,SAAS,CAAC,SAAS,GAAG,WAAW,EAAE,CAAA;QACtF,CAAC,CAAC,CACH,CAAA;QAED,IAAI,iBAAiB,GAAW,eAAe,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;YAC7E,KAAK,IAAI,YAAY,CAAC,QAAQ,CAAA;YAC9B,OAAO,KAAK,CAAA;QACd,CAAC,EAAE,CAAC,CAAC,CAAA;QAEL,MAAM,cAAc,GAAU;YAC5B;gBACE,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,IAAI,EAAE,oBAAoB,CAAC,IAAI;gBAC/B,KAAK,EAAE;oBACL,QAAQ,EAAE,iBAAiB;oBAC3B,eAAe,EAAE,IAAI;iBACtB;gBACD,iBAAiB,EAAE,oBAAoB,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,UAAU;gBAC5F,kBAAkB,EAAE;oBAClB,SAAS,EAAE,oBAAoB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK;oBAC1E,QAAQ,EAAE,oBAAoB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK;oBACzE,SAAS,EAAE,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM;iBAC7E;aACF;SACF,CAAA;QAED,MAAM,wCAAc,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,cAAc,EAAE,CAAC,CAAA;IACvG,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,WAAwB,EAAE,WAAwB;QAC5E,MAAM,gBAAgB,GAAQ;YAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,OAAO,EAAE,WAAW,CAAC,MAAM;YAC3B,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAA;QAED,MAAM,EACJ,YAAY,EACZ,UAAU,EACV,aAAa,EACb,cAAc,EACf,GAAG,MAAM,wCAAc,CAAC,qBAAqB,CAAC,WAAW,oBAAO,gBAAgB,EAAG,CAAA;QAEpF,WAAW,CAAC,YAAY,GAAG,YAAY,CAAA;QACvC,IAAI,aAAa,EAAE;YACjB,WAAW,CAAC,aAAa,GAAG,aAAa,CAAA;YACzC,WAAW,CAAC,UAAU,GAAG,IAAI,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAA;SACrD;QACD,IAAI,cAAc;YAAE,WAAW,CAAC,cAAc,GAAG,cAAc,CAAA;QAC/D,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,WAAwB,EAAE,WAAwB;QAC5E,MAAM,gBAAgB,GAAQ;YAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,OAAO,EAAE,WAAW,CAAC,MAAM;YAC3B,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAA;QACD,MAAM,wCAAc,CAAC,qBAAqB,CAAC,WAAW,oBAAO,gBAAgB,EAAG,CAAA;IAClF,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,WAAwB,EAAE,WAAwB;QACzE,MAAM,gBAAgB,GAAQ;YAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,OAAO,EAAE,WAAW,CAAC,MAAM;YAC3B,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAA;QACD,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAA6C,MAAM,wCAAc,CAAC,kBAAkB,CACjH,WAAW,oBAEN,gBAAgB,EAEtB,CAAA;QAED,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE;YACrB,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBACvB,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;oBAC/B,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAA;iBAC5C;qBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,aAAa,EAAE;oBAC1C,WAAW,CAAC,UAAU,GAAG,QAAQ,CAAC,YAAY,CAAA;iBAC/C;YACH,CAAC,CAAC,CAAA;YAEF,WAAW,CAAC,UAAU,GAAG,UAAU,CAAA;YACnC,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YAC/B,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;SAC7E;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;CACF;AA5ND,sDA4NC"}
1
+ {"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":"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"}
package/dist-server/controllers/render-grn.js CHANGED
@@ -171,6 +171,7 @@ async function renderGRN({ grnNo, timezoneOffSet }, context) {
171
171
  product_type: item.packingType,
172
172
  product_size: item.packingSize,
173
173
  product_batch: item.batchId,
174
+ batch_id_ref: (item === null || item === void 0 ? void 0 : item.batchIdRef) ? item.batchIdRef : '',
174
175
  pallet_qty: item.actualPalletQty,
175
176
  product_qty: unloadInvHistory.qty || item.actualPackQty,
176
177
  product_unit_uom_value: `${Math.round(item.uomValue * 100) / 100}`,
package/dist-server/controllers/render-grn.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render-grn.js","sourceRoot":"","sources":["../../server/controllers/render-grn.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-grn.js","sourceRoot":"","sources":["../../server/controllers/render-grn.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,4DAA8B;AAC9B,qCAAoD;AAEpD,qEAAqE;AACrE,yDAAmD;AACnD,uDAAiE;AACjE,6CAA4C;AAC5C,2DAAyG;AACzG,iDAA8C;AAC9C,mEAAwE;AAExE,4CAA4D;AAC5D,0CAAuC;AACvC,0DAA0D;AAE1D,MAAM,cAAc,GAAG,YAAM,CAAC,GAAG,CAAC,cAAc,EAAE,6CAA6C,CAAC,CAAA;AAEzF,KAAK,UAAU,SAAS,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,OAAY;IACrE,iBAAiB;IACjB,MAAM,MAAM,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC;QACzD,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE;KACvC,CAAC,CAAA;IAEF,cAAc;IACd,MAAM,QAAQ,GAAsB,MAAM,IAAA,uBAAa,EAAC,8BAAiB,CAAC,CAAC,OAAO,CAAC;QACjF,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE;QAC9B,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,CAAC;KAC1F,CAAC,CAAA;IAEF,cAAc;IACd,MAAM,QAAQ,GAAkB,QAAQ,CAAC,aAAa,CAAA;IACtD,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAA;IAE/B,4BAA4B;IAC5B,MAAM,UAAU,GAAa,QAAQ,CAAC,QAAQ,CAAA;IAE9C,MAAM,aAAa,GAAY,MAAM,IAAA,uBAAa,EAAC,mBAAO,CAAC,CAAC,OAAO,CAAC;QAClE,KAAK,EAAE,EAAE,aAAa,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE;QACnD,SAAS,EAAE,CAAC,QAAQ,CAAC;KACtB,CAAC,CAAA;IAEF,MAAM,WAAW,GAAW,aAAa,CAAC,MAAM,CAAA;IAChD,MAAM,cAAc,GAAa,MAAM,IAAA,uBAAa,EAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;QACrE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE;QAC9B,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC,CAAA;IAEF,MAAM,kBAAkB,GAAG,IAAA,uBAAa,EAAC,wCAAuB,CAAC;SAC9D,kBAAkB,CAAC,KAAK,CAAC;SACzB,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC;SACjC,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC;SAChC,SAAS,CAAC,oBAAoB,EAAE,kBAAkB,CAAC;SACnD,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;SACxC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC;SAC5B,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC;SACvC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;SACvB,SAAS,CAAC,2BAA2B,EAAE,QAAQ,CAAC;SAChD,SAAS,CAAC,sFAAsF,EAAE,YAAY,CAAC;SAC/G,SAAS,CAAC,0EAA0E,EAAE,UAAU,CAAC;SACjG,KAAK,CAAC,2BAA2B,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;SAC3D,QAAQ,CAAC,gCAAgC,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC;SACvE,QAAQ,CAAC,oCAAoC,CAAC;SAC9C,OAAO,CAAC,oBAAoB,CAAC;SAC7B,UAAU,CAAC,YAAY,CAAC;SACxB,UAAU,CAAC,UAAU,CAAC;SACtB,UAAU,CAAC,cAAc,CAAC;SAC1B,UAAU,CAAC,KAAK,CAAC;SACjB,UAAU,EAAE,CAAA;IAEf,+BAA+B;IAC/B,MAAM,OAAO,GAAiB,MAAM,IAAA,uBAAa,EAAC,uBAAY,CAAC,CAAC,OAAO,CAAC;QACtE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE;KAC5C,CAAC,CAAA;IAEF,+BAA+B;IAC/B,MAAM,cAAc,GAAiB,MAAM,IAAA,uBAAa,EAAC,uBAAY,CAAC,CAAC,OAAO,CAAC;QAC7E,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE;KACxC,CAAC,CAAA;IAEF,8BAA8B;IAC9B,MAAM,OAAO,GAAc,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;QAChE,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,0BAAc,CAAC,SAAS,EAAE,MAAM,EAAE,yBAAY,CAAC,IAAI,EAAE;QACrG,SAAS,EAAE,CAAC,kBAAkB,EAAE,SAAS,CAAC;KAC3C,CAAC,CAAA;IAEF,yBAAyB;IACzB,MAAM,cAAc,GAAc,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;QACvE,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,0BAAc,CAAC,OAAO,EAAE,MAAM,EAAE,yBAAY,CAAC,IAAI,EAAE;QACnG,SAAS,EAAE,CAAC,kBAAkB,EAAE,SAAS,CAAC;KAC3C,CAAC,CAAA;IAEF,MAAM,cAAc,GAAmB,MAAM,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,IAAI,CAAC;QAC5E,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,eAAe,EAAE,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC,EAAE,aAAa,EAAE,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC,EAAE;QACxG,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC,CAAA;IAEF,yCAAyC;IACzC,MAAM,aAAa,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;QACxE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,yBAAa,CAAC,YAAY,EAAE;KACxD,CAAC,CAAA;IAEF,mBAAmB;IACnB,MAAM,SAAS,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;QACpE,KAAK,EAAE;YACL,MAAM;YACN,QAAQ,EAAE,yBAAa,CAAC,IAAI;SAC7B;KACF,CAAC,CAAA;IAEF,oBAAoB;IACpB,MAAM,cAAc,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;QACzE,KAAK,EAAE;YACL,MAAM;YACN,QAAQ,EAAE,yBAAa,CAAC,SAAS;SAClC;KACF,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;QACnE,KAAK,EAAE;YACL,MAAM;YACN,QAAQ,EAAE,yBAAa,CAAC,GAAG;SAC5B;KACF,CAAC,CAAA;IAEF,MAAM,kBAAkB,GAAU,MAAM,kBAAkB,CAAA;IAE1D,MAAM,QAAQ,GAAG,MAAM,yBAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAEpE,IAAI,IAAI,GAAG,IAAI,CAAA;IACf,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,EAAE;QACnB,IAAI,GAAG,OAAO,GAAG,SAAS,CAAC,QAAQ,GAAG,UAAU,GAAG,CAAC,MAAM,yBAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;KACtG;IAED,IAAI,SAAS,GAAG,IAAI,CAAA;IACpB,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAE;QACxB,SAAS,GAAG,OAAO,GAAG,cAAc,CAAC,QAAQ,GAAG,UAAU,GAAG,CAAC,MAAM,yBAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;KACrH;IAED,IAAI,GAAG,GAAG,IAAI,CAAA;IACd,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE;QAClB,GAAG,GAAG,OAAO,GAAG,cAAc,CAAC,QAAQ,GAAG,UAAU,GAAG,CAAC,MAAM,yBAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;KACzG;IAED,MAAM,IAAI,GAAG;QACX,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,GAAG;QACZ,YAAY,EAAE,UAAU,CAAC,IAAI;QAC7B,gBAAgB,EAAE,UAAU,CAAC,OAAO;QACpC,cAAc,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI;QAC3C,aAAa,EAAE,OAAO,CAAC,KAAK;QAC5B,aAAa,EAAE,OAAO,CAAC,KAAK;QAC5B,WAAW,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG;QACvC,eAAe,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO;QAC/C,iBAAiB,EAAE,OAAO,CAAC,OAAO;QAClC,kBAAkB,EAAE,OAAO,CAAC,QAAQ;QACpC,kBAAkB,EAAE,OAAO,CAAC,QAAQ;QACpC,cAAc,EAAE,OAAO,CAAC,IAAI;QAC5B,eAAe,EAAE,OAAO,CAAC,KAAK;QAC9B,eAAe,EAAE,OAAO,CAAC,KAAK;QAC9B,aAAa,EAAE,OAAO,CAAC,GAAG;QAC1B,eAAe,EAAE,OAAO,CAAC,KAAK;QAC9B,QAAQ,EAAE,QAAQ,CAAC,IAAI;QACvB,MAAM,EAAE,QAAQ,CAAC,IAAI;QACrB,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,iCAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE;QAC3G,WAAW,EAAE,iCAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QACpD,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE;QAC9E,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;QACpD,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;QACpD,aAAa,EAAE,iCAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QACtD,QAAQ,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;QAChC,YAAY,EAAE,QAAQ,CAAC,WAAW,IAAI,EAAE;QACxC,cAAc,EAAE,QAAQ,CAAC,aAAa,IAAI,EAAE;QAC5C,iBAAiB,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE;QAC3E,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;QAC1D,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QAChD,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QAC7D,YAAY,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC7C,IAAI,gBAAgB,GAAG,kBAAkB,CAAC,IAAI,CAC5C,EAAE,CAAC,EAAE,CACH,EAAE,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC/B,EAAE,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;gBAC1B,EAAE,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW;gBAClC,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CACrB,CAAA;YAED,OAAO;gBACL,OAAO,EAAE,GAAG,GAAG,CAAC;gBAChB,WAAW,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;gBAClC,YAAY,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG;gBACjE,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;gBACtC,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACnC,YAAY,EAAE,IAAI,CAAC,WAAW;gBAC9B,YAAY,EAAE,IAAI,CAAC,WAAW;gBAC9B,aAAa,EAAE,IAAI,CAAC,OAAO;gBAC3B,YAAY,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,EAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;gBACrD,UAAU,EAAE,IAAI,CAAC,eAAe;gBAChC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAI,IAAI,CAAC,aAAa;gBACvD,sBAAsB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,GAAG,EAAE;gBAClE,uBAAuB,EAAE,GACvB,IAAI,CAAC,KAAK,CAAC,CAAC,gBAAgB,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,GAAG,CAAC,GAAG,GACxF,EAAE;gBACF,WAAW,EAAE,GAAG,gBAAgB,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE;gBAClD,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,IAAI;gBACtD,UAAU,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI;gBAClC,WAAW,EAAE,gBAAgB,CAAC,UAAU,IAAI,EAAE;gBAC9C,kBAAkB,EAAE,gBAAgB,CAAC,gBAAgB,IAAI,EAAE;gBAC3D,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;aACzF,CAAA;QACH,CAAC,CAAC;KACH,CAAA;IAED,MAAM,QAAQ,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAC/B,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACrC,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;IAEnD,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,cAAc,EAAE;QAC3C,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,QAAQ;KACf,CAAC,CAAA;IAEF,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;AAC9B,CAAC;AA7MD,8BA6MC"}
package/dist-server/controllers/render-ro-do.js CHANGED
@@ -128,6 +128,7 @@ async function renderRODO({ doNo }, context) {
128
128
  product_type: inventory.packingType,
129
129
  product_size: matchedProductDetail ? matchedProductDetail.packingSize : inventory.packingSize,
130
130
  product_batch: inventory.batchId,
131
+ product_batch_ref: inventory.batchIdRef,
131
132
  product_qty: targetInventory.releaseQty,
132
133
  product_weight: targetInventory.releaseWeight,
133
134
  product_gross_weight: inventory.product.grossWeight,
@@ -142,6 +143,7 @@ async function renderRODO({ doNo }, context) {
142
143
  .reduce((newItem, item) => {
143
144
  var foundItem = newItem.find(newItem => newItem.product_name === item.product_name &&
144
145
  newItem.product_batch === item.product_batch &&
146
+ newItem.product_batch_ref === item.product_batch_ref &&
145
147
  newItem.cross_docking === item.cross_docking &&
146
148
  newItem.pallet === item.pallet);
147
149
  if (!foundItem) {
@@ -151,6 +153,7 @@ async function renderRODO({ doNo }, context) {
151
153
  product_type: item.product_type,
152
154
  product_size: item.product_size,
153
155
  product_batch: item.product_batch,
156
+ product_batch_ref: item.product_batch_ref,
154
157
  product_qty: item.product_qty,
155
158
  product_weight: item.product_weight,
156
159
  product_gross_weight: item.product_gross_weight,
@@ -171,6 +174,7 @@ async function renderRODO({ doNo }, context) {
171
174
  return newItem.map(ni => {
172
175
  if (ni.product_name === item.product_name &&
173
176
  ni.product_batch === item.product_batch &&
177
+ ni.product_batch_ref === item.product_batch_ref &&
174
178
  ni.cross_docking === item.cross_docking &&
175
179
  ni.pallet === item.pallet) {
176
180
  return Object.assign(Object.assign({}, ni), { palletQty: ni.palletQty + 1, product_qty: ni.product_qty + item.product_qty, product_weight: ni.product_weight + item.product_weight, product_uom_value: ni.product_uom_value + item.product_uom_value });
@@ -237,7 +241,7 @@ async function renderRODO({ doNo }, context) {
237
241
  : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
238
242
  : prod.pallet === ''
239
243
  ? `${prod.palletQty} PALLET(S)`
240
- : `${prod.palletQty} PALLET(S) (${prod.pallet})`, inventory_remark: (prod === null || prod === void 0 ? void 0 : prod.inventory_remark) ? prod.inventory_remark : '' });
244
+ : `${prod.palletQty} PALLET(S) (${prod.pallet})`, inventory_remark: (prod === null || prod === void 0 ? void 0 : prod.inventory_remark) ? prod.inventory_remark : '', batch_id_ref: prod.product_batch_ref });
241
245
  })
242
246
  }; //.. make data from do
243
247
  const formData = new form_data_1.default();
package/dist-server/controllers/render-ro-do.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render-ro-do.js","sourceRoot":"","sources":["../../server/controllers/render-ro-do.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-ro-do.js","sourceRoot":"","sources":["../../server/controllers/render-ro-do.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.completeBatchPicking = exports.completeBatchPickingResolver = void 0;
4
4
  const biz_base_1 = require("@things-factory/biz-base");
5
5
  const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
6
+ const sales_base_1 = require("@things-factory/sales-base");
6
7
  const controllers_1 = require("../../../../controllers/");
7
8
  const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
8
9
  exports.completeBatchPickingResolver = {
@@ -39,7 +40,15 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
39
40
  }
40
41
  await Promise.all(uniqueReleaseGoods.map(async (releaseGood) => {
41
42
  const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
42
- await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
43
+ let foundReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
44
+ where: { id: releaseGood.id },
45
+ relations: ['orderProducts', 'orderProducts.product', 'orderProducts.product.productDetails']
46
+ });
47
+ if (!(foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.packageId)) {
48
+ foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood);
49
+ }
50
+ foundReleaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood);
51
+ await sellercraftCtrl.initiateOrderDocument(sellercraft, foundReleaseGood);
43
52
  }));
44
53
  }
45
54
  const pickPackTargetInventories = targetInventories
package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js CHANGED
@@ -40,7 +40,10 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
40
40
  'bizplace.company.domain',
41
41
  'orderInventories',
42
42
  'orderInventories.inventory',
43
- 'orderInventories.product'
43
+ 'orderInventories.product',
44
+ 'orderProducts',
45
+ 'orderProducts.product',
46
+ 'orderProducts.product.productDetails'
44
47
  ]
45
48
  });
46
49
  const worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.PICKING, [
@@ -63,6 +66,9 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
63
66
  .findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
64
67
  if (sellercraft) {
65
68
  const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
69
+ if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId)) {
70
+ releaseGood = await sellercraftCtrl.packOrder(sellercraft, releaseGood);
71
+ }
66
72
  releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
67
73
  await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
68
74
  }
@@ -72,84 +78,92 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
72
78
  where: { orderNo: releaseGood.refNo, domain: companyDomain },
73
79
  relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
74
80
  });
75
- const marketplaceStore = marketplaceOrder.marketplaceStore;
76
- let eTraxOption;
77
- if (marketplaceStore.isAutoUpdateShipment) {
78
- const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
79
- await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
80
- }
81
- if (!marketplaceOrder)
82
- throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue');
83
- eTraxOption = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore.eTrax;
84
- // if eTrax option is true
85
- if (eTraxOption) {
86
- const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
87
- // access every marketplaceOrderItems for shipping information you need
88
- // trigger the controller from integration-lmd that trigger the API, build the parameters needed
89
- // for etrax didn't support multi awb per order
90
- const marketplaceOrderShipping = marketplaceOrderItems[0].marketplaceOrderShipping;
91
- const lmd = await tx.getRepository(integration_lmd_1.LastMileDelivery).findOne({
92
- where: {
93
- domain,
94
- platform: 'eTrax'
95
- }
96
- });
97
- //Get which transporter to use
98
- const marketplaceTransporter = await tx.getRepository(integration_marketplace_1.MarketplaceTransporter).findOne({
99
- where: { marketplaceStore: marketplaceOrder.marketplaceStore },
100
- relations: ['pickupTransporter', 'deliveryTransporter']
101
- });
102
- const resp = await integration_lmd_1.LastMileAPI.createShipmentRequest(lmd, {
103
- orderNo: marketplaceOrder.orderNo,
104
- clientId: lmd.clientId,
105
- clientType: lmd.clientType,
106
- clientName: lmd.clientName,
107
- transporterId: marketplaceTransporter.pickupTransporter.transporterId,
108
- pickupName: warehouseContactPoint.name,
109
- pickupAddress1: warehouseContactPoint.address,
110
- pickupAddress2: warehouseContactPoint.address2,
111
- pickupPostcode: warehouseContactPoint.postCode,
112
- pickupState: warehouseContactPoint.state,
113
- pickupCity: warehouseContactPoint.city,
114
- pickupPhone: warehouseContactPoint.phone,
115
- pickupEmail: warehouseContactPoint.email,
116
- name: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.attentionTo) ? marketplaceOrderShipping.attentionTo.trim() : '',
117
- address1: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1.trim() : '-',
118
- address2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2.trim() : '-',
119
- postCode: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode.trim() : '',
120
- city: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city.trim() : '',
121
- state: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state.trim() : '',
122
- phone: marketplaceOrderShipping.phone1 || '',
123
- email: marketplaceOrderShipping.email || '',
124
- attentionTo: marketplaceOrderShipping.attentionTo,
125
- quantity: marketplaceOrderItems.length
126
- });
127
- const delay = (ms) => {
128
- return new Promise(resolve => setTimeout(resolve, ms));
129
- };
130
- if (resp.Status === 'SUCCESS') {
131
- //Success
132
- let awbObtained = false;
133
- let retry = 0;
134
- while (!awbObtained) {
135
- const marketplaceOrder2 = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
136
- where: { releaseOrderId: releaseGood.id },
137
- relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
138
- });
139
- const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShipping;
140
- if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.airwayBill) {
141
- awbObtained = true;
81
+ if (marketplaceOrder) {
82
+ const marketplaceStore = marketplaceOrder.marketplaceStore;
83
+ let eTraxOption;
84
+ if (marketplaceStore.isAutoUpdateShipment) {
85
+ const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
86
+ await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
87
+ }
88
+ if (!marketplaceOrder)
89
+ throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue');
90
+ eTraxOption = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore.eTrax;
91
+ // if eTrax option is true
92
+ if (eTraxOption) {
93
+ const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
94
+ // access every marketplaceOrderItems for shipping information you need
95
+ // trigger the controller from integration-lmd that trigger the API, build the parameters needed
96
+ // for etrax didn't support multi awb per order
97
+ const marketplaceOrderShipping = marketplaceOrderItems[0].marketplaceOrderShipping;
98
+ const lmd = await tx.getRepository(integration_lmd_1.LastMileDelivery).findOne({
99
+ where: {
100
+ domain,
101
+ platform: 'eTrax'
142
102
  }
143
- await delay(5000);
144
- //Timeout after 15sec
145
- if (++retry > 3) {
146
- break;
103
+ });
104
+ //Get which transporter to use
105
+ const marketplaceTransporter = await tx
106
+ .getRepository(integration_marketplace_1.MarketplaceTransporter)
107
+ .findOne({
108
+ where: { marketplaceStore: marketplaceOrder.marketplaceStore },
109
+ relations: ['pickupTransporter', 'deliveryTransporter']
110
+ });
111
+ const resp = await integration_lmd_1.LastMileAPI.createShipmentRequest(lmd, {
112
+ orderNo: marketplaceOrder.orderNo,
113
+ clientId: lmd.clientId,
114
+ clientType: lmd.clientType,
115
+ clientName: lmd.clientName,
116
+ transporterId: marketplaceTransporter.pickupTransporter.transporterId,
117
+ pickupName: warehouseContactPoint.name,
118
+ pickupAddress1: warehouseContactPoint.address,
119
+ pickupAddress2: warehouseContactPoint.address2,
120
+ pickupPostcode: warehouseContactPoint.postCode,
121
+ pickupState: warehouseContactPoint.state,
122
+ pickupCity: warehouseContactPoint.city,
123
+ pickupPhone: warehouseContactPoint.phone,
124
+ pickupEmail: warehouseContactPoint.email,
125
+ name: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.attentionTo) ? marketplaceOrderShipping.attentionTo.trim() : '',
126
+ address1: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1.trim() : '-',
127
+ address2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2.trim() : '-',
128
+ postCode: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode.trim() : '',
129
+ city: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city.trim() : '',
130
+ state: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state.trim() : '',
131
+ phone: marketplaceOrderShipping.phone1 || '',
132
+ email: marketplaceOrderShipping.email || '',
133
+ attentionTo: marketplaceOrderShipping.attentionTo,
134
+ quantity: marketplaceOrderItems.length
135
+ });
136
+ const delay = (ms) => {
137
+ return new Promise(resolve => setTimeout(resolve, ms));
138
+ };
139
+ if (resp.Status === 'SUCCESS') {
140
+ //Success
141
+ let awbObtained = false;
142
+ let retry = 0;
143
+ while (!awbObtained) {
144
+ const marketplaceOrder2 = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
145
+ where: { releaseOrderId: releaseGood.id },
146
+ relations: [
147
+ 'marketplaceStore',
148
+ 'marketplaceOrderItems',
149
+ 'marketplaceOrderItems.marketplaceOrderShipping'
150
+ ]
151
+ });
152
+ const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShipping;
153
+ if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.airwayBill) {
154
+ awbObtained = true;
155
+ }
156
+ await delay(5000);
157
+ //Timeout after 15sec
158
+ if (++retry > 3) {
159
+ break;
160
+ }
147
161
  }
148
162
  }
149
- }
150
- else {
151
- throw resp;
152
- //Failed
163
+ else {
164
+ throw resp;
165
+ //Failed
166
+ }
153
167
  }
154
168
  }
155
169
  }
package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "3.8.24",
3
+ "version": "3.8.28",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -25,20 +25,20 @@
25
25
  },
26
26
  "dependencies": {
27
27
  "@things-factory/auth-base": "^3.8.0",
28
- "@things-factory/biz-base": "^3.8.0",
28
+ "@things-factory/biz-base": "^3.8.26",
29
29
  "@things-factory/document-template-base": "^3.8.0",
30
30
  "@things-factory/id-rule-base": "^3.8.0",
31
- "@things-factory/integration-lmd": "^3.8.19",
32
- "@things-factory/integration-marketplace": "^3.8.23",
33
- "@things-factory/integration-sellercraft": "^3.8.23",
34
- "@things-factory/integration-sftp": "^3.8.21",
35
- "@things-factory/marketplace-base": "^3.8.23",
31
+ "@things-factory/integration-lmd": "^3.8.26",
32
+ "@things-factory/integration-marketplace": "^3.8.28",
33
+ "@things-factory/integration-sellercraft": "^3.8.28",
34
+ "@things-factory/integration-sftp": "^3.8.26",
35
+ "@things-factory/marketplace-base": "^3.8.28",
36
36
  "@things-factory/notification": "^3.8.0",
37
- "@things-factory/sales-base": "^3.8.24",
37
+ "@things-factory/sales-base": "^3.8.28",
38
38
  "@things-factory/setting-base": "^3.8.0",
39
39
  "@things-factory/shell": "^3.8.0",
40
- "@things-factory/transport-base": "^3.8.0",
41
- "@things-factory/warehouse-base": "^3.8.24"
40
+ "@things-factory/transport-base": "^3.8.26",
41
+ "@things-factory/warehouse-base": "^3.8.28"
42
42
  },
43
- "gitHead": "f5ac602fd1c55aa59f3b04b6b3819d7ec32dd91b"
43
+ "gitHead": "8bc0e8adad38cec375d701d66f2f198bceafd644"
44
44
  }
package/server/controllers/ecommerce/sellercraft-controller.ts CHANGED
@@ -13,6 +13,32 @@ import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/ware
13
13
  import { WorksheetController } from '../worksheet-controller'
14
14
 
15
15
  export class SellercraftController extends WorksheetController {
16
+ async packOrder(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
17
+ const orderProducts: OrderProduct[] = releaseGood.orderProducts
18
+ let sellercraftOPs: any[] = []
19
+
20
+ sellercraftOPs = orderProducts.map(orderProduct => {
21
+ const product: Product = orderProduct.product
22
+
23
+ return {
24
+ sku: product.sku,
25
+ releaseQty: orderProduct.releaseQty,
26
+ uom: 'EA'
27
+ }
28
+ })
29
+
30
+ const orderInformation: any = {
31
+ accountId: sellercraft.accountId,
32
+ orderId: releaseGood.refNo2,
33
+ sellercraftOPs
34
+ }
35
+ const packageId: string = await SellercraftAPI.packMarketplaceOrder(sellercraft, { ...orderInformation })
36
+
37
+ releaseGood.packageId = packageId
38
+ releaseGood.updater = this.user
39
+ return releaseGood
40
+ }
41
+
16
42
  async registerProductInbound(sellercraft: Sellercraft, arrivalNotice: ArrivalNotice): Promise<void> {
17
43
  const orderProducts: OrderProduct[] = arrivalNotice.orderProducts
18
44
  const purchaseOrder: PurchaseOrder = arrivalNotice.purchaseOrder
@@ -87,12 +113,20 @@ export class SellercraftController extends WorksheetController {
87
113
 
88
114
  return {
89
115
  sku: product.sku,
116
+ productName: product.name,
117
+ gtin: defaultProductDetail.gtin,
90
118
  purchaseOrderQty: orderInventory.returnQty * packingSize,
91
119
  receivedQty: orderInventory.returnQty * packingSize,
92
120
  uom: 'EA',
93
121
  batchId: orderInventory.batchId,
94
122
  forceCreateProduct: false,
95
- expiryTime: 0
123
+ expiryTime: 0,
124
+ weight: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
125
+ packageDimension: {
126
+ length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
127
+ width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
128
+ height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
129
+ }
96
130
  }
97
131
  })
98
132
  )
@@ -125,30 +159,33 @@ export class SellercraftController extends WorksheetController {
125
159
  })
126
160
 
127
161
  let inventories: Inventory[] = await qb.getMany()
162
+ let inventoryTotalQty: number = 0
128
163
 
129
- let defaultProductDetail: ProductDetail
130
- const sellercraftInvs: any[] = await Promise.all(
131
- inventories.map(async (inventory: Inventory) => {
132
- const inventoryPackingType: string = inventory.packingType
133
- defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
164
+ let defaultProductDetail: ProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
134
165
 
135
- let packingSize: number = 1
136
- if (inventoryPackingType !== defaultProductDetail.packingType) {
137
- const unmatchingProductDetail: ProductDetail = product.productDetails.find(
138
- productDetail => productDetail.packingType === inventoryPackingType
139
- )
166
+ if (inventories?.length > 0) {
167
+ const sellercraftInvs: any[] = await Promise.all(
168
+ inventories.map(async (inventory: Inventory) => {
169
+ const inventoryPackingType: string = inventory.packingType
140
170
 
141
- packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
142
- }
171
+ let packingSize: number = 1
172
+ if (inventoryPackingType !== defaultProductDetail.packingType) {
173
+ const unmatchingProductDetail: ProductDetail = product.productDetails.find(
174
+ productDetail => productDetail.packingType === inventoryPackingType
175
+ )
143
176
 
144
- return { quantity: inventory.qty * packingSize - inventory.lockedQty * packingSize }
145
- })
146
- )
177
+ packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
178
+ }
179
+
180
+ return { quantity: inventory.qty * packingSize - inventory.lockedQty * packingSize }
181
+ })
182
+ )
147
183
 
148
- let inventoryTotalQty: number = sellercraftInvs.reduce((total, currentValue) => {
149
- total += currentValue.quantity
150
- return total
151
- }, 0)
184
+ inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
185
+ total += currentValue.quantity
186
+ return total
187
+ }, 0)
188
+ }
152
189
 
153
190
  const sellercraftInv: any[] = [
154
191
  {
@@ -171,6 +208,8 @@ export class SellercraftController extends WorksheetController {
171
208
  }
172
209
 
173
210
  async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
211
+ if (!releaseGood?.packageId) throw new Error('Order package id is not found')
212
+
174
213
  const orderInformation: any = {
175
214
  accountId: sellercraft.accountId,
176
215
  orderId: releaseGood.refNo2,
package/server/controllers/render-grn.ts CHANGED
@@ -194,6 +194,7 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
194
194
  product_type: item.packingType,
195
195
  product_size: item.packingSize,
196
196
  product_batch: item.batchId,
197
+ batch_id_ref: item?.batchIdRef ? item.batchIdRef : '',
197
198
  pallet_qty: item.actualPalletQty,
198
199
  product_qty: unloadInvHistory.qty || item.actualPackQty,
199
200
  product_unit_uom_value: `${Math.round(item.uomValue * 100) / 100}`,
package/server/controllers/render-ro-do.ts CHANGED
@@ -143,6 +143,7 @@ export async function renderRODO({ doNo }, context: any) {
143
143
  product_type: inventory.packingType,
144
144
  product_size: matchedProductDetail ? matchedProductDetail.packingSize : inventory.packingSize,
145
145
  product_batch: inventory.batchId,
146
+ product_batch_ref: inventory.batchIdRef,
146
147
  product_qty: targetInventory.releaseQty,
147
148
  product_weight: targetInventory.releaseWeight,
148
149
  product_gross_weight: inventory.product.grossWeight,
@@ -159,6 +160,7 @@ export async function renderRODO({ doNo }, context: any) {
159
160
  newItem =>
160
161
  newItem.product_name === item.product_name &&
161
162
  newItem.product_batch === item.product_batch &&
163
+ newItem.product_batch_ref === item.product_batch_ref &&
162
164
  newItem.cross_docking === item.cross_docking &&
163
165
  newItem.pallet === item.pallet
164
166
  )
@@ -169,6 +171,7 @@ export async function renderRODO({ doNo }, context: any) {
169
171
  product_type: item.product_type,
170
172
  product_size: item.product_size,
171
173
  product_batch: item.product_batch,
174
+ product_batch_ref: item.product_batch_ref,
172
175
  product_qty: item.product_qty,
173
176
  product_weight: item.product_weight,
174
177
  product_gross_weight: item.product_gross_weight,
@@ -190,6 +193,7 @@ export async function renderRODO({ doNo }, context: any) {
190
193
  if (
191
194
  ni.product_name === item.product_name &&
192
195
  ni.product_batch === item.product_batch &&
196
+ ni.product_batch_ref === item.product_batch_ref &&
193
197
  ni.cross_docking === item.cross_docking &&
194
198
  ni.pallet === item.pallet
195
199
  ) {
@@ -268,7 +272,8 @@ export async function renderRODO({ doNo }, context: any) {
268
272
  : prod.pallet === ''
269
273
  ? `${prod.palletQty} PALLET(S)`
270
274
  : `${prod.palletQty} PALLET(S) (${prod.pallet})`,
271
- inventory_remark: prod?.inventory_remark ? prod.inventory_remark : ''
275
+ inventory_remark: prod?.inventory_remark ? prod.inventory_remark : '',
276
+ batch_id_ref: prod.product_batch_ref
272
277
  }
273
278
  })
274
279
  } //.. make data from do
package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts CHANGED
@@ -64,7 +64,18 @@ export async function completeBatchPicking(
64
64
  await Promise.all(
65
65
  uniqueReleaseGoods.map(async releaseGood => {
66
66
  const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
67
- await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
67
+
68
+ let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
69
+ where: { id: releaseGood.id },
70
+ relations: ['orderProducts', 'orderProducts.product', 'orderProducts.product.productDetails']
71
+ })
72
+
73
+ if (!foundReleaseGood?.packageId) {
74
+ foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
75
+ }
76
+
77
+ foundReleaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood)
78
+ await sellercraftCtrl.initiateOrderDocument(sellercraft, foundReleaseGood)
68
79
  })
69
80
  )
70
81
  }
package/server/graphql/resolvers/worksheet/picking/complete-picking.ts CHANGED
@@ -55,7 +55,10 @@ export async function completePicking(
55
55
  'bizplace.company.domain',
56
56
  'orderInventories',
57
57
  'orderInventories.inventory',
58
- 'orderInventories.product'
58
+ 'orderInventories.product',
59
+ 'orderProducts',
60
+ 'orderProducts.product',
61
+ 'orderProducts.product.productDetails'
59
62
  ]
60
63
  })
61
64
 
@@ -86,6 +89,11 @@ export async function completePicking(
86
89
 
87
90
  if (sellercraft) {
88
91
  const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
92
+
93
+ if (!releaseGood?.packageId) {
94
+ releaseGood = await sellercraftCtrl.packOrder(sellercraft, releaseGood)
95
+ }
96
+
89
97
  releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
90
98
  await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
91
99
  } else {
@@ -94,91 +102,100 @@ export async function completePicking(
94
102
  where: { orderNo: releaseGood.refNo, domain: companyDomain },
95
103
  relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
96
104
  })
97
- const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
98
- let eTraxOption: boolean
99
105
 
100
- if (marketplaceStore.isAutoUpdateShipment) {
101
- const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
102
- await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
103
- }
106
+ if (marketplaceOrder) {
107
+ const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
108
+ let eTraxOption: boolean
104
109
 
105
- if (!marketplaceOrder)
106
- throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
107
- eTraxOption = marketplaceOrder?.marketplaceStore.eTrax
108
-
109
- // if eTrax option is true
110
- if (eTraxOption) {
111
- const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
112
-
113
- // access every marketplaceOrderItems for shipping information you need
114
- // trigger the controller from integration-lmd that trigger the API, build the parameters needed
115
- // for etrax didn't support multi awb per order
116
- const marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderItems[0].marketplaceOrderShipping
117
- const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
118
- where: {
119
- domain,
120
- platform: 'eTrax'
121
- }
122
- })
123
-
124
- //Get which transporter to use
125
- const marketplaceTransporter: MarketplaceTransporter = await tx.getRepository(MarketplaceTransporter).findOne({
126
- where: { marketplaceStore: marketplaceOrder.marketplaceStore },
127
- relations: ['pickupTransporter', 'deliveryTransporter']
128
- })
129
-
130
- const resp = await LastMileAPI.createShipmentRequest(lmd, {
131
- orderNo: marketplaceOrder.orderNo,
132
- clientId: lmd.clientId,
133
- clientType: lmd.clientType,
134
- clientName: lmd.clientName,
135
- transporterId: marketplaceTransporter.pickupTransporter.transporterId,
136
- pickupName: warehouseContactPoint.name,
137
- pickupAddress1: warehouseContactPoint.address,
138
- pickupAddress2: warehouseContactPoint.address2,
139
- pickupPostcode: warehouseContactPoint.postCode,
140
- pickupState: warehouseContactPoint.state,
141
- pickupCity: warehouseContactPoint.city,
142
- pickupPhone: warehouseContactPoint.phone,
143
- pickupEmail: warehouseContactPoint.email,
144
- name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
145
- address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
146
- address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
147
- postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
148
- city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
149
- state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
150
- phone: marketplaceOrderShipping.phone1 || '',
151
- email: marketplaceOrderShipping.email || '',
152
- attentionTo: marketplaceOrderShipping.attentionTo,
153
- quantity: marketplaceOrderItems.length
154
- })
155
-
156
- const delay = (ms: number) => {
157
- return new Promise(resolve => setTimeout(resolve, ms))
110
+ if (marketplaceStore.isAutoUpdateShipment) {
111
+ const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
112
+ await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
158
113
  }
159
114
 
160
- if (resp.Status === 'SUCCESS') {
161
- //Success
162
- let awbObtained = false
163
- let retry = 0
164
- while (!awbObtained) {
165
- const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
166
- where: { releaseOrderId: releaseGood.id },
167
- relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
168
- })
169
- const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShipping
170
- if (orderShipping?.airwayBill) {
171
- awbObtained = true
115
+ if (!marketplaceOrder)
116
+ throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
117
+ eTraxOption = marketplaceOrder?.marketplaceStore.eTrax
118
+
119
+ // if eTrax option is true
120
+ if (eTraxOption) {
121
+ const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
122
+
123
+ // access every marketplaceOrderItems for shipping information you need
124
+ // trigger the controller from integration-lmd that trigger the API, build the parameters needed
125
+ // for etrax didn't support multi awb per order
126
+ const marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderItems[0].marketplaceOrderShipping
127
+ const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
128
+ where: {
129
+ domain,
130
+ platform: 'eTrax'
172
131
  }
173
- await delay(5000)
174
- //Timeout after 15sec
175
- if (++retry > 3) {
176
- break
132
+ })
133
+
134
+ //Get which transporter to use
135
+ const marketplaceTransporter: MarketplaceTransporter = await tx
136
+ .getRepository(MarketplaceTransporter)
137
+ .findOne({
138
+ where: { marketplaceStore: marketplaceOrder.marketplaceStore },
139
+ relations: ['pickupTransporter', 'deliveryTransporter']
140
+ })
141
+
142
+ const resp = await LastMileAPI.createShipmentRequest(lmd, {
143
+ orderNo: marketplaceOrder.orderNo,
144
+ clientId: lmd.clientId,
145
+ clientType: lmd.clientType,
146
+ clientName: lmd.clientName,
147
+ transporterId: marketplaceTransporter.pickupTransporter.transporterId,
148
+ pickupName: warehouseContactPoint.name,
149
+ pickupAddress1: warehouseContactPoint.address,
150
+ pickupAddress2: warehouseContactPoint.address2,
151
+ pickupPostcode: warehouseContactPoint.postCode,
152
+ pickupState: warehouseContactPoint.state,
153
+ pickupCity: warehouseContactPoint.city,
154
+ pickupPhone: warehouseContactPoint.phone,
155
+ pickupEmail: warehouseContactPoint.email,
156
+ name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
157
+ address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
158
+ address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
159
+ postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
160
+ city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
161
+ state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
162
+ phone: marketplaceOrderShipping.phone1 || '',
163
+ email: marketplaceOrderShipping.email || '',
164
+ attentionTo: marketplaceOrderShipping.attentionTo,
165
+ quantity: marketplaceOrderItems.length
166
+ })
167
+
168
+ const delay = (ms: number) => {
169
+ return new Promise(resolve => setTimeout(resolve, ms))
170
+ }
171
+
172
+ if (resp.Status === 'SUCCESS') {
173
+ //Success
174
+ let awbObtained = false
175
+ let retry = 0
176
+ while (!awbObtained) {
177
+ const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
178
+ where: { releaseOrderId: releaseGood.id },
179
+ relations: [
180
+ 'marketplaceStore',
181
+ 'marketplaceOrderItems',
182
+ 'marketplaceOrderItems.marketplaceOrderShipping'
183
+ ]
184
+ })
185
+ const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShipping
186
+ if (orderShipping?.airwayBill) {
187
+ awbObtained = true
188
+ }
189
+ await delay(5000)
190
+ //Timeout after 15sec
191
+ if (++retry > 3) {
192
+ break
193
+ }
177
194
  }
195
+ } else {
196
+ throw resp
197
+ //Failed
178
198
  }
179
- } else {
180
- throw resp
181
- //Failed
182
199
  }
183
200
  }
184
201
  }