@things-factory/worksheet-base 4.3.514 → 4.3.516

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 (10) hide show
  1. package/dist-server/graphql/resolvers/worksheet/cycle-count-worksheet-for-carton.js +10 -2
  2. package/dist-server/graphql/resolvers/worksheet/cycle-count-worksheet-for-carton.js.map +1 -1
  3. package/dist-server/graphql/resolvers/worksheet/cycle-count-worksheet-for-pallet.js +8 -1
  4. package/dist-server/graphql/resolvers/worksheet/cycle-count-worksheet-for-pallet.js.map +1 -1
  5. package/dist-server/graphql/types/worksheet/worksheet-info.js +1 -0
  6. package/dist-server/graphql/types/worksheet/worksheet-info.js.map +1 -1
  7. package/package.json +4 -4
  8. package/server/graphql/resolvers/worksheet/cycle-count-worksheet-for-carton.ts +12 -2
  9. package/server/graphql/resolvers/worksheet/cycle-count-worksheet-for-pallet.ts +10 -1
  10. package/server/graphql/types/worksheet/worksheet-info.ts +1 -0
package/dist-server/graphql/resolvers/worksheet/cycle-count-worksheet-for-carton.js CHANGED
@@ -70,13 +70,20 @@ exports.cycleCountWorksheetForCartonResolver = {
70
70
  qb.andWhere('"T_INV"."status" = :inventoryCheckItemStatus', { inventoryCheckItemStatus });
71
71
  }
72
72
  const worksheetDetails = await qb.getMany();
73
+ // fetch all worksheet details to check status
74
+ const qb2 = (0, typeorm_1.createQueryBuilder)(entities_1.WorksheetDetail, 'WSD')
75
+ .where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
76
+ .andWhere('"WSD"."status" != :status', { status: constants_1.WORKSHEET_STATUS.REPLACED });
77
+ const wsd = await qb2.getMany();
78
+ const ccCompleted = wsd.every(wsd => ['DONE', 'NOT_TALLY'].includes(wsd.status));
73
79
  return {
74
80
  worksheetInfo: {
75
81
  name: worksheet.name,
76
82
  status: worksheet.status,
77
83
  startedAt: worksheet.startedAt,
78
84
  bizplace: worksheet.bizplace,
79
- partnerDomainId: (_a = worksheet.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id
85
+ partnerDomainId: (_a = worksheet.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
86
+ ccCompleted
80
87
  },
81
88
  worksheetDetailInfos: await Promise.all(worksheetDetails.map(async (cycleCountWSD) => {
82
89
  const targetInventoryCheckItem = cycleCountWSD.targetInventoryCheckItem;
@@ -105,7 +112,8 @@ exports.cycleCountWorksheetForCartonResolver = {
105
112
  location: (inventory === null || inventory === void 0 ? void 0 : inventory.location) ? inventory.location : targetInventoryCheckItem.inspectedLocation,
106
113
  relatedInvCheckItem: targetInventoryCheckItem
107
114
  };
108
- }))
115
+ })),
116
+ ccCompleted
109
117
  };
110
118
  }
111
119
  };
package/dist-server/graphql/resolvers/worksheet/cycle-count-worksheet-for-carton.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cycle-count-worksheet-for-carton.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-worksheet-for-carton.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cycle-count-worksheet-for-carton.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-worksheet-for-carton.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/worksheet/cycle-count-worksheet-for-pallet.js CHANGED
@@ -70,13 +70,20 @@ exports.cycleCountWorksheetForPalletResolver = {
70
70
  qb.andWhere('"T_INV"."status" = :inventoryCheckItemStatus', { inventoryCheckItemStatus });
71
71
  }
72
72
  const worksheetDetails = await qb.getMany();
73
+ // fetch all worksheet details to check status
74
+ const qb2 = (0, typeorm_1.createQueryBuilder)(entities_1.WorksheetDetail, 'WSD')
75
+ .where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
76
+ .andWhere('"WSD"."status" != :status', { status: constants_1.WORKSHEET_STATUS.REPLACED });
77
+ const wsd = await qb2.getMany();
78
+ const ccCompleted = wsd.every(wsd => ['DONE', 'NOT_TALLY'].includes(wsd.status));
73
79
  return {
74
80
  worksheetInfo: {
75
81
  name: worksheet.name,
76
82
  status: worksheet.status,
77
83
  startedAt: worksheet.startedAt,
78
84
  bizplace: worksheet.bizplace,
79
- partnerDomainId: (_a = worksheet.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id
85
+ partnerDomainId: (_a = worksheet.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
86
+ ccCompleted
80
87
  },
81
88
  worksheetDetailInfos: await Promise.all(worksheetDetails.map(async (cycleCountWSD) => {
82
89
  const targetInventoryCheckItem = cycleCountWSD.targetInventoryCheckItem;
package/dist-server/graphql/resolvers/worksheet/cycle-count-worksheet-for-pallet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cycle-count-worksheet-for-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-worksheet-for-pallet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cycle-count-worksheet-for-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-worksheet-for-pallet.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/types/worksheet/worksheet-info.js CHANGED
@@ -38,6 +38,7 @@ exports.WorksheetInfo = (0, apollo_server_koa_1.gql) `
38
38
  orderPackages: [OrderPackage]
39
39
  name: String
40
40
  isBatchPicking: Boolean
41
+ ccCompleted: Boolean
41
42
  }
42
43
  `;
43
44
  //# sourceMappingURL=worksheet-info.js.map
package/dist-server/graphql/types/worksheet/worksheet-info.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"worksheet-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,aAAa,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqC/B,CAAA"}
1
+ {"version":3,"file":"worksheet-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,aAAa,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsC/B,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.3.514",
3
+ "version": "4.3.516",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -36,14 +36,14 @@
36
36
  "@things-factory/integration-sftp": "^4.3.512",
37
37
  "@things-factory/marketplace-base": "^4.3.512",
38
38
  "@things-factory/notification": "^4.3.452",
39
- "@things-factory/sales-base": "^4.3.514",
39
+ "@things-factory/sales-base": "^4.3.516",
40
40
  "@things-factory/setting-base": "^4.3.452",
41
41
  "@things-factory/shell": "^4.3.434",
42
42
  "@things-factory/transport-base": "^4.3.452",
43
- "@things-factory/warehouse-base": "^4.3.514",
43
+ "@things-factory/warehouse-base": "^4.3.516",
44
44
  "jspdf": "2.5.1",
45
45
  "puppeteer": "21.0.3",
46
46
  "uuid": "^9.0.0"
47
47
  },
48
- "gitHead": "35fd9143a02a229fbc164b30e6204f16c27f6a89"
48
+ "gitHead": "e978cd97325cd1fe187d81e566f393f5d94093ea"
49
49
  }
package/server/graphql/resolvers/worksheet/cycle-count-worksheet-for-carton.ts CHANGED
@@ -86,13 +86,22 @@ export const cycleCountWorksheetForCartonResolver = {
86
86
 
87
87
  const worksheetDetails: WorksheetDetail[] = await qb.getMany()
88
88
 
89
+ // fetch all worksheet details to check status
90
+ const qb2 : SelectQueryBuilder<WorksheetDetail> = createQueryBuilder(WorksheetDetail, 'WSD')
91
+ .where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
92
+ .andWhere('"WSD"."status" != :status', { status: WORKSHEET_STATUS.REPLACED })
93
+
94
+ const wsd = await qb2.getMany()
95
+ const ccCompleted = wsd.every(wsd => ['DONE', 'NOT_TALLY'].includes(wsd.status))
96
+
89
97
  return {
90
98
  worksheetInfo: {
91
99
  name: worksheet.name,
92
100
  status: worksheet.status,
93
101
  startedAt: worksheet.startedAt,
94
102
  bizplace: worksheet.bizplace,
95
- partnerDomainId: worksheet.bizplace?.domain.id
103
+ partnerDomainId: worksheet.bizplace?.domain.id,
104
+ ccCompleted
96
105
  },
97
106
  worksheetDetailInfos: await Promise.all(
98
107
  worksheetDetails.map(async (cycleCountWSD: WorksheetDetail) => {
@@ -124,7 +133,8 @@ export const cycleCountWorksheetForCartonResolver = {
124
133
  relatedInvCheckItem: targetInventoryCheckItem
125
134
  }
126
135
  })
127
- )
136
+ ),
137
+ ccCompleted
128
138
  }
129
139
  }
130
140
  }
package/server/graphql/resolvers/worksheet/cycle-count-worksheet-for-pallet.ts CHANGED
@@ -94,13 +94,22 @@ export const cycleCountWorksheetForPalletResolver = {
94
94
 
95
95
  const worksheetDetails: WorksheetDetail[] = await qb.getMany()
96
96
 
97
+ // fetch all worksheet details to check status
98
+ const qb2 : SelectQueryBuilder<WorksheetDetail> = createQueryBuilder(WorksheetDetail, 'WSD')
99
+ .where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
100
+ .andWhere('"WSD"."status" != :status', { status: WORKSHEET_STATUS.REPLACED })
101
+
102
+ const wsd = await qb2.getMany()
103
+ const ccCompleted = wsd.every(wsd => ['DONE', 'NOT_TALLY'].includes(wsd.status))
104
+
97
105
  return {
98
106
  worksheetInfo: {
99
107
  name: worksheet.name,
100
108
  status: worksheet.status,
101
109
  startedAt: worksheet.startedAt,
102
110
  bizplace: worksheet.bizplace,
103
- partnerDomainId: worksheet.bizplace?.domain.id
111
+ partnerDomainId: worksheet.bizplace?.domain.id,
112
+ ccCompleted
104
113
  },
105
114
  worksheetDetailInfos: await Promise.all(
106
115
  worksheetDetails.map(async (cycleCountWSD: WorksheetDetail) => {
package/server/graphql/types/worksheet/worksheet-info.ts CHANGED
@@ -36,5 +36,6 @@ export const WorksheetInfo = gql`
36
36
  orderPackages: [OrderPackage]
37
37
  name: String
38
38
  isBatchPicking: Boolean
39
+ ccCompleted: Boolean
39
40
  }
40
41
  `