@things-factory/worksheet-base 4.3.144 → 4.3.149

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 (37) hide show
  1. package/dist-server/controllers/ecommerce/ecommerce-controller.js +48 -0
  2. package/dist-server/controllers/ecommerce/ecommerce-controller.js.map +1 -1
  3. package/dist-server/controllers/ecommerce/sellercraft-controller.js +82 -31
  4. package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
  5. package/dist-server/controllers/outbound/packing-worksheet-controller.js +265 -189
  6. package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
  7. package/dist-server/controllers/render-manifest.js +3 -2
  8. package/dist-server/controllers/render-manifest.js.map +1 -1
  9. package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js +4 -4
  10. package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js.map +1 -1
  11. package/dist-server/graphql/resolvers/worksheet/packing/packing.js +6 -7
  12. package/dist-server/graphql/resolvers/worksheet/packing/packing.js.map +1 -1
  13. package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js +4 -4
  14. package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js.map +1 -1
  15. package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +84 -38
  16. package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
  17. package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +44 -9
  18. package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
  19. package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +41 -11
  20. package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
  21. package/dist-server/graphql/types/worksheet/index.js +6 -5
  22. package/dist-server/graphql/types/worksheet/index.js.map +1 -1
  23. package/dist-server/graphql/types/worksheet/worksheet-info.js +2 -0
  24. package/dist-server/graphql/types/worksheet/worksheet-info.js.map +1 -1
  25. package/package.json +18 -18
  26. package/server/controllers/ecommerce/ecommerce-controller.ts +52 -1
  27. package/server/controllers/ecommerce/sellercraft-controller.ts +119 -46
  28. package/server/controllers/outbound/packing-worksheet-controller.ts +314 -211
  29. package/server/controllers/render-manifest.ts +24 -20
  30. package/server/graphql/resolvers/worksheet/packing/complete-packing.ts +5 -4
  31. package/server/graphql/resolvers/worksheet/packing/packing.ts +6 -8
  32. package/server/graphql/resolvers/worksheet/packing/scan-product-packing.ts +6 -9
  33. package/server/graphql/resolvers/worksheet/packing-worksheet.ts +124 -42
  34. package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +59 -11
  35. package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +47 -12
  36. package/server/graphql/types/worksheet/index.ts +6 -5
  37. package/server/graphql/types/worksheet/worksheet-info.ts +2 -0
package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js CHANGED
@@ -9,9 +9,9 @@ const controllers_1 = require("../../../../controllers/");
9
9
  const pos_1 = require("../../../../controllers/pos");
10
10
  const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
11
11
  exports.completePackingResolver = {
12
- async completePacking(_, { releaseGoodNo }, context) {
12
+ async completePacking(_, { releaseGoodNo, orderPackageId }, context) {
13
13
  const { tx, domain, user } = context.state;
14
- await completePacking(tx, domain, user, releaseGoodNo);
14
+ await completePacking(tx, domain, user, releaseGoodNo, orderPackageId);
15
15
  const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
16
16
  where: { name: releaseGoodNo, domain },
17
17
  relations: ['bizplace', 'bizplace.domain']
@@ -40,9 +40,9 @@ exports.completePackingResolver = {
40
40
  });
41
41
  }
42
42
  };
43
- async function completePacking(tx, domain, user, releaseGoodNo) {
43
+ async function completePacking(tx, domain, user, releaseGoodNo, orderPackageId) {
44
44
  const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
45
- await packingWSCtrl.completePacking(releaseGoodNo);
45
+ await packingWSCtrl.completePacking(releaseGoodNo, orderPackageId);
46
46
  }
47
47
  exports.completePacking = completePacking;
48
48
  //# sourceMappingURL=complete-packing.js.map
package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"complete-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/complete-packing.ts"],"names":[],"mappings":";;;AAGA,uDAAkE;AAClE,6CAA4C;AAC5C,mFAAgE;AAChE,2DAAwD;AAGxD,0DAAqE;AACrE,qDAA8D;AAC9D,uFAAkF;AAErE,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QAC3D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;QAEtD,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YAC3E,KAAK,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE;YACtC,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC;SAC3C,CAAC,CAAA;QAEF,IAAI,WAAW,CAAC,IAAI,IAAI,KAAK,EAAE;YAC7B,MAAM,MAAM,GAAY,MAAM,EAAE;iBAC7B,aAAa,CAAC,gCAAO,CAAC;iBACtB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;YAEpG,IAAI,MAAM,EAAE;gBACV,IAAI;oBACF,MAAM,UAAU,GAAqB,IAAI,sBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;oBAC3E,MAAM,UAAU,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC,CAAA;iBAC5D;gBAAC,OAAO,KAAK,EAAE;oBACd,YAAM,CAAC,KAAK,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAA;iBAC1D;aACF;SACF;QAED,MAAM,QAAQ,GAAa,MAAM,IAAA,wBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC5D,MAAM,mBAAmB,GAAwB,IAAI,0CAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YACnD,KAAK,EAAE,+BAA+B,QAAQ,CAAC,IAAI,KAAK,aAAa,GAAG;YACxE,IAAI,EAAE,4CAA4C;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,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB;IAErB,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAClG,MAAM,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;AACpD,CAAC;AARD,0CAQC"}
1
+ {"version":3,"file":"complete-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/complete-packing.ts"],"names":[],"mappings":";;;AAGA,uDAAkE;AAClE,6CAA4C;AAC5C,mFAAgE;AAChE,2DAAwD;AAGxD,0DAAqE;AACrE,qDAA8D;AAC9D,uFAAkF;AAErE,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,OAAY;QAC3E,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,cAAc,CAAC,CAAA;QAEtE,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YAC3E,KAAK,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE;YACtC,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC;SAC3C,CAAC,CAAA;QAEF,IAAI,WAAW,CAAC,IAAI,IAAI,KAAK,EAAE;YAC7B,MAAM,MAAM,GAAY,MAAM,EAAE;iBAC7B,aAAa,CAAC,gCAAO,CAAC;iBACtB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;YAEpG,IAAI,MAAM,EAAE;gBACV,IAAI;oBACF,MAAM,UAAU,GAAqB,IAAI,sBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;oBAC3E,MAAM,UAAU,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC,CAAA;iBAC5D;gBAAC,OAAO,KAAK,EAAE;oBACd,YAAM,CAAC,KAAK,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAA;iBAC1D;aACF;SACF;QAED,MAAM,QAAQ,GAAa,MAAM,IAAA,wBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC5D,MAAM,mBAAmB,GAAwB,IAAI,0CAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YACnD,KAAK,EAAE,+BAA+B,QAAQ,CAAC,IAAI,KAAK,aAAa,GAAG;YACxE,IAAI,EAAE,4CAA4C;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,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB,EACrB,cAAsB;IAEtB,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAClG,MAAM,aAAa,CAAC,eAAe,CAAC,aAAa,EAAE,cAAc,CAAC,CAAA;AACpE,CAAC;AATD,0CASC"}
package/dist-server/graphql/resolvers/worksheet/packing/packing.js CHANGED
@@ -5,22 +5,21 @@ const auth_base_1 = require("@things-factory/auth-base");
5
5
  const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
6
6
  const controllers_1 = require("../../../../controllers");
7
7
  exports.packingResolver = {
8
- async packing(_, { worksheetDetailName, releaseQty, serialNumber }, context) {
8
+ async packing(_, { orderPackageItemId, releaseQty, serialNumber }, context) {
9
9
  const { tx, domain, user } = context.state;
10
- await packing(tx, domain, user, worksheetDetailName, releaseQty, serialNumber);
10
+ await packing(tx, domain, user, orderPackageItemId, releaseQty, serialNumber);
11
11
  }
12
12
  };
13
- async function packing(tx, domain, user, worksheetDetailName, releaseQty, serialNumber) {
13
+ async function packing(tx, domain, user, orderPackageItemId, releaseQty, serialNumber) {
14
14
  const worksheetController = new controllers_1.PackingWorksheetController(tx, domain, user);
15
- const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty, serialNumber);
16
- let releaseGood = worksheetDetail.targetInventory.releaseGood;
17
- const worksheet = worksheetDetail.worksheet;
15
+ const worksheetDetail = await worksheetController.packing(orderPackageItemId, releaseQty, serialNumber);
16
+ let releaseGood = worksheetDetail.releaseGood;
18
17
  const orderSource = releaseGood.source;
19
18
  switch (orderSource) {
20
19
  case auth_base_1.ApplicationType.SELLERCRAFT:
21
20
  const sellercraft = await tx
22
21
  .getRepository(integration_sellercraft_1.Sellercraft)
23
- .findOne({ domain: worksheet.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
22
+ .findOne({ domain: worksheetDetail.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
24
23
  if (sellercraft) {
25
24
  const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
26
25
  await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
package/dist-server/graphql/resolvers/worksheet/packing/packing.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/packing.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,OAAY;QACnF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAChF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,UAAkB,EAClB,YAAoB;IAEpB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,mBAAmB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAExG,IAAI,WAAW,GAAgB,eAAe,CAAC,eAAe,CAAC,WAAW,CAAA;IAC1E,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;IAEtD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;IAC9C,QAAQ,WAAW,EAAE;QACnB,KAAK,2BAAe,CAAC,WAAW;YAC9B,MAAM,WAAW,GAAgB,MAAM,EAAE;iBACtC,aAAa,CAAC,qCAAW,CAAC;iBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;YAEnF,IAAI,WAAW,EAAE;gBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC1F,MAAM,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;aACnE;YACD,MAAK;QAEP;YACE,MAAK;KACR;IAED,gEAAgE;IAChE,8CAA8C;IAC9C,kCAAkC;IAClC,wFAAwF;IAExF,uBAAuB;IACvB,iGAAiG;IACjG,yEAAyE;IACzE,MAAM;IACN,IAAI;AACN,CAAC;AAzCD,0BAyCC"}
1
+ {"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/packing.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,qFAAwF;AAIxF,yDAA2F;AAE9E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,kBAAkB,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,OAAY;QAClF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAC/E,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,kBAA0B,EAC1B,UAAkB,EAClB,YAAoB;IAEpB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,kBAAkB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAEvG,IAAI,WAAW,GAAgB,eAAe,CAAC,WAAW,CAAA;IAE1D,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;IAC9C,QAAQ,WAAW,EAAE;QACnB,KAAK,2BAAe,CAAC,WAAW;YAC9B,MAAM,WAAW,GAAgB,MAAM,EAAE;iBACtC,aAAa,CAAC,qCAAW,CAAC;iBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;YAEzF,IAAI,WAAW,EAAE;gBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC1F,MAAM,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;aACnE;YACD,MAAK;QAEP;YACE,MAAK;KACR;IAED,gEAAgE;IAChE,8CAA8C;IAC9C,kCAAkC;IAClC,wFAAwF;IAExF,uBAAuB;IACvB,iGAAiG;IACjG,yEAAyE;IACzE,MAAM;IACN,IAAI;AACN,CAAC;AAxCD,0BAwCC"}
package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js CHANGED
@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.scanProductPacking = exports.scanProductPackingResolver = void 0;
4
4
  const controllers_1 = require("../../../../controllers");
5
5
  exports.scanProductPackingResolver = {
6
- async scanProductPacking(_, { worksheetDetailName, productBarcode, serialNumber }, context) {
6
+ async scanProductPacking(_, { orderPackageItemId, productBarcode, serialNumber }, context) {
7
7
  const { tx, domain, user } = context.state;
8
- return await scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode, serialNumber);
8
+ return await scanProductPacking(tx, domain, user, orderPackageItemId, productBarcode, serialNumber);
9
9
  }
10
10
  };
11
- async function scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode, serialNumber) {
11
+ async function scanProductPacking(tx, domain, user, orderPackageItemId, productBarcode, serialNumber) {
12
12
  try {
13
13
  console.time('execution time to scan for packing');
14
14
  const worksheetController = new controllers_1.PackingWorksheetController(tx, domain, user);
15
- const inventoryItems = await worksheetController.scanProductPacking(worksheetDetailName, productBarcode, serialNumber);
15
+ const inventoryItems = await worksheetController.scanProductPacking(orderPackageItemId, productBarcode, serialNumber);
16
16
  console.timeEnd('execution time to scan for packing');
17
17
  return inventoryItems;
18
18
  // if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"scan-product-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/scan-product-packing.ts"],"names":[],"mappings":";;;AAOA,yDAA2F;AAG9E,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,OAAY;QAClG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;IACtG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,cAAsB,EACtB,YAAqB;IAErB,IAAI;QACF,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAA;QAClD,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACxG,MAAM,cAAc,GAAG,MAAM,mBAAmB,CAAC,kBAAkB,CACjE,mBAAmB,EACnB,cAAc,EACd,YAAY,CACb,CAAA;QAED,OAAO,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAA;QACrD,OAAO,cAAc,CAAA;QAErB,gEAAgE;QAChE,8CAA8C;QAC9C,kCAAkC;QAClC,wFAAwF;QAExF,uBAAuB;QACvB,iGAAiG;QACjG,mEAAmE;QACnE,MAAM;QACN,IAAI;KACL;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;AAjCD,gDAiCC"}
1
+ {"version":3,"file":"scan-product-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/scan-product-packing.ts"],"names":[],"mappings":";;;AAKA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,kBAAkB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,OAAY;QACjG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;IACrG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,kBAA0B,EAC1B,cAAsB,EACtB,YAAqB;IAErB,IAAI;QACF,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAA;QAClD,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACxG,MAAM,cAAc,GAAG,MAAM,mBAAmB,CAAC,kBAAkB,CACjE,kBAAkB,EAClB,cAAc,EACd,YAAY,CACb,CAAA;QAED,OAAO,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAA;QACrD,OAAO,cAAc,CAAA;QAErB,gEAAgE;QAChE,8CAA8C;QAC9C,kCAAkC;QAClC,wFAAwF;QAExF,uBAAuB;QACvB,iGAAiG;QACjG,mEAAmE;QACnE,MAAM;QACN,IAAI;KACL;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;AAjCD,gDAiCC"}
package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js CHANGED
@@ -14,7 +14,7 @@ const controllers_1 = require("../../../controllers");
14
14
  const entities_1 = require("../../../entities");
15
15
  exports.packingWorksheetResolver = {
16
16
  async packingWorksheet(_, { releaseGoodNo }, context) {
17
- var _a, _b, _c, _d;
17
+ var _a, _b, _c, _d, _e, _f, _g, _h;
18
18
  try {
19
19
  const { tx, domain, user } = context.state;
20
20
  let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
@@ -24,9 +24,11 @@ exports.packingWorksheetResolver = {
24
24
  },
25
25
  relations: ['bizplace', 'bizplace.domain']
26
26
  });
27
+ let binLocation = null;
28
+ let isBatchPicking = false;
27
29
  // Find Release Order based on Bin
28
30
  if (!releaseGood) {
29
- const binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
31
+ binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
30
32
  where: { domain, name: releaseGoodNo }
31
33
  });
32
34
  if (binLocation) {
@@ -54,13 +56,36 @@ exports.packingWorksheetResolver = {
54
56
  const [orderInventoriesByBin, totalInventoriesByBin] = await qb.getManyAndCount();
55
57
  // @oscarchuaweiwen-fsd @chrislim I suggest using getMany() instead since the total is redundant here
56
58
  // remove duplicated count of release good
57
- const filteredRO = orderInventoriesByBin.map(oiBin => {
58
- return oiBin.releaseGood.name;
59
- });
59
+ const filteredRO = [
60
+ ...new Set(orderInventoriesByBin.map(oiBin => {
61
+ return oiBin.releaseGood.id;
62
+ }))
63
+ ];
60
64
  if (orderInventoriesByBin.length > 0) {
61
- releaseGoodNo = orderInventoriesByBin[0].releaseGood.name;
62
- releaseGood = orderInventoriesByBin[0].releaseGood;
63
- releaseGood.totalInventoriesByBin = [...new Set(filteredRO)].length;
65
+ if ((filteredRO === null || filteredRO === void 0 ? void 0 : filteredRO.length) > 1) {
66
+ await Promise.all(filteredRO.map(async (roId) => {
67
+ let orderPackages = await tx
68
+ .getRepository(sales_base_1.OrderPackage)
69
+ .createQueryBuilder('opk')
70
+ .innerJoinAndSelect('opk.releaseGood', 'rg')
71
+ .innerJoinAndSelect('rg.bizplace', 'bizplace')
72
+ .innerJoinAndSelect('bizplace.domain', 'domain')
73
+ .innerJoinAndSelect('rg.orderInventories', 'oi')
74
+ .where('rg.id = :releaseGoodId', { releaseGoodId: roId })
75
+ .getMany();
76
+ if (orderPackages === null || orderPackages === void 0 ? void 0 : orderPackages.length) {
77
+ releaseGood = orderPackages[0].releaseGood;
78
+ }
79
+ }));
80
+ releaseGoodNo = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.name;
81
+ isBatchPicking = ((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderInventories[0]) === null || _a === void 0 ? void 0 : _a.refWorksheetId) ? true : false;
82
+ }
83
+ else {
84
+ releaseGoodNo = orderInventoriesByBin[0].releaseGood.name;
85
+ releaseGood = orderInventoriesByBin[0].releaseGood;
86
+ isBatchPicking = ((_b = orderInventoriesByBin[0]) === null || _b === void 0 ? void 0 : _b.refWorksheetId) ? true : false;
87
+ }
88
+ releaseGood.totalInventoriesByBin = filteredRO.length;
64
89
  releaseGood.isOrderInventoryBin = true;
65
90
  }
66
91
  else {
@@ -70,6 +95,7 @@ exports.packingWorksheetResolver = {
70
95
  }
71
96
  if (!releaseGood)
72
97
  throw new Error(`Release good do not exist.`);
98
+ const orderSource = releaseGood.source;
73
99
  const worksheet = await tx
74
100
  .getRepository(entities_1.Worksheet)
75
101
  .createQueryBuilder('w')
@@ -88,10 +114,28 @@ exports.packingWorksheetResolver = {
88
114
  .getOne();
89
115
  if (!worksheet)
90
116
  throw new Error('Worksheet does not exist');
117
+ const orderPackages = await tx.getRepository(sales_base_1.OrderPackage).find({
118
+ where: { releaseGood, domain, bizplace: releaseGood.bizplace },
119
+ order: { updatedAt: 'DESC' },
120
+ relations: [
121
+ 'orderPackageItems',
122
+ 'orderPackageItems.orderProduct',
123
+ 'orderPackageItems.orderProduct.product',
124
+ 'orderPackageItems.orderProduct.product.productDetails'
125
+ ]
126
+ });
91
127
  if (worksheet.status === constants_1.WORKSHEET_STATUS.DONE) {
92
128
  throw new Error(`Worksheet is completed already`);
93
129
  }
130
+ else if (worksheet.status === constants_1.WORKSHEET_STATUS.EXECUTING) {
131
+ if ((orderPackages === null || orderPackages === void 0 ? void 0 : orderPackages.length) == 0 && orderSource == auth_base_1.ApplicationType.SELLERCRAFT) {
132
+ throw new Error('Waiting for packages from marketplace. Please retry in while.');
133
+ }
134
+ }
94
135
  else if (worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED) {
136
+ if ((orderPackages === null || orderPackages === void 0 ? void 0 : orderPackages.length) == 0 && orderSource == auth_base_1.ApplicationType.SELLERCRAFT) {
137
+ throw new Error('Waiting for packages from marketplace. Please retry in while.');
138
+ }
95
139
  const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
96
140
  const directActivatePackingWorksheet = await tx.getRepository(setting_base_1.Setting).findOne({
97
141
  where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
@@ -102,7 +146,7 @@ exports.packingWorksheetResolver = {
102
146
  where: {
103
147
  setting: directActivatePackingWorksheet,
104
148
  domain: domain,
105
- partnerDomain: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain
149
+ partnerDomain: (_c = releaseGood.bizplace) === null || _c === void 0 ? void 0 : _c.domain
106
150
  }
107
151
  });
108
152
  if (directActivatePackingWorksheet != undefined &&
@@ -125,7 +169,6 @@ exports.packingWorksheetResolver = {
125
169
  let trackingNo;
126
170
  let shippingProvider;
127
171
  let marketplaceStatus;
128
- const orderSource = releaseGood.source;
129
172
  switch (orderSource) {
130
173
  case auth_base_1.ApplicationType.SELLERCRAFT:
131
174
  const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
@@ -174,6 +217,7 @@ exports.packingWorksheetResolver = {
174
217
  default:
175
218
  break;
176
219
  }
220
+ let processingOrderPackage = orderPackages.filter(opk => opk.status == sales_base_1.ORDER_STATUS.PROCESSING) || [];
177
221
  return {
178
222
  worksheetInfo: {
179
223
  releaseGood,
@@ -181,41 +225,43 @@ exports.packingWorksheetResolver = {
181
225
  refNo: releaseGood.refNo,
182
226
  refNo2: releaseGood.refNo2,
183
227
  refNo3: releaseGood.refNo3,
184
- partnerDomainId: (_b = releaseGood.bizplace) === null || _b === void 0 ? void 0 : _b.domain.id,
228
+ partnerDomainId: (_d = releaseGood.bizplace) === null || _d === void 0 ? void 0 : _d.domain.id,
185
229
  startedAt: worksheet.startedAt,
186
230
  shippingProvider: shippingProvider ? shippingProvider : '',
187
231
  trackingNo: trackingNo ? trackingNo : '',
188
- airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
232
+ airwayBill: (_e = processingOrderPackage[0]) === null || _e === void 0 ? void 0 : _e.airwayBill,
189
233
  checkedRemarkBy: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.checkedRemarkBy,
190
- invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
191
- platform: Object.keys(marketplaceOrder).length > 0 ? (_c = marketplaceOrder.marketplaceStore) === null || _c === void 0 ? void 0 : _c.platform : 'operato',
192
- marketplaceStoreId: Object.keys(marketplaceOrder).length > 0 ? (_d = marketplaceOrder.marketplaceStore) === null || _d === void 0 ? void 0 : _d.id : '',
234
+ invoice: (_f = processingOrderPackage[0]) === null || _f === void 0 ? void 0 : _f.invoice,
235
+ platform: Object.keys(marketplaceOrder).length > 0 ? (_g = marketplaceOrder.marketplaceStore) === null || _g === void 0 ? void 0 : _g.platform : 'operato',
236
+ marketplaceStoreId: Object.keys(marketplaceOrder).length > 0 ? (_h = marketplaceOrder.marketplaceStore) === null || _h === void 0 ? void 0 : _h.id : '',
193
237
  marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
194
- marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
238
+ marketplaceOrder: marketplaceOrder ? marketplaceOrder : '',
239
+ orderPackage: processingOrderPackage[0],
240
+ orderPackages
195
241
  },
196
- worksheetDetailInfos: worksheet.worksheetDetails
197
- .map((packingWSD) => {
198
- const targetInventory = packingWSD.targetInventory;
199
- const inventory = targetInventory.inventory;
242
+ worksheetDetailInfos: processingOrderPackage[0].orderPackageItems
243
+ .map(opi => {
244
+ const orderProduct = opi.orderProduct;
200
245
  return {
201
- id: packingWSD.id,
202
- name: packingWSD.name,
203
- palletId: inventory.palletId,
204
- cartonId: inventory.cartonId,
205
- batchId: inventory.batchId,
206
- batchIdRef: inventory.batchIdRef,
207
- product: inventory.product,
208
- sku: inventory.product.sku,
209
- releaseQty: targetInventory.releaseQty,
210
- packedQty: targetInventory.packedQty,
211
- status: packingWSD.status,
212
- description: packingWSD.description,
213
- targetName: targetInventory.name,
214
- packingType: inventory.packingType,
215
- packingSize: inventory.packingSize,
216
- binLocation: targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.binLocation,
217
- location: inventory.location,
218
- relatedOrderInv: targetInventory
246
+ id: opi.id,
247
+ name: opi.name,
248
+ // palletId: inventory.palletId,
249
+ // cartonId: inventory.cartonId,
250
+ batchId: orderProduct.batchId,
251
+ // batchIdRef: inventory.batchIdRef,
252
+ product: orderProduct.product,
253
+ sku: orderProduct.product.sku,
254
+ releaseQty: opi.releaseQty,
255
+ packedQty: (opi === null || opi === void 0 ? void 0 : opi.packedQty) || 0,
256
+ status: opi.status,
257
+ // description: packingWSD.description,
258
+ // targetName: targetInventory.name,
259
+ // packingType: inventory.packingType,
260
+ // packingSize: inventory.packingSize,
261
+ binLocation: binLocation,
262
+ isBatchPicking
263
+ // location: inventory.location,
264
+ // relatedOrderInv: targetInventory
219
265
  };
220
266
  })
221
267
  .sort((a, b) => {
package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js CHANGED
@@ -44,7 +44,17 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
44
44
  await Promise.all(uniqueReleaseGoods.map(async (releaseGood) => {
45
45
  let foundReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
46
46
  where: { id: releaseGood.id },
47
- relations: ['orderProducts', 'orderProducts.product', 'bizplace', 'bizplace.company', 'bizplace.company.domain']
47
+ relations: [
48
+ 'domain',
49
+ 'creator',
50
+ 'updater',
51
+ 'orderPackages',
52
+ 'orderProducts',
53
+ 'orderProducts.product',
54
+ 'bizplace',
55
+ 'bizplace.company',
56
+ 'bizplace.company.domain'
57
+ ]
48
58
  });
49
59
  const orderSource = foundReleaseGood.source;
50
60
  switch (orderSource) {
@@ -55,14 +65,10 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
55
65
  if (sellercraft) {
56
66
  const initSCOrderShipment = async (sellercraft, foundReleaseGood) => {
57
67
  await (0, typeorm_1.getManager)().transaction(async (txMgr) => {
68
+ var _a;
58
69
  const sellercraftCtrl = new controllers_1.SellercraftController(txMgr, domain, user);
59
- if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId)) {
60
- releaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood);
61
- if (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId) {
62
- await txMgr
63
- .getRepository(sales_base_1.ReleaseGood)
64
- .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater });
65
- }
70
+ if (!((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length)) {
71
+ await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood);
66
72
  }
67
73
  const rtsTriggerLevel = await tx.getRepository(setting_base_1.Setting).findOne({
68
74
  where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
@@ -89,12 +95,41 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
89
95
  ]
90
96
  });
91
97
  const marketplaceStore = marketplaceOrder.marketplaceStore;
98
+ const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
92
99
  if (marketplaceStore === null || marketplaceStore === void 0 ? void 0 : marketplaceStore.isAutoUpdateShipment) {
93
- const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
94
100
  await ecommerceCtrl.createOrderShip(foundReleaseGood, marketplaceStore, marketplaceOrder, companyDomain);
95
101
  }
102
+ await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, foundReleaseGood);
96
103
  break;
97
104
  default:
105
+ const orderPackage = {
106
+ name: sales_base_1.OrderNoGenerator.orderPackage(),
107
+ packageId: null,
108
+ trackingNo: null,
109
+ transporter: null,
110
+ airwayBill: null,
111
+ status: sales_base_1.ORDER_STATUS.PROCESSING,
112
+ releaseGood,
113
+ domain: releaseGood.domain,
114
+ bizplace: releaseGood.bizplace,
115
+ creator: releaseGood.creator,
116
+ updater: releaseGood.updater
117
+ };
118
+ let savedOrderPackage = await tx.getRepository(sales_base_1.OrderPackage).save(orderPackage);
119
+ const orderPackageItems = releaseGood.orderProducts.map(op => {
120
+ return {
121
+ name: sales_base_1.OrderNoGenerator.orderPackageItem(),
122
+ orderProduct: op,
123
+ status: sales_base_1.ORDER_STATUS.PROCESSING,
124
+ releaseQty: op.releaseQty,
125
+ orderPackage: savedOrderPackage,
126
+ domain: releaseGood.domain,
127
+ bizplace: releaseGood.bizplace,
128
+ creator: releaseGood.creator,
129
+ updater: releaseGood.updater
130
+ };
131
+ });
132
+ await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
98
133
  break;
99
134
  }
100
135
  }));
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":";;;AAAA,qCAAmD;AAEnD,yDAAiE;AACjE,uDAAkE;AAElE,qFAAwF;AACxF,uEAAmE;AACnE,2DAAwE;AACxE,+DAAsD;AAGtD,0DAKiC;AACjC,iEAAuE;AACvE,uFAAkF;AAGrE,QAAA,4BAA4B,GAAG;IAC1C,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,EAAE,OAAY;QACzD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QAEpD,MAAM,QAAQ,GAAa,MAAM,IAAA,wBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC5D,MAAM,mBAAmB,GAAwB,IAAI,0CAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YACnD,KAAK,EAAE,+BAA+B,QAAQ,CAAC,IAAI,KAAK,MAAM,GAAG;YACjE,IAAI,EAAE,iCAAiC;YACvC,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,oBAAoB,CACxC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,MAAc;IAEd,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAClG,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;IAElE,MAAM,gBAAgB,GAAsB,SAAS,CAAC,gBAAgB,CAAA;IACtE,MAAM,iBAAiB,GAAqB,gBAAgB;SACzD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,SAAS,CAAC;SACtC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAErD,MAAM,YAAY,GAAkB,gBAAgB,CAAC,GAAG,CACtD,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,eAAe,IAAI,eAAe,CAAC,eAAe,CAAC,WAAW,CAClG,CAAA;IACD,MAAM,kBAAkB,GAAkB,EAAE,CAAA;IAC5C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAA;IACrB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACtC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;YAC5B,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;YAC7B,kBAAkB,CAAC,IAAI,mBAAM,WAAW,EAAG,CAAA;SAC5C;KACF;IAED,MAAM,OAAO,CAAC,GAAG,CACf,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAC,WAAW,EAAC,EAAE;QACzC,IAAI,gBAAgB,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YAC9E,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE;YAC7B,SAAS,EAAE,CAAC,eAAe,EAAE,uBAAuB,EAAE,UAAU,EAAE,kBAAkB,EAAE,yBAAyB,CAAC;SACjH,CAAC,CAAA;QACF,MAAM,WAAW,GAAW,gBAAgB,CAAC,MAAM,CAAA;QACnD,QAAQ,WAAW,EAAE;YACnB,KAAK,2BAAe,CAAC,WAAW;gBAC9B,MAAM,WAAW,GAAgB,MAAM,EAAE;qBACtC,aAAa,CAAC,qCAAW,CAAC;qBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;gBAEnF,IAAI,WAAW,EAAE;oBACf,MAAM,mBAAmB,GAAG,KAAK,EAAE,WAAwB,EAAE,gBAA6B,EAAE,EAAE;wBAC5F,MAAM,IAAA,oBAAU,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;4BAC3C,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;4BAE7F,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,SAAS,CAAA,EAAE;gCAC3B,WAAW,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAA;gCAE5E,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,SAAS,EAAE;oCAC1B,MAAM,KAAK;yCACR,aAAa,CAAC,wBAAW,CAAC;yCAC1B,MAAM,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;iCACtG;6BACF;4BAED,MAAM,eAAe,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAC,OAAO,CAAC;gCACvE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE;6BAClE,CAAC,CAAA;4BAEF,IAAI,eAAe,IAAI,QAAQ,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,KAAK,KAAI,CAAC,CAAC,IAAI,CAAC,EAAE;gCACjE,MAAM,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;6BACtE;wBACH,CAAC,CAAC,CAAA;oBACJ,CAAC,CAAA;oBAED,iEAAiE;oBACjE,mBAAmB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAA;iBACnD;gBACD,MAAK;YAEP,KAAK,2BAAe,CAAC,GAAG;gBACtB,MAAM,aAAa,GAAW,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAA;gBACtE,MAAM,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;oBAC1F,KAAK,EAAE,EAAE,OAAO,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;oBACjE,SAAS,EAAE;wBACT,uBAAuB;wBACvB,qDAAqD;wBACrD,8EAA8E;wBAC9E,kBAAkB;wBAClB,0CAA0C;qBAC3C;iBACF,CAAC,CAAA;gBACF,MAAM,gBAAgB,GAAqB,gBAAgB,CAAC,gBAAgB,CAAA;gBAE5E,IAAI,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,oBAAoB,EAAE;oBAC1C,MAAM,aAAa,GAAwB,IAAI,+BAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;oBACpF,MAAM,aAAa,CAAC,eAAe,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;iBACzG;gBACD,MAAK;YAEP;gBACE,MAAK;SACR;IACH,CAAC,CAAC,CACH,CAAA;IAED,MAAM,yBAAyB,GAAqB,iBAAiB;SAClE,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,WAAW,CAAC,aAAa,CAAC;SACpE,GAAG,CAAC,CAAC,uBAAuC,EAAE,EAAE;QAC/C,OAAO,uBAAuB,CAAA;IAChC,CAAC,CAAC,CAAA;IAEJ,MAAM,yBAAyB,GAAqB,iBAAiB;SAClE,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,aAAa,CAAC;SACrE,GAAG,CAAC,CAAC,uBAAuC,EAAE,EAAE;QAC/C,OAAO,uBAAuB,CAAA;IAChC,CAAC,CAAC,CAAA;IAEJ,IAAI,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,MAAM,EAAE;QACrC,yBAAyB;QACzB,MAAM,QAAQ,GAAa,yBAAyB,CAAC,GAAG,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACrG,IAAI,UAAU,GAAa,EAAE,CAAA;QAC7B,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACtB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAC9B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aACtB;QACH,CAAC,CAAC,CAAA;QAEF,qCAAqC;QACrC,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClD,MAAM,aAAa,GAAW,UAAU,CAAC,CAAC,CAAC,CAAA;YAE3C,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAClG,MAAM,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;SAC5D;KACF;IAED,qCAAqC;IACrC,IAAI,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,MAAM,EAAE;QACrC,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAClG,MAAM,aAAa,CAAC,wBAAwB,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAA;KACnF;AACH,CAAC;AAnID,oDAmIC"}
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
@@ -9,9 +9,9 @@ const integration_accounting_1 = require("@things-factory/integration-accounting
9
9
  const integration_lmd_1 = require("@things-factory/integration-lmd");
10
10
  const integration_marketplace_1 = require("@things-factory/integration-marketplace");
11
11
  const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
12
- const setting_base_1 = require("@things-factory/setting-base");
13
12
  const marketplace_base_1 = require("@things-factory/marketplace-base");
14
13
  const sales_base_1 = require("@things-factory/sales-base");
14
+ const setting_base_1 = require("@things-factory/setting-base");
15
15
  const constants_1 = require("../../../../constants");
16
16
  const controllers_1 = require("../../../../controllers/");
17
17
  const ecommerce_1 = require("../../../../controllers/ecommerce");
@@ -37,13 +37,17 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
37
37
  let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
38
38
  where: { domain, name: releaseGoodNo },
39
39
  relations: [
40
+ 'domain',
40
41
  'bizplace',
41
42
  'bizplace.domain',
42
43
  'bizplace.company',
43
44
  'bizplace.company.domain',
45
+ 'orderPackages',
44
46
  'orderProducts',
45
47
  'orderProducts.product',
46
- 'orderProducts.productDetail'
48
+ 'orderProducts.productDetail',
49
+ 'creator',
50
+ 'updater'
47
51
  ]
48
52
  });
49
53
  const worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.PICKING, [
@@ -69,18 +73,14 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
69
73
  if (sellercraft) {
70
74
  const initSCOrderShipment = async (sellercraft) => {
71
75
  await (0, typeorm_1.getManager)().transaction(async (txMgr) => {
76
+ var _a;
72
77
  const sellercraftCtrl = new controllers_1.SellercraftController(txMgr, domain, user);
73
- if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId)) {
78
+ if (!((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length)) {
74
79
  const orderProducts = await tx.getRepository(sales_base_1.OrderProduct).find({
75
80
  where: { releaseGood },
76
81
  relations: ['product', 'product.productDetails']
77
82
  });
78
- releaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
79
- if (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId) {
80
- await txMgr
81
- .getRepository(sales_base_1.ReleaseGood)
82
- .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater });
83
- }
83
+ await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
84
84
  }
85
85
  const rtsTriggerLevel = await tx.getRepository(setting_base_1.Setting).findOne({
86
86
  where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
@@ -107,15 +107,16 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
107
107
  ]
108
108
  });
109
109
  if (marketplaceOrder) {
110
+ const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
110
111
  const marketplaceStore = marketplaceOrder.marketplaceStore;
111
112
  let eTraxOption;
112
113
  if (marketplaceStore === null || marketplaceStore === void 0 ? void 0 : marketplaceStore.isAutoUpdateShipment) {
113
- const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
114
114
  await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
115
115
  await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain);
116
116
  }
117
- if (!marketplaceOrder)
117
+ if (!marketplaceOrder) {
118
118
  throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue');
119
+ }
119
120
  eTraxOption = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore.eTrax;
120
121
  // if eTrax option is true
121
122
  if (eTraxOption) {
@@ -200,9 +201,38 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
200
201
  throw resp;
201
202
  }
202
203
  }
204
+ await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood);
203
205
  }
204
206
  break;
205
207
  default:
208
+ const orderPackage = {
209
+ name: sales_base_1.OrderNoGenerator.orderPackage(),
210
+ packageId: null,
211
+ trackingNo: null,
212
+ transporter: null,
213
+ airwayBill: null,
214
+ status: sales_base_1.ORDER_STATUS.PROCESSING,
215
+ releaseGood,
216
+ domain: releaseGood.domain,
217
+ bizplace: releaseGood.bizplace,
218
+ creator: releaseGood.creator,
219
+ updater: releaseGood.updater
220
+ };
221
+ let savedOrderPackage = await tx.getRepository(sales_base_1.OrderPackage).save(orderPackage);
222
+ const orderPackageItems = releaseGood.orderProducts.map(op => {
223
+ return {
224
+ name: sales_base_1.OrderNoGenerator.orderPackageItem(),
225
+ orderProduct: op,
226
+ status: sales_base_1.ORDER_STATUS.PROCESSING,
227
+ releaseQty: op.releaseQty,
228
+ orderPackage: savedOrderPackage,
229
+ domain: releaseGood.domain,
230
+ bizplace: releaseGood.bizplace,
231
+ creator: releaseGood.creator,
232
+ updater: releaseGood.updater
233
+ };
234
+ });
235
+ await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
206
236
  break;
207
237
  }
208
238
  const account = await tx