@things-factory/operato-hub 4.3.500 → 4.3.502

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 (8) hide show
  1. package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-details.js +1 -0
  2. package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-details.js.map +1 -1
  3. package/dist-server/routers/support-router.js +151 -0
  4. package/dist-server/routers/support-router.js.map +1 -1
  5. package/openapi/v1/outbound.yaml +3 -0
  6. package/package.json +10 -10
  7. package/server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts +1 -0
  8. package/server/routers/support-router.ts +204 -29
package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-details.js CHANGED
@@ -156,6 +156,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
156
156
  packingType: oi.packingType,
157
157
  packingSize: oi.packingSize,
158
158
  remark: oi.remark,
159
+ batchId: oi.batchId,
159
160
  product: {
160
161
  id: oi.product.id,
161
162
  name: oi.product.name,
package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-details.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAAuC;AAEvC,6CAAgE;AAChE,qEAA4D;AAC5D,2DAAuE;AAEvE,gDAA4F;AAC5F,oDAAyF;AAEzF,sBAAM,CAAC,GAAG,CACR,yCAAyC,EACzC,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;;IACtB,IAAI;QACF,uCAAuC;QACvC,kCAAkC;QAClC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAChC,IAAI,MAAM,mCAAQ,OAAO,CAAC,KAAK,KAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAE,CAAA;QACpD,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE;YAC/B,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;YACzC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAA;SAC5B;QAED,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACzB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;YAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;SACtB;QAED,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE;YAC5B,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;YACnC,OAAO,MAAM,CAAC,SAAS,CAAC,CAAA;SACzB;QAED,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE;YAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;YACrC,OAAO,MAAM,CAAC,UAAU,CAAC,CAAA;SAC1B;QAED,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE;YAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;YACrC,OAAO,MAAM,CAAC,UAAU,CAAC,CAAA;SAC1B;QAED,MAAM,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,MAAM;YACb,SAAS,EAAE;gBACT,kBAAkB;gBAClB,0BAA0B;gBAC1B,gCAAgC;gBAChC,+BAA+B;gBAC/B,iCAAiC;gBACjC,2CAA2C;gBAC3C,0DAA0D;gBAC1D,6CAA6C;gBAC7C,eAAe;gBACf,iCAAiC;gBACjC,UAAU;aACX;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,kBAAkB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAE/E,kCAAkC;QAClC,IAAI,gBAAgB,GAAG,EAAE,CAAA;QACzB,KAAK,MAAM,cAAc,IAAI,WAAW,CAAC,gBAAgB,EAAE;YACzD,IAAI,YAAY,GAAG,cAAc,CAAC,YAAY,CAAA;YAC9C,MAAM,yBAAyB,GAAG;gBAChC,OAAO,EAAE;oBACP,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG;oBAC/B,aAAa,EAAE;wBACb,OAAO,EAAE,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;wBAC3F,IAAI,EAAE,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,aAAa,0CAAE,IAAI,EAAC,CAAC,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,aAAa,0CAAE,IAAI,CAAC,CAAC,CAAC,IAAI;qBACvF;iBACF;gBACD,YAAY,EAAE;oBACZ,aAAa,EAAE;wBACb,GAAG,EAAE,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,GAAG,EAAC,CAAC,CAAC,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,GAAG,CAAC,CAAC,CAAC,IAAI;wBAC/E,IAAI,EAAE,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,IAAI,EAAC,CAAC,CAAC,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,IAAI,CAAC,CAAC,CAAC,IAAI;qBACnF;oBACD,UAAU,EAAE,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,EAAC,CAAC,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,CAAC,CAAC,CAAC,IAAI;iBACvE;gBACD,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,WAAW,EAAE,cAAc,CAAC,WAAW;gBACvC,WAAW,EAAE,cAAc,CAAC,WAAW;gBACvC,UAAU,EAAE,cAAc,CAAC,UAAU;gBACrC,cAAc,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACtD,OAAO;wBACL,GAAG,EAAE,GAAG,CAAC,GAAG;wBACZ,SAAS,EAAE;4BACT,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI;4BACxB,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gCACrD,OAAO;oCACL,IAAI,EAAE,GAAG,CAAC,IAAI;iCACf,CAAA;4BACH,CAAC,CAAC;yBACH;qBACF,CAAA;gBACH,CAAC,CAAC;aACH,CAAA;YACD,gBAAgB,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;SACjD;QAED,IAAI,aAAa,GAAG,EAAE,CAAA;QACtB,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,aAAa,EAAE;YACpD,MAAM,sBAAsB,GAAG;gBAC7B,iBAAiB,EAAE,YAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBAC1D,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAA;gBACrG,CAAC,CAAC;gBACF,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,kBAAkB,EAAE,YAAY,CAAC,kBAAkB;aACpD,CAAA;YACD,aAAa,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;SAC3C;QAED,IAAI,cAAc,GAAoB,EAAE,CAAA;QACxC,cAAc,GAAG,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,IAAI,CAAC;YACvD,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE;YACtC,SAAS,EAAE;gBACT,kBAAkB;gBAClB,0BAA0B;gBAC1B,gCAAgC;gBAChC,iCAAiC;gBACjC,2CAA2C;gBAC3C,0DAA0D;gBAC1D,iBAAiB;gBACjB,kBAAkB;gBAClB,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;QAEF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;gBAClD,OAAO;oBACL,EAAE,EAAE,aAAa,CAAC,EAAE;oBACpB,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,EAAE,EAAE,aAAa,CAAC,EAAE;oBACpB,OAAO,EAAE,aAAa,CAAC,OAAO;oBAC9B,aAAa,EAAE,aAAa,CAAC,aAAa;oBAC1C,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,YAAY,EAAE,aAAa,CAAC,YAAY;oBACxC,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,MAAM,EAAE,aAAa,CAAC,MAAM;oBAC5B,MAAM,EAAE,aAAa,CAAC,MAAM;oBAC5B,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI;oBAC1G,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI;oBAC1G,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,eAAe,EAAE,aAAa,CAAC,eAAe;wBAC5C,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE;wBACpF,CAAC,CAAC,IAAI;oBACR,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;wBAC9C,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,gBAAgB,CAAC,IAAI,EAAE;wBACtF,CAAC,CAAC,IAAI;oBACR,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;wBACxD,OAAO;4BACL,EAAE,EAAE,EAAE,CAAC,EAAE;4BACT,UAAU,EAAE,EAAE,CAAC,UAAU;4BACzB,eAAe,EAAE,EAAE,CAAC,eAAe;4BACnC,WAAW,EAAE,EAAE,CAAC,WAAW;4BAC3B,WAAW,EAAE,EAAE,CAAC,WAAW;4BAC3B,MAAM,EAAE,EAAE,CAAC,MAAM;4BACjB,OAAO,EAAE,EAAE,CAAC,OAAO;4BACnB,OAAO,EAAE;gCACP,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE;gCACjB,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI;gCACrB,WAAW,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW;gCACnC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG;6BACpB;4BACD,aAAa,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;4BACtF,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gCAC1C,OAAO;oCACL,GAAG,EAAE,GAAG,CAAC,GAAG;oCACZ,SAAS,EAAE;wCACT,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI;wCACxB,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;4CACrD,OAAO;gDACL,IAAI,EAAE,GAAG,CAAC,IAAI;6CACf,CAAA;wCACH,CAAC,CAAC;qCACH;iCACF,CAAA;4BACH,CAAC,CAAC;yBACH,CAAA;oBACH,CAAC,CAAC;oBAEF,IAAI;oBACJ,wDAAwD;oBACxD,eAAe;oBACf,2BAA2B;oBAC3B,+BAA+B;oBAC/B,6CAA6C;oBAC7C,6BAA6B;oBAC7B,6DAA6D;oBAC7D,QAAQ;oBACR,QAAQ;oBACR,IAAI;iBACL,CAAA;YACH,CAAC,CAAC,CAAA;SACH;QAED,IAAI,WAAW,GAAiB,EAAE,CAAA;QAClC,WAAW,GAAG,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;YACjD,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,EAAE;SACjC,CAAC,CAAA;QAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBACzC,OAAO;oBACL,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,QAAQ,EAAE,GAAG,OAAO,CAAC,MAAM,eAAe,UAAU,CAAC,IAAI,EAAE;iBAC5D,CAAA;YACH,CAAC,CAAC,CAAA;SACH;QAED,MAAM,IAAI,GAAG;YACX,EAAE,EAAE,WAAW,CAAC,EAAE;YAClB,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;YAChD,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,sBAAsB,EAAE,WAAW,CAAC,sBAAsB;YAC1D,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,QAAQ,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE;YAC1E,MAAM,EAAE;gBACN,cAAc,EAAE,WAAW,CAAC,cAAc;aAC3C;YACD,SAAS,EAAE;gBACT,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,WAAW,EAAE,WAAW,CAAC,WAAW;gBACpC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB;YACD,gBAAgB;YAChB,aAAa,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;YAC9D,cAAc,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;YACjE,UAAU,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI;SACxD,CAAA;QAED,OAAO,CAAC,IAAI,GAAG;YACb,IAAI;SACL,CAAA;KACF;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,qBAAQ;YAAE,IAAA,4BAAe,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;;YACjD,IAAA,qCAAwB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;KAC1C;AACH,CAAC,CACF,CAAA"}
package/dist-server/routers/support-router.js CHANGED
@@ -9,6 +9,8 @@ const typeorm_1 = require("typeorm");
9
9
  const sales_base_1 = require("@things-factory/sales-base");
10
10
  const shell_1 = require("@things-factory/shell");
11
11
  const worksheet_base_1 = require("@things-factory/worksheet-base");
12
+ const marketplace_base_1 = require("@things-factory/marketplace-base");
13
+ const integration_marketplace_1 = require("@things-factory/integration-marketplace");
12
14
  const debug = require('debug')('things-factory:integration-accounting:xilnex-router');
13
15
  exports.supportRouter = new koa_router_1.default();
14
16
  exports.supportRouter.post('/fetch-lmd-awb', async (context, next) => {
@@ -37,4 +39,153 @@ exports.supportRouter.post('/fetch-lmd-awb', async (context, next) => {
37
39
  console.log(e);
38
40
  }
39
41
  });
42
+ exports.supportRouter.post('/update-magento-tracking-no', async (context, next) => {
43
+ try {
44
+ await (0, typeorm_1.getConnection)().transaction(async (tx) => {
45
+ let successRecords = [];
46
+ let failRecords = [];
47
+ const { storeId, orderId } = context.request.body;
48
+ const flatOrderIds = orderId.flat();
49
+ const marketplaceStore = await tx.getRepository(integration_marketplace_1.MarketplaceStore).findOne({
50
+ id: storeId
51
+ }, { relations: ['domain'] });
52
+ const qb = tx
53
+ .getRepository(marketplace_base_1.MarketplaceOrder)
54
+ .createQueryBuilder('mo')
55
+ .distinct(true)
56
+ .innerJoinAndSelect('mo.marketplaceStore', 'ms')
57
+ .leftJoinAndSelect('ms.marketplaceDistributors', 'md')
58
+ .innerJoinAndSelect('mo.marketplaceOrderItems', 'moi')
59
+ .innerJoinAndSelect('moi.marketplaceOrderShippingItems', 'mosi')
60
+ .innerJoinAndSelect('mosi.marketplaceOrderShipping', 'mos')
61
+ .where('mo.orderNo IN (:...orderIds)', {
62
+ orderIds: flatOrderIds
63
+ })
64
+ .andWhere('ms.id = :marketplaceStoreId', { marketplaceStoreId: marketplaceStore.id });
65
+ let marketplaceOrders = await qb.getMany();
66
+ for (let marketplaceOrder of marketplaceOrders) {
67
+ let orderPackage;
68
+ let result;
69
+ try {
70
+ const qb = tx
71
+ .getRepository(sales_base_1.OrderPackage)
72
+ .createQueryBuilder('op')
73
+ .innerJoinAndSelect('op.releaseGood', 'rg')
74
+ .innerJoinAndSelect('rg.domain', 'd')
75
+ .innerJoinAndSelect('rg.bizplace', 'b')
76
+ .innerJoinAndSelect('b.company', 'c')
77
+ .innerJoinAndSelect('c.domain', 'companyDomain')
78
+ .innerJoinAndSelect('b.domain', 'd2')
79
+ .leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
80
+ .where('rg.refNo = :refNo', {
81
+ refNo: marketplaceOrder.orderNo
82
+ });
83
+ orderPackage = await qb.getOne();
84
+ if (!orderPackage)
85
+ return;
86
+ result = await updateTrackingNo(tx, marketplaceOrder, marketplaceStore, orderPackage);
87
+ if (result.success) {
88
+ successRecords.push({ orderId: marketplaceOrder.id, trackingNumber: result.trackingNumber });
89
+ }
90
+ else {
91
+ failRecords.push({
92
+ orderId: marketplaceOrder.id,
93
+ trackingNumber: result.trackingNumber,
94
+ error: result.error
95
+ });
96
+ }
97
+ }
98
+ catch (e) {
99
+ failRecords.push({
100
+ orderId: marketplaceOrder.id,
101
+ trackingNumber: orderPackage.trackingNumber,
102
+ error: result.error
103
+ });
104
+ }
105
+ }
106
+ context.response.body = {
107
+ success: successRecords,
108
+ fail: failRecords
109
+ };
110
+ });
111
+ }
112
+ catch (e) {
113
+ console.error(`fail-update-tracking-number: ${e}`);
114
+ }
115
+ });
116
+ async function updateTrackingNo(tx, marketplaceOrder, marketplaceStore, orderPackage) {
117
+ var _a;
118
+ try {
119
+ const companyDomain = marketplaceStore.domain;
120
+ let marketplaceOrderShipping;
121
+ if (marketplaceOrder.isSplitted) {
122
+ marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
123
+ where: { domain: companyDomain, marketplaceStore, subOrderNoRef: orderPackage.releaseGood.refNo2 }
124
+ });
125
+ }
126
+ else {
127
+ marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
128
+ where: { domain: companyDomain, marketplaceStore, orderNoRef: orderPackage.releaseGood.refNo }
129
+ });
130
+ }
131
+ if (orderPackage.trackingNo) {
132
+ let platform = (_a = orderPackage.releaseGood.lastMileDelivery) === null || _a === void 0 ? void 0 : _a.platform;
133
+ marketplaceOrderShipping.ownTrackingNo = orderPackage.trackingNo;
134
+ marketplaceOrderShipping.ownTransporter = platform;
135
+ await tx
136
+ .getRepository(marketplace_base_1.MarketplaceOrderShipping)
137
+ .update({ id: marketplaceOrderShipping.id }, { ownTrackingNo: orderPackage.trackingNo, ownTransporter: platform });
138
+ }
139
+ const trackingNo = marketplaceOrderShipping.ownTrackingNo
140
+ ? marketplaceOrderShipping.ownTrackingNo
141
+ : marketplaceOrderShipping.trackingNo;
142
+ const shippingProvider = marketplaceOrderShipping.ownTransporter
143
+ ? marketplaceOrderShipping.ownTransporter
144
+ : marketplaceOrderShipping.transporter;
145
+ let validMarketplaceDistributors = [];
146
+ if (marketplaceOrder.marketplaceStore.marketplaceDistributors) {
147
+ validMarketplaceDistributors = marketplaceOrder.marketplaceStore.marketplaceDistributors.filter(distributor => distributor.status === 'ACTIVE');
148
+ }
149
+ let marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
150
+ let orderItems = [];
151
+ marketplaceOrderItems.map(marketplaceOrderItem => {
152
+ const marketplaceOrderShippingItems = marketplaceOrderItem.marketplaceOrderShippingItems;
153
+ marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
154
+ if ((marketplaceOrderShippingItem === null || marketplaceOrderShippingItem === void 0 ? void 0 : marketplaceOrderShippingItem.marketplaceOrderShipping.id) == marketplaceOrderShipping.id) {
155
+ orderItems.push({ name: marketplaceOrderItem.name, qty: marketplaceOrderShippingItem.qty });
156
+ }
157
+ });
158
+ });
159
+ const response = await integration_marketplace_1.StoreAPI.createOrderShip(marketplaceStore, {
160
+ orderId: marketplaceOrder.name,
161
+ orderItems,
162
+ shippings: [{ trackingNo, carrierCode: shippingProvider }],
163
+ sourceCodes: validMarketplaceDistributors.map(distributor => distributor.name)
164
+ });
165
+ if (response) {
166
+ return {
167
+ orderId: marketplaceOrder.orderNo,
168
+ trackingNumber: orderPackage.trackingNo,
169
+ success: true
170
+ };
171
+ }
172
+ else {
173
+ return {
174
+ orderId: marketplaceOrder.orderNo,
175
+ trackingNumber: orderPackage.trackingNo,
176
+ success: false,
177
+ error: `invalid-response`
178
+ };
179
+ }
180
+ }
181
+ catch (e) {
182
+ console.log(`fail-update-tracking-number: ${marketplaceOrder.orderNo}`);
183
+ return {
184
+ orderId: marketplaceOrder.orderNo,
185
+ trackingNumber: orderPackage.trackingNo,
186
+ success: false,
187
+ error: e.message
188
+ };
189
+ }
190
+ }
40
191
  //# sourceMappingURL=support-router.js.map
package/dist-server/routers/support-router.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"support-router.js","sourceRoot":"","sources":["../../server/routers/support-router.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA+B;AAC/B,qCAAkG;AAClG,2DAEmC;AACnC,iDAA8C;AAC9C,mEAAwE;AAGxE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,qDAAqD,CAAC,CAAA;AAExE,QAAA,aAAa,GAAG,IAAI,oBAAM,EAAE,CAAA;AAEzC,qBAAa,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACzD,IAAI;QACA,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAiB,EAAE,EAAE;YAC1D,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;YAEtC,MAAM,MAAM,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;YAE/E,MAAM,EAAE,GAAqC,EAAE;iBAC1C,aAAa,CAAC,yBAAY,CAAC;iBAC3B,kBAAkB,CAAC,IAAI,CAAC;iBACxB,kBAAkB,CAAC,gBAAgB,EAAE,IAAI,CAAC;iBAC1C,kBAAkB,CAAC,WAAW,EAAE,GAAG,CAAC;iBACpC,kBAAkB,CAAC,aAAa,EAAE,GAAG,CAAC;iBACtC,kBAAkB,CAAC,WAAW,EAAE,GAAG,CAAC;iBACpC,kBAAkB,CAAC,UAAU,EAAE,eAAe,CAAC;iBAC/C,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC;iBACpC,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,CAAC;iBAC/C,KAAK,CAAC,kCAAkC,EAAE;gBACvC,eAAe,EAAE,CAAC,EAAE,CAAC;aACxB,CAAC,CAAA;YAEN,IAAI,aAAa,GAAG,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;YAEtC,MAAM,IAAA,wCAAuB,EAAC,aAAa,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;KACL;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;KACjB;AACL,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"support-router.js","sourceRoot":"","sources":["../../server/routers/support-router.ts"],"names":[],"mappings":"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"}
package/openapi/v1/outbound.yaml CHANGED
@@ -865,6 +865,9 @@ definitions:
865
865
  remark:
866
866
  type: 'string'
867
867
  example: null
868
+ batchId:
869
+ type: 'string'
870
+ example: 'B374727-1-1-1'
868
871
  product:
869
872
  type: 'object'
870
873
  properties:
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-hub",
3
- "version": "4.3.500",
3
+ "version": "4.3.502",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -79,20 +79,20 @@
79
79
  "@things-factory/import-ui-excel": "^4.3.434",
80
80
  "@things-factory/integration-accounting": "^4.3.495",
81
81
  "@things-factory/integration-fulfillment": "^4.3.479",
82
- "@things-factory/integration-lmd": "^4.3.479",
83
- "@things-factory/integration-marketplace": "^4.3.479",
82
+ "@things-factory/integration-lmd": "^4.3.502",
83
+ "@things-factory/integration-marketplace": "^4.3.502",
84
84
  "@things-factory/integration-pos": "^4.3.479",
85
- "@things-factory/integration-powrup": "^4.3.479",
86
- "@things-factory/integration-sellercraft": "^4.3.479",
85
+ "@things-factory/integration-powrup": "^4.3.502",
86
+ "@things-factory/integration-sellercraft": "^4.3.502",
87
87
  "@things-factory/integration-sftp": "^4.3.479",
88
88
  "@things-factory/lite-menu": "^4.3.452",
89
- "@things-factory/marketplace-base": "^4.3.495",
89
+ "@things-factory/marketplace-base": "^4.3.502",
90
90
  "@things-factory/more-ui": "^4.3.434",
91
91
  "@things-factory/notification": "^4.3.452",
92
92
  "@things-factory/pdf": "^4.3.381",
93
93
  "@things-factory/product-ui": "^4.3.495",
94
94
  "@things-factory/resource-ui": "^4.3.452",
95
- "@things-factory/sales-base": "^4.3.500",
95
+ "@things-factory/sales-base": "^4.3.502",
96
96
  "@things-factory/scene-data-transform": "^4.3.381",
97
97
  "@things-factory/scene-excel": "^4.3.381",
98
98
  "@things-factory/scene-firebase": "^4.3.381",
@@ -108,8 +108,8 @@
108
108
  "@things-factory/shell": "^4.3.434",
109
109
  "@things-factory/system-ui": "^4.3.434",
110
110
  "@things-factory/transport-base": "^4.3.452",
111
- "@things-factory/warehouse-base": "^4.3.495",
112
- "@things-factory/worksheet-base": "^4.3.500",
111
+ "@things-factory/warehouse-base": "^4.3.502",
112
+ "@things-factory/worksheet-base": "^4.3.502",
113
113
  "cron-parser": "^4.7.0",
114
114
  "koa2-swagger-ui": "^5.0.2",
115
115
  "swagger-jsdoc": "^5.0.0",
@@ -121,5 +121,5 @@
121
121
  "resolutions": {
122
122
  "core-js": "^3.16.0"
123
123
  },
124
- "gitHead": "7309dbba2d1d56664b79e7d0d704763ee326d304"
124
+ "gitHead": "957513fdcd72830eebf001bf27fa6febcc1cd5e6"
125
125
  }
package/server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts CHANGED
@@ -167,6 +167,7 @@ router.get(
167
167
  packingType: oi.packingType,
168
168
  packingSize: oi.packingSize,
169
169
  remark: oi.remark,
170
+ batchId: oi.batchId,
170
171
  product: {
171
172
  id: oi.product.id,
172
173
  name: oi.product.name,
package/server/routers/support-router.ts CHANGED
@@ -1,42 +1,217 @@
1
1
  import Router from 'koa-router'
2
2
  import { EntityManager, getConnection, getRepository, In, Not, SelectQueryBuilder } from 'typeorm'
3
- import {
4
- OrderPackage
5
- } from '@things-factory/sales-base'
3
+ import { OrderPackage, ReleaseGood } from '@things-factory/sales-base'
6
4
  import { Domain } from '@things-factory/shell'
7
5
  import { processAwbAndTrackingNo } from '@things-factory/worksheet-base'
6
+ import {
7
+ MarketplaceOrder,
8
+ MarketplaceOrderItem,
9
+ MarketplaceOrderShippingItem,
10
+ MarketplaceOrderShipping
11
+ } from '@things-factory/marketplace-base'
8
12
 
13
+ import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
9
14
 
10
15
  const debug = require('debug')('things-factory:integration-accounting:xilnex-router')
11
16
 
12
17
  export const supportRouter = new Router()
13
18
 
14
19
  supportRouter.post('/fetch-lmd-awb', async (context, next) => {
15
- try {
16
- await getConnection().transaction(async (tx: EntityManager) => {
17
- const { id, domainId } = context.query
18
-
19
- const domain: Domain = await tx.getRepository(Domain).findOne({ id: domainId })
20
-
21
- const qb: SelectQueryBuilder<OrderPackage> = tx
22
- .getRepository(OrderPackage)
23
- .createQueryBuilder('op')
24
- .innerJoinAndSelect('op.releaseGood', 'rg')
25
- .innerJoinAndSelect('rg.domain', 'd')
26
- .innerJoinAndSelect('rg.bizplace', 'b')
27
- .innerJoinAndSelect('b.company', 'c')
28
- .innerJoinAndSelect('c.domain', 'companyDomain')
29
- .innerJoinAndSelect('b.domain', 'd2')
30
- .leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
31
- .where('op.name IN (:...orderPackageIds)', {
32
- orderPackageIds: [id]
33
- })
34
-
35
- let orderPackages = await qb.getMany()
36
-
37
- await processAwbAndTrackingNo(orderPackages, tx, domain, null, null)
20
+ try {
21
+ await getConnection().transaction(async (tx: EntityManager) => {
22
+ const { id, domainId } = context.query
23
+
24
+ const domain: Domain = await tx.getRepository(Domain).findOne({ id: domainId })
25
+
26
+ const qb: SelectQueryBuilder<OrderPackage> = tx
27
+ .getRepository(OrderPackage)
28
+ .createQueryBuilder('op')
29
+ .innerJoinAndSelect('op.releaseGood', 'rg')
30
+ .innerJoinAndSelect('rg.domain', 'd')
31
+ .innerJoinAndSelect('rg.bizplace', 'b')
32
+ .innerJoinAndSelect('b.company', 'c')
33
+ .innerJoinAndSelect('c.domain', 'companyDomain')
34
+ .innerJoinAndSelect('b.domain', 'd2')
35
+ .leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
36
+ .where('op.name IN (:...orderPackageIds)', {
37
+ orderPackageIds: [id]
38
+ })
39
+
40
+ let orderPackages = await qb.getMany()
41
+
42
+ await processAwbAndTrackingNo(orderPackages, tx, domain, null, null)
43
+ })
44
+ } catch (e) {
45
+ console.log(e)
46
+ }
47
+ })
48
+
49
+ supportRouter.post('/update-magento-tracking-no', async (context, next) => {
50
+ try {
51
+ await getConnection().transaction(async (tx: EntityManager) => {
52
+ let successRecords: { orderId: string; trackingNumber: string }[] = []
53
+ let failRecords: { orderId: string; trackingNumber: string; error: string }[] = []
54
+
55
+ const { storeId, orderId } = context.request.body
56
+ const flatOrderIds = orderId.flat()
57
+
58
+ const marketplaceStore: MarketplaceStore = await tx.getRepository(MarketplaceStore).findOne(
59
+ {
60
+ id: storeId
61
+ },
62
+ { relations: ['domain'] }
63
+ )
64
+
65
+ const qb: SelectQueryBuilder<MarketplaceOrder> = tx
66
+ .getRepository(MarketplaceOrder)
67
+ .createQueryBuilder('mo')
68
+ .distinct(true)
69
+ .innerJoinAndSelect('mo.marketplaceStore', 'ms')
70
+ .leftJoinAndSelect('ms.marketplaceDistributors', 'md')
71
+ .innerJoinAndSelect('mo.marketplaceOrderItems', 'moi')
72
+ .innerJoinAndSelect('moi.marketplaceOrderShippingItems', 'mosi')
73
+ .innerJoinAndSelect('mosi.marketplaceOrderShipping', 'mos')
74
+ .where('mo.orderNo IN (:...orderIds)', {
75
+ orderIds: flatOrderIds
38
76
  })
39
- } catch (e) {
40
- console.log(e)
77
+ .andWhere('ms.id = :marketplaceStoreId', { marketplaceStoreId: marketplaceStore.id })
78
+
79
+ let marketplaceOrders = await qb.getMany()
80
+
81
+ for (let marketplaceOrder of marketplaceOrders) {
82
+ let orderPackage: OrderPackage
83
+ let result
84
+
85
+ try {
86
+ const qb: SelectQueryBuilder<OrderPackage> = tx
87
+ .getRepository(OrderPackage)
88
+ .createQueryBuilder('op')
89
+ .innerJoinAndSelect('op.releaseGood', 'rg')
90
+ .innerJoinAndSelect('rg.domain', 'd')
91
+ .innerJoinAndSelect('rg.bizplace', 'b')
92
+ .innerJoinAndSelect('b.company', 'c')
93
+ .innerJoinAndSelect('c.domain', 'companyDomain')
94
+ .innerJoinAndSelect('b.domain', 'd2')
95
+ .leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
96
+ .where('rg.refNo = :refNo', {
97
+ refNo: marketplaceOrder.orderNo
98
+ })
99
+
100
+ orderPackage = await qb.getOne()
101
+
102
+ if (!orderPackage) return
103
+
104
+ result = await updateTrackingNo(tx, marketplaceOrder, marketplaceStore, orderPackage)
105
+
106
+ if (result.success) {
107
+ successRecords.push({ orderId: marketplaceOrder.id, trackingNumber: result.trackingNumber })
108
+ } else {
109
+ failRecords.push({
110
+ orderId: marketplaceOrder.id,
111
+ trackingNumber: result.trackingNumber,
112
+ error: result.error
113
+ })
114
+ }
115
+ } catch (e) {
116
+ failRecords.push({
117
+ orderId: marketplaceOrder.id,
118
+ trackingNumber: orderPackage.trackingNumber,
119
+ error: result.error
120
+ })
121
+ }
122
+ }
123
+
124
+ context.response.body = {
125
+ success: successRecords,
126
+ fail: failRecords
127
+ }
128
+ })
129
+ } catch (e) {
130
+ console.error(`fail-update-tracking-number: ${e}`)
131
+ }
132
+ })
133
+
134
+ async function updateTrackingNo(tx, marketplaceOrder, marketplaceStore, orderPackage) {
135
+ try {
136
+ const companyDomain: Domain = marketplaceStore.domain
137
+ let marketplaceOrderShipping: MarketplaceOrderShipping
138
+
139
+ if (marketplaceOrder.isSplitted) {
140
+ marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
141
+ where: { domain: companyDomain, marketplaceStore, subOrderNoRef: orderPackage.releaseGood.refNo2 }
142
+ })
143
+ } else {
144
+ marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
145
+ where: { domain: companyDomain, marketplaceStore, orderNoRef: orderPackage.releaseGood.refNo }
146
+ })
147
+ }
148
+
149
+ if (orderPackage.trackingNo) {
150
+ let platform = orderPackage.releaseGood.lastMileDelivery?.platform
151
+ marketplaceOrderShipping.ownTrackingNo = orderPackage.trackingNo
152
+ marketplaceOrderShipping.ownTransporter = platform
153
+ await tx
154
+ .getRepository(MarketplaceOrderShipping)
155
+ .update(
156
+ { id: marketplaceOrderShipping.id },
157
+ { ownTrackingNo: orderPackage.trackingNo, ownTransporter: platform }
158
+ )
159
+ }
160
+
161
+ const trackingNo: string = marketplaceOrderShipping.ownTrackingNo
162
+ ? marketplaceOrderShipping.ownTrackingNo
163
+ : marketplaceOrderShipping.trackingNo
164
+ const shippingProvider: string = marketplaceOrderShipping.ownTransporter
165
+ ? marketplaceOrderShipping.ownTransporter
166
+ : marketplaceOrderShipping.transporter
167
+
168
+ let validMarketplaceDistributors: any[] = []
169
+ if (marketplaceOrder.marketplaceStore.marketplaceDistributors) {
170
+ validMarketplaceDistributors = marketplaceOrder.marketplaceStore.marketplaceDistributors.filter(
171
+ distributor => distributor.status === 'ACTIVE'
172
+ )
173
+ }
174
+
175
+ let marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
176
+ let orderItems: any[] = []
177
+ marketplaceOrderItems.map(marketplaceOrderItem => {
178
+ const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
179
+ marketplaceOrderItem.marketplaceOrderShippingItems
180
+ marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
181
+ if (marketplaceOrderShippingItem?.marketplaceOrderShipping.id == marketplaceOrderShipping.id) {
182
+ orderItems.push({ name: marketplaceOrderItem.name, qty: marketplaceOrderShippingItem.qty })
183
+ }
184
+ })
185
+ })
186
+
187
+ const response = await StoreAPI.createOrderShip(marketplaceStore, {
188
+ orderId: marketplaceOrder.name,
189
+ orderItems,
190
+ shippings: [{ trackingNo, carrierCode: shippingProvider }],
191
+ sourceCodes: validMarketplaceDistributors.map(distributor => distributor.name)
192
+ })
193
+
194
+ if (response) {
195
+ return {
196
+ orderId: marketplaceOrder.orderNo,
197
+ trackingNumber: orderPackage.trackingNo,
198
+ success: true
199
+ }
200
+ } else {
201
+ return {
202
+ orderId: marketplaceOrder.orderNo,
203
+ trackingNumber: orderPackage.trackingNo,
204
+ success: false,
205
+ error: `invalid-response`
206
+ }
207
+ }
208
+ } catch (e) {
209
+ console.log(`fail-update-tracking-number: ${marketplaceOrder.orderNo}`)
210
+ return {
211
+ orderId: marketplaceOrder.orderNo,
212
+ trackingNumber: orderPackage.trackingNo,
213
+ success: false,
214
+ error: e.message
41
215
  }
42
- })
216
+ }
217
+ }