@things-factory/worksheet-base 4.3.238 → 4.3.241

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 (63) hide show
  1. package/dist-server/controllers/ecommerce/powrup-controller.js +3 -3
  2. package/dist-server/controllers/ecommerce/powrup-controller.js.map +1 -1
  3. package/dist-server/controllers/outbound/loading-worksheet-controller.js +36 -9
  4. package/dist-server/controllers/outbound/loading-worksheet-controller.js.map +1 -1
  5. package/dist-server/controllers/outbound/packing-worksheet-controller.js +1 -1
  6. package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
  7. package/dist-server/controllers/outbound/picking-worksheet-controller.js +14 -8
  8. package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
  9. package/dist-server/controllers/render-ro-do.js +21 -8
  10. package/dist-server/controllers/render-ro-do.js.map +1 -1
  11. package/dist-server/controllers/vas/vas-worksheet-controller.js +157 -31
  12. package/dist-server/controllers/vas/vas-worksheet-controller.js.map +1 -1
  13. package/dist-server/controllers/worksheet-controller.js +21 -8
  14. package/dist-server/controllers/worksheet-controller.js.map +1 -1
  15. package/dist-server/graphql/resolvers/worksheet/loading/loading.js.map +1 -1
  16. package/dist-server/graphql/resolvers/worksheet/loading/undo-loading.js +4 -4
  17. package/dist-server/graphql/resolvers/worksheet/loading/undo-loading.js.map +1 -1
  18. package/dist-server/graphql/resolvers/worksheet/loading-worksheet.js +62 -3
  19. package/dist-server/graphql/resolvers/worksheet/loading-worksheet.js.map +1 -1
  20. package/dist-server/graphql/resolvers/worksheet/packing/packing.js +1 -1
  21. package/dist-server/graphql/resolvers/worksheet/packing/packing.js.map +1 -1
  22. package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +1 -1
  23. package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
  24. package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +1 -1
  25. package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
  26. package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +19 -2
  27. package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
  28. package/dist-server/graphql/resolvers/worksheet/vas/complete-vas.js +22 -1
  29. package/dist-server/graphql/resolvers/worksheet/vas/complete-vas.js.map +1 -1
  30. package/dist-server/graphql/resolvers/worksheet/vas-worksheet.js +9 -7
  31. package/dist-server/graphql/resolvers/worksheet/vas-worksheet.js.map +1 -1
  32. package/dist-server/graphql/resolvers/worksheet/worksheet.js +31 -16
  33. package/dist-server/graphql/resolvers/worksheet/worksheet.js.map +1 -1
  34. package/dist-server/graphql/resolvers/worksheet-detail/create-worksheet-detail.js +3 -0
  35. package/dist-server/graphql/resolvers/worksheet-detail/create-worksheet-detail.js.map +1 -1
  36. package/dist-server/graphql/resolvers/worksheet-detail/worksheet-detail.js +1 -1
  37. package/dist-server/graphql/resolvers/worksheet-detail/worksheet-detail.js.map +1 -1
  38. package/dist-server/graphql/types/worksheet/index.js +2 -1
  39. package/dist-server/graphql/types/worksheet/index.js.map +1 -1
  40. package/dist-server/graphql/types/worksheet/worksheet-detail-info.js +1 -0
  41. package/dist-server/graphql/types/worksheet/worksheet-detail-info.js.map +1 -1
  42. package/package.json +11 -11
  43. package/server/controllers/ecommerce/powrup-controller.ts +3 -3
  44. package/server/controllers/outbound/loading-worksheet-controller.ts +38 -10
  45. package/server/controllers/outbound/packing-worksheet-controller.ts +1 -1
  46. package/server/controllers/outbound/picking-worksheet-controller.ts +15 -7
  47. package/server/controllers/render-ro-do.ts +25 -6
  48. package/server/controllers/vas/vas-worksheet-controller.ts +239 -49
  49. package/server/controllers/worksheet-controller.ts +21 -10
  50. package/server/graphql/resolvers/worksheet/loading/loading.ts +0 -2
  51. package/server/graphql/resolvers/worksheet/loading/undo-loading.ts +5 -4
  52. package/server/graphql/resolvers/worksheet/loading-worksheet.ts +68 -2
  53. package/server/graphql/resolvers/worksheet/packing/packing.ts +1 -1
  54. package/server/graphql/resolvers/worksheet/packing-worksheet.ts +1 -1
  55. package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +1 -1
  56. package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +21 -2
  57. package/server/graphql/resolvers/worksheet/vas/complete-vas.ts +27 -2
  58. package/server/graphql/resolvers/worksheet/vas-worksheet.ts +7 -5
  59. package/server/graphql/resolvers/worksheet/worksheet.ts +34 -13
  60. package/server/graphql/resolvers/worksheet-detail/create-worksheet-detail.ts +5 -1
  61. package/server/graphql/resolvers/worksheet-detail/worksheet-detail.ts +1 -1
  62. package/server/graphql/types/worksheet/index.ts +2 -1
  63. package/server/graphql/types/worksheet/worksheet-detail-info.ts +1 -0
@@ -1 +1 @@
1
- {"version":3,"file":"worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet.ts"],"names":[],"mappings":"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"}
@@ -20,6 +20,9 @@ exports.createWorksheetDetail = {
20
20
  if (worksheetDetail.targetProduct && worksheetDetail.targetProduct.id) {
21
21
  worksheetDetail.targetProduct = await tx.getRepository(sales_base_1.OrderProduct).findOne(worksheetDetail.targetProduct.id);
22
22
  }
23
+ if (worksheetDetail.targetInventory && worksheetDetail.targetInventory.id) {
24
+ worksheetDetail.targetInventory = await tx.getRepository(sales_base_1.OrderInventory).findOne(worksheetDetail.targetInventory.id);
25
+ }
23
26
  if (worksheetDetail.targetVas && worksheetDetail.targetVas.id) {
24
27
  worksheetDetail.targetVas = await tx.getRepository(sales_base_1.OrderVas).findOne(worksheetDetail.targetVas.id);
25
28
  }
@@ -1 +1 @@
1
- {"version":3,"file":"create-worksheet-detail.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/create-worksheet-detail.ts"],"names":[],"mappings":";;;AAGA,uDAA0E;AAC1E,2DAAmE;AACnE,gDAA8D;AAEjD,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,EAAE,OAAY;QACnE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,eAAe,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YACpE,KAAK,EAAE;gBACL,MAAM;gBACN,QAAQ,EAAE,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC;gBACrD,EAAE,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE;aACjC;SACF,CAAC,CAAA;QAEF,IAAI,eAAe,CAAC,MAAM,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,EAAE;YACvD,eAAe,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAM,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;SAC3F;QAED,IAAI,eAAe,CAAC,aAAa,IAAI,eAAe,CAAC,aAAa,CAAC,EAAE,EAAE;YACrE,eAAe,CAAC,aAAa,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,yBAAY,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;SAC/G;QAED,IAAI,eAAe,CAAC,SAAS,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,EAAE;YAC7D,eAAe,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,qBAAQ,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;SACnG;QAED,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,iCAC9C,eAAe,KAClB,MAAM,EACN,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EACnC,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;IACJ,CAAC;CACF,CAAA"}
1
+ {"version":3,"file":"create-worksheet-detail.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/create-worksheet-detail.ts"],"names":[],"mappings":";;;AAGA,uDAA0E;AAC1E,2DAAmF;AACnF,gDAA8D;AAEjD,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,EAAE,OAAY;QACnE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,eAAe,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YACpE,KAAK,EAAE;gBACL,MAAM;gBACN,QAAQ,EAAE,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC;gBACrD,EAAE,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE;aACjC;SACF,CAAC,CAAA;QAEF,IAAI,eAAe,CAAC,MAAM,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,EAAE;YACvD,eAAe,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAM,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;SAC3F;QAED,IAAI,eAAe,CAAC,aAAa,IAAI,eAAe,CAAC,aAAa,CAAC,EAAE,EAAE;YACrE,eAAe,CAAC,aAAa,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,yBAAY,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;SAC/G;QAED,IAAI,eAAe,CAAC,eAAe,IAAI,eAAe,CAAC,eAAe,CAAC,EAAE,EAAE;YACzE,eAAe,CAAC,eAAe,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;SACrH;QAED,IAAI,eAAe,CAAC,SAAS,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,EAAE;YAC7D,eAAe,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,qBAAQ,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;SACnG;QAED,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,iCAC9C,eAAe,KAClB,MAAM,EACN,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EACnC,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;IACJ,CAAC;CACF,CAAA"}
@@ -13,7 +13,7 @@ exports.worksheetDetailResolver = {
13
13
  bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user)),
14
14
  name
15
15
  },
16
- relations: ['domain', 'bizplace', 'worksheet', 'worker', 'targetProduct', 'targetVas', 'creator', 'updater']
16
+ relations: ['domain', 'bizplace', 'worksheet', 'worker', 'targetInventory', 'targetProduct', 'targetVas', 'creator', 'updater']
17
17
  });
18
18
  }
19
19
  };
@@ -1 +1 @@
1
- {"version":3,"file":"worksheet-detail.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/worksheet-detail.ts"],"names":[],"mappings":";;;AAAA,uDAAkE;AAClE,qCAA4B;AAC5B,gDAAmD;AAKtC,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAClD,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE;gBACL,MAAM;gBACN,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzD,IAAI;aACL;YACD,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC;SAC7G,CAAC,CAAA;IACJ,CAAC;CACF,CAAA"}
1
+ {"version":3,"file":"worksheet-detail.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/worksheet-detail.ts"],"names":[],"mappings":";;;AAAA,uDAAkE;AAClE,qCAA4B;AAC5B,gDAAmD;AAKtC,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAClD,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE;gBACL,MAAM;gBACN,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzD,IAAI;aACL;YACD,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,iBAAiB,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC;SAChI,CAAC,CAAA;IACJ,CAAC;CACF,CAAA"}
@@ -316,6 +316,7 @@ exports.Mutation = `
316
316
  undoLoading (
317
317
  deliveryOrder: ObjectRef!
318
318
  palletIds: [String]!
319
+ productIds: [String]!
319
320
  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
320
321
 
321
322
  transfer (
@@ -499,7 +500,7 @@ exports.Mutation = `
499
500
  completeVas (
500
501
  orderNo: String!
501
502
  orderType: String!
502
- worksheetDetails: [WorksheetDetailPatch]!
503
+ worksheetDetails: [WorksheetDetailPatch]
503
504
  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
504
505
 
505
506
  repalletizing (
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,2EAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,uFAAgF;AAChF,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,iEAA4D;AAC5D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAykBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwJlC,CAAA;AAEY,QAAA,KAAK,GAAgB;IAChC,qBAAS;IACT,0CAAmB;IACnB,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;IACrB,8DAA4B;CAC7B,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,2EAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,uFAAgF;AAChF,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,iEAA4D;AAC5D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0kBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwJlC,CAAA;AAEY,QAAA,KAAK,GAAgB;IAChC,qBAAS;IACT,0CAAmB;IACnB,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;IACrB,8DAA4B;CAC7B,CAAA"}
@@ -43,6 +43,7 @@ exports.WorksheetDetailInfo = (0, apollo_server_koa_1.gql) `
43
43
  targetType: String
44
44
  targetBatchId: String
45
45
  targetProduct: Product
46
+ targetVas: OrderVas
46
47
  otherTarget: String
47
48
  vas: Vas
48
49
  targetName: String
@@ -1 +1 @@
1
- {"version":3,"file":"worksheet-detail-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-detail-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,mBAAmB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsErC,CAAA"}
1
+ {"version":3,"file":"worksheet-detail-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-detail-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,mBAAmB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuErC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.3.238",
3
+ "version": "4.3.241",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -27,21 +27,21 @@
27
27
  "@things-factory/biz-base": "^4.3.237",
28
28
  "@things-factory/document-template-base": "^4.3.237",
29
29
  "@things-factory/id-rule-base": "^4.3.237",
30
- "@things-factory/integration-accounting": "^4.3.238",
30
+ "@things-factory/integration-accounting": "^4.3.239",
31
31
  "@things-factory/integration-base": "^4.3.238",
32
- "@things-factory/integration-lmd": "^4.3.238",
33
- "@things-factory/integration-marketplace": "^4.3.238",
34
- "@things-factory/integration-powrup": "^4.3.238",
35
- "@things-factory/integration-sellercraft": "^4.3.238",
36
- "@things-factory/integration-sftp": "^4.3.238",
37
- "@things-factory/marketplace-base": "^4.3.238",
32
+ "@things-factory/integration-lmd": "^4.3.239",
33
+ "@things-factory/integration-marketplace": "^4.3.239",
34
+ "@things-factory/integration-powrup": "^4.3.239",
35
+ "@things-factory/integration-sellercraft": "^4.3.239",
36
+ "@things-factory/integration-sftp": "^4.3.239",
37
+ "@things-factory/marketplace-base": "^4.3.239",
38
38
  "@things-factory/notification": "^4.3.237",
39
- "@things-factory/sales-base": "^4.3.238",
39
+ "@things-factory/sales-base": "^4.3.241",
40
40
  "@things-factory/setting-base": "^4.3.237",
41
41
  "@things-factory/shell": "^4.3.237",
42
42
  "@things-factory/transport-base": "^4.3.237",
43
- "@things-factory/warehouse-base": "^4.3.238",
43
+ "@things-factory/warehouse-base": "^4.3.241",
44
44
  "uuid": "^9.0.0"
45
45
  },
46
- "gitHead": "926d659dd0e4d6c24c33ed7cf558779a51f5cba7"
46
+ "gitHead": "507fce6438f95509d660bc61cd1ddc615c868ee3"
47
47
  }
@@ -22,7 +22,7 @@ export class PowrupController extends WorksheetController {
22
22
  try {
23
23
  const orderProducts: OrderProduct[] = releaseGood.orderProducts
24
24
  const orderInformation: any = {
25
- orderId: releaseGood.refOrderId
25
+ refOrderId: releaseGood.refOrderId
26
26
  }
27
27
 
28
28
  if (
@@ -171,7 +171,7 @@ export class PowrupController extends WorksheetController {
171
171
  if (releaseGood.lmdOption && !op?.parcelId) return
172
172
 
173
173
  let orderInformation: any = {
174
- orderId: releaseGood.refOrderId,
174
+ refOrderId: releaseGood.refOrderId,
175
175
  packageId: op.packageId
176
176
  }
177
177
  if (releaseGood.lmdOption) {
@@ -226,7 +226,7 @@ export class PowrupController extends WorksheetController {
226
226
  if (!op?.packageId) throw new Error('Order package id is not found')
227
227
 
228
228
  const orderInformation: any = {
229
- orderId: releaseGood.refOrderId,
229
+ refOrderId: releaseGood.refOrderId,
230
230
  packageId: op.packageId
231
231
  }
232
232
 
@@ -1,4 +1,4 @@
1
- import { Equal, In, Not } from 'typeorm'
1
+ import { Equal, In, Not, IsNull } from 'typeorm'
2
2
 
3
3
  import { Bizplace } from '@things-factory/biz-base'
4
4
  import {
@@ -10,6 +10,7 @@ import {
10
10
  OrderNoGenerator,
11
11
  OrderTote,
12
12
  OrderToteItem,
13
+ OrderVas,
13
14
  ReleaseGood
14
15
  } from '@things-factory/sales-base'
15
16
  import {
@@ -112,6 +113,7 @@ export class LoadingWorksheetController extends VasWorksheetController {
112
113
  const bizplace: Bizplace = releaseGood.bizplace
113
114
 
114
115
  for (let i = 0; i < worksheetDetails.length; i++) {
116
+ // const pickedQty: number = worksheetDetails[i].pickedQty
115
117
  const loadedQty: number = worksheetDetails[i].loadedQty
116
118
  const toteName: string = worksheetDetails[i].toteName
117
119
  let worksheetDetail = await this.findExecutableWorksheetDetailByName(
@@ -132,7 +134,10 @@ export class LoadingWorksheetController extends VasWorksheetController {
132
134
 
133
135
  const worksheet: Worksheet = worksheetDetail.worksheet
134
136
  let targetInventory: OrderInventory = worksheetDetail.targetInventory
135
- const pickedQty: number = targetInventory.releaseQty
137
+ const pickedQty: number =
138
+ targetInventory.type === ORDER_TYPES.VAS_ORDER || targetInventory.releaseQty != targetInventory.pickedQty
139
+ ? targetInventory.releaseQty
140
+ : targetInventory.pickedQty
136
141
  let inventory: Inventory = targetInventory.inventory
137
142
 
138
143
  targetInventory.loadedAt = new Date()
@@ -164,7 +169,14 @@ export class LoadingWorksheetController extends VasWorksheetController {
164
169
  const remainUomValue: number = parseFloat((targetInventory.releaseUomValue - loadedUomValue).toFixed(2))
165
170
 
166
171
  targetInventory.status = ORDER_INVENTORY_STATUS.LOADED
167
- targetInventory.releaseQty = loadedQty
172
+ targetInventory.releaseQty =
173
+ targetInventory.type === ORDER_TYPES.VAS_ORDER || targetInventory.releaseQty != targetInventory.pickedQty
174
+ ? remainQty
175
+ : targetInventory.releaseQty
176
+ targetInventory.pickedQty =
177
+ targetInventory.type === ORDER_TYPES.VAS_ORDER || targetInventory.releaseQty != targetInventory.pickedQty
178
+ ? targetInventory.pickedQty
179
+ : loadedQty
168
180
  targetInventory.releaseUomValue = loadedUomValue
169
181
  targetInventory.updater = this.user
170
182
  await this.updateOrderTargets([targetInventory])
@@ -180,9 +192,16 @@ export class LoadingWorksheetController extends VasWorksheetController {
180
192
  newTargetInventory.name = OrderNoGenerator.orderInventory()
181
193
  newTargetInventory.releaseGood = releaseGood
182
194
  newTargetInventory.inventory = inventory
183
- newTargetInventory.type = ORDER_TYPES.RELEASE_OF_GOODS
195
+ newTargetInventory.type = targetInventory.type
184
196
  newTargetInventory.status = ORDER_INVENTORY_STATUS.LOADING
185
- newTargetInventory.releaseQty = remainQty
197
+ newTargetInventory.releaseQty =
198
+ targetInventory.type === ORDER_TYPES.VAS_ORDER || targetInventory.releaseQty != targetInventory.pickedQty
199
+ ? remainQty
200
+ : targetInventory.releaseQty
201
+ newTargetInventory.pickedQty =
202
+ targetInventory.type === ORDER_TYPES.VAS_ORDER || targetInventory.releaseQty != targetInventory.pickedQty
203
+ ? targetInventory.pickedQty
204
+ : remainQty
186
205
  newTargetInventory.releaseUomValue = remainUomValue
187
206
  newTargetInventory.product = targetInventory.product
188
207
  newTargetInventory.productDetail = targetInventory.productDetail
@@ -257,7 +276,7 @@ export class LoadingWorksheetController extends VasWorksheetController {
257
276
  return worksheetDetails
258
277
  }
259
278
 
260
- async undoLoading(deliveryOrder: Partial<DeliveryOrder>, palletIds: string[]): Promise<void> {
279
+ async undoLoading(deliveryOrder: Partial<DeliveryOrder>, palletIds: string[], productIds: string[]): Promise<void> {
261
280
  deliveryOrder = await this.findRefOrder(DeliveryOrder, { id: deliveryOrder.id, domain: this.domain }, [
262
281
  'releaseGood'
263
282
  ])
@@ -266,13 +285,15 @@ export class LoadingWorksheetController extends VasWorksheetController {
266
285
 
267
286
  const targetInventories: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
268
287
  where: { domain: this.domain, deliveryOrder, status: ORDER_INVENTORY_STATUS.LOADED },
269
- relations: ['inventory']
288
+ relations: ['inventory', 'product', 'deliveryOrder']
270
289
  })
271
290
  // Filter out inventories which is included palletIds list.
272
291
  let undoTargetOrderInventories: OrderInventory[] = targetInventories.filter(
273
292
  (targetInventory: OrderInventory) =>
274
293
  targetInventory.status === ORDER_INVENTORY_STATUS.LOADED &&
275
- palletIds.includes(targetInventory.inventory.palletId)
294
+ palletIds.includes(targetInventory.inventory.palletId) &&
295
+ // productIds.includes(targetInventory.product.id) &&
296
+ deliveryOrder.id === targetInventory.deliveryOrder.id
276
297
  )
277
298
 
278
299
  // If there was remained items => Merge into previous order inventories
@@ -290,7 +311,8 @@ export class LoadingWorksheetController extends VasWorksheetController {
290
311
  id: Not(Equal(undoTargetOrderInventory.id)),
291
312
  releaseGood,
292
313
  status: ORDER_INVENTORY_STATUS.LOADING,
293
- inventory: undoTargetOrderInventory.inventory
314
+ inventory: undoTargetOrderInventory.inventory,
315
+ product: undoTargetOrderInventory.product
294
316
  }
295
317
  })
296
318
 
@@ -301,7 +323,13 @@ export class LoadingWorksheetController extends VasWorksheetController {
301
323
  if (prevTargetInventory) {
302
324
  // If there's prev target inventory
303
325
  // Merge qty and uomValue into prev target inventory
304
- prevTargetInventory.releaseQty += undoTargetOrderInventory.releaseQty
326
+ if (prevTargetInventory.type === ORDER_TYPES.VAS_ORDER) {
327
+ prevTargetInventory.releaseQty += undoTargetOrderInventory.releaseQty
328
+ prevTargetInventory.pickedQty = undoTargetOrderInventory.pickedQty
329
+ } else {
330
+ prevTargetInventory.releaseQty = undoTargetOrderInventory.releaseQty
331
+ prevTargetInventory.pickedQty += undoTargetOrderInventory.pickedQty
332
+ }
305
333
  prevTargetInventory.releaseUomValue += undoTargetOrderInventory.releaseUomValue
306
334
  prevTargetInventory.updater = this.user
307
335
  await this.updateOrderTargets([prevTargetInventory])
@@ -126,7 +126,7 @@ export class PackingWorksheetController extends VasWorksheetController {
126
126
  break
127
127
 
128
128
  case ApplicationType.POWRUP:
129
- const powrup: Powrup = await this.trxMgr.getRepository(Powrup).findOne({ active: true })
129
+ const powrup: Powrup = await this.trxMgr.getRepository(Powrup).findOne({ active: true, platform: 'POWRUP' })
130
130
 
131
131
  if (powrup) {
132
132
  const powrupCtrl: PowrupController = new PowrupController(this.trxMgr, this.domain, this.user)
@@ -222,12 +222,13 @@ export class PickingWorksheetController extends VasWorksheetController {
222
222
 
223
223
  worksheet = await this.activateWorksheet(worksheet, worksheetDetails, [])
224
224
 
225
- try {
226
- const vasWorksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.VAS)
227
- if (vasWorksheet) {
228
- await this.activateVAS(vasWorksheet.name, vasWorksheet.worksheetDetails)
229
- }
230
- } catch (e) {}
225
+ // VAS will be activated after PICKING is completed
226
+ // try {
227
+ // const vasWorksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.VAS)
228
+ // if (vasWorksheet) {
229
+ // await this.activateVAS(vasWorksheet.name, vasWorksheet.worksheetDetails)
230
+ // }
231
+ // } catch (e) {}
231
232
 
232
233
  const pendingSplitOIs: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
233
234
  where: { domain: this.domain, releaseGood, status: ORDER_INVENTORY_STATUS.PENDING_SPLIT }
@@ -269,7 +270,7 @@ export class PickingWorksheetController extends VasWorksheetController {
269
270
 
270
271
  case ApplicationType.POWRUP:
271
272
  getManager().transaction(async txMgr => {
272
- const powrup: Powrup = await txMgr.getRepository(Powrup).findOne({ active: true })
273
+ const powrup: Powrup = await txMgr.getRepository(Powrup).findOne({ active: true, platform: 'POWRUP' })
273
274
 
274
275
  if (powrup) {
275
276
  const powrupCtrl: PowrupController = new PowrupController(txMgr, this.domain, this.user)
@@ -1340,9 +1341,16 @@ export class PickingWorksheetController extends VasWorksheetController {
1340
1341
  await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
1341
1342
  }
1342
1343
 
1344
+ let orderVas: OrderVas[] = await this.trxMgr
1345
+ .getRepository(OrderVas)
1346
+ .find({ where: { releaseGood: releaseGood.id } })
1347
+
1343
1348
  let orderStatus: string
1344
1349
  if (releaseGood?.packingOption) {
1345
1350
  orderStatus = ORDER_STATUS.READY_TO_PACK
1351
+ }
1352
+ if (orderVas.length > 0) {
1353
+ orderStatus = ORDER_STATUS.VAS
1346
1354
  } else {
1347
1355
  orderStatus = ORDER_STATUS.LOADING
1348
1356
  }
@@ -120,6 +120,7 @@ export async function renderRODO({ doNo }, context: any) {
120
120
  wdQb
121
121
  .leftJoinAndSelect('wd.targetInventory', 'targetInventory')
122
122
  .leftJoinAndSelect('targetInventory.inventory', 'inventory')
123
+ .leftJoinAndSelect('targetInventory.product', 'oiProduct')
123
124
  .leftJoinAndSelect('inventory.location', 'location')
124
125
  .leftJoinAndSelect('inventory.product', 'product')
125
126
  .leftJoinAndSelect('product.productDetails', 'productDetails')
@@ -174,20 +175,38 @@ export async function renderRODO({ doNo }, context: any) {
174
175
  productDetail => productDetail.packingType === inventory.packingType
175
176
  )
176
177
  return {
177
- product_name: `${inventory.product.name} (${inventory.product.description})`,
178
- product_desc: `${inventory.product?.description || ''}`,
179
- product_nameOnly: `${inventory.product.name}`,
180
- product_sku: `${inventory.product.sku}`,
178
+ product_name:
179
+ wsd.targetInventory.product.id === wsd.targetInventory.inventory.product.id
180
+ ? `${inventory.product.name} (${inventory.product.description})`
181
+ : `${wsd.targetInventory.product.name} (${wsd.targetInventory.product.description})`,
182
+ product_desc:
183
+ wsd.targetInventory.product.id === wsd.targetInventory.inventory.product.id
184
+ ? `${inventory.product?.description || ''}`
185
+ : `${wsd.targetInventory.product.description || ''}`,
186
+ product_nameOnly:
187
+ wsd.targetInventory.product.id === wsd.targetInventory.inventory.product.id
188
+ ? `${inventory.product.name}`
189
+ : `${wsd.targetInventory.product.name}`,
190
+ product_sku:
191
+ wsd.targetInventory.product.id === wsd.targetInventory.inventory.product.id
192
+ ? `${inventory.product.sku}`
193
+ : `${wsd.targetInventory.product.sku}`,
181
194
  product_type: inventory.packingType,
182
195
  product_size: matchedProductDetail ? matchedProductDetail.packingSize : inventory.packingSize,
183
196
  product_batch: inventory.batchId,
184
197
  product_batch_ref: inventory.batchIdRef,
185
- product_qty: targetInventory.releaseQty,
198
+ product_qty:
199
+ targetInventory.type === 'VAS_ORDER' || targetInventory.releaseQty != targetInventory.pickedQty
200
+ ? targetInventory.releaseQty
201
+ : targetInventory.pickedQty,
186
202
  product_weight: targetInventory.releaseWeight,
187
203
  product_gross_weight: inventory.product.grossWeight,
188
204
  product_uom_value: targetInventory.releaseUomValue,
189
205
  product_uom: inventory.uom,
190
- product_brand_sku: `${inventory.product?.brandSku || ''}`,
206
+ product_brand_sku:
207
+ wsd.targetInventory.product.id === wsd.targetInventory.inventory.product.id
208
+ ? `${inventory.product?.brandSku || ''}`
209
+ : `${wsd.targetInventory.product?.brandSku || ''}`,
191
210
  remark: targetInventory.remark,
192
211
  inventory_remark: inventory.remark,
193
212
  cross_docking: targetInventory.crossDocking,