@things-factory/worksheet-base 4.3.258 → 4.3.262

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 (25) hide show
  1. package/dist-server/controllers/vas/vas-worksheet-controller.js +115 -0
  2. package/dist-server/controllers/vas/vas-worksheet-controller.js.map +1 -1
  3. package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js +16 -1
  4. package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js.map +1 -1
  5. package/dist-server/graphql/resolvers/worksheet/reject-cancellation-release-order.js +111 -57
  6. package/dist-server/graphql/resolvers/worksheet/reject-cancellation-release-order.js.map +1 -1
  7. package/dist-server/graphql/resolvers/worksheet/vas/edit-vas.js +16 -0
  8. package/dist-server/graphql/resolvers/worksheet/vas/edit-vas.js.map +1 -0
  9. package/dist-server/graphql/resolvers/worksheet/vas/index.js +2 -1
  10. package/dist-server/graphql/resolvers/worksheet/vas/index.js.map +1 -1
  11. package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js +3 -1
  12. package/dist-server/graphql/resolvers/worksheet-detail/generate-pallet-id.js.map +1 -1
  13. package/dist-server/graphql/types/worksheet/index.js +6 -0
  14. package/dist-server/graphql/types/worksheet/index.js.map +1 -1
  15. package/dist-server/utils/lmd-util.js +5 -5
  16. package/dist-server/utils/lmd-util.js.map +1 -1
  17. package/package.json +13 -13
  18. package/server/controllers/vas/vas-worksheet-controller.ts +163 -0
  19. package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts +18 -1
  20. package/server/graphql/resolvers/worksheet/reject-cancellation-release-order.ts +138 -71
  21. package/server/graphql/resolvers/worksheet/vas/edit-vas.ts +25 -0
  22. package/server/graphql/resolvers/worksheet/vas/index.ts +2 -0
  23. package/server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts +5 -1
  24. package/server/graphql/types/worksheet/index.ts +6 -0
  25. package/server/utils/lmd-util.ts +5 -5
@@ -6,6 +6,7 @@ const activate_vas_1 = require("./activate-vas");
6
6
  const execute_vas_1 = require("./execute-vas");
7
7
  const undo_vas_1 = require("./undo-vas");
8
8
  const complete_vas_1 = require("./complete-vas");
9
+ const edit_vas_1 = require("./edit-vas");
9
10
  const undo_vas_inventory_1 = require("./undo-vas-inventory");
10
- exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, assign_vas_inventories_1.assignVasInventoriesResolver), activate_vas_1.activateVasResolver), execute_vas_1.executeVasResolver), undo_vas_1.undoVasResolver), complete_vas_1.completeVasResolver), undo_vas_inventory_1.undoVasInventoryResolver);
11
+ exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, assign_vas_inventories_1.assignVasInventoriesResolver), activate_vas_1.activateVasResolver), execute_vas_1.executeVasResolver), undo_vas_1.undoVasResolver), complete_vas_1.completeVasResolver), edit_vas_1.editVasResolver), undo_vas_inventory_1.undoVasInventoryResolver);
11
12
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/vas/index.ts"],"names":[],"mappings":";;;AAAA,qEAAuE;AACvE,iDAAoD;AACpD,+CAAkD;AAClD,yCAA4C;AAC5C,iDAAoD;AACpD,6DAA+D;AAElD,QAAA,SAAS,2FACjB,qDAA4B,GAC5B,kCAAmB,GACnB,gCAAkB,GAClB,0BAAe,GACf,kCAAmB,GACnB,6CAAwB,EAC5B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/vas/index.ts"],"names":[],"mappings":";;;AAAA,qEAAuE;AACvE,iDAAoD;AACpD,+CAAkD;AAClD,yCAA4C;AAC5C,iDAAoD;AACpD,yCAA4C;AAC5C,6DAA+D;AAElD,QAAA,SAAS,yGACjB,qDAA4B,GAC5B,kCAAmB,GACnB,gCAAkB,GAClB,0BAAe,GACf,kCAAmB,GACnB,0BAAe,GACf,6CAAwB,EAC5B"}
@@ -26,8 +26,10 @@ exports.generatePalletIdResolver = {
26
26
  'targetProduct.arrivalNotice',
27
27
  'targetProduct.arrivalNotice.purchaseOrder',
28
28
  'targetProduct.product',
29
+ 'targetProduct.productDetail',
29
30
  'targetInventory',
30
31
  'targetInventory.product',
32
+ 'targetInventory.productDetail',
31
33
  'targetVas',
32
34
  'targetVas.targetProduct'
33
35
  ]
@@ -45,7 +47,7 @@ exports.generatePalletIdResolver = {
45
47
  let result = {};
46
48
  // 5. map all data to be returned
47
49
  if (foundWSD.targetProduct) {
48
- result = Object.assign(Object.assign({}, foundWSD.targetProduct), { bizplace: foundWSD.bizplace, orderProductRemark: foundWSD.targetProduct.remark, purchaseOrderNo: ((_b = (_a = foundWSD.targetProduct.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) || '', arrivalNoticeRefNo: ((_c = foundWSD.targetProduct.arrivalNotice) === null || _c === void 0 ? void 0 : _c.refNo) || '', arrivalNoticeNo: ((_d = foundWSD.targetProduct.arrivalNotice) === null || _d === void 0 ? void 0 : _d.name) || '' });
50
+ result = Object.assign(Object.assign({}, foundWSD.targetProduct), { bizplace: foundWSD.bizplace, orderProductRemark: foundWSD.targetProduct.remark, purchaseOrderNo: ((_b = (_a = foundWSD.targetProduct.arrivalNotice) === null || _a === void 0 ? void 0 : _a.purchaseOrder) === null || _b === void 0 ? void 0 : _b.name) || '', arrivalNoticeRefNo: ((_c = foundWSD.targetProduct.arrivalNotice) === null || _c === void 0 ? void 0 : _c.refNo) || '', arrivalNoticeNo: ((_d = foundWSD.targetProduct.arrivalNotice) === null || _d === void 0 ? void 0 : _d.name) || '', uomValue: foundWSD.targetProduct.uomValue, uom: foundWSD.targetProduct.uom });
49
51
  }
50
52
  else if (foundWSD.targetInventory) {
51
53
  result = Object.assign(Object.assign({}, foundWSD.targetInventory), { bizplace: foundWSD.bizplace, orderProductRemark: '', purchaseOrderNo: '', arrivalNoticeRefNo: '' });
@@ -1 +1 @@
1
- {"version":3,"file":"generate-pallet-id.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate-pallet-id.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts"],"names":[],"mappings":"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"}
@@ -508,6 +508,12 @@ exports.Mutation = `
508
508
  worksheetDetails: [WorksheetDetailPatch]
509
509
  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
510
510
 
511
+ editVas (
512
+ orderVasPatch: [OrderVasPatch]
513
+ orderVasItemPatch: [OrderVasItemPatch]
514
+ orderNo: String
515
+ ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
516
+
511
517
  repalletizing (
512
518
  worksheetDetailName: String!
513
519
  fromPalletId: String!
@@ -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,uDAAkD;AAClD,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8kBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwJlC,CAAA;AAEY,QAAA,KAAK,GAAiB;IACjC,qBAAS;IACT,0CAAmB;IACnB,gCAAc;IACd,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,uDAAkD;AAClD,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAolBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwJlC,CAAA;AAEY,QAAA,KAAK,GAAiB;IACjC,qBAAS;IACT,0CAAmB;IACnB,gCAAc;IACd,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"}
@@ -50,11 +50,11 @@ async function createLmdParcel(releaseGoods, tx) {
50
50
  country: releaseGood.country,
51
51
  pAddress: bizplace.address,
52
52
  pAddress2: bizplace.address2,
53
- pCity: senderGeoArea.cityName,
54
- pPostcode: senderGeoArea.postalCode,
55
- pDistrict: senderGeoArea.cityName,
56
- pState: senderGeoArea.stateName,
57
- pCountry: senderGeoArea.countryCode,
53
+ pCity: bizplace.city || senderGeoArea.cityName,
54
+ pPostcode: bizplace.postalCode || senderGeoArea.postalCode,
55
+ pDistrict: bizplace.city || senderGeoArea.cityName,
56
+ pState: bizplace.state || senderGeoArea.stateName,
57
+ pCountry: bizplace.countryCode || senderGeoArea.countryCode,
58
58
  handoverMethod: 1
59
59
  };
60
60
  let unprocessedOrderPackages = releaseGood.orderPackages.filter(op => !op.parcelId);
@@ -1 +1 @@
1
- {"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,+BAAmC;AAEnC,qEAAuE;AACvE,uDAAmD;AACnD,iEAAyE;AACzE,6CAA4C;AAC5C,yDAAmD;AACnD,qEAA+E;AAC/E,2DAAsE;AAEtE,yDAAyD;AAEzD,MAAM,UAAU,GAAG;IACjB,8BAA8B;IAC9B,QAAQ,EAAE,0BAA0B;CACrC,CAAA;AAEM,KAAK,UAAU,eAAe,CAAC,YAAY,EAAE,EAAE;IACpD,IAAI;QACF,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,KAAK,IAAI,WAAW,IAAI,YAAY,EAAE;YACpC,MAAM,GAAG,GAAqB,WAAW,CAAC,gBAAgB,CAAA;YAE1D,MAAM,QAAQ,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;gBAClE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE;gBACrC,SAAS,EAAE,CAAC,QAAQ,CAAC;aACtB,CAAC,CAAA;YAEF,MAAM,aAAa,GAAY,MAAM,EAAE;iBACpC,aAAa,CAAC,mBAAO,CAAC;iBACtB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;YAE1D,MAAM,gBAAgB,GAAY,MAAM,EAAE;iBACvC,aAAa,CAAC,mBAAO,CAAC;iBACtB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;YAE7D,IAAI,IAAI,GAAG;gBACT,OAAO,EAAE,GAAG,CAAC,QAAQ;gBACrB,QAAQ,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ;gBACvB,UAAU,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,SAAS;gBAC1B,eAAe,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,eAAe;gBACrC,eAAe,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,eAAe;gBACrC,KAAK,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW;gBACvB,OAAO,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO;gBAErB,SAAS,EAAE,WAAW,CAAC,WAAW;gBAClC,KAAK,EAAE,WAAW,CAAC,MAAM;gBACzB,KAAK,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,KAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC;gBACxF,OAAO,EAAE,WAAW,CAAC,gBAAgB;gBACrC,QAAQ,EAAE,WAAW,CAAC,gBAAgB;gBACtC,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,QAAQ,EAAE,WAAW,CAAC,UAAU;gBAChC,QAAQ,EAAE,WAAW,CAAC,IAAI;gBAC1B,KAAK,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,MAAI,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,SAAS,CAAA;gBACxD,OAAO,EAAE,WAAW,CAAC,OAAO;gBAE5B,QAAQ,EAAE,QAAQ,CAAC,OAAO;gBAC1B,SAAS,EAAE,QAAQ,CAAC,QAAQ;gBAC5B,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAI,aAAa,CAAC,QAAQ;gBAC9C,SAAS,EAAE,QAAQ,CAAC,UAAU,IAAG,aAAa,CAAC,UAAU;gBACzD,SAAS,EAAE,QAAQ,CAAC,IAAI,IAAI,aAAa,CAAC,QAAQ;gBAClD,MAAM,EAAE,QAAQ,CAAC,KAAK,IAAG,aAAa,CAAC,SAAS;gBAChD,QAAQ,EAAE,QAAQ,CAAC,WAAW,IAAI,aAAa,CAAC,WAAW;gBAE3D,cAAc,EAAE,CAAC;aAClB,CAAA;YAED,IAAI,wBAAwB,GAAmB,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;YAEnG,IAAI,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBACnD,uCACK,IAAI,KACP,KAAK,EAAE,EAAE,CAAC,IAAI,EACd,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;;wBACpC,IAAI,UAAU,GAAG,CAAA,MAAA,MAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC,aAAa,0CAAE,UAAU,0CAAE,QAAQ,EAAE,0CAAE,WAAW,EAAE,KAAI,EAAE,CAAA;wBAE7F,IAAI,KAAK,GAAG;4BACV,QAAQ,EAAE,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,UAAU,0CAAE,QAAQ,EAAE,KAAI,GAAG;4BAC5C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG;4BAC9D,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG;4BACxC,KAAK,EAAE,CAAA,MAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC,aAAa,0CAAE,SAAS,0CAAE,QAAQ,EAAE,KAAI,GAAG;4BACpE,MAAM,EAAE,CAAA,MAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC,aAAa,0CAAE,WAAW,0CAAE,QAAQ,EAAE,KAAI,GAAG;4BACvE,KAAK,EAAE,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC,aAAa,0CAAE,KAAK,KAAG,GAAG;4BACnD,MAAM,EAAE,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC,aAAa,0CAAE,KAAK,KAAG,GAAG;4BACpD,MAAM,EAAE,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC,aAAa,0CAAE,MAAM,KAAG,GAAG;yBACtD,CAAA;wBAED,IAAK,GAAG,CAAC,QAAQ,IAAI,MAAM,EAAC;4BAC1B,IAAG,UAAU,IAAI,IAAI,IAAI,UAAU,IAAI,GAAG,EAAE;gCAC1C,KAAK,CAAC,KAAK,GAAG,MAAA,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,0CAAE,QAAQ,EAAE;oCAC5C,KAAK,CAAC,MAAM,GAAG,MAAA,CAAC,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC,0CAAE,QAAQ,EAAE;oCAC9C,KAAK,CAAC,MAAM,GAAG,MAAA,CAAC,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC,0CAAE,QAAQ,EAAE,CAAA;6BAC/C;iCACE;gCACD,KAAK,CAAC,KAAK,GAAG,MAAA,KAAK,CAAC,KAAK,0CAAE,QAAQ,EAAE;oCACrC,KAAK,CAAC,MAAM,GAAG,MAAA,KAAK,CAAC,MAAM,0CAAE,QAAQ,EAAE;oCACvC,KAAK,CAAC,MAAM,GAAG,MAAA,KAAK,CAAC,MAAM,0CAAE,QAAQ,EAAE,CAAA;6BAC1C;yBACA;wBACD,OAAO,KAAK,CAAA;oBACd,CAAC,CAAC,IACH;YACH,CAAC,CAAC,CAAA;YAEF,cAAc,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAA;SACrC;QAED,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/C,IAAI,GAAG,GAAG,MAAM,6BAAW,CAAC,YAAY,iCACjC,YAAY,CAAC,CAAC,CAAC,CAAC,gBAAgB,KAAE,QAAQ,EAAE,eAAe,KAChE,cAAc,CACf,CAAA;YACD,KAAK,IAAI,MAAM,IAAI,GAAG,EAAE;gBACtB,MAAM,EAAE,CAAC,aAAa,CAAC,yBAAY,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;aACnG;YAED,MAAM,EAAE,GAAqC,EAAE;iBAC5C,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,UAAU,EAAE,IAAI,CAAC;iBACpC,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,CAAC;iBAC/C,KAAK,CAAC,kCAAkC,EAAE;gBACzC,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBAChC,OAAO,MAAM,CAAC,KAAK,CAAA;gBACrB,CAAC,CAAC;aACH,CAAC,CAAA;YAEJ,MAAM,aAAa,GAAmB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;YACxD,MAAM,uBAAuB,CAAC,aAAa,EAAE,EAAE,CAAC,CAAA;SACjD;KACF;IAAC,OAAO,CAAC,EAAE;QACV,YAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAA;KAC1C;AACH,CAAC;AAvHD,0CAuHC;AAEM,KAAK,UAAU,uBAAuB,CAAC,aAAa,EAAE,EAAE;;IAC7D,IAAI,aAAa,GAAgB,EAAE,CAAA;IAEnC,KAAK,IAAI,YAAY,IAAI,aAAa,EAAE;QACtC,kDAAkD;QAClD,IAAI;YACF,IAAI,MAAM,GAAG,MAAM,6BAAW,CAAC,MAAM,iCAC9B,YAAY,CAAC,WAAW,CAAC,gBAAgB,KAAE,QAAQ,EAAE,eAAe,KACzE,EAAE,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAA,YAAY,CAAC,WAAW,CAAC,gBAAgB,0CAAE,OAAO,EAAE,CACjG,CAAA;YAED,IAAI,MAAM,EAAE;gBACV,IAAI,UAAe,CAAA;gBACnB,IAAI,GAAQ,CAAA;gBACZ,MAAM,EAAE,sBAAsB,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;gBACtD,IAAI,MAAM,CAAC,OAAO,EAAE;oBAClB,IACE,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,QAAQ,IAAI,SAAS;wBAC/D,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,QAAQ,IAAI,MAAM,EAC5D;wBACA,MAAM,QAAQ,GAAQ,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE;4BAChD,MAAM,EAAE,KAAK;yBACd,CAAC,CAAA;wBACF,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAA;qBACvD;yBAAM;wBACL,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;qBACnD;iBACF;qBAAM;oBACL,UAAU,GAAG,MAAM,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;iBACtD;gBACD,GAAG,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;gBACnD,MAAM,EAAE;qBACL,aAAa,CAAC,yBAAY,CAAC;qBAC3B,MAAM,CACL,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,EAC3B,EAAE,UAAU,EAAE,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,sBAAsB,IAAI,WAAW,EAAE,CAC3E,CAAA;gBACH,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;aAC7C;SACF;QAAC,OAAO,CAAC,EAAE;YACV,YAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;SAChB;QACD,KAAK;KACN;IAED,cAAc;IACd,QAAQ;IACR,gHAAgH;IAEhH,oDAAoD;IACpD,sDAAsD;IAEtD,wDAAwD;IACxD,oFAAoF;IACpF,gDAAgD;IAChD,2CAA2C;IAC3C,WAAW;IACX,2BAA2B;IAC3B,0DAA0D;IAC1D,qGAAqG;IACrG,uFAAuF;IACvF,qGAAqG;IACrG,eAAe;IAEf,iFAAiF;IACjF,qFAAqF;IACrF,cAAc;IACd,aAAa;IACb,UAAU;IACV,QAAQ;IACR,MAAM;IACN,gBAAgB;IAChB,oDAAoD;IACpD,IAAI;IACJ,EAAE;AACJ,CAAC;AA3ED,0DA2EC;AAED,KAAK,UAAU,YAAY,CAAC,YAAY,EAAE,MAAM;IAC9C,MAAM,YAAY,GAAG,YAAY,CAAC,WAAW,CAAA;IAC7C,IAAI,EACF,UAAU,EACV,sBAAsB,EACtB,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,SAAS,EACT,MAAM,EACN,WAAW,EACX,OAAO,EACR,GAAG,MAAM,CAAA;IAEV,IAAI,iBAAiB,GAAG,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAC,CAAC,CAAC,IAAI,IAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAA,CAAC,CAAC,CAAC,EAAE,GAC1F,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAC,CAAC,CAAC,IAAI,IAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAA,CAAC,CAAC,CAAC,EAC/C,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,EAAC,CAAC,CAAC,IAAI,IAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAA,CAAC,CAAC,CAAC,EAAE,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAC,CAAC,CAAC,IAAI,IAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAA,CAAC,CAAC,CAAC,EAAE,GAC1F,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,EAAC,CAAC,CAAC,IAAI,IAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAA,CAAC,CAAC,CAAC,EACzC,EAAE,CAAA;IAEF,IAAI,iBAAiB,GAAG,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,GAAG,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,EAAC,CAAC,CAAC,IAAI,IAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAA,CAAC,CAAC,CAAC,EAAE,GACnG,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,EAAC,CAAC,CAAC,IAAI,IAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAA,CAAC,CAAC,CAAC,EACrD,EAAE,CAAA;IAEF,IAAI,iBAAiB,GAAG,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,GAAG,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,EAAC,CAAC,CAAC,IAAI,IAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAA,CAAC,CAAC,CAAC,EAAE,GACzF,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,EAAC,CAAC,CAAC,IAAI,IAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAA,CAAC,CAAC,CAAC,EACrD,EAAE,CAAA;IAEF,IAAI,IAAI,GAAG;QACT,iBAAiB;QACjB,UAAU,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI;QACxB,iBAAiB;QACjB,iBAAiB;QACjB,cAAc,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK;QAChC,aAAa,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI;QAC9B,KAAK,EAAE,UAAU;QACjB,sBAAsB,EAAE,sBAAsB,IAAI,WAAW;QAC7D,iBAAiB,EAAE,iBAAiB;QACpC,eAAe,EAAE,eAAe;QAChC,iBAAiB,EAAE,iBAAiB;QACpC,OAAO,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK;KAC7B,CAAA;IAED,IAAI,QAAQ,GAAU,MAAM,IAAA,uBAAa,EAAC,qBAAK,CAAC,CAAC,OAAO,CAAC;QACvD,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE;QACpC,SAAS,EAAE,CAAC,QAAQ,CAAC;KACtB,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,YAAY,CAAC,IAAI,GAAG,CAAC,CAAA;IAE7F,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,6BAAa,EAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAA;IAEnF,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAG,EAAC;QACvB,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,KAAK;QACL,IAAI;QACJ,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb;QACD,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAE;KAChD,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,MAAM,EAAE,YAAY;IAC/C,MAAM,YAAY,GAAG,YAAY,CAAC,WAAW,CAAA;IAC7C,MAAM,IAAI,GAAG,IAAA,SAAM,GAAE,CAAA;IACrB,MAAM,GAAG,GAAQ,MAAM,IAAA,2BAAS,EAAC;QAC/B,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,IAAI;KACZ,CAAC,CAAA;IAEF,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,GAAG,CAAA;QAAE,MAAM,IAAI,KAAK,CAAC,+CAA+C,YAAY,CAAC,IAAI,GAAG,CAAC,CAAA;IAEnG,oBAAoB;IAEpB,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,MAAM,CAAC;QACrC,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,iBAAiB;QAC3B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,YAAY,CAAC,IAAI;QACxB,IAAI,EAAE,GAAG,CAAC,GAAG;QACb,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,IAAI,EAAE,CAAC;QACP,QAAQ,EAAE,EAAE;KACb,CAAC,CAAA;IAEF,OAAO,GAAG,CAAA;AACZ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.3.258",
3
+ "version": "4.3.262",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -24,24 +24,24 @@
24
24
  },
25
25
  "dependencies": {
26
26
  "@things-factory/auth-base": "^4.3.253",
27
- "@things-factory/biz-base": "^4.3.253",
27
+ "@things-factory/biz-base": "^4.3.262",
28
28
  "@things-factory/document-template-base": "^4.3.253",
29
29
  "@things-factory/id-rule-base": "^4.3.253",
30
- "@things-factory/integration-accounting": "^4.3.253",
30
+ "@things-factory/integration-accounting": "^4.3.262",
31
31
  "@things-factory/integration-base": "^4.3.253",
32
- "@things-factory/integration-lmd": "^4.3.253",
33
- "@things-factory/integration-marketplace": "^4.3.253",
34
- "@things-factory/integration-powrup": "^4.3.253",
35
- "@things-factory/integration-sellercraft": "^4.3.253",
36
- "@things-factory/integration-sftp": "^4.3.253",
37
- "@things-factory/marketplace-base": "^4.3.253",
32
+ "@things-factory/integration-lmd": "^4.3.262",
33
+ "@things-factory/integration-marketplace": "^4.3.262",
34
+ "@things-factory/integration-powrup": "^4.3.262",
35
+ "@things-factory/integration-sellercraft": "^4.3.262",
36
+ "@things-factory/integration-sftp": "^4.3.262",
37
+ "@things-factory/marketplace-base": "^4.3.262",
38
38
  "@things-factory/notification": "^4.3.253",
39
- "@things-factory/sales-base": "^4.3.257",
39
+ "@things-factory/sales-base": "^4.3.262",
40
40
  "@things-factory/setting-base": "^4.3.253",
41
41
  "@things-factory/shell": "^4.3.253",
42
- "@things-factory/transport-base": "^4.3.253",
43
- "@things-factory/warehouse-base": "^4.3.256",
42
+ "@things-factory/transport-base": "^4.3.262",
43
+ "@things-factory/warehouse-base": "^4.3.262",
44
44
  "uuid": "^9.0.0"
45
45
  },
46
- "gitHead": "db6fb3b3758ceda90678999a76c281c9ca46ccc4"
46
+ "gitHead": "671e49e317445c2bd655c290ab6a0549cd86ad93"
47
47
  }
@@ -13,6 +13,9 @@ import {
13
13
  ORDER_INVENTORY_STATUS,
14
14
  OrderNoGenerator,
15
15
  OrderVas,
16
+ OrderVasItem,
17
+ OrderVasPatch,
18
+ OrderVasItemPatch,
16
19
  ReleaseGood,
17
20
  VAS,
18
21
  VasOrder
@@ -1012,4 +1015,164 @@ export class VasWorksheetController extends WorksheetController {
1012
1015
  await this.COMPLETE_TRX_MAP[operationGuide](this.trxMgr, targetVas, this.user)
1013
1016
  }
1014
1017
  }
1018
+
1019
+ async editVas(
1020
+ tx: any,
1021
+ domain: Domain,
1022
+ user: User,
1023
+ orderVasPatch: OrderVasPatch[],
1024
+ orderVasItemPatch: OrderVasItemPatch[],
1025
+ orderNo: string
1026
+ ): Promise<Boolean> {
1027
+ let results = []
1028
+ const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({ where: { name: orderNo } })
1029
+ const orderVasRepo = getRepository(OrderVas)
1030
+ const orderVasItemRepo = getRepository(OrderVasItem)
1031
+ const worksheetDetailRepo = getRepository(WorksheetDetail)
1032
+ const worksheetRepo = getRepository(Worksheet)
1033
+ let vasWorksheet: Worksheet = await getRepository(Worksheet).findOne({
1034
+ where: { domain, releaseGood: releaseGood.id, type: 'VAS' }
1035
+ })
1036
+ // Order Vas
1037
+ if (orderVasPatch.length > 0) {
1038
+ const _deleteRecords = orderVasPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === '-')
1039
+ const _createRecords = orderVasPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
1040
+ const _updateRecords = orderVasPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
1041
+
1042
+ if (_deleteRecords.length > 0) {
1043
+ for (let i = 0; i < _deleteRecords.length; i++) {
1044
+ const deleteRecord = _deleteRecords[i]
1045
+ if (vasWorksheet) {
1046
+ await worksheetDetailRepo.delete({ targetVas: deleteRecord.id })
1047
+ }
1048
+ await orderVasItemRepo.delete({ orderVas: deleteRecord.id })
1049
+ await orderVasRepo.delete(deleteRecord.id)
1050
+ }
1051
+ }
1052
+
1053
+ if (_createRecords.length > 0) {
1054
+ for (let i = 0; i < _createRecords.length; i++) {
1055
+ const newRecord = _createRecords[i]
1056
+
1057
+ const result = await orderVasRepo.save({
1058
+ ...newRecord,
1059
+ id: uuidv4(),
1060
+ domain: domain,
1061
+ creator: user,
1062
+ updater: user
1063
+ })
1064
+
1065
+ results.push({ ...result, cuFlag: '+' })
1066
+
1067
+ // create wds if worksheet is available
1068
+ if (vasWorksheet) {
1069
+ const orderVas: OrderVas[] = await getRepository(OrderVas).find({ where: { id: result.id } })
1070
+ await this.createWorksheetDetails(vasWorksheet, WORKSHEET_TYPE.VAS, orderVas)
1071
+ }
1072
+ else if (releaseGood.status === 'READY_TO_PICK' && !vasWorksheet){
1073
+ const orderVas: OrderVas[] = await getRepository(OrderVas).find({ where: { id: result.id } })
1074
+ vasWorksheet = await this.generateWorksheet(
1075
+ WORKSHEET_TYPE.VAS,
1076
+ releaseGood,
1077
+ orderVas,
1078
+ ORDER_STATUS.READY_TO_PICK,
1079
+ ORDER_INVENTORY_STATUS.READY_TO_PICK
1080
+ )
1081
+ }
1082
+
1083
+ // create new ovi
1084
+ for (let ii = 0; ii < newRecord.orderVasItemsPatch.length; ii++) {
1085
+ await orderVasItemRepo.save({
1086
+ orderVas: result.id,
1087
+ name: `${newRecord.orderVasItemsPatch[ii].vas.name}- ${result.id}`,
1088
+ vas: newRecord.orderVasItemsPatch[ii].vas,
1089
+ vasQty: newRecord.orderVasItemsPatch[ii].vasQty,
1090
+ domain: domain,
1091
+ creator: user,
1092
+ createdAt: new Date()
1093
+ })
1094
+ }
1095
+ }
1096
+ }
1097
+
1098
+ if (_updateRecords.length > 0) {
1099
+ for (let i = 0; i < _updateRecords.length; i++) {
1100
+ const newRecord = _updateRecords[i]
1101
+ const orderVas: OrderVas = await orderVasRepo.findOne({
1102
+ where: { domain, id: newRecord.id },
1103
+ relations: ['product', 'productDetail', 'newProduct', 'newProductDetail', 'releaseGood', 'orderVasItems']
1104
+ })
1105
+
1106
+ const result = await orderVasRepo.save({
1107
+ ...orderVas,
1108
+ ...newRecord,
1109
+ updater: user
1110
+ })
1111
+
1112
+ results.push({ ...result, cuFlag: 'M' })
1113
+ }
1114
+ }
1115
+ }
1116
+
1117
+ // order Vas Item
1118
+ if (orderVasItemPatch.length > 0) {
1119
+ const _deleteRecords = orderVasItemPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === '-')
1120
+ const _createRecords = orderVasItemPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
1121
+ const _updateRecords = orderVasItemPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
1122
+
1123
+ if (_deleteRecords.length > 0) {
1124
+ for (let i = 0; i < _deleteRecords.length; i++) {
1125
+ const deleteRecord = _deleteRecords[i]
1126
+ if (deleteRecord.id) {
1127
+ await orderVasItemRepo.delete(deleteRecord.id)
1128
+ }
1129
+ }
1130
+ }
1131
+
1132
+ if (_createRecords.length > 0) {
1133
+ for (let i = 0; i < _createRecords.length; i++) {
1134
+ const newRecord = _createRecords[i]
1135
+ const result = await orderVasItemRepo.save({
1136
+ id: uuidv4(),
1137
+ orderVas: newRecord.orderVas.id,
1138
+ name: `${newRecord.vas.name}- ${newRecord.orderVas.id}`,
1139
+ vas: newRecord.vas,
1140
+ vasQty: newRecord.vasQty,
1141
+ domain: domain,
1142
+ creator: user,
1143
+ createdAt: new Date()
1144
+ })
1145
+ results.push({ ...result, cuFlag: '+' })
1146
+ }
1147
+ }
1148
+
1149
+ if (_updateRecords.length > 0) {
1150
+ for (let i = 0; i < _updateRecords.length; i++) {
1151
+ const newRecord = _updateRecords[i]
1152
+
1153
+ const result = await getRepository(OrderVasItem).update(
1154
+ {
1155
+ id: newRecord.id
1156
+ },
1157
+ { vasQty: newRecord.vasQty, updater: user.id, updatedAt: new Date() }
1158
+ )
1159
+
1160
+ results.push({ ...result, cuFlag: 'M' })
1161
+ }
1162
+ }
1163
+ }
1164
+
1165
+ // delete worksheet if no orderVas Left
1166
+ if (vasWorksheet) {
1167
+ const vasWorksheetDetails: WorksheetDetail[] = await getRepository(WorksheetDetail).find({
1168
+ where: { domain, worksheet: vasWorksheet.id }
1169
+ })
1170
+
1171
+ if (vasWorksheetDetails.length == 0) {
1172
+ await worksheetRepo.delete(vasWorksheet.id)
1173
+ }
1174
+ }
1175
+
1176
+ return results ? true : false
1177
+ }
1015
1178
  }
@@ -20,7 +20,8 @@ import {
20
20
  Inventory,
21
21
  INVENTORY_STATUS,
22
22
  INVENTORY_TRANSACTION_TYPE,
23
- Location
23
+ Location,
24
+ ProductDetailStock
24
25
  } from '@things-factory/warehouse-base'
25
26
  import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
26
27
 
@@ -36,6 +37,7 @@ export const confirmCancellationReleaseOrder = {
36
37
  'bizplace',
37
38
  'bizplace.domain',
38
39
  'orderProducts',
40
+ 'orderProducts.productDetail',
39
41
  'orderInventories',
40
42
  'orderInventories.inventory',
41
43
  'orderInventories.inventory.location',
@@ -262,6 +264,21 @@ export const confirmCancellationReleaseOrder = {
262
264
  }
263
265
  }
264
266
 
267
+ if (!releaseGood?.assignedInventory && releaseGood?.orderInventories?.length <= 0) {
268
+ for (let op of releaseGood.orderProducts) {
269
+ await tx
270
+ .getRepository(ProductDetailStock)
271
+ .createQueryBuilder()
272
+ .update(ProductDetailStock)
273
+ .set({
274
+ unassignedQty: () => `"unassigned_qty" - ${op.releaseQty}`,
275
+ unassignedUomValue: () => `"unassigned_uom_value" - ${op.releaseUomValue}`
276
+ })
277
+ .where({ productDetail: op.productDetail.id })
278
+ .execute()
279
+ }
280
+ }
281
+
265
282
  await updateStockForOrderInventories(targetOIs, releaseGood, domain, user, tx)
266
283
 
267
284
  return
@@ -18,7 +18,6 @@ export const rejectCancellationReleaseOrder = {
18
18
  async rejectCancellationReleaseOrder(_: any, { name }, context: any) {
19
19
  const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
20
20
 
21
-
22
21
  try {
23
22
  // find release order
24
23
  let foundRO: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
@@ -35,79 +34,148 @@ export const rejectCancellationReleaseOrder = {
35
34
 
36
35
  if (!foundRO) throw new Error(`Release order doesn't exists.`)
37
36
 
38
- let targetOIs: OrderInventory[] = foundRO.orderInventories
39
-
40
- // perform update on all order inventories and worksheet
41
- let worksheetDetails = await Promise.all(targetOIs.map(async (orderInventory) => {
42
- let existingWorksheetDetail: WorksheetDetail = await tx.getRepository(WorksheetDetail).createQueryBuilder('wd')
43
- .innerJoinAndSelect('wd.worksheet', 'ws')
44
- .where('wd.target_inventory_id = :orderInventoryId', { orderInventoryId: orderInventory.id })
45
- .orderBy('ws.created_at', 'DESC')
46
- .addOrderBy('wd.name')
47
- .getOne()
48
-
49
- if (existingWorksheetDetail) {
50
- const startedAt = existingWorksheetDetail.worksheet.startedAt
51
- const wdType = existingWorksheetDetail.worksheet.type
52
- let wdStatus, oiStatus, roStatus, wStatus
53
- switch (wdType) {
54
- case 'PICKING':
55
- case 'BATCH_PICKING':
56
- wdStatus = !startedAt ? WORKSHEET_STATUS.DEACTIVATED : orderInventory.pickedQty == orderInventory.releaseQty ? WORKSHEET_STATUS.DONE : WORKSHEET_STATUS.EXECUTING
57
- oiStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_PICK : orderInventory.pickedQty == orderInventory.releaseQty ? ORDER_INVENTORY_STATUS.PICKED : ORDER_INVENTORY_STATUS.PICKING
58
- roStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_PICK : ORDER_INVENTORY_STATUS.PICKING
59
- break;
60
- case 'PACKING':
61
- wdStatus = !startedAt ? WORKSHEET_STATUS.DEACTIVATED : orderInventory.packedQty == orderInventory.releaseQty ? WORKSHEET_STATUS.DONE : WORKSHEET_STATUS.EXECUTING
62
- oiStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_PACK : orderInventory.packedQty == orderInventory.releaseQty ? ORDER_INVENTORY_STATUS.PACKED : ORDER_INVENTORY_STATUS.PACKING
63
- roStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_PACK : ORDER_INVENTORY_STATUS.PACKING
64
- break;
65
- case 'SORTING':
66
- wdStatus = !startedAt ? WORKSHEET_STATUS.DEACTIVATED : orderInventory.sortedQty == orderInventory.releaseQty ? WORKSHEET_STATUS.DONE : WORKSHEET_STATUS.EXECUTING
67
- oiStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_SORT : orderInventory.sortedQty == orderInventory.releaseQty ? ORDER_INVENTORY_STATUS.PICKED : ORDER_INVENTORY_STATUS.SORTING
68
- roStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_SORT : ORDER_INVENTORY_STATUS.SORTING
69
- break;
70
- case 'LOADING':
71
- wdStatus = !startedAt ? WORKSHEET_STATUS.DEACTIVATED : orderInventory?.deliveryOrder ? WORKSHEET_STATUS.DONE : WORKSHEET_STATUS.EXECUTING
72
- oiStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_LOAD : orderInventory?.deliveryOrder ? ORDER_INVENTORY_STATUS.LOADED : ORDER_INVENTORY_STATUS.LOADING
73
- roStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_LOAD : ORDER_INVENTORY_STATUS.LOADING
74
- break;
75
- default:
76
- break;
77
- }
78
-
79
- wStatus = !startedAt ? WORKSHEET_STATUS.DEACTIVATED : WORKSHEET_STATUS.EXECUTING
80
-
81
- await tx.getRepository(WorksheetDetail).update({ id: existingWorksheetDetail.id }, { status: wdStatus, updatedAt: new Date(), updater: user })
82
- await tx.getRepository(OrderInventory).update({ id: orderInventory.id }, { status: oiStatus, updatedAt: new Date(), updater: user })
83
-
84
- return { worksheet: existingWorksheetDetail.worksheet, wStatus, roStatus }
85
- } else {
86
- await tx.getRepository(OrderInventory).update({ id: orderInventory.id }, { status: ORDER_INVENTORY_STATUS.PENDING_WORKSHEET, updatedAt: new Date(), updater: user })
87
- return { worksheet: null, wStatus: null, roStatus: ORDER_STATUS.PENDING_WORKSHEET }
37
+ let targetOIs: OrderInventory[] = foundRO?.orderInventories
38
+
39
+ if (targetOIs.length > 0) {
40
+ // perform update on all order inventories and worksheet
41
+ let worksheetDetails = await Promise.all(
42
+ targetOIs.map(async orderInventory => {
43
+ let existingWorksheetDetail: WorksheetDetail = await tx
44
+ .getRepository(WorksheetDetail)
45
+ .createQueryBuilder('wd')
46
+ .innerJoinAndSelect('wd.worksheet', 'ws')
47
+ .where('wd.target_inventory_id = :orderInventoryId', { orderInventoryId: orderInventory.id })
48
+ .orderBy('ws.created_at', 'DESC')
49
+ .addOrderBy('wd.name')
50
+ .getOne()
51
+
52
+ if (existingWorksheetDetail) {
53
+ const startedAt = existingWorksheetDetail.worksheet.startedAt
54
+ const wdType = existingWorksheetDetail.worksheet.type
55
+ let wdStatus, oiStatus, roStatus, wStatus
56
+ switch (wdType) {
57
+ case 'PICKING':
58
+ case 'BATCH_PICKING':
59
+ wdStatus = !startedAt
60
+ ? WORKSHEET_STATUS.DEACTIVATED
61
+ : orderInventory.pickedQty == orderInventory.releaseQty
62
+ ? WORKSHEET_STATUS.DONE
63
+ : WORKSHEET_STATUS.EXECUTING
64
+ oiStatus = !startedAt
65
+ ? ORDER_INVENTORY_STATUS.READY_TO_PICK
66
+ : orderInventory.pickedQty == orderInventory.releaseQty
67
+ ? ORDER_INVENTORY_STATUS.PICKED
68
+ : ORDER_INVENTORY_STATUS.PICKING
69
+ roStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_PICK : ORDER_INVENTORY_STATUS.PICKING
70
+ break
71
+ case 'PACKING':
72
+ wdStatus = !startedAt
73
+ ? WORKSHEET_STATUS.DEACTIVATED
74
+ : orderInventory.packedQty == orderInventory.releaseQty
75
+ ? WORKSHEET_STATUS.DONE
76
+ : WORKSHEET_STATUS.EXECUTING
77
+ oiStatus = !startedAt
78
+ ? ORDER_INVENTORY_STATUS.READY_TO_PACK
79
+ : orderInventory.packedQty == orderInventory.releaseQty
80
+ ? ORDER_INVENTORY_STATUS.PACKED
81
+ : ORDER_INVENTORY_STATUS.PACKING
82
+ roStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_PACK : ORDER_INVENTORY_STATUS.PACKING
83
+ break
84
+ case 'SORTING':
85
+ wdStatus = !startedAt
86
+ ? WORKSHEET_STATUS.DEACTIVATED
87
+ : orderInventory.sortedQty == orderInventory.releaseQty
88
+ ? WORKSHEET_STATUS.DONE
89
+ : WORKSHEET_STATUS.EXECUTING
90
+ oiStatus = !startedAt
91
+ ? ORDER_INVENTORY_STATUS.READY_TO_SORT
92
+ : orderInventory.sortedQty == orderInventory.releaseQty
93
+ ? ORDER_INVENTORY_STATUS.PICKED
94
+ : ORDER_INVENTORY_STATUS.SORTING
95
+ roStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_SORT : ORDER_INVENTORY_STATUS.SORTING
96
+ break
97
+ case 'LOADING':
98
+ wdStatus = !startedAt
99
+ ? WORKSHEET_STATUS.DEACTIVATED
100
+ : orderInventory?.deliveryOrder
101
+ ? WORKSHEET_STATUS.DONE
102
+ : WORKSHEET_STATUS.EXECUTING
103
+ oiStatus = !startedAt
104
+ ? ORDER_INVENTORY_STATUS.READY_TO_LOAD
105
+ : orderInventory?.deliveryOrder
106
+ ? ORDER_INVENTORY_STATUS.LOADED
107
+ : ORDER_INVENTORY_STATUS.LOADING
108
+ roStatus = !startedAt ? ORDER_INVENTORY_STATUS.READY_TO_LOAD : ORDER_INVENTORY_STATUS.LOADING
109
+ break
110
+ default:
111
+ break
112
+ }
113
+
114
+ wStatus = !startedAt ? WORKSHEET_STATUS.DEACTIVATED : WORKSHEET_STATUS.EXECUTING
115
+
116
+ await tx
117
+ .getRepository(WorksheetDetail)
118
+ .update({ id: existingWorksheetDetail.id }, { status: wdStatus, updatedAt: new Date(), updater: user })
119
+ await tx
120
+ .getRepository(OrderInventory)
121
+ .update({ id: orderInventory.id }, { status: oiStatus, updatedAt: new Date(), updater: user })
122
+
123
+ return { worksheet: existingWorksheetDetail.worksheet, wStatus, roStatus }
124
+ } else {
125
+ await tx
126
+ .getRepository(OrderInventory)
127
+ .update(
128
+ { id: orderInventory.id },
129
+ { status: ORDER_INVENTORY_STATUS.PENDING_WORKSHEET, updatedAt: new Date(), updater: user }
130
+ )
131
+ return { worksheet: null, wStatus: null, roStatus: ORDER_STATUS.PENDING_WORKSHEET }
132
+ }
133
+ })
134
+ )
135
+
136
+ if (worksheetDetails[0].worksheet) {
137
+ await tx.getRepository(Worksheet).update(
138
+ { id: worksheetDetails[0].worksheet.id },
139
+ {
140
+ status: worksheetDetails[0].wStatus,
141
+ updatedAt: new Date(),
142
+ updater: user
143
+ }
144
+ )
88
145
  }
89
- }))
90
-
91
- if (worksheetDetails[0].worksheet) {
92
- await tx.getRepository(Worksheet).update({ id: worksheetDetails[0].worksheet.id }, {
93
- status: worksheetDetails[0].wStatus,
94
- updatedAt: new Date(),
95
- updater: user
96
- })
97
- }
98
-
99
- await tx.getRepository(ReleaseGood).update({ id: foundRO.id }, {
100
- status: worksheetDetails[0].roStatus,
101
- updatedAt: new Date(),
102
- updater: user
103
- })
104
146
 
105
- // reverse DO status
106
- await reverseDO(foundRO, context)
147
+ await tx.getRepository(ReleaseGood).update(
148
+ { id: foundRO.id },
149
+ {
150
+ status: worksheetDetails[0].roStatus,
151
+ updatedAt: new Date(),
152
+ updater: user
153
+ }
154
+ )
155
+
156
+ // reverse DO status
157
+ await reverseDO(foundRO, context)
158
+ } else {
159
+ await tx.getRepository(ReleaseGood).update(
160
+ { id: foundRO.id },
161
+ {
162
+ status: ORDER_STATUS.PENDING_WORKSHEET,
163
+ updatedAt: new Date(),
164
+ updater: user
165
+ }
166
+ )
167
+ }
107
168
 
108
169
  return
109
170
  } catch (error) {
110
- logger.error(`reject-cancellation-release-order[rejectCancellationReleaseOrder]:(data:${JSON.stringify({ name, tx, domain, user })}) ${error}`)
171
+ logger.error(
172
+ `reject-cancellation-release-order[rejectCancellationReleaseOrder]:(data:${JSON.stringify({
173
+ name,
174
+ tx,
175
+ domain,
176
+ user
177
+ })}) ${error}`
178
+ )
111
179
  throw new Error('Something went wrong. Please contact support.')
112
180
  }
113
181
  }
@@ -132,5 +200,4 @@ async function reverseDO(releaseGood: ReleaseGood, context: any) {
132
200
 
133
201
  await tx.getRepository(DeliveryOrder).save(foundDO)
134
202
  }
135
-
136
- }
203
+ }