@things-factory/operato-wms 3.8.1 → 3.8.2

package/client/pages/adjustment/transfer-inventory.js

@@ -280,7 +280,13 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
               <label class="content">${this?._selectedInventory?.packingType || '-'}</label>
 
               <label class="content-title">${i18next.t('label.qty')}</label>
-              <label class="content">${this?._selectedInventory?.qty || '-'}</label>
+              <label class="content">${(this?._selectedInventory?.qty || 0).toString()}</label>
+
+              <label class="content-title">${i18next.t('label.reserve_qty')}</label>
+              <label class="content">${(this?._selectedInventory?.lockedQty || 0).toString()}</label>
+
+              <label class="content-title">${i18next.t('label.available_qty')}</label>
+              <label class="content">${(this?._selectedInventory?.availableQty || 0).toString()}</label>
 
               <!-- <input name="fromLocationName" readonly /> -->
             </fieldset>
@@ -299,11 +305,11 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
                     this.qtyInput.value = 0
                   }
                   if (this._selectedInventory) {
-                    if (this._selectedInventory.qty > parseInt(this.qtyInput.value)) {
+                    if (this._selectedInventory.availableQty > parseInt(this.qtyInput.value)) {
                       this._requireNewId = true
                     } else {
-                      if (parseInt(this.qtyInput.value) > this._selectedInventory.qty) {
-                        this.qtyInput.value = this._selectedInventory.qty
+                      if (parseInt(this.qtyInput.value) > this._selectedInventory.availableQty) {
+                        this.qtyInput.value = this._selectedInventory.availableQty
                       }
                       this._requireNewId = false
                     }
@@ -396,6 +402,8 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
           'packingType',
           'packingSize',
           'qty',
+          'lockedQty',
+          'availableQty',
           'expirationDate'
         ]
       },
@@ -480,6 +488,20 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.qty'),
           width: 60
         },
+        {
+          type: 'integer',
+          name: 'lockedQty',
+          label: true,
+          header: i18next.t('field.reserve_qty'),
+          width: 60
+        },
+        {
+          type: 'integer',
+          name: 'availableQty',
+          label: true,
+          header: i18next.t('field.available_qty'),
+          width: 60
+        },
         {
           type: 'date',
           name: 'expirationDate',
@@ -568,7 +590,7 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
             return {
               ...record,
               sku: record.product.sku,
-              qty: record.qty - record.lockedQty > 0 ? record.qty - record.lockedQty : 0
+              availableQty: record.qty - (record.lockedQty > 0 ? record.lockedQty : 0)
             }
           })
         }
@@ -654,7 +676,11 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
       throw new Error(i18next.t('text.please_select_an_inventory'))
     }
 
-    if (!this.qtyInput.value > 0) {
+    if (!(this._selectedInventory.availableQty > 0)) {
+      throw new Error(i18next.t('text.not_enough_available_qty'))
+    }
+
+    if (!parseInt(this.qtyInput?.value || 0) > 0) {
       throw new Error(i18next.t('text.please_enter_transfer_qty'))
     }
 

package/client/pages/inventory/inventory-adjustment.js

@@ -571,7 +571,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     const filters = await this.searchForm.getQueryFilters()
     const response = await client.query({
       query: gql`
-        query inventories($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+        query inventories($filters: [Filter!]!, $pagination: Pagination, $sortings: [Sorting!]!) {
           inventories(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
@@ -828,13 +828,12 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         data = await this.fetchInventoriesForExport()
       }
 
-      let [product, bizplace] = await Promise.all([
+      let [product, bizplace, location] = await Promise.all([
         this.fetchProduct(bizplaceFilters),
-        this.fetchBizplaces([{ ...bizplaceFilters[0], name: 'bizplace' }])
+        this.fetchBizplaces([{ ...bizplaceFilters[0], name: 'bizplace' }]),
+        this.fetchLocation()
       ])
 
-      let location = this.fetchLocation()
-
       headerSetting = headerSetting.map(column => {
         switch (column.key) {
           case 'bizplace.name':
@@ -845,7 +844,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
               return { ...itm, name: `(${itm.sku}) ${itm.name} - ${itm.description}` }
             })
             break
-          case 'location':
+          case 'location.name':
             column.arrData = location
             break
           default:
@@ -891,7 +890,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
   async fetchBizplaces(bizplace = []) {
     const response = await client.query({
       query: gql`
-        query bizplaces($filters: [Filter!]) {
+        query bizplaces($filters: [Filter!]!) {
           bizplaces(filters: $filters) {
             items {
               id
@@ -911,7 +910,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       bizplace[0].name = 'bizplace'
       const response = await client.query({
         query: gql`
-          query productsByBizplace($filters: [Filter!]) {
+          query productsByBizplace($filters: [Filter!]!) {
             productsByBizplace(filters: $filters) {
               items {
                 id
@@ -933,7 +932,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
   async fetchLocation() {
     const response = await client.query({
       query: gql`
-        query locations($filters: [Filter!]) {
+        query locations($filters: [Filter!]!) {
           locations(filters: $filters) {
             items {
               id

package/client/pages/vas/print-product-label.js

@@ -475,6 +475,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                 id
                 batchId
                 packingType
+                releaseQty
                 product {
                   name
                   sku
@@ -549,7 +550,8 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                     auxValue1: product.auxValue1 || '',
                     auxUnit2: product.auxUnit2 || '',
                     auxValue2: product.auxValue2 || '',
-                    bizplaceId: releaseGood.bizplace.id
+                    bizplaceId: releaseGood.bizplace.id,
+                    printQty: oi.releaseQty || 0
                   }
 
                   if (product.productDetails && product.productDetails.length) {

package/dist-server/graphql/resolvers/reports/product-label-report.js

@@ -28,6 +28,7 @@ exports.productLabelReport = {
         WHERE "bizplace_id" = '${bizplaceId}'
         ${type ? `AND "type" ilike '%${type}%'` : ''}
         AND "date"::date BETWEEN '${fromDate}' AND '${toDate}'
+        ORDER BY type ASC, date ASC
       `);
             // @farishelmi any usage for this function? If no please remove.
             /*

package/dist-server/graphql/resolvers/reports/product-label-report.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-label-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/product-label-report.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,+DAAsE;AAGzD,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QAC9D,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;YACpD,uDAAuD;YACvD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,CAAA;YAC9E,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,0CAAE,KAAK,CAAA;YACrE,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,CAAA;YAC5E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,KAAK,CAAA;YAExE,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;YAEzE,MAAM,KAAK,GAAG,MAAM,IAAA,uBAAa,EAAC,uBAAQ,CAAC,CAAC,KAAK,CAAC;;;;;;;uDAOD,4BAAa,CAAC,qBAAqB;oCACtD,MAAM,CAAC,EAAE;;iCAEZ,UAAU;UACjC,IAAI,CAAC,CAAC,CAAC,sBAAsB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;oCAChB,QAAQ,UAAU,MAAM;OACrD,CAAC,CAAA;YAEF,gEAAgE;YAChE;;;;;;;;;;;;cAYE;YAEF,OAAO;gBACL,KAAK;gBACL,KAAK,EAAE,CAAC;aACT,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
+{"version":3,"file":"product-label-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/product-label-report.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,+DAAsE;AAGzD,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QAC9D,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;YACpD,uDAAuD;YACvD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,CAAA;YAC9E,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,0CAAE,KAAK,CAAA;YACrE,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,CAAA;YAC5E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,KAAK,CAAA;YAExE,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;YAEzE,MAAM,KAAK,GAAG,MAAM,IAAA,uBAAa,EAAC,uBAAQ,CAAC,CAAC,KAAK,CAAC;;;;;;;uDAOD,4BAAa,CAAC,qBAAqB;oCACtD,MAAM,CAAC,EAAE;;iCAEZ,UAAU;UACjC,IAAI,CAAC,CAAC,CAAC,sBAAsB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;oCAChB,QAAQ,UAAU,MAAM;;OAErD,CAAC,CAAA;YAEF,gEAAgE;YAChE;;;;;;;;;;;;cAYE;YAEF,OAAO;gBACL,KAAK;gBACL,KAAK,EAAE,CAAC;aACT,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -71,7 +71,7 @@
     "@things-factory/print-ui": "^3.8.0",
     "@things-factory/product-base": "^3.8.1",
     "@things-factory/resource-ui": "^3.8.0",
-    "@things-factory/sales-ui": "^3.8.1",
+    "@things-factory/sales-ui": "^3.8.2",
     "@things-factory/scene-chartjs": "^3.7.5",
     "@things-factory/scene-clock": "^3.7.5",
     "@things-factory/scene-clone": "^3.7.5",
@@ -102,11 +102,11 @@
     "@things-factory/system-ui": "^3.8.0",
     "@things-factory/transport-base": "^3.8.0",
     "@things-factory/tutorial-ui": "^3.8.0",
-    "@things-factory/warehouse-base": "^3.8.1",
-    "@things-factory/worksheet-base": "^3.8.1"
+    "@things-factory/warehouse-base": "^3.8.2",
+    "@things-factory/worksheet-base": "^3.8.2"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "2f2534de2c0866a693f6ec9949b35a5a0e65065f"
+  "gitHead": "d2f935bdad2321ef93780978e593157ef0c1eb52"
 }

package/server/graphql/resolvers/reports/product-label-report.ts

@@ -28,6 +28,7 @@ export const productLabelReport = {
         WHERE "bizplace_id" = '${bizplaceId}'
         ${type ? `AND "type" ilike '%${type}%'` : ''}
         AND "date"::date BETWEEN '${fromDate}' AND '${toDate}'
+        ORDER BY type ASC, date ASC
       `)
 
       // @farishelmi any usage for this function? If no please remove.

package/translations/en.json

@@ -545,6 +545,7 @@
   "label.attention_to": "attention to",
   "label.availabel_pallet_qty": "available pallet qty",
   "label.available_qty": "available qty",
+  "label.reserve_qty": "reserve qty",
   "label.bag": "bag",
   "label.balance": "balance",
   "label.batch_and_product": "batch and product",

package/translations/ko.json

@@ -583,6 +583,7 @@
   "label.attention_to": "[ko] attention to",
   "label.availabel_pallet_qty": "사용 가능 파레트 수량",
   "label.available_qty": "사용가능 수량",
+  "label.reserve_qty": "[ko] reserve qty",
   "label.bag_crates_carton_ibc_drums_pails": "bag/crates/carton/ibc/drums/pails",
   "label.bag": "백",
   "label.balance": "잔고",

package/translations/ms.json

@@ -560,6 +560,7 @@
   "label.attention_to": "[ms] attention to",
   "label.availabel_pallet_qty": "baki kuantiti palet",
   "label.available_qty": "baki kuantiti",
+  "label.reserve_qty": "[ms] reserve qty",
   "label.bag": "beg",
   "label.balance": "baki",
   "label.batch_and_product": "batch and product",

package/translations/zh.json

@@ -540,6 +540,7 @@
   "label.attention_to": "[zh] attention to",
   "label.availabel_pallet_qty": "available pallet qty",
   "label.available_qty": "available qty",
+  "label.reserve_qty": "[zh] reserve qty",
   "label.bag": "bag",
   "label.balance": "balance",
   "label.batch_and_product": "batch and product",