@things-factory/worksheet-base 4.0.35 → 4.0.39

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 (40) hide show
  1. package/dist-server/controllers/ecommerce/ecommerce-controller.js +12 -8
  2. package/dist-server/controllers/ecommerce/ecommerce-controller.js.map +1 -1
  3. package/dist-server/controllers/ecommerce/sellercraft-controller.js +45 -33
  4. package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
  5. package/dist-server/controllers/inbound/unloading-returning-worksheet-controller.js +12 -9
  6. package/dist-server/controllers/inbound/unloading-returning-worksheet-controller.js.map +1 -1
  7. package/dist-server/controllers/inbound/unloading-worksheet-controller.js +15 -11
  8. package/dist-server/controllers/inbound/unloading-worksheet-controller.js.map +1 -1
  9. package/dist-server/controllers/outbound/sorting-worksheet-controller.js +2 -0
  10. package/dist-server/controllers/outbound/sorting-worksheet-controller.js.map +1 -1
  11. package/dist-server/graphql/resolvers/worksheet/find-release-orders-by-task-no.js +5 -2
  12. package/dist-server/graphql/resolvers/worksheet/find-release-orders-by-task-no.js.map +1 -1
  13. package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-return-worksheet.js +8 -8
  14. package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-return-worksheet.js.map +1 -1
  15. package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-worksheet.js +8 -8
  16. package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-worksheet.js.map +1 -1
  17. package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js +2 -2
  18. package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
  19. package/dist-server/graphql/resolvers/worksheet/unloading/complete-unloading-partially.js.map +1 -1
  20. package/dist-server/graphql/resolvers/worksheet/unloading-return/complete-unload-return-partially.js.map +1 -1
  21. package/dist-server/graphql/types/worksheet/index.js +2 -2
  22. package/dist-server/graphql/types/worksheet-detail/worksheet-detail-patch.js +1 -0
  23. package/dist-server/graphql/types/worksheet-detail/worksheet-detail-patch.js.map +1 -1
  24. package/dist-server/utils/inventory-util.js +3 -2
  25. package/dist-server/utils/inventory-util.js.map +1 -1
  26. package/package.json +17 -17
  27. package/server/controllers/ecommerce/ecommerce-controller.ts +14 -8
  28. package/server/controllers/ecommerce/sellercraft-controller.ts +52 -43
  29. package/server/controllers/inbound/unloading-returning-worksheet-controller.ts +17 -12
  30. package/server/controllers/inbound/unloading-worksheet-controller.ts +19 -13
  31. package/server/controllers/outbound/sorting-worksheet-controller.ts +1 -0
  32. package/server/graphql/resolvers/worksheet/find-release-orders-by-task-no.ts +11 -6
  33. package/server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-return-worksheet.ts +8 -8
  34. package/server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-worksheet.ts +8 -8
  35. package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +2 -2
  36. package/server/graphql/resolvers/worksheet/unloading/complete-unloading-partially.ts +1 -1
  37. package/server/graphql/resolvers/worksheet/unloading-return/complete-unload-return-partially.ts +1 -1
  38. package/server/graphql/types/worksheet/index.ts +2 -2
  39. package/server/graphql/types/worksheet-detail/worksheet-detail-patch.ts +1 -0
  40. package/server/utils/inventory-util.ts +5 -3
package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-return-worksheet.js CHANGED
@@ -30,14 +30,14 @@ exports.generatePartialPutawayReturnWorksheetResolver = {
30
30
  });
31
31
  const wsdStatus = remainPalletCnt >= 0 ? constants_1.WORKSHEET_STATUS.PARTIALLY_UNLOADED : constants_1.WORKSHEET_STATUS.EXECUTING;
32
32
  const worksheetDetails = unloadingWorksheet.worksheetDetails;
33
- const nonStartedWorksheetDetails = worksheetDetails
34
- .filter((wsd) => { var _a, _b; return ((_b = (_a = wsd.targetInventory) === null || _a === void 0 ? void 0 : _a.inventory) === null || _b === void 0 ? void 0 : _b.status) !== warehouse_base_1.INVENTORY_STATUS.PARTIALLY_UNLOADED; })
35
- .map((wsd) => {
36
- wsd.status = wsdStatus;
37
- wsd.updater = user;
38
- return wsd;
39
- });
40
- await tx.getRepository(entities_1.WorksheetDetail).save(nonStartedWorksheetDetails);
33
+ // const nonStartedWorksheetDetails: WorksheetDetail[] = worksheetDetails
34
+ // .filter((wsd: WorksheetDetail) => wsd.targetInventory?.inventory?.status !== INVENTORY_STATUS.PARTIALLY_UNLOADED)
35
+ // .map((wsd: WorksheetDetail) => {
36
+ // wsd.status = wsdStatus
37
+ // wsd.updater = user
38
+ // return wsd
39
+ // })
40
+ // await tx.getRepository(WorksheetDetail).save(nonStartedWorksheetDetails)
41
41
  }
42
42
  };
43
43
  async function generatePartialPutawayReturnWorksheet(tx, domain, user, returnOrderNo, inventories) {
package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-return-worksheet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate-partial-putaway-return-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-return-worksheet.ts"],"names":[],"mappings":";;;AAGA,mEAA4E;AAE5E,qDAAwE;AACxE,yDAA6E;AAC7E,mDAAiE;AAEpD,QAAA,6CAA6C,GAAG;IAC3D,KAAK,CAAC,qCAAqC,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,OAAY;;QAC9F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,IAAI,SAAS,GAAc,MAAM,qCAAqC,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,CAAA;QAEpH,IAAI,CAAC,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,EAAE,CAAA,EAAE;YAC/B,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE;gBAC3B,SAAS,EAAE,CAAC,aAAa,CAAC;aAC3B,CAAC,CAAA;SACH;QAED,MAAM,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;QACtD,MAAM,kBAAkB,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAC9E,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,0BAAc,CAAC,gBAAgB,EAAE;YAC7D,SAAS,EAAE,CAAC,kBAAkB,EAAE,kCAAkC,EAAE,4CAA4C,CAAC;SAClH,CAAC,CAAA;QAEF,MAAM,eAAe,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,KAAK,CAAC;YACtE,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,WAAW,CAAC,EAAE;gBAC1B,MAAM,EAAE,4BAAgB,CAAC,kBAAkB;aAC5C;SACF,CAAC,CAAA;QACF,MAAM,SAAS,GAAW,eAAe,IAAI,CAAC,CAAC,CAAC,CAAC,4BAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC,4BAAgB,CAAC,SAAS,CAAA;QAEjH,MAAM,gBAAgB,GAAsB,kBAAkB,CAAC,gBAAgB,CAAA;QAC/E,MAAM,0BAA0B,GAAsB,gBAAgB;aACnE,MAAM,CAAC,CAAC,GAAoB,EAAE,EAAE,eAAC,OAAA,CAAA,MAAA,MAAA,GAAG,CAAC,eAAe,0CAAE,SAAS,0CAAE,MAAM,MAAK,iCAAgB,CAAC,kBAAkB,CAAA,EAAA,CAAC;aAChH,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE;YAC5B,GAAG,CAAC,MAAM,GAAG,SAAS,CAAA;YACtB,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;YAClB,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;QAEJ,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;IAC1E,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,qCAAqC,CACzD,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB,EACrB,WAAwB;IAExB,MAAM,mBAAmB,GAAwC,IAAI,iDAAmC,CACtG,EAAE,EACF,MAAM,EACN,IAAI,CACL,CAAA;IACD,OAAO,MAAM,mBAAmB,CAAC,8BAA8B,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;AAC7F,CAAC;AAbD,sFAaC"}
1
+ {"version":3,"file":"generate-partial-putaway-return-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-return-worksheet.ts"],"names":[],"mappings":";;;AAGA,mEAA4E;AAE5E,qDAAwE;AACxE,yDAA6E;AAC7E,mDAAiE;AAEpD,QAAA,6CAA6C,GAAG;IAC3D,KAAK,CAAC,qCAAqC,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,OAAY;;QAC9F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,IAAI,SAAS,GAAc,MAAM,qCAAqC,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,CAAA;QAEpH,IAAI,CAAC,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,EAAE,CAAA,EAAE;YAC/B,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE;gBAC3B,SAAS,EAAE,CAAC,aAAa,CAAC;aAC3B,CAAC,CAAA;SACH;QAED,MAAM,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;QACtD,MAAM,kBAAkB,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAC9E,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,0BAAc,CAAC,gBAAgB,EAAE;YAC7D,SAAS,EAAE,CAAC,kBAAkB,EAAE,kCAAkC,EAAE,4CAA4C,CAAC;SAClH,CAAC,CAAA;QAEF,MAAM,eAAe,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,KAAK,CAAC;YACtE,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,WAAW,CAAC,EAAE;gBAC1B,MAAM,EAAE,4BAAgB,CAAC,kBAAkB;aAC5C;SACF,CAAC,CAAA;QACF,MAAM,SAAS,GAAW,eAAe,IAAI,CAAC,CAAC,CAAC,CAAC,4BAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC,4BAAgB,CAAC,SAAS,CAAA;QAEjH,MAAM,gBAAgB,GAAsB,kBAAkB,CAAC,gBAAgB,CAAA;QAC/E,yEAAyE;QACzE,sHAAsH;QACtH,qCAAqC;QACrC,6BAA6B;QAC7B,yBAAyB;QACzB,iBAAiB;QACjB,OAAO;QAEP,2EAA2E;IAC7E,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,qCAAqC,CACzD,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB,EACrB,WAAwB;IAExB,MAAM,mBAAmB,GAAwC,IAAI,iDAAmC,CACtG,EAAE,EACF,MAAM,EACN,IAAI,CACL,CAAA;IACD,OAAO,MAAM,mBAAmB,CAAC,8BAA8B,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;AAC7F,CAAC;AAbD,sFAaC"}
package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-worksheet.js CHANGED
@@ -30,14 +30,14 @@ exports.generatePartialPutawayWorksheetResolver = {
30
30
  });
31
31
  const wsdStatus = remainPalletCnt >= 0 ? constants_1.WORKSHEET_STATUS.PARTIALLY_UNLOADED : constants_1.WORKSHEET_STATUS.EXECUTING;
32
32
  const worksheetDetails = unloadingWorksheet.worksheetDetails;
33
- const nonStartedWorksheetDetails = worksheetDetails
34
- .filter((wsd) => { var _a, _b; return ((_b = (_a = wsd.targetInventory) === null || _a === void 0 ? void 0 : _a.inventory) === null || _b === void 0 ? void 0 : _b.status) !== warehouse_base_1.INVENTORY_STATUS.PARTIALLY_UNLOADED; })
35
- .map((wsd) => {
36
- wsd.status = wsdStatus;
37
- wsd.updater = user;
38
- return wsd;
39
- });
40
- await tx.getRepository(entities_1.WorksheetDetail).save(nonStartedWorksheetDetails);
33
+ // const nonStartedWorksheetDetails: WorksheetDetail[] = worksheetDetails
34
+ // .filter((wsd: WorksheetDetail) => wsd.targetInventory?.inventory?.status !== INVENTORY_STATUS.PARTIALLY_UNLOADED)
35
+ // .map((wsd: WorksheetDetail) => {
36
+ // wsd.status = wsdStatus
37
+ // wsd.updater = user
38
+ // return wsd
39
+ // })
40
+ // await tx.getRepository(WorksheetDetail).save(nonStartedWorksheetDetails)
41
41
  }
42
42
  };
43
43
  async function generatePartialPutawayWorksheet(tx, domain, user, arrivalNoticeNo, inventories) {
package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-worksheet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate-partial-putaway-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-worksheet.ts"],"names":[],"mappings":";;;AAGA,mEAA4E;AAE5E,qDAAwE;AACxE,yDAAoE;AACpE,mDAAiE;AAEpD,QAAA,uCAAuC,GAAG;IACrD,KAAK,CAAC,+BAA+B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,OAAY;;QAC1F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,IAAI,SAAS,GAAc,MAAM,+BAA+B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,CAAC,CAAA;QAEhH,IAAI,CAAC,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,aAAa,0CAAE,EAAE,CAAA,EAAE;YACjC,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE;gBAC3B,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;SACH;QAED,MAAM,aAAa,GAAkB,SAAS,CAAC,aAAa,CAAA;QAC5D,MAAM,kBAAkB,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAC9E,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,0BAAc,CAAC,SAAS,EAAE;YACxD,SAAS,EAAE,CAAC,kBAAkB,EAAE,kCAAkC,EAAE,4CAA4C,CAAC;SAClH,CAAC,CAAA;QAEF,MAAM,eAAe,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,KAAK,CAAC;YACtE,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,aAAa,CAAC,EAAE;gBAC5B,MAAM,EAAE,4BAAgB,CAAC,kBAAkB;aAC5C;SACF,CAAC,CAAA;QACF,MAAM,SAAS,GAAW,eAAe,IAAI,CAAC,CAAC,CAAC,CAAC,4BAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC,4BAAgB,CAAC,SAAS,CAAA;QAEjH,MAAM,gBAAgB,GAAsB,kBAAkB,CAAC,gBAAgB,CAAA;QAC/E,MAAM,0BAA0B,GAAsB,gBAAgB;aACnE,MAAM,CAAC,CAAC,GAAoB,EAAE,EAAE,eAAC,OAAA,CAAA,MAAA,MAAA,GAAG,CAAC,eAAe,0CAAE,SAAS,0CAAE,MAAM,MAAK,iCAAgB,CAAC,kBAAkB,CAAA,EAAA,CAAC;aAChH,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE;YAC5B,GAAG,CAAC,MAAM,GAAG,SAAS,CAAA;YACtB,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;YAClB,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;QAEJ,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;IAC1E,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,+BAA+B,CACnD,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,WAAwB;IAExB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,OAAO,MAAM,mBAAmB,CAAC,wBAAwB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;AACzF,CAAC;AATD,0EASC"}
1
+ {"version":3,"file":"generate-partial-putaway-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-worksheet.ts"],"names":[],"mappings":";;;AAGA,mEAA4E;AAE5E,qDAAwE;AACxE,yDAAoE;AACpE,mDAAiE;AAEpD,QAAA,uCAAuC,GAAG;IACrD,KAAK,CAAC,+BAA+B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,OAAY;;QAC1F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,IAAI,SAAS,GAAc,MAAM,+BAA+B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,CAAC,CAAA;QAEhH,IAAI,CAAC,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,aAAa,0CAAE,EAAE,CAAA,EAAE;YACjC,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE;gBAC3B,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;SACH;QAED,MAAM,aAAa,GAAkB,SAAS,CAAC,aAAa,CAAA;QAC5D,MAAM,kBAAkB,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAC9E,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,0BAAc,CAAC,SAAS,EAAE;YACxD,SAAS,EAAE,CAAC,kBAAkB,EAAE,kCAAkC,EAAE,4CAA4C,CAAC;SAClH,CAAC,CAAA;QAEF,MAAM,eAAe,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,KAAK,CAAC;YACtE,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,aAAa,CAAC,EAAE;gBAC5B,MAAM,EAAE,4BAAgB,CAAC,kBAAkB;aAC5C;SACF,CAAC,CAAA;QACF,MAAM,SAAS,GAAW,eAAe,IAAI,CAAC,CAAC,CAAC,CAAC,4BAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC,4BAAgB,CAAC,SAAS,CAAA;QAEjH,MAAM,gBAAgB,GAAsB,kBAAkB,CAAC,gBAAgB,CAAA;QAC/E,yEAAyE;QACzE,sHAAsH;QACtH,qCAAqC;QACrC,6BAA6B;QAC7B,yBAAyB;QACzB,iBAAiB;QACjB,OAAO;QAEP,2EAA2E;IAC7E,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,+BAA+B,CACnD,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,WAAwB;IAExB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,OAAO,MAAM,mBAAmB,CAAC,wBAAwB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;AACzF,CAAC;AATD,0EASC"}
package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js CHANGED
@@ -87,8 +87,8 @@ exports.inventoriesByPalletResolver = {
87
87
  };
88
88
  async function getRemainAmount(inventory) {
89
89
  return {
90
- remainQty: inventory.qty - inventory.lockedQty,
91
- remainUomValue: inventory.uomValue - inventory.lockedUomValue
90
+ remainQty: inventory.qty - (inventory.lockedQty || 0),
91
+ remainUomValue: inventory.uomValue - (inventory.lockedUomValue || 0)
92
92
  };
93
93
  }
94
94
  //# sourceMappingURL=inventories-by-pallet.js.map
package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/worksheet/unloading/complete-unloading-partially.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"complete-unloading-partially.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/complete-unloading-partially.ts"],"names":[],"mappings":";;;AAGA,yDAAsE;AAGzD,QAAA,kCAAkC,GAAG;IAChD,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE,EAAE,OAAY;QACzF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,0BAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;IACtF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,0BAA0B,CAC9C,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,wBAAkD;IAElD,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,MAAM,mBAAmB,CAAC,0BAA0B,CAAC,eAAe,EAAE,wBAAwB,CAAC,CAAA;AACjG,CAAC;AATD,gEASC"}
1
+ {"version":3,"file":"complete-unloading-partially.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/complete-unloading-partially.ts"],"names":[],"mappings":";;;AAGA,yDAAsE;AAGzD,QAAA,kCAAkC,GAAG;IAChD,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE,EAAE,OAAY;QACzF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,0BAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;IACtF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,0BAA0B,CAC9C,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,wBAAoD;IAEpD,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,MAAM,mBAAmB,CAAC,0BAA0B,CAAC,eAAe,EAAE,wBAAwB,CAAC,CAAA;AACjG,CAAC;AATD,gEASC"}
package/dist-server/graphql/resolvers/worksheet/unloading-return/complete-unload-return-partially.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"complete-unload-return-partially.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading-return/complete-unload-return-partially.ts"],"names":[],"mappings":";;;AAGA,yDAA+E;AAGlE,QAAA,qCAAqC,GAAG;IACnD,KAAK,CAAC,6BAA6B,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,OAAY;QAC1F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,6BAA6B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,eAAe,CAAC,CAAA;IACvF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,6BAA6B,CACjD,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB,EACrB,wBAAkD;IAElD,MAAM,mBAAmB,GAA0C,IAAI,mDAAqC,CAC1G,EAAE,EACF,MAAM,EACN,IAAI,CACL,CAAA;IACD,MAAM,mBAAmB,CAAC,6BAA6B,CAAC,aAAa,EAAE,wBAAwB,CAAC,CAAA;AAClG,CAAC;AAbD,sEAaC"}
1
+ {"version":3,"file":"complete-unload-return-partially.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading-return/complete-unload-return-partially.ts"],"names":[],"mappings":";;;AAGA,yDAA+E;AAGlE,QAAA,qCAAqC,GAAG;IACnD,KAAK,CAAC,6BAA6B,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,OAAY;QAC1F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,6BAA6B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,eAAe,CAAC,CAAA;IACvF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,6BAA6B,CACjD,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB,EACrB,wBAAoD;IAEpD,MAAM,mBAAmB,GAA0C,IAAI,mDAAqC,CAC1G,EAAE,EACF,MAAM,EACN,IAAI,CACL,CAAA;IACD,MAAM,mBAAmB,CAAC,6BAA6B,CAAC,aAAa,EAAE,wBAAwB,CAAC,CAAA;AAClG,CAAC;AAbD,sEAaC"}
package/dist-server/graphql/types/worksheet/index.js CHANGED
@@ -199,12 +199,12 @@ exports.Mutation = `
199
199
 
200
200
  completeUnloadingPartially (
201
201
  arrivalNoticeNo: String!
202
- worksheetDetail: WorksheetDetailPatch!
202
+ worksheetDetail: [WorksheetDetailPatch!]
203
203
  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
204
204
 
205
205
  completeUnloadReturnPartially (
206
206
  returnOrderNo: String!
207
- worksheetDetail: WorksheetDetailPatch!
207
+ worksheetDetail: [WorksheetDetailPatch!]
208
208
  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
209
209
 
210
210
  completeUnloading (
package/dist-server/graphql/types/worksheet-detail/worksheet-detail-patch.js CHANGED
@@ -25,6 +25,7 @@ exports.WorksheetDetailPatch = (0, apollo_server_koa_1.gql) `
25
25
  remark: String
26
26
  issue: String
27
27
  cuFlag: String
28
+ actualPackQty: Int
28
29
  }
29
30
  `;
30
31
  //# sourceMappingURL=worksheet-detail-patch.js.map
package/dist-server/graphql/types/worksheet-detail/worksheet-detail-patch.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"worksheet-detail-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/worksheet-detail-patch.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,oBAAoB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;CAwBtC,CAAA"}
1
+ {"version":3,"file":"worksheet-detail-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/worksheet-detail-patch.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,oBAAoB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;CAyBtC,CAAA"}
package/dist-server/utils/inventory-util.js CHANGED
@@ -180,8 +180,8 @@ exports.checkPalletIdenticallity = checkPalletIdenticallity;
180
180
  */
181
181
  async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId, productId, packingType, packingSize, uom, pickingStrategy, locationSortingRules }, domain, trxMgr) {
182
182
  const qb = await trxMgr.getRepository(warehouse_base_1.Inventory).createQueryBuilder('INV');
183
- qb.leftJoinAndSelect('INV.product', 'PROD')
184
- .leftJoinAndSelect('INV.location', 'LOC')
183
+ qb.innerJoinAndSelect('INV.product', 'PROD')
184
+ .innerJoinAndSelect('INV.location', 'LOC')
185
185
  .addSelect(subQuery => subQuery
186
186
  .select('COALESCE(SUM(release_qty), 0)', 'releaseQty')
187
187
  .from('order_inventories', 'OI')
@@ -200,6 +200,7 @@ async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId, product
200
200
  .andWhere('"INV"."packing_size" = :packingSize')
201
201
  .andWhere('"INV"."uom" = :uom')
202
202
  .andWhere('"INV"."status" = :status', { status: 'STORED' })
203
+ .andWhere('"LOC"."type" NOT IN (:...locationTypes)', { locationTypes: [warehouse_base_1.LOCATION_TYPE.QUARANTINE, warehouse_base_1.LOCATION_TYPE.RESERVE] })
203
204
  .setParameters({
204
205
  domainId: domain.id,
205
206
  productId,
package/dist-server/utils/inventory-util.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.0.35",
3
+ "version": "4.0.39",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -24,21 +24,21 @@
24
24
  "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
25
25
  },
26
26
  "dependencies": {
27
- "@things-factory/auth-base": "^4.0.35",
28
- "@things-factory/biz-base": "^4.0.35",
29
- "@things-factory/document-template-base": "^4.0.35",
30
- "@things-factory/id-rule-base": "^4.0.35",
31
- "@things-factory/integration-lmd": "^4.0.35",
32
- "@things-factory/integration-marketplace": "^4.0.35",
33
- "@things-factory/integration-sellercraft": "^4.0.35",
34
- "@things-factory/integration-sftp": "^4.0.35",
35
- "@things-factory/marketplace-base": "^4.0.35",
36
- "@things-factory/notification": "^4.0.35",
37
- "@things-factory/sales-base": "^4.0.35",
38
- "@things-factory/setting-base": "^4.0.35",
39
- "@things-factory/shell": "^4.0.35",
40
- "@things-factory/transport-base": "^4.0.35",
41
- "@things-factory/warehouse-base": "^4.0.35"
27
+ "@things-factory/auth-base": "^4.0.39",
28
+ "@things-factory/biz-base": "^4.0.39",
29
+ "@things-factory/document-template-base": "^4.0.39",
30
+ "@things-factory/id-rule-base": "^4.0.39",
31
+ "@things-factory/integration-lmd": "^4.0.39",
32
+ "@things-factory/integration-marketplace": "^4.0.39",
33
+ "@things-factory/integration-sellercraft": "^4.0.39",
34
+ "@things-factory/integration-sftp": "^4.0.39",
35
+ "@things-factory/marketplace-base": "^4.0.39",
36
+ "@things-factory/notification": "^4.0.39",
37
+ "@things-factory/sales-base": "^4.0.39",
38
+ "@things-factory/setting-base": "^4.0.39",
39
+ "@things-factory/shell": "^4.0.39",
40
+ "@things-factory/transport-base": "^4.0.39",
41
+ "@things-factory/warehouse-base": "^4.0.39"
42
42
  },
43
- "gitHead": "842a39426de15e808ee3aaf5972f1024afe5281f"
43
+ "gitHead": "a4f93ea85a26cf70ae0aa2fcd298aa59b55dd039"
44
44
  }
package/server/controllers/ecommerce/ecommerce-controller.ts CHANGED
@@ -21,14 +21,20 @@ export class EcommerceController extends WorksheetController {
21
21
  let inventoryProducts: any[] = await Promise.all(
22
22
  orderProducts.map(async orderProduct => {
23
23
  const product = orderProduct.product
24
- let inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
25
- where: {
26
- domain: this.domain,
27
- product: orderProduct.product,
28
- status: Not(Equal(INVENTORY_STATUS.TERMINATED))
29
- },
30
- relations: ['location']
31
- })
24
+ let qb = await this.trxMgr.getRepository(Inventory).createQueryBuilder('inv')
25
+ qb.leftJoinAndSelect('inv.location', 'loc')
26
+ .andWhere('"inv"."domain_id" = :domainId')
27
+ .andWhere('"inv"."product_id" = :productId')
28
+ .andWhere('"inv"."status" != :status')
29
+ .andWhere('"loc"."type" NOT IN (:...locationTypes)')
30
+ .setParameters({
31
+ domainId: this.domain.id,
32
+ productId: orderProduct.product.id,
33
+ status: INVENTORY_STATUS.TERMINATED,
34
+ locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
35
+ })
36
+
37
+ let inventories: Inventory[] = await qb.getMany()
32
38
 
33
39
  inventories = inventories.filter(
34
40
  inventory =>
package/server/controllers/ecommerce/sellercraft-controller.ts CHANGED
@@ -1,5 +1,3 @@
1
- import { Equal, Not } from 'typeorm'
2
-
3
1
  import { Sellercraft, SellercraftAPI } from '@things-factory/integration-sellercraft'
4
2
  import { Product, ProductDetail } from '@things-factory/product-base'
5
3
  import {
@@ -113,55 +111,66 @@ export class SellercraftController extends WorksheetController {
113
111
  async updateSellercraftStock(sellercraft: Sellercraft, inventory: Inventory): Promise<void> {
114
112
  let product: Product = inventory.product
115
113
  const productDetails: ProductDetail[] = product.productDetails
116
- let inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
117
- where: { domain: this.domain, product, status: Not(Equal(INVENTORY_STATUS.TERMINATED)) },
118
- relations: ['location']
119
- })
120
-
121
- inventories = inventories.filter(
122
- inventory =>
123
- inventory?.location.type !== LOCATION_TYPE.QUARANTINE || inventory?.location.type !== LOCATION_TYPE.RESERVE
124
- )
114
+ let qb = await this.trxMgr.getRepository(Inventory).createQueryBuilder('inv')
115
+ qb.leftJoinAndSelect('inv.location', 'loc')
116
+ .andWhere('"inv"."domain_id" = :domainId')
117
+ .andWhere('"inv"."product_id" = :productId')
118
+ .andWhere('"inv"."status" != :status')
119
+ .andWhere('"loc"."type" NOT IN (:...locationTypes)')
120
+ .setParameters({
121
+ domainId: this.domain.id,
122
+ productId: product.id,
123
+ status: INVENTORY_STATUS.TERMINATED,
124
+ locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
125
+ })
125
126
 
126
- let defaultProductDetail: ProductDetail
127
- const sellercraftInvs: any[] = await Promise.all(
128
- inventories.map(async (inventory: Inventory) => {
129
- const inventoryPackingType: string = inventory.packingType
130
- defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
127
+ let inventories: Inventory[] = await qb.getMany()
128
+ let inventoryTotalQty: number = 0
131
129
 
132
- let packingSize: number = 1
133
- if (inventoryPackingType !== defaultProductDetail.packingType) {
134
- const unmatchingProductDetail: ProductDetail = product.productDetails.find(
135
- productDetail => productDetail.packingType === inventoryPackingType
136
- )
130
+ let defaultProductDetail: ProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
137
131
 
138
- packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
139
- }
132
+ if (inventories?.length > 0) {
133
+ const sellercraftInvs: any[] = await Promise.all(
134
+ inventories.map(async (inventory: Inventory) => {
135
+ const inventoryPackingType: string = inventory.packingType
140
136
 
141
- return { quantity: inventory.qty * packingSize - inventory.lockedQty * packingSize }
142
- })
143
- )
137
+ let packingSize: number = 1
138
+ if (inventoryPackingType !== defaultProductDetail.packingType) {
139
+ const unmatchingProductDetail: ProductDetail = product.productDetails.find(
140
+ productDetail => productDetail.packingType === inventoryPackingType
141
+ )
144
142
 
145
- const totalQty: number = sellercraftInvs.reduce((total, currentValue) => {
146
- total += currentValue.quantity
147
- return total
148
- }, 0)
143
+ packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
144
+ }
149
145
 
150
- const sellercraftInv: any = {
151
- accountId: sellercraft.accountId,
152
- sku: product.sku,
153
- uom: 'EA',
154
- quantity: totalQty,
155
- gtin: defaultProductDetail.gtin,
156
- weight: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
157
- packageDimension: {
158
- length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
159
- width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
160
- height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
161
- }
146
+ return { quantity: inventory.qty * packingSize - inventory.lockedQty * packingSize }
147
+ })
148
+ )
149
+
150
+ inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
151
+ total += currentValue.quantity
152
+ return total
153
+ }, 0)
162
154
  }
163
155
 
164
- await SellercraftAPI.updateProduct(sellercraft, { sellercraftInv })
156
+ const sellercraftInv: any[] = [
157
+ {
158
+ sku: product.sku,
159
+ gtin: defaultProductDetail.gtin,
160
+ stock: {
161
+ quantity: inventoryTotalQty,
162
+ unit_of_measure: 'EA'
163
+ },
164
+ package_weight_gm: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
165
+ package_dimensions: {
166
+ length_mm: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
167
+ width_mm: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
168
+ height_mm: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
169
+ }
170
+ }
171
+ ]
172
+
173
+ await SellercraftAPI.updateProduct(sellercraft, { accountId: sellercraft.accountId, sellercraftInv })
165
174
  }
166
175
 
167
176
  async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
package/server/controllers/inbound/unloading-returning-worksheet-controller.ts CHANGED
@@ -187,7 +187,7 @@ export class UnloadingReturningWorksheetController extends VasWorksheetControlle
187
187
 
188
188
  async completeUnloadReturnPartially(
189
189
  returnOrderNo: string,
190
- unloadingReturnWorksheetDetails: Partial<WorksheetDetail>
190
+ unloadingReturnWorksheetDetails: Partial<WorksheetDetail>[]
191
191
  ): Promise<Worksheet> {
192
192
  const returnOrder: ReturnOrder = await this.findRefOrder(ReturnOrder, {
193
193
  name: returnOrderNo,
@@ -200,18 +200,23 @@ export class UnloadingReturningWorksheetController extends VasWorksheetControlle
200
200
  ])
201
201
  this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
202
202
 
203
- let worksheetDetail: WorksheetDetail = worksheet.worksheetDetails.find(
204
- (wsd: WorksheetDetail) => wsd.name === unloadingReturnWorksheetDetails.name
203
+ let worksheetDetails = worksheet.worksheetDetails.filter(({ name: itm1 }) =>
204
+ unloadingReturnWorksheetDetails.some(({ name: itm2 }) => itm2 === itm1)
205
205
  )
206
- worksheetDetail.status = WORKSHEET_STATUS.PARTIALLY_UNLOADED
207
- worksheetDetail.issue = unloadingReturnWorksheetDetails.issue || worksheetDetail.issue
208
- worksheetDetail.updater = this.user
209
- worksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
210
-
211
- let targetInventory: OrderInventory = worksheetDetail.targetInventory
212
- targetInventory.status = ORDER_PRODUCT_STATUS.PARTIALLY_UNLOADED
213
- targetInventory.remark = worksheetDetail.issue || targetInventory.remark
214
- await this.updateOrderTargets([targetInventory])
206
+
207
+ worksheetDetails.forEach((wsds: WorksheetDetail) => {
208
+ wsds.status = WORKSHEET_STATUS.PARTIALLY_UNLOADED
209
+ wsds.updater = this.user
210
+ })
211
+
212
+ worksheetDetails = await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetails)
213
+
214
+ for (let i = 0; i < worksheetDetails.length; i++) {
215
+ worksheetDetails[i].targetInventory.status = ORDER_PRODUCT_STATUS.PARTIALLY_UNLOADED
216
+ worksheetDetails[i].targetInventory.remark =
217
+ worksheetDetails[i].issue || worksheetDetails[i].targetInventory.remark
218
+ await this.updateOrderTargets([worksheetDetails[i].targetInventory])
219
+ }
215
220
 
216
221
  let inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
217
222
  where: {
package/server/controllers/inbound/unloading-worksheet-controller.ts CHANGED
@@ -561,6 +561,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
561
561
  targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
562
562
  } else {
563
563
  targetProduct.actualPackQty--
564
+ targetProduct.actualPalletQty--
564
565
  }
565
566
  targetProduct.updater = this.user
566
567
  await this.updateOrderTargets([targetProduct])
@@ -578,7 +579,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
578
579
  oi =>
579
580
  oi.batchId == inventory.batchId &&
580
581
  oi.packingType == inventory.packingType &&
581
- oi.product.id == inventory.product.id
582
+ oi.product.id == inventory.product.id &&
583
+ oi.packingSize === inventory.packingSize
582
584
  )
583
585
  if (inventory.status == INVENTORY_STATUS.UNLOADED) {
584
586
  targetInventory.actualPackQty -= qty
@@ -586,6 +588,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
586
588
  targetInventory.status = ORDER_PRODUCT_STATUS.UNLOADING
587
589
  } else {
588
590
  targetInventory.actualPackQty--
591
+ targetInventory.actualPalletQty--
589
592
  }
590
593
  targetInventory.updater = this.user
591
594
  await this.updateOrderTargets([targetInventory])
@@ -822,7 +825,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
822
825
 
823
826
  async completeUnloadingPartially(
824
827
  arrivalNoticeNo: string,
825
- unloadingWorksheetDetail: Partial<WorksheetDetail>
828
+ unloadingWorksheetDetail: Partial<WorksheetDetail>[]
826
829
  ): Promise<Worksheet> {
827
830
  const arrivalNotice: ArrivalNotice = await this.findRefOrder(ArrivalNotice, {
828
831
  name: arrivalNoticeNo,
@@ -835,24 +838,27 @@ export class UnloadingWorksheetController extends VasWorksheetController {
835
838
  ])
836
839
  this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
837
840
 
838
- let worksheetDetail: WorksheetDetail = worksheet.worksheetDetails.find(
839
- (wsd: WorksheetDetail) => wsd.name === unloadingWorksheetDetail.name
841
+ let worksheetDetails = worksheet.worksheetDetails.filter(({ name: itm1 }) =>
842
+ unloadingWorksheetDetail.some(({ name: itm2 }) => itm2 === itm1)
840
843
  )
841
- worksheetDetail.status = WORKSHEET_STATUS.PARTIALLY_UNLOADED
842
- worksheetDetail.issue = unloadingWorksheetDetail.issue || worksheetDetail.issue
843
- worksheetDetail.updater = this.user
844
- worksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
845
844
 
846
- let targetProduct: OrderProduct = worksheetDetail.targetProduct
847
- targetProduct.status = ORDER_PRODUCT_STATUS.PARTIALLY_UNLOADED
848
- targetProduct.issue = worksheetDetail.issue
849
- await this.updateOrderTargets([targetProduct])
845
+ worksheetDetails.forEach((wsds: WorksheetDetail) => {
846
+ wsds.status = WORKSHEET_STATUS.PARTIALLY_UNLOADED
847
+ wsds.updater = this.user
848
+ })
849
+
850
+ worksheetDetails = await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetails)
851
+
852
+ for (let i = 0; i < worksheetDetails.length; i++) {
853
+ worksheetDetails[i].targetProduct.status = ORDER_PRODUCT_STATUS.PARTIALLY_UNLOADED
854
+ worksheetDetails[i].targetProduct.remark = worksheetDetails[i].issue || worksheetDetails[i].targetProduct.remark
855
+ await this.updateOrderTargets([worksheetDetails[i].targetProduct])
856
+ }
850
857
 
851
858
  let inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
852
859
  where: {
853
860
  domain: this.domain,
854
861
  refOrderId: arrivalNotice.id,
855
- orderProductId: targetProduct.id,
856
862
  status: INVENTORY_STATUS.UNLOADED
857
863
  }
858
864
  })
package/server/controllers/outbound/sorting-worksheet-controller.ts CHANGED
@@ -90,6 +90,7 @@ export class SortingWorksheetController extends VasWorksheetController {
90
90
  const matchingProductDetail: ProductDetail = productDetails.find(
91
91
  (productDetail: ProductDetail) => productDetail.gtin === productBarcode
92
92
  )
93
+ if (!matchingProductDetail) throw new Error('Unable to find product barcode.')
93
94
  const packingType: string = matchingProductDetail.packingType
94
95
  const packingSize: number = matchingProductDetail.packingSize
95
96
  if (!matchingProductDetail)
package/server/graphql/resolvers/worksheet/find-release-orders-by-task-no.ts CHANGED
@@ -1,17 +1,22 @@
1
- import { Domain } from '@things-factory/shell'
2
- import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
3
1
  import { EntityManager, SelectQueryBuilder } from 'typeorm'
4
- import { Worksheet as WorksheetEntity, WorksheetDetail as WorksheetDetailEntity } from '../../../entities'
2
+
5
3
  import {
6
- ReleaseGood as ReleaseGoodEntity,
4
+ ORDER_STATUS,
7
5
  OrderInventory as OrderInventoryEntity,
8
- ORDER_STATUS
6
+ ReleaseGood as ReleaseGoodEntity
9
7
  } from '@things-factory/sales-base'
8
+ import { Domain } from '@things-factory/shell'
9
+
10
+ import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
11
+ import { Worksheet as WorksheetEntity, WorksheetDetail as WorksheetDetailEntity } from '../../../entities'
10
12
 
11
13
  export const findReleaseOrdersByTaskNoResolver = {
12
14
  async findReleaseOrdersByTaskNo(_: any, { taskNo }, context: any) {
13
15
  const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
14
- if (!taskNo) throw new Error('Unable to find task no.')
16
+ let task = await tx.getRepository(WorksheetEntity).findOne({
17
+ where: { taskNo, status: WORKSHEET_STATUS.EXECUTING, type: WORKSHEET_TYPE.SORTING }
18
+ })
19
+ if (!task) throw new Error('Unable to find task no.')
15
20
 
16
21
  const qb: SelectQueryBuilder<WorksheetEntity> = tx
17
22
  .getRepository(WorksheetEntity)
package/server/graphql/resolvers/worksheet/generate-worksheet/generate-partial-putaway-return-worksheet.ts CHANGED
@@ -35,15 +35,15 @@ export const generatePartialPutawayReturnWorksheetResolver = {
35
35
  const wsdStatus: string = remainPalletCnt >= 0 ? WORKSHEET_STATUS.PARTIALLY_UNLOADED : WORKSHEET_STATUS.EXECUTING
36
36
 
37
37
  const worksheetDetails: WorksheetDetail[] = unloadingWorksheet.worksheetDetails
38
- const nonStartedWorksheetDetails: WorksheetDetail[] = worksheetDetails
39
- .filter((wsd: WorksheetDetail) => wsd.targetInventory?.inventory?.status !== INVENTORY_STATUS.PARTIALLY_UNLOADED)
40
- .map((wsd: WorksheetDetail) => {
41
- wsd.status = wsdStatus
42
- wsd.updater = user
43
- return wsd
44
- })
38
+ // const nonStartedWorksheetDetails: WorksheetDetail[] = worksheetDetails
39
+ // .filter((wsd: WorksheetDetail) => wsd.targetInventory?.inventory?.status !== INVENTORY_STATUS.PARTIALLY_UNLOADED)
40
+ // .map((wsd: WorksheetDetail) => {
41
+ // wsd.status = wsdStatus
42
+ // wsd.updater = user
43
+ // return wsd
44
+ // })
45
45
 
46
- await tx.getRepository(WorksheetDetail).save(nonStartedWorksheetDetails)
46
+ // await tx.getRepository(WorksheetDetail).save(nonStartedWorksheetDetails)
47
47
  }
48
48
  }
49
49