@things-factory/worksheet-base 4.3.453 → 4.3.457

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 (12) hide show
  1. package/dist-server/graphql/resolvers/worksheet/fetch-sellercraft-document.js +13 -10
  2. package/dist-server/graphql/resolvers/worksheet/fetch-sellercraft-document.js.map +1 -1
  3. package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js +2 -2
  4. package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js.map +1 -1
  5. package/dist-server/graphql/types/worksheet/index.js +1 -1
  6. package/dist-server/graphql/types/worksheet-detail/inventory-detail.js +3 -0
  7. package/dist-server/graphql/types/worksheet-detail/inventory-detail.js.map +1 -1
  8. package/package.json +4 -4
  9. package/server/graphql/resolvers/worksheet/fetch-sellercraft-document.ts +13 -11
  10. package/server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts +4 -1
  11. package/server/graphql/types/worksheet/index.ts +1 -1
  12. package/server/graphql/types/worksheet-detail/inventory-detail.ts +3 -0
package/dist-server/graphql/resolvers/worksheet/fetch-sellercraft-document.js CHANGED
@@ -7,33 +7,35 @@ const sales_base_1 = require("@things-factory/sales-base");
7
7
  const env_1 = require("@things-factory/env");
8
8
  const controllers_1 = require("../../../controllers");
9
9
  exports.fetchSellercraftDocumentResolver = {
10
- async fetchSellercraftDocument(_, { releaseGoodId }, context) {
10
+ async fetchSellercraftDocument(_, { orderPackageId }, context) {
11
+ var _a;
11
12
  const { tx, domain, user } = context.state;
12
13
  //find release goods base on id
13
- let releaseGood = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).findOne({ where: { domain, id: releaseGoodId }, relations: ['bizplace', 'bizplace.domain'] });
14
+ let orderPackage = await (0, typeorm_1.getRepository)(sales_base_1.OrderPackage).findOne({ where: { domain, id: orderPackageId }, relations: ['releaseGood', 'releaseGood.bizplace', 'releaseGood.bizplace.domain'] });
15
+ // let releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({ where: { domain, id: releaseGoodId }, relations: ['bizplace', 'bizplace.domain'] })
14
16
  //find user sellercraft data
15
17
  const sellercraft = await (0, typeorm_1.getRepository)(integration_sellercraft_1.Sellercraft).findOne({
16
- domain: releaseGood.bizplace.domain,
18
+ domain: orderPackage.releaseGood.bizplace.domain,
17
19
  status: integration_sellercraft_1.SellercraftStatus.ACTIVE
18
20
  });
19
21
  // instantiate sellercraft controller
20
22
  const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
21
23
  try {
22
24
  // fetch document if not found
23
- if (sellercraft && !(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
25
+ if (sellercraft && !((_a = orderPackage.releaseGood) === null || _a === void 0 ? void 0 : _a.airwayBill)) {
24
26
  try {
25
27
  // try fetch order document / AWB
26
- releaseGood = await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
28
+ await sellercraftCtrl.fetchOrderDocument(sellercraft, orderPackage.releaseGood);
27
29
  }
28
30
  catch (error) {
29
31
  try {
30
32
  // retry initiate order document
31
- await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
33
+ await sellercraftCtrl.initiateOrderDocument(sellercraft, orderPackage.releaseGood);
32
34
  }
33
35
  catch (error) {
34
36
  try {
35
37
  // retry initiate order shipment / RTS
36
- await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
38
+ await sellercraftCtrl.initiateOrderShipment(sellercraft, orderPackage.releaseGood);
37
39
  }
38
40
  catch (error) {
39
41
  throw new Error(`initiateOrderShipment: ${error}`);
@@ -43,13 +45,14 @@ exports.fetchSellercraftDocumentResolver = {
43
45
  throw new Error(`fetchOrderDocument: ${error}`);
44
46
  }
45
47
  }
46
- const airwayBill = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill;
47
- const invoice = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice;
48
+ orderPackage = await (0, typeorm_1.getRepository)(sales_base_1.OrderPackage).findOne({ where: { domain, id: orderPackageId } });
49
+ const airwayBill = orderPackage.airwayBill;
50
+ const invoice = orderPackage.invoice;
48
51
  return { airwayBill, invoice };
49
52
  }
50
53
  catch (error) {
51
54
  // await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
52
- env_1.logger.error(`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({ sellercraft, releaseGood, domain, user })}) ${error} `);
55
+ env_1.logger.error(`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({ sellercraft, orderPackage, domain, user })}) ${error} `);
53
56
  throw new Error('Waiting for AWB from marketplace. Please retry in awhile');
54
57
  }
55
58
  }
package/dist-server/graphql/resolvers/worksheet/fetch-sellercraft-document.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-sellercraft-document.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/fetch-sellercraft-document.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAGtD,qFAAwF;AACxF,2DAAwD;AAExD,6CAA4C;AAE5C,sDAA4D;AAE/C,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QACpE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,+BAA+B;QAC/B,IAAI,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAA;QAE7J,6BAA6B;QAC7B,MAAM,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,qCAAW,CAAC,CAAC,OAAO,CAAC;YACxE,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM;YACnC,MAAM,EAAE,2CAAiB,CAAC,MAAM;SACjC,CAAC,CAAA;QAEF,qCAAqC;QACrC,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAE1F,IAAI;YACF,8BAA8B;YAC9B,IAAI,WAAW,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA,EAAE;gBAC3C,IAAI;oBACF,iCAAiC;oBACjC,WAAW,GAAG,MAAM,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;iBACjF;gBAAC,OAAO,KAAK,EAAE;oBACd,IAAI;wBACF,gCAAgC;wBAChC,MAAM,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;qBACtE;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAI;4BACF,sCAAsC;4BACtC,MAAM,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;yBACtE;wBAAC,OAAO,KAAK,EAAE;4BACd,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAA;yBACnD;wBACD,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAA;qBACnD;oBACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,KAAK,EAAE,CAAC,CAAA;iBAChD;aACF;YAED,MAAM,UAAU,GAAW,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA;YAClD,MAAM,OAAO,GAAW,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAA;YAC5C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAA;SAE/B;QAAC,OAAO,KAAK,EAAE;YACd,wEAAwE;YACxE,YAAM,CAAC,KAAK,CAAC,mDAAmD,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;YAExI,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;SAC5E;IAEH,CAAC;CACF,CAAA"}
1
+ {"version":3,"file":"fetch-sellercraft-document.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/fetch-sellercraft-document.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAGtD,qFAAwF;AACxF,2DAAsE;AAEtE,6CAA4C;AAE5C,sDAA4D;AAE/C,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,cAAc,EAAE,EAAE,OAAY;;QACrE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,+BAA+B;QAC/B,IAAI,YAAY,GAAiB,MAAM,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,SAAS,EAAE,CAAC,aAAa,EAAE,sBAAsB,EAAE,6BAA6B,CAAC,EAAE,CAAC,CAAA;QACxM,gKAAgK;QAEhK,6BAA6B;QAC7B,MAAM,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,qCAAW,CAAC,CAAC,OAAO,CAAC;YACxE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM;YAChD,MAAM,EAAE,2CAAiB,CAAC,MAAM;SACjC,CAAC,CAAA;QAEF,qCAAqC;QACrC,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAE1F,IAAI;YACF,8BAA8B;YAC9B,IAAI,WAAW,IAAI,CAAC,CAAA,MAAA,YAAY,CAAC,WAAW,0CAAE,UAAU,CAAA,EAAE;gBACxD,IAAI;oBACF,iCAAiC;oBACjC,MAAM,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,YAAY,CAAC,WAAW,CAAC,CAAA;iBAChF;gBAAC,OAAO,KAAK,EAAE;oBACd,IAAI;wBACF,gCAAgC;wBAChC,MAAM,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,YAAY,CAAC,WAAW,CAAC,CAAA;qBACnF;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAI;4BACF,sCAAsC;4BACtC,MAAM,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,YAAY,CAAC,WAAW,CAAC,CAAA;yBACnF;wBAAC,OAAO,KAAK,EAAE;4BACd,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAA;yBACnD;wBACD,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAA;qBACnD;oBACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,KAAK,EAAE,CAAC,CAAA;iBAChD;aACF;YACD,YAAY,GAAG,MAAM,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,CAAA;YAEnG,MAAM,UAAU,GAAW,YAAY,CAAC,UAAU,CAAA;YAClD,MAAM,OAAO,GAAW,YAAY,CAAC,OAAO,CAAA;YAC5C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAA;SAE/B;QAAC,OAAO,KAAK,EAAE;YACd,wEAAwE;YACxE,YAAM,CAAC,KAAK,CAAC,mDAAmD,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;YAEzI,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;SAC5E;IAEH,CAAC;CACF,CAAA"}
package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js CHANGED
@@ -6,7 +6,7 @@ const id_rule_base_1 = require("@things-factory/id-rule-base");
6
6
  const entities_1 = require("../../../entities");
7
7
  exports.generatePalletIdResolver = {
8
8
  async generatePalletId(_, { targets, type }, context) {
9
- var _a, _b, _c, _d;
9
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
10
10
  const { tx, domain } = context.state;
11
11
  // 1. get date in yymmdd format
12
12
  const date = new Date().toJSON().slice(0, 10).replace(/-/g, '').slice(2, 8);
@@ -47,7 +47,7 @@ exports.generatePalletIdResolver = {
47
47
  let result = {};
48
48
  // 5. map all data to be returned
49
49
  if (foundWSD.targetProduct) {
50
- result = Object.assign(Object.assign({}, foundWSD.targetProduct), { bizplace: foundWSD.bizplace, orderProductRemark: foundWSD.targetProduct.remark, purchaseOrderNo: ((_b = (_a = foundWSD.targetProduct.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) || '', arrivalNoticeRefNo: ((_c = foundWSD.targetProduct.arrivalNotice) === null || _c === void 0 ? void 0 : _c.refNo) || '', arrivalNoticeNo: ((_d = foundWSD.targetProduct.arrivalNotice) === null || _d === void 0 ? void 0 : _d.name) || '', uomValue: foundWSD.targetProduct.uomValue, uom: foundWSD.targetProduct.uom });
50
+ result = Object.assign(Object.assign({}, foundWSD.targetProduct), { bizplace: foundWSD.bizplace, orderProductRemark: foundWSD.targetProduct.remark, purchaseOrderNo: ((_b = (_a = foundWSD.targetProduct.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) || '', arrivalNoticeRefNo: ((_c = foundWSD.targetProduct.arrivalNotice) === null || _c === void 0 ? void 0 : _c.refNo) || '', arrivalNoticeNo: ((_d = foundWSD.targetProduct.arrivalNotice) === null || _d === void 0 ? void 0 : _d.name) || '', uomValue: foundWSD.targetProduct.uomValue, uom: foundWSD.targetProduct.uom, manufactureDate: ((_e = foundWSD.targetProduct) === null || _e === void 0 ? void 0 : _e.manufactureDate) || '', arrivalNoticeRefNo2: ((_g = (_f = foundWSD.targetProduct) === null || _f === void 0 ? void 0 : _f.arrivalNotice) === null || _g === void 0 ? void 0 : _g.refNo2) || '', arrivalNoticeRefNo3: ((_j = (_h = foundWSD.targetProduct) === null || _h === void 0 ? void 0 : _h.arrivalNotice) === null || _j === void 0 ? void 0 : _j.refNo3) || '' });
51
51
  }
52
52
  else if (foundWSD.targetInventory) {
53
53
  result = Object.assign(Object.assign({}, foundWSD.targetInventory), { bizplace: foundWSD.bizplace, orderProductRemark: '', purchaseOrderNo: '', arrivalNoticeRefNo: '' });
package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate-pallet-id.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate-pallet-id.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/types/worksheet/index.js CHANGED
@@ -75,7 +75,7 @@ exports.Mutation = `
75
75
  ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
76
76
 
77
77
  fetchSellercraftDocument (
78
- releaseGoodId: String!
78
+ orderPackageId: String!
79
79
  ): SellercraftDocument @privilege(category: "worksheet_control", privilege: "mutation") @transaction
80
80
 
81
81
  fetchPowrupDocument (
package/dist-server/graphql/types/worksheet-detail/inventory-detail.js CHANGED
@@ -39,7 +39,10 @@ exports.InventoryDetail = (0, graphql_tag_1.default) `
39
39
  orderProductRemark: String
40
40
  purchaseOrderNo: String
41
41
  arrivalNoticeRefNo: String
42
+ arrivalNoticeRefNo2: String
43
+ arrivalNoticeRefNo3: String
42
44
  arrivalNoticeNo: String
45
+ manufactureDate: Date
43
46
  }
44
47
  `;
45
48
  //# sourceMappingURL=inventory-detail.js.map
package/dist-server/graphql/types/worksheet-detail/inventory-detail.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inventory-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/inventory-detail.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,eAAe,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoCjC,CAAA"}
1
+ {"version":3,"file":"inventory-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/inventory-detail.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,eAAe,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuCjC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.3.453",
3
+ "version": "4.3.457",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -36,14 +36,14 @@
36
36
  "@things-factory/integration-sftp": "^4.3.452",
37
37
  "@things-factory/marketplace-base": "^4.3.452",
38
38
  "@things-factory/notification": "^4.3.452",
39
- "@things-factory/sales-base": "^4.3.453",
39
+ "@things-factory/sales-base": "^4.3.457",
40
40
  "@things-factory/setting-base": "^4.3.452",
41
41
  "@things-factory/shell": "^4.3.434",
42
42
  "@things-factory/transport-base": "^4.3.452",
43
- "@things-factory/warehouse-base": "^4.3.452",
43
+ "@things-factory/warehouse-base": "^4.3.457",
44
44
  "jspdf": "2.5.1",
45
45
  "puppeteer": "21.0.3",
46
46
  "uuid": "^9.0.0"
47
47
  },
48
- "gitHead": "ce1c0ab081e2ff34a01f0c6d18a6d5747327a6a1"
48
+ "gitHead": "2116456b92d085abd1ccffd61faf3415e3f9e911"
49
49
  }
package/server/graphql/resolvers/worksheet/fetch-sellercraft-document.ts CHANGED
@@ -2,22 +2,23 @@ import { EntityManager, getRepository } from 'typeorm'
2
2
 
3
3
  import { User } from '@things-factory/auth-base'
4
4
  import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
5
- import { ReleaseGood } from '@things-factory/sales-base'
5
+ import { ReleaseGood, OrderPackage } from '@things-factory/sales-base'
6
6
  import { Domain } from '@things-factory/shell'
7
7
  import { logger } from '@things-factory/env'
8
8
 
9
9
  import { SellercraftController } from '../../../controllers'
10
10
 
11
11
  export const fetchSellercraftDocumentResolver = {
12
- async fetchSellercraftDocument(_: any, { releaseGoodId }, context: any) {
12
+ async fetchSellercraftDocument(_: any, { orderPackageId }, context: any) {
13
13
  const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
14
14
 
15
15
  //find release goods base on id
16
- let releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({ where: { domain, id: releaseGoodId }, relations: ['bizplace', 'bizplace.domain'] })
16
+ let orderPackage: OrderPackage = await getRepository(OrderPackage).findOne({ where: { domain, id: orderPackageId }, relations: ['releaseGood', 'releaseGood.bizplace', 'releaseGood.bizplace.domain'] })
17
+ // let releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({ where: { domain, id: releaseGoodId }, relations: ['bizplace', 'bizplace.domain'] })
17
18
 
18
19
  //find user sellercraft data
19
20
  const sellercraft: Sellercraft = await getRepository(Sellercraft).findOne({
20
- domain: releaseGood.bizplace.domain,
21
+ domain: orderPackage.releaseGood.bizplace.domain,
21
22
  status: SellercraftStatus.ACTIVE
22
23
  })
23
24
 
@@ -26,18 +27,18 @@ export const fetchSellercraftDocumentResolver = {
26
27
 
27
28
  try {
28
29
  // fetch document if not found
29
- if (sellercraft && !releaseGood?.airwayBill) {
30
+ if (sellercraft && !orderPackage.releaseGood?.airwayBill) {
30
31
  try {
31
32
  // try fetch order document / AWB
32
- releaseGood = await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
33
+ await sellercraftCtrl.fetchOrderDocument(sellercraft, orderPackage.releaseGood)
33
34
  } catch (error) {
34
35
  try {
35
36
  // retry initiate order document
36
- await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
37
+ await sellercraftCtrl.initiateOrderDocument(sellercraft, orderPackage.releaseGood)
37
38
  } catch (error) {
38
39
  try {
39
40
  // retry initiate order shipment / RTS
40
- await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
41
+ await sellercraftCtrl.initiateOrderShipment(sellercraft, orderPackage.releaseGood)
41
42
  } catch (error) {
42
43
  throw new Error(`initiateOrderShipment: ${error}`)
43
44
  }
@@ -46,14 +47,15 @@ export const fetchSellercraftDocumentResolver = {
46
47
  throw new Error(`fetchOrderDocument: ${error}`)
47
48
  }
48
49
  }
50
+ orderPackage = await getRepository(OrderPackage).findOne({ where: { domain, id: orderPackageId } })
49
51
 
50
- const airwayBill: string = releaseGood?.airwayBill
51
- const invoice: string = releaseGood?.invoice
52
+ const airwayBill: string = orderPackage.airwayBill
53
+ const invoice: string = orderPackage.invoice
52
54
  return { airwayBill, invoice }
53
55
 
54
56
  } catch (error) {
55
57
  // await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
56
- logger.error(`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({ sellercraft, releaseGood, domain, user })}) ${error} `)
58
+ logger.error(`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({ sellercraft, orderPackage, domain, user })}) ${error} `)
57
59
 
58
60
  throw new Error('Waiting for AWB from marketplace. Please retry in awhile')
59
61
  }
package/server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts CHANGED
@@ -56,7 +56,10 @@ export const generatePalletIdResolver = {
56
56
  arrivalNoticeRefNo: foundWSD.targetProduct.arrivalNotice?.refNo || '',
57
57
  arrivalNoticeNo: foundWSD.targetProduct.arrivalNotice?.name || '',
58
58
  uomValue: foundWSD.targetProduct.uomValue,
59
- uom: foundWSD.targetProduct.uom
59
+ uom: foundWSD.targetProduct.uom,
60
+ manufactureDate: foundWSD.targetProduct?.manufactureDate || '',
61
+ arrivalNoticeRefNo2: foundWSD.targetProduct?.arrivalNotice?.refNo2 || '',
62
+ arrivalNoticeRefNo3: foundWSD.targetProduct?.arrivalNotice?.refNo3 || ''
60
63
  }
61
64
  } else if (foundWSD.targetInventory) {
62
65
  result = {
package/server/graphql/types/worksheet/index.ts CHANGED
@@ -73,7 +73,7 @@ export const Mutation = /* GraphQL */ `
73
73
  ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
74
74
 
75
75
  fetchSellercraftDocument (
76
- releaseGoodId: String!
76
+ orderPackageId: String!
77
77
  ): SellercraftDocument @privilege(category: "worksheet_control", privilege: "mutation") @transaction
78
78
 
79
79
  fetchPowrupDocument (
package/server/graphql/types/worksheet-detail/inventory-detail.ts CHANGED
@@ -34,6 +34,9 @@ export const InventoryDetail = gql`
34
34
  orderProductRemark: String
35
35
  purchaseOrderNo: String
36
36
  arrivalNoticeRefNo: String
37
+ arrivalNoticeRefNo2: String
38
+ arrivalNoticeRefNo3: String
37
39
  arrivalNoticeNo: String
40
+ manufactureDate: Date
38
41
  }
39
42
  `