@things-factory/operato-wms 5.0.13 → 6.0.0-alpha.1

package/client/pages/order/release-order/release-extra-product-popup.js

@@ -45,6 +45,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
           flex-direction: column;
           flex: 1;
           overflow-y: auto;
+          padding: 5px;
         }
         .grist h2 mwc-icon {
           vertical-align: middle;
@@ -95,6 +96,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
   static get properties() {
     return {
       releaseGoodNo: String,
+      recall: Boolean,
       bizplace: Object,
       config: Object,
 
@@ -223,6 +225,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
                 { name: 'id', hidden: true },
                 { name: 'name', hidden: true },
                 { name: 'palletId', header: i18next.t('field.lot_id') },
+                { name: 'cartonId', header: i18next.t('field.carton_id') },
                 { name: 'product', type: 'object', queryName: 'products' },
                 { name: 'batchId', header: i18next.t('field.batch_id') },
                 {
@@ -240,7 +243,9 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
                 },
                 { name: 'batchIdRef', header: i18next.t('field.batch_no_ref') }
               ],
-              list: { fields: ['palletId', 'product', 'batchId', 'location', 'remainUomValue', 'batchIdRef'] }
+              list: {
+                fields: ['palletId', 'cartonId', 'product', 'batchId', 'location', 'remainUomValue', 'batchIdRef']
+              }
             }
           },
           width: 250
@@ -338,7 +343,8 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
               basicArgs: {
                 filters: [
                   { name: 'status', operator: 'eq', value: INVENTORY_STATUS.STORED.value },
-                  { name: 'bizplace', value: [this.bizplace], operator: 'in' }
+                  { name: 'bizplace', value: [this.bizplace], operator: 'in' },
+                  { name: 'recall', value: this.recall ? this.recall : false, operator: '' }
                 ],
                 locationSortingRules
               },
@@ -348,6 +354,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
                 { name: 'id', hidden: true },
                 { name: 'name', hidden: true },
                 { name: 'palletId', header: i18next.t('field.lot_id') },
+                { name: 'cartonId', header: i18next.t('field.carton_id') },
                 { name: 'product', type: 'object', queryName: 'products' },
                 { name: 'batchId', header: i18next.t('field.batch_id') },
                 {
@@ -365,7 +372,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
                 },
                 { name: 'batchIdRef', header: i18next.t('field.batch_no_ref') }
               ],
-              list: { fields: ['palletId', 'product', 'batchId', 'location', 'batchIdRef'] }
+              list: { fields: ['palletId', 'cartonId', 'product', 'batchId', 'location', 'batchIdRef'] }
             }
           },
           width: 250