@things-factory/operato-wms 4.3.673 → 4.3.676

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 (14) hide show
  1. package/_index.html +16 -0
  2. package/client/pages/outbound/loading-v2/loading-execution-base.js +22 -4
  3. package/client/pages/outbound/loading-v2/loading.js +11 -4
  4. package/client/pages/outbound/loading-v2/release-good-info.js +10 -1
  5. package/dist-server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.js +1 -0
  6. package/dist-server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.js.map +1 -1
  7. package/dist-server/graphql/resolvers/outbound/loading-worksheet-v2.js +3 -0
  8. package/dist-server/graphql/resolvers/outbound/loading-worksheet-v2.js.map +1 -1
  9. package/dist-server/graphql/resolvers/reports/outbound-order-details-report.js +15 -7
  10. package/dist-server/graphql/resolvers/reports/outbound-order-details-report.js.map +1 -1
  11. package/package.json +38 -38
  12. package/server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.ts +1 -0
  13. package/server/graphql/resolvers/outbound/loading-worksheet-v2.ts +6 -0
  14. package/server/graphql/resolvers/reports/outbound-order-details-report.ts +17 -7
package/_index.html CHANGED
@@ -66,6 +66,22 @@
66
66
 
67
67
  <!-- Global site tag (gtag.js) - Google Analytics -->
68
68
  <script async src="https://www.googletagmanager.com/gtag/js?id=G-3B948P4EP1"></script>
69
+ <!-- Microsoft Clarity tracking code for operato-wms -->
70
+ <script type="text/javascript">
71
+ ;(function (c, l, a, r, i, t, y) {
72
+ c[a] =
73
+ c[a] ||
74
+ function () {
75
+ ;(c[a].q = c[a].q || []).push(arguments)
76
+ }
77
+ t = l.createElement(r)
78
+ t.async = 1
79
+ t.src = 'https://www.clarity.ms/tag/' + i
80
+ y = l.getElementsByTagName(r)[0]
81
+ y.parentNode.insertBefore(t, y)
82
+ })(window, document, 'clarity', 'script', 't1pr56babk')
83
+ </script>
84
+ <!-- End Microsoft Clarity tracking code -->
69
85
  <script>
70
86
  window.dataLayer = window.dataLayer || []
71
87
  function gtag() {
package/client/pages/outbound/loading-v2/loading-execution-base.js CHANGED
@@ -41,6 +41,9 @@ const FIND_LOADABLE_RELEASE_GOOD = gql`
41
41
  status
42
42
  district
43
43
  attentionCompany
44
+ attentionTo
45
+ deliveryAddress1
46
+ deliveryAddress2
44
47
  sortedBy {
45
48
  name
46
49
  }
@@ -69,6 +72,18 @@ const FIND_LOADABLE_RELEASE_GOOD_BY_BIN = gql`
69
72
  binLocation {
70
73
  name
71
74
  }
75
+ releaseGood {
76
+ id
77
+ name
78
+ attentionCompany
79
+ attentionTo
80
+ deliveryAddress1
81
+ deliveryAddress2
82
+ status
83
+ refNo
84
+ refNo2
85
+ refNo3
86
+ }
72
87
  productName
73
88
  productSku
74
89
  relatedOrderInv {
@@ -105,6 +120,9 @@ const LOADING_WORKSHEET_V2 = gql`
105
120
  id
106
121
  name
107
122
  attentionCompany
123
+ attentionTo
124
+ deliveryAddress1
125
+ deliveryAddress2
108
126
  status
109
127
  refNo
110
128
  refNo2
@@ -782,8 +800,8 @@ export class LoadingExecutionBase extends LitElement {
782
800
  showToast({ type: 'success', message: i18next.t('text.loading_completed') })
783
801
 
784
802
  // --- Clear previous order and UI data ---
785
- this._currentReleaseGood = null;
786
- this.loadedData = [];
803
+ this._currentReleaseGood = null
804
+ this.loadedData = []
787
805
 
788
806
  setTimeout(async () => {
789
807
  try {
@@ -852,8 +870,8 @@ export class LoadingExecutionBase extends LitElement {
852
870
  showToast({ type: 'success', message: i18next.t('text.loading_completed_partially') })
853
871
 
854
872
  // --- Clear previous order and UI data ---
855
- this._currentReleaseGood = null;
856
- this.loadedData = [];
873
+ this._currentReleaseGood = null
874
+ this.loadedData = []
857
875
 
858
876
  setTimeout(async () => {
859
877
  try {
package/client/pages/outbound/loading-v2/loading.js CHANGED
@@ -41,6 +41,9 @@ const FIND_LOADABLE_RELEASE_GOOD = gql`
41
41
  status
42
42
  district
43
43
  attentionCompany
44
+ attentionTo
45
+ deliveryAddress1
46
+ deliveryAddress2
44
47
  sortedBy {
45
48
  name
46
49
  }
@@ -70,6 +73,9 @@ const FIND_LOADABLE_RELEASE_GOOD_BY_BIN = gql`
70
73
  name
71
74
  attentionCompany
72
75
  status
76
+ attentionTo
77
+ deliveryAddress1
78
+ deliveryAddress2
73
79
  }
74
80
  }
75
81
  worksheetDetailInfos {
@@ -122,6 +128,9 @@ const LOADING_WORKSHEET_V2 = gql`
122
128
  id
123
129
  name
124
130
  attentionCompany
131
+ attentionTo
132
+ deliveryAddress1
133
+ deliveryAddress2
125
134
  status
126
135
  refNo
127
136
  refNo2
@@ -338,11 +347,9 @@ class LoadingProductV2 extends connect(store)(localize(i18next)(PageView)) {
338
347
  ]
339
348
  ) {
340
349
  if (this._qcSku) {
341
- actions = actions.filter(
342
- a => a.title !== i18next.t('button.get_task')
343
- )
350
+ actions = actions.filter(a => a.title !== i18next.t('button.get_task'))
344
351
  }
345
- this._context = {
352
+ this._context = {
346
353
  ...this._context,
347
354
  actions
348
355
  }
package/client/pages/outbound/loading-v2/release-good-info.js CHANGED
@@ -64,8 +64,11 @@ class ReleaseGoodInfo extends localize(i18next)(LitElement) {
64
64
  <label class="text-14 font-bold order-no">Order No.: ${this.data?.releaseGood?.name || ''}</label>
65
65
 
66
66
  <div class="worksheet-info">
67
+ <label class="worksheet-info-title">Attention</label>
68
+ <label class="worksheet-info-description">: ${this.data?.releaseGood?.attentionTo || ''}</label>
69
+
67
70
  <label class="worksheet-info-title">Company</label>
68
- <label class="worksheet-info-description">: ${this.data?.bizplaceName || ''}</label>
71
+ <label class="worksheet-info-description">: ${this.data?.releaseGood?.attentionCompany || ''}</label>
69
72
 
70
73
  <label class="worksheet-info-title">Ref 1</label>
71
74
  <label class="worksheet-info-description">: ${this.data?.releaseGood?.refNo || ''}</label>
@@ -84,6 +87,12 @@ class ReleaseGoodInfo extends localize(i18next)(LitElement) {
84
87
 
85
88
  <label class="worksheet-info-title">Status</label>
86
89
  <label class="worksheet-info-description">: ${this.data?.releaseGood?.status || ''}</label>
90
+
91
+ <label class="worksheet-info-title">Address 1</label>
92
+ <label class="worksheet-info-description">: ${this.data?.releaseGood?.deliveryAddress1 || ''}</label>
93
+
94
+ <label class="worksheet-info-title">Address 2</label>
95
+ <label class="worksheet-info-description">: ${this.data?.releaseGood?.deliveryAddress2 || ''}</label>
87
96
  </div>
88
97
  `
89
98
  }
package/dist-server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.js CHANGED
@@ -39,6 +39,7 @@ const buildOrderInventoryQuery = (tx, domainId, locationId) => {
39
39
  .leftJoinAndSelect('inventory.product', 'product')
40
40
  .leftJoinAndSelect('inventory.productDetail', 'productDetail')
41
41
  .leftJoinAndSelect('orderInventory.binLocation', 'binLocation')
42
+ .innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
42
43
  .where('orderInventory.domain_id = :domainId', { domainId })
43
44
  .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
44
45
  orderInventoryStatus: [
package/dist-server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"find-loadable-release-good-by-bin.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"find-loadable-release-good-by-bin.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/outbound/loading-worksheet-v2.js CHANGED
@@ -110,6 +110,9 @@ async function mapdata(worksheet, worksheetDetails, releaseGood, disableQC) {
110
110
  name: releaseGood.name,
111
111
  status: releaseGood.status,
112
112
  attentionCompany: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.attentionCompany,
113
+ attentionTo: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.attentionTo,
114
+ deliveryAddress1: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress1,
115
+ deliveryAddress2: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress2,
113
116
  refNo: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.refNo,
114
117
  refNo2: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.refNo2,
115
118
  refNo3: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.refNo3,
package/dist-server/graphql/resolvers/outbound/loading-worksheet-v2.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"loading-worksheet-v2.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/loading-worksheet-v2.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loading-worksheet-v2.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/loading-worksheet-v2.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/reports/outbound-order-details-report.js CHANGED
@@ -37,12 +37,17 @@ exports.outboundOrderDetailsReport = {
37
37
  id: bizplaceFilter.value
38
38
  });
39
39
  await (0, utils_1.rawProductsQuery)(tx, params, bizplace);
40
- let extraQueryFilters = '';
40
+ // Apply filters using base table columns within the inner SELECT to avoid alias scoping issues
41
+ // The first subquery joins delivery_orders as do2; the second does not. Split filters accordingly.
42
+ let innerQueryFilters1 = '';
43
+ let innerQueryFilters2 = '';
44
+ const hasDoFilter = !!doNo;
41
45
  if (roNo) {
42
- extraQueryFilters = `${extraQueryFilters} and ro_no like '%${roNo.value}%' `;
46
+ innerQueryFilters1 = `${innerQueryFilters1} and rg.name like '%${roNo.value}%' `;
47
+ innerQueryFilters2 = `${innerQueryFilters2} and rg.name like '%${roNo.value}%' `;
43
48
  }
44
49
  if (doNo) {
45
- extraQueryFilters = `${extraQueryFilters} and delivery_order_no like '%${doNo.value}%' `;
50
+ innerQueryFilters1 = `${innerQueryFilters1} and do2.name like '%${doNo.value}%' `;
46
51
  }
47
52
  console.time('temp');
48
53
  await tx.query(`
@@ -88,11 +93,13 @@ exports.outboundOrderDetailsReport = {
88
93
  ${status ? `and rg.status = '${status.value}' ` : ``}
89
94
  ${binLocation ? `and l.name ilike '${binLocation.value}' ` : ``}
90
95
  ${priorityDelivery ? `and rg.priority_delivery = ${priorityDelivery.value} ` : ``}
96
+ ${innerQueryFilters1}
91
97
  and oi.release_qty > 0
92
98
  ) src
93
99
  where 1=1
94
- ${extraQueryFilters}
95
- union all
100
+ ${hasDoFilter
101
+ ? ''
102
+ : `union all
96
103
  select * from (
97
104
  select op.id,
98
105
  op.release_qty AS "release_qty", NULL::timestamp, NULL, NULL::timestamp, NULL, NULL::timestamp, NULL,
@@ -123,11 +130,12 @@ exports.outboundOrderDetailsReport = {
123
130
  and rg.created_at >= $3 and rg.created_at <= $4
124
131
  and rg.assigned_inventory = false
125
132
  ${status ? `and rg.status = '${status.value}' ` : ``}
133
+ ${priorityDelivery ? `and rg.priority_delivery = ${priorityDelivery.value} ` : ``}
134
+ ${innerQueryFilters2}
126
135
  and rg.assigned_inventory = false
127
136
  and op.release_qty > 0
128
137
  ) src2
129
- where 1=1
130
- ${extraQueryFilters}
138
+ where 1=1`}
131
139
  )
132
140
  `, [context.state.domain.id, bizplace.id, fromDate.value, toDate.value, bizplace.name, bizplace.description]);
133
141
  console.timeEnd('temp');
package/dist-server/graphql/resolvers/reports/outbound-order-details-report.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"outbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-order-details-report.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAChD,uDAAmD;AAEnD,0CAAiD;AAEpC,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACtE,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;YAC7F,IAAI,cAAc,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;YAC1D,IAAI,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAA;YAClE,IAAI,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YACpE,IAAI,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;YAChE,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAA;YAC5D,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAA;YAC5D,IAAI,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;YAChE,IAAI,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,CAAA;YAC1E,IAAI,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAA;YACpF,IAAI,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAA;YAEtF,IAAI,UAAU,EAAE;gBACd,MAAM,IAAI,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;oBACtD,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,KAAK,EAAE;oBAC/B,SAAS,EAAE,CAAC,WAAW,CAAC;iBACzB,CAAC,CAAA;gBAEF,MAAM,QAAQ,GAAa,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;gBAE5C,IAAI,CAAC,QAAQ;oBAAE,MAAM,eAAe,CAAA;gBAEpC,cAAc,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAA;aAC1E;iBAAM;gBACL,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;aACvE;YAED,IAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM;gBAAE,MAAM,eAAe,CAAA;YAElE,MAAM,QAAQ,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;gBAClE,EAAE,EAAE,cAAc,CAAC,KAAK;aACzB,CAAC,CAAA;YAEF,MAAM,IAAA,wBAAgB,EAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YAE5C,IAAI,iBAAiB,GAAG,EAAE,CAAA;YAC1B,IAAI,IAAI,EAAE;gBACR,iBAAiB,GAAG,GAAG,iBAAiB,qBAAqB,IAAI,CAAC,KAAK,KAAK,CAAA;aAC7E;YACD,IAAI,IAAI,EAAE;gBACR,iBAAiB,GAAG,GAAG,iBAAiB,iCAAiC,IAAI,CAAC,KAAK,KAAK,CAAA;aACzF;YAED,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACpB,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAwCM,MAAM,CAAC,CAAC,CAAC,oBAAoB,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE;cAClD,WAAW,CAAC,CAAC,CAAC,qBAAqB,WAAW,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE;cAC7D,gBAAgB,CAAC,CAAC,CAAC,8BAA8B,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE;;;;YAIjF,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cA+Bf,MAAM,CAAC,CAAC,CAAC,oBAAoB,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE;;;;;YAKpD,iBAAiB;;OAEtB,EACC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,CAC1G,CAAA;YAED,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YACvB,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;SAOC,CACF,CAAA;YAED,MAAM,KAAK,GAAQ,MAAM,EAAE,CAAC,KAAK,CAAC;;;;UAK9B,iBAAiB,CAAC,KAAK;gBACrB,CAAC,CAAC,+BAA+B,QAAQ,CAAC,KAAK,UAAU,MAAM,CAAC,KAAK,6BAA6B;gBAClG,CAAC,CAAC,EACN;OACD,CAAC,CAAA;YAEF,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACtB,MAAM,MAAM,GAAQ,MAAM,EAAE,CAAC,KAAK,CAChC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YA0CI,iBAAiB,CAAC,KAAK;gBACrB,CAAC,CAAC,+BAA+B,QAAQ,CAAC,KAAK,UAAU,MAAM,CAAC,KAAK,6BAA6B;gBAClG,CAAC,CAAC,EACN;YACE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,gCAAgC;;;OAGhG,EACC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAClF,CAAA;YAED,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;YAEzB,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC3B,OAAO;oBACL,QAAQ,EAAE;wBACR,EAAE,EAAE,GAAG,CAAC,WAAW;wBACnB,IAAI,EAAE,GAAG,CAAC,aAAa;wBACvB,WAAW,EAAE,GAAG,CAAC,oBAAoB;qBACtC;oBACD,IAAI,EAAE,GAAG,CAAC,iBAAiB;oBAC3B,cAAc,EAAE,GAAG,CAAC,4BAA4B;oBAChD,YAAY,EAAE,GAAG,CAAC,aAAa;oBAC/B,eAAe,EAAE,GAAG,CAAC,gBAAgB;oBACrC,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,IAAI,EAAE,GAAG,CAAC,KAAK;oBACf,MAAM,EAAE,GAAG,CAAC,OAAO;oBACnB,MAAM,EAAE,GAAG,CAAC,SAAS;oBACrB,MAAM,EAAE,GAAG,CAAC,QAAQ;oBACpB,MAAM,EAAE,GAAG,CAAC,QAAQ;oBACpB,MAAM,EAAE,GAAG,CAAC,QAAQ;oBACpB,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,cAAc,EAAE,GAAG,CAAC,gBAAgB;oBACpC,cAAc,EAAE,GAAG,CAAC,gBAAgB;oBACpC,YAAY,EAAE,GAAG,CAAC,aAAa;oBAC/B,eAAe,EAAE,GAAG,CAAC,gBAAgB;oBACrC,YAAY,EAAE,GAAG,CAAC,aAAa;oBAC/B,eAAe,EAAE,GAAG,CAAC,gBAAgB;oBACrC,YAAY,EAAE,GAAG,CAAC,aAAa;oBAC/B,eAAe,EAAE,GAAG,CAAC,gBAAgB;oBACrC,YAAY,EAAE,GAAG,CAAC,aAAa;oBAC/B,eAAe,EAAE,GAAG,CAAC,gBAAgB;oBACrC,OAAO,EAAE;wBACP,EAAE,EAAE,GAAG,CAAC,UAAU;wBAClB,GAAG,EAAE,GAAG,CAAC,WAAW;wBACpB,IAAI,EAAE,GAAG,CAAC,YAAY;wBACtB,WAAW,EAAE,GAAG,CAAC,mBAAmB;wBACpC,IAAI,EAAE,GAAG,CAAC,YAAY;qBACvB;oBACD,QAAQ,EAAE,GAAG,CAAC,YAAY;oBAC1B,QAAQ,EAAE,GAAG,CAAC,YAAY;oBAC1B,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;oBACtB,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC;oBACjC,GAAG,EAAE,GAAG,CAAC,GAAG;oBACZ,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,mBAAmB,EAAE,GAAG,CAAC,sBAAsB;oBAC/C,wBAAwB,EAAE,GAAG,CAAC,4BAA4B;oBAC1D,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,WAAW,EAAE,GAAG,CAAC,YAAY;oBAC7B,cAAc,EAAE,GAAG,CAAC,gBAAgB;oBACpC,mBAAmB,EAAE,GAAG,CAAC,sBAAsB;oBAC/C,eAAe,EAAE,GAAG,CAAC,iBAAiB;oBACtC,oBAAoB,EAAE,GAAG,CAAC,uBAAuB;oBACjD,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,OAAO,EAAE,GAAG,CAAC,QAAQ;oBACrB,UAAU,EAAE,GAAG,CAAC,YAAY;oBAC5B,cAAc,EAAE,GAAG,CAAC,eAAe;oBACnC,eAAe,EAAE,GAAG,CAAC,gBAAgB;oBACrC,eAAe,EAAE,GAAG,CAAC,gBAAgB;oBACrC,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,eAAe,EAAE,GAAG,CAAC,iBAAiB;oBACtC,eAAe,EAAE,GAAG,CAAC,iBAAiB;oBACtC,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,YAAY,EAAE,GAAG,CAAC,aAAa;oBAC/B,YAAY,EAAE,GAAG,CAAC,aAAa;oBAC/B,WAAW,EAAE,GAAG,CAAC,WAAW;oBAC5B,YAAY,EAAE,GAAG,CAAC,aAAa;oBAC/B,WAAW,EAAE,GAAG,CAAC,YAAY;oBAC7B,aAAa,EAAE,GAAG,CAAC,cAAc;oBACjC,SAAS,EAAE,GAAG,CAAC,UAAU;oBACzB,eAAe,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,qBAAqB;oBAC5E,SAAS,EAAE,GAAG,CAAC,UAAU;oBACzB,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,gBAAgB,EAAE,GAAG,CAAC,iBAAiB;iBACxC,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,OAAO;gBACL,KAAK;gBACL,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;aACtB,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
1
+ {"version":3,"file":"outbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-order-details-report.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-wms",
3
- "version": "4.3.673",
3
+ "version": "4.3.676",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -62,53 +62,53 @@
62
62
  "@operato/scene-tab": "^0.1.8",
63
63
  "@operato/scene-table": "^0.1.8",
64
64
  "@operato/scene-wheel-sorter": "^0.1.8",
65
- "@things-factory/apptool-ui": "^4.3.673",
66
- "@things-factory/attachment-ui": "^4.3.673",
67
- "@things-factory/auth-ui": "^4.3.673",
68
- "@things-factory/barcode-ui": "^4.3.673",
69
- "@things-factory/biz-ui": "^4.3.673",
70
- "@things-factory/board-service": "^4.3.673",
71
- "@things-factory/board-ui": "^4.3.673",
72
- "@things-factory/code-ui": "^4.3.673",
73
- "@things-factory/context-ui": "^4.3.673",
74
- "@things-factory/export-ui": "^4.3.673",
75
- "@things-factory/export-ui-csv": "^4.3.673",
76
- "@things-factory/export-ui-excel": "^4.3.673",
77
- "@things-factory/fav-base": "^4.3.673",
78
- "@things-factory/form-ui": "^4.3.673",
79
- "@things-factory/geography": "^4.3.673",
80
- "@things-factory/grist-ui": "^4.3.673",
81
- "@things-factory/help": "^4.3.673",
82
- "@things-factory/i18n-base": "^4.3.673",
83
- "@things-factory/id-rule-base": "^4.3.673",
84
- "@things-factory/import-ui": "^4.3.673",
85
- "@things-factory/import-ui-excel": "^4.3.673",
86
- "@things-factory/menu-ui": "^4.3.673",
87
- "@things-factory/more-ui": "^4.3.673",
88
- "@things-factory/notification": "^4.3.673",
65
+ "@things-factory/apptool-ui": "^4.3.675",
66
+ "@things-factory/attachment-ui": "^4.3.675",
67
+ "@things-factory/auth-ui": "^4.3.675",
68
+ "@things-factory/barcode-ui": "^4.3.675",
69
+ "@things-factory/biz-ui": "^4.3.675",
70
+ "@things-factory/board-service": "^4.3.675",
71
+ "@things-factory/board-ui": "^4.3.675",
72
+ "@things-factory/code-ui": "^4.3.675",
73
+ "@things-factory/context-ui": "^4.3.675",
74
+ "@things-factory/export-ui": "^4.3.675",
75
+ "@things-factory/export-ui-csv": "^4.3.675",
76
+ "@things-factory/export-ui-excel": "^4.3.675",
77
+ "@things-factory/fav-base": "^4.3.675",
78
+ "@things-factory/form-ui": "^4.3.675",
79
+ "@things-factory/geography": "^4.3.675",
80
+ "@things-factory/grist-ui": "^4.3.675",
81
+ "@things-factory/help": "^4.3.675",
82
+ "@things-factory/i18n-base": "^4.3.675",
83
+ "@things-factory/id-rule-base": "^4.3.675",
84
+ "@things-factory/import-ui": "^4.3.675",
85
+ "@things-factory/import-ui-excel": "^4.3.675",
86
+ "@things-factory/menu-ui": "^4.3.675",
87
+ "@things-factory/more-ui": "^4.3.675",
88
+ "@things-factory/notification": "^4.3.675",
89
89
  "@things-factory/pdf": "^4.3.591",
90
- "@things-factory/print-proxy-service": "^4.3.673",
91
- "@things-factory/print-ui": "^4.3.673",
92
- "@things-factory/product-base": "^4.3.673",
93
- "@things-factory/resource-ui": "^4.3.673",
94
- "@things-factory/sales-ui": "^4.3.673",
90
+ "@things-factory/print-proxy-service": "^4.3.675",
91
+ "@things-factory/print-ui": "^4.3.675",
92
+ "@things-factory/product-base": "^4.3.675",
93
+ "@things-factory/resource-ui": "^4.3.675",
94
+ "@things-factory/sales-ui": "^4.3.675",
95
95
  "@things-factory/scene-data-transform": "^4.3.591",
96
96
  "@things-factory/scene-excel": "^4.3.591",
97
97
  "@things-factory/scene-firebase": "^4.3.591",
98
98
  "@things-factory/scene-form": "^4.3.591",
99
99
  "@things-factory/scene-google-map": "^4.3.591",
100
100
  "@things-factory/scene-graphql": "^4.3.591",
101
- "@things-factory/scene-label": "^4.3.673",
101
+ "@things-factory/scene-label": "^4.3.675",
102
102
  "@things-factory/scene-marker": "^4.3.591",
103
103
  "@things-factory/scene-mqtt": "^4.3.591",
104
104
  "@things-factory/scene-restful": "^4.3.591",
105
105
  "@things-factory/scene-visualizer": "^4.3.591",
106
- "@things-factory/setting-ui": "^4.3.673",
107
- "@things-factory/system-ui": "^4.3.673",
108
- "@things-factory/transport-base": "^4.3.673",
109
- "@things-factory/tutorial-ui": "^4.3.673",
110
- "@things-factory/warehouse-base": "^4.3.673",
111
- "@things-factory/worksheet-base": "^4.3.673"
106
+ "@things-factory/setting-ui": "^4.3.675",
107
+ "@things-factory/system-ui": "^4.3.675",
108
+ "@things-factory/transport-base": "^4.3.675",
109
+ "@things-factory/tutorial-ui": "^4.3.675",
110
+ "@things-factory/warehouse-base": "^4.3.675",
111
+ "@things-factory/worksheet-base": "^4.3.676"
112
112
  },
113
113
  "devDependencies": {
114
114
  "@things-factory/builder": "^4.3.591",
@@ -117,5 +117,5 @@
117
117
  "cypress-localstorage-commands": "^1.6.1",
118
118
  "eslint-plugin-cypress": "^2.12.1"
119
119
  },
120
- "gitHead": "d22f985380f3af2ebc0f81ea8bec478ba00b4777"
120
+ "gitHead": "29579492b1f655ce2e33e6eb0ab746702c12013f"
121
121
  }
package/server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.ts CHANGED
@@ -41,6 +41,7 @@ const buildOrderInventoryQuery = (tx: EntityManager, domainId: string, locationI
41
41
  .leftJoinAndSelect('inventory.product', 'product')
42
42
  .leftJoinAndSelect('inventory.productDetail', 'productDetail')
43
43
  .leftJoinAndSelect('orderInventory.binLocation', 'binLocation')
44
+ .innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
44
45
  .where('orderInventory.domain_id = :domainId', { domainId })
45
46
  .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
46
47
  orderInventoryStatus: [
package/server/graphql/resolvers/outbound/loading-worksheet-v2.ts CHANGED
@@ -26,6 +26,9 @@ interface WorksheetInfo {
26
26
  name: string
27
27
  status: string
28
28
  attentionCompany?: string
29
+ attentionTo?: string
30
+ deliveryAddress1?: string
31
+ deliveryAddress2?: string
29
32
  refNo?: string
30
33
  refNo2?: string
31
34
  refNo3?: string
@@ -193,6 +196,9 @@ async function mapdata(
193
196
  name: releaseGood.name,
194
197
  status: releaseGood.status,
195
198
  attentionCompany: releaseGood?.attentionCompany,
199
+ attentionTo: releaseGood?.attentionTo,
200
+ deliveryAddress1: releaseGood?.deliveryAddress1,
201
+ deliveryAddress2: releaseGood?.deliveryAddress2,
196
202
  refNo: releaseGood?.refNo,
197
203
  refNo2: releaseGood?.refNo2,
198
204
  refNo3: releaseGood?.refNo3,
package/server/graphql/resolvers/reports/outbound-order-details-report.ts CHANGED
@@ -42,12 +42,17 @@ export const outboundOrderDetailsReport = {
42
42
 
43
43
  await rawProductsQuery(tx, params, bizplace)
44
44
 
45
- let extraQueryFilters = ''
45
+ // Apply filters using base table columns within the inner SELECT to avoid alias scoping issues
46
+ // The first subquery joins delivery_orders as do2; the second does not. Split filters accordingly.
47
+ let innerQueryFilters1 = ''
48
+ let innerQueryFilters2 = ''
49
+ const hasDoFilter = !!doNo
46
50
  if (roNo) {
47
- extraQueryFilters = `${extraQueryFilters} and ro_no like '%${roNo.value}%' `
51
+ innerQueryFilters1 = `${innerQueryFilters1} and rg.name like '%${roNo.value}%' `
52
+ innerQueryFilters2 = `${innerQueryFilters2} and rg.name like '%${roNo.value}%' `
48
53
  }
49
54
  if (doNo) {
50
- extraQueryFilters = `${extraQueryFilters} and delivery_order_no like '%${doNo.value}%' `
55
+ innerQueryFilters1 = `${innerQueryFilters1} and do2.name like '%${doNo.value}%' `
51
56
  }
52
57
 
53
58
  console.time('temp')
@@ -95,11 +100,14 @@ export const outboundOrderDetailsReport = {
95
100
  ${status ? `and rg.status = '${status.value}' ` : ``}
96
101
  ${binLocation ? `and l.name ilike '${binLocation.value}' ` : ``}
97
102
  ${priorityDelivery ? `and rg.priority_delivery = ${priorityDelivery.value} ` : ``}
103
+ ${innerQueryFilters1}
98
104
  and oi.release_qty > 0
99
105
  ) src
100
106
  where 1=1
101
- ${extraQueryFilters}
102
- union all
107
+ ${
108
+ hasDoFilter
109
+ ? ''
110
+ : `union all
103
111
  select * from (
104
112
  select op.id,
105
113
  op.release_qty AS "release_qty", NULL::timestamp, NULL, NULL::timestamp, NULL, NULL::timestamp, NULL,
@@ -130,11 +138,13 @@ export const outboundOrderDetailsReport = {
130
138
  and rg.created_at >= $3 and rg.created_at <= $4
131
139
  and rg.assigned_inventory = false
132
140
  ${status ? `and rg.status = '${status.value}' ` : ``}
141
+ ${priorityDelivery ? `and rg.priority_delivery = ${priorityDelivery.value} ` : ``}
142
+ ${innerQueryFilters2}
133
143
  and rg.assigned_inventory = false
134
144
  and op.release_qty > 0
135
145
  ) src2
136
- where 1=1
137
- ${extraQueryFilters}
146
+ where 1=1`
147
+ }
138
148
  )
139
149
  `,
140
150
  [context.state.domain.id, bizplace.id, fromDate.value, toDate.value, bizplace.name, bizplace.description]