@things-factory/operato-wms 4.3.744 → 4.3.745

package/client/pages/order/transport-order/delivery-order-list.js

@@ -103,8 +103,8 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
         props: { searchOper: 'i_like' }
       },
       {
-        name: 'releaseGoodNo',
-        label: i18next.t('field.ro_no'),
+        label: i18next.t('field.order_info'),
+        name: 'orderInfo',
         type: 'text',
         props: { searchOper: 'i_like' }
       },
@@ -125,24 +125,6 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
         ],
         props: { searchOper: 'eq' }
       },
-      {
-        label: i18next.t('field.ref_no'),
-        name: 'refNo',
-        type: 'text',
-        props: { searchOper: 'i_like' }
-      },
-      {
-        label: i18next.t('field.ref_no_2'),
-        name: 'refNo2',
-        type: 'text',
-        props: { searchOper: 'i_like' }
-      },
-      {
-        label: i18next.t('field.ref_no_3'),
-        name: 'refNo3',
-        type: 'text',
-        props: { searchOper: 'i_like' }
-      },
       {
         name: 'status',
         label: i18next.t('label.status'),
@@ -182,6 +164,18 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           })()
         },
         value: new Date().toISOString().split('T')[0]
+      },
+      {
+        label: i18next.t('field.business_rest_day'),
+        name: 'businessRestDayFilter',
+        type: 'select',
+        options: [
+          { name: i18next.t('label.all'), value: '' },
+          { name: i18next.t('label.not_within_business_rest_day'), value: 'not_within' },
+          { name: i18next.t('label.within_business_rest_day'), value: 'within' }
+        ],
+        props: { searchOper: 'eq' },
+        value: ''
       }
     ]
 
@@ -262,6 +256,19 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           sortable: true,
           width: 160
         },
+        {
+          type: 'string',
+          name: 'businessRestDay',
+          header: i18next.t('field.business_rest_day'),
+          imex: {
+            header: i18next.t('field.business_rest_day'),
+            key: 'businessRestDay',
+            width: 30,
+            type: 'string'
+          },
+          sortable: false,
+          width: 200
+        },
         {
           type: 'boolean',
           name: 'ownCollection',
@@ -351,6 +358,11 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
                 refNo
                 refNo2
                 refNo3
+                deliverTo {
+                  id
+                  name
+                  businessRestDay
+                }
               }
               ownCollection
               createdAt
@@ -385,7 +397,8 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
               ...dord,
               refNo: dord?.releaseGood?.refNo || '',
               refNo2: dord?.releaseGood?.refNo2 || '',
-              refNo3: dord?.releaseGood?.refNo3 || ''
+              refNo3: dord?.releaseGood?.refNo3 || '',
+              businessRestDay: dord?.releaseGood?.deliverTo?.businessRestDay || ''
             }
           }) || []
       }

package/client/pages/order/transport-order/print-delivery-note.js

@@ -46,7 +46,8 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
       _isManualDo: Boolean,
       _data: Object,
       _roNo: String,
-      _refNo: String
+      _refNo: String,
+      _deliveryContactPoint: Object
     }
   }
 
@@ -66,7 +67,9 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
       {
         title: i18next.t('button.print'),
         action: () => {
-          this.renderRoot.querySelector('iframe').contentWindow.print()
+          if (this._validateBusinessRestDay()) {
+            this.renderRoot.querySelector('iframe').contentWindow.print()
+          }
         },
         ...CommonButtonStyles.print
       }
@@ -165,6 +168,15 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
                 uomValue
               }
             }
+            releaseOrderDeliverTo {
+              id
+              contactName
+              address
+              phone
+              fax
+              email
+              businessRestDay
+            }
           }
         }
       `,
@@ -177,28 +189,68 @@ class PrintDeliveryOrder extends localize(i18next)(PageView) {
       const deliveryOrderData = response.data.deliveryOrderByWorksheet
 
       let orderInfo = deliveryOrderData.deliveryOrderInfo
-      let contactPoints = deliveryOrderData.contactPointInfo
       this._roNo = orderInfo.releaseGood.name
       this._status = orderInfo.doStatus
       this._ownCollection = orderInfo.ownCollection
-      // this._customerContactPoints = deliveryOrderData.contactPointInfo
       this._truckNo = orderInfo.truckNo
       this._bizplace = orderInfo.bizplace
       this._isManualDo = orderInfo.isManualDo
 
-      let deliverTo = orderInfo.deliverTo
-      if (deliverTo !== '') {
-        const deliveryContactPoint = contactPoints.filter(contactPoint => contactPoint.id === deliverTo)[0]
-        orderInfo = {
-          ...orderInfo,
-          deliverTo: deliveryContactPoint
-        }
-      }
+      // Use release order's deliverTo contact point for business rest day validation
+      this._deliveryContactPoint = deliveryOrderData.releaseOrderDeliverTo || null
 
       this._orderInfo = orderInfo
     }
   }
 
+  /**
+   * Validates if current date falls on a business rest day
+   * @returns {boolean} - Returns true if printing is allowed, false otherwise
+   */
+  _validateBusinessRestDay() {
+    // Check if there's a contact point reference
+    if (!this._deliveryContactPoint || !this._deliveryContactPoint.businessRestDay) {
+      return true // No business rest day restriction, allow printing
+    }
+
+    const businessRestDay = this._deliveryContactPoint.businessRestDay
+    if (!businessRestDay || businessRestDay.trim() === '') {
+      return true // Empty business rest day, allow printing
+    }
+
+    // Get current day of week
+    const today = new Date()
+    const dayOfWeek = today.getDay() // 0 = Sunday, 1 = Monday, ..., 6 = Saturday
+    const dayNames = ['SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY']
+    const currentDayName = dayNames[dayOfWeek]
+
+    // Parse business rest days (comma-separated)
+    const restDays = businessRestDay
+      .split(',')
+      .map(day => day.trim().toUpperCase())
+      .filter(day => day.length > 0)
+
+    // Check if current day is in the rest days list
+    if (restDays.includes(currentDayName)) {
+      CustomAlert({
+        type: 'warning',
+        title: i18next.t('title.printing_not_allowed'),
+        text:
+          i18next.t('text.printing_not_allowed_business_rest_day', {
+            day: currentDayName,
+            restDays: restDays.join(', ')
+          }) ||
+          `Printing is not allowed as today (${currentDayName}) falls on the business rest day(s) of this contact point: ${restDays.join(
+            ', '
+          )}`,
+        confirmButton: { text: i18next.t('button.okay') }
+      })
+      return false
+    }
+
+    return true // Current day is not a rest day, allow printing
+  }
+
   /**
    * @oscarchuaweiwen-fsd
    * Kindly clean up anything regarding this function.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.744",
+  "version": "4.3.745",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -66,7 +66,7 @@
     "@things-factory/attachment-ui": "^4.3.743",
     "@things-factory/auth-ui": "^4.3.743",
     "@things-factory/barcode-ui": "^4.3.743",
-    "@things-factory/biz-ui": "^4.3.743",
+    "@things-factory/biz-ui": "^4.3.745",
     "@things-factory/board-service": "^4.3.743",
     "@things-factory/board-ui": "^4.3.743",
     "@things-factory/code-ui": "^4.3.743",
@@ -89,9 +89,9 @@
     "@things-factory/pdf": "^4.3.743",
     "@things-factory/print-proxy-service": "^4.3.743",
     "@things-factory/print-ui": "^4.3.743",
-    "@things-factory/product-base": "^4.3.743",
+    "@things-factory/product-base": "^4.3.745",
     "@things-factory/resource-ui": "^4.3.743",
-    "@things-factory/sales-ui": "^4.3.743",
+    "@things-factory/sales-ui": "^4.3.745",
     "@things-factory/scene-data-transform": "^4.3.743",
     "@things-factory/scene-excel": "^4.3.743",
     "@things-factory/scene-firebase": "^4.3.743",
@@ -105,10 +105,10 @@
     "@things-factory/scene-visualizer": "^4.3.743",
     "@things-factory/setting-ui": "^4.3.743",
     "@things-factory/system-ui": "^4.3.743",
-    "@things-factory/transport-base": "^4.3.743",
+    "@things-factory/transport-base": "^4.3.745",
     "@things-factory/tutorial-ui": "^4.3.743",
-    "@things-factory/warehouse-base": "^4.3.743",
-    "@things-factory/worksheet-base": "^4.3.744"
+    "@things-factory/warehouse-base": "^4.3.745",
+    "@things-factory/worksheet-base": "^4.3.745"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.743",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "1519990fa45b1edfdfa52b0ac3748b841fb18afd"
+  "gitHead": "89c8b3c8c7ac589d4f547a984c1027a6f509671f"
 }

package/translations/en.json

@@ -1027,6 +1027,8 @@
   "label.no_of_random_item": "no of random item",
   "label.normal": "normal",
   "label.not_tally": "not tally",
+  "label.not_within_business_rest_day": "not within business rest day",
+  "label.within_business_rest_day": "within business rest day",
   "label.open": "open",
   "label.options": "options",
   "label.order": "order",
@@ -1707,6 +1709,7 @@
   "text.print_1_label_for_item_with_non_specified_print_qty": "print 1 label for item with non-specified print qty",
   "text.print_qty_is_empty": "print qty is empty",
   "text.printing": "printing",
+  "text.printing_not_allowed_business_rest_day": "Printing is not allowed as today ({day}) falls on the business rest day(s) of this contact point: {restDays}",
   "text.priority": "priority",
   "text.proceed_cancel": "proceed cancel",
   "text.proceed_undo_loading": "proceed undo loading",
@@ -2168,6 +2171,7 @@
   "title.print_preview": "print preview",
   "title.print_product_label": "print product label",
   "title.print_route_label": "print route label",
+  "title.printing_not_allowed": "printing not allowed",
   "title.privilege": "privilege",
   "title.proceed_edited_added_product": "proceed edited/added products",
   "title.proceed_edited_vas": "proceed edited/added vas",

package/translations/ko.json

@@ -1021,6 +1021,8 @@
   "label.new_lot_id": "새 lot 아이디",
   "label.no_of_random_item": "무작위 상품 수량",
   "label.not_tally": "집계 불일치",
+  "label.not_within_business_rest_day": "영업일 아님",
+  "label.within_business_rest_day": "영업일",
   "label.open": "[ko] open",
   "label.options": "옴션",
   "label.order_name": "주문명",
@@ -1683,6 +1685,7 @@
   "text.print_1_label_for_item_with_non_specified_print_qty": "[ko]print 1 label for item with non-specified print qty",
   "text.print_qty_is_empty": "인쇄수량이 없습니다",
   "text.printing": "인쇄중",
+  "text.printing_not_allowed_business_rest_day": "오늘 ({day})은 이 연락처 지점의 영업 휴일입니다: {restDays}",
   "text.priority": "[ko] priority",
   "text.proceed_undo_loading": "[ko] proceed undo loading",
   "text.proceed_cancel": "[ko] proceed cancel",
@@ -2204,6 +2207,7 @@
   "title.print_preview": "인쇄 미리보기",
   "title.print_product_label": "[ko]print product label",
   "title.print_route_label": "[ko] print route label",
+  "title.printing_not_allowed": "인쇄 불가능",
   "title.privilege": "권한",
   "title.proceed_edited_added_product": "[ko]proceed edited/added product",
   "title.proceed_edited_vas": "[ko] proceed edited/added vas",

package/translations/ms.json

@@ -1039,6 +1039,8 @@
   "label.no_of_random_item": "bilangan item rawak",
   "label.normal": "normal",
   "label.not_tally": "tidak tally",
+  "label.not_within_business_rest_day": "tidak dalam hari rehat perniagaan",
+  "label.within_business_rest_day": "dalam hari rehat perniagaan",
   "label.open": "buka",
   "label.options": "pilihan",
   "label.order": "order",
@@ -1748,6 +1750,7 @@
   "text.print_1_label_for_item_with_non_specified_print_qty": "cetak 1 label untuk item dengan kuantiti cetak tidak ditetapkan",
   "text.print_qty_is_empty": "kuantiti untuk cetak adalah mssong",
   "text.printing": "cetak",
+  "text.printing_not_allowed_business_rest_day": "Cetakan tidak dibenarkan kerana hari ini ({day}) jatuh pada hari rehat perniagaan bagi titik kontak ini: {restDays}",
   "text.priority": "keutamaan",
   "text.proceed_cancel": "teruskan pembatalan",
   "text.proceed_undo_loading": "teruskan pembatalan pemuatan",
@@ -2241,6 +2244,7 @@
   "title.print_preview": "cetak preview",
   "title.print_product_label": "cetak label produk",
   "title.print_route_label": "cetak label rute",
+  "title.printing_not_allowed": "cetak tidak dibenarkan",
   "title.privilege": "privilege",
   "title.proceed_edited_added_product": "teruskan produk tambahan",
   "title.proceed_edited_vas": "teruskan VAS disunting/ditambah",

package/translations/zh.json

@@ -1054,6 +1054,8 @@
   "label.no_of_random_item": "随机物品数量",
   "label.normal": "正常",
   "label.not_tally": "不称重",
+  "label.not_within_business_rest_day": "不在业务休息日",
+  "label.within_business_rest_day": "在业务休息日",
   "label.open": "打开",
   "label.options": "选项",
   "label.order": "订单",
@@ -1774,6 +1776,7 @@
   "text.print_1_label_for_item_with_non_specified_print_qty": "打印一个非指定打印数量的项目的标签",
   "text.print_qty_is_empty": "打印数量为空",
   "text.printing": "打印中",
+  "text.printing_not_allowed_business_rest_day": "打印不允许，因为今天({day})是此联系点的业务休息日: {restDays}",
   "text.priority": "优先级",
   "text.proceed_cancel": "继续取消",
   "text.proceed_undo_loading": "继续撤销装载",
@@ -2274,6 +2277,7 @@
   "title.print_preview": "打印预览",
   "title.print_product_label": "打印产品标签",
   "title.print_route_label": "打印路线标签",
+  "title.printing_not_allowed": "打印不允许",
   "title.privilege": "权限",
   "title.proceed_edited_added_product": "继续编辑/添加产品",
   "title.proceed_edited_vas": "继续编辑/添加VAS",