@things-factory/operato-wms 6.0.0-alpha.6 → 6.0.0-alpha.8

package/client/bootstrap.js

@@ -5,6 +5,8 @@ import '@things-factory/system-ui'
 import gql from 'graphql-tag'
 import { html } from 'lit-element'
 
+import { setupMenuPart } from '@things-factory/meta-ui'
+import { ADD_MORENDA } from '@things-factory/more-base'
 import { registerDefaultGroups } from '@operato/board/register-default-groups.js'
 import { APPEND_APP_TOOL } from '@things-factory/apptool-base'
 import { auth } from '@things-factory/auth-base'
@@ -38,19 +40,21 @@ export default function bootstrap() {
   /* set board-modeller group and default templates */
   registerDefaultGroups()
 
+  setupMenuPart({ hovering: isMobileDevice(), position: VIEWPART_POSITION.NAVBAR })
+
+
   /* setting app-tools */
   store.dispatch({
     type: APPEND_APP_TOOL,
     tool: {
       name: 'notification-badge',
       template: html`
-        <notification-badge
-          @click=${e => {
+        <notification-badge @click=${e => {
             toggleOverlay('notification', {
               backdrop: true
             })
           }}
-        >
+          >
         </notification-badge>
       `,
       position: TOOL_POSITION.REAR
@@ -61,7 +65,7 @@ export default function bootstrap() {
     type: ADD_SETTING,
     setting: {
       seq: 21,
-      template: html` <default-label-printer-setting-let></default-label-printer-setting-let> `
+      template: html`<default-label-printer-setting-let></default-label-printer-setting-let>`
     }
   })
 
@@ -70,7 +74,7 @@ export default function bootstrap() {
     viewpart: {
       show: false,
       hovering: 'edge',
-      template: html` <notification-list style="min-width: 300px;"></notification-list> `
+      template: html`<notification-list style="min-width: 300px;"></notification-list>`
     },
     position: VIEWPART_POSITION.ASIDEBAR
   })
@@ -79,7 +83,7 @@ export default function bootstrap() {
     type: ADD_SETTING,
     setting: {
       seq: 20,
-      template: html` <notification-setting-let></notification-setting-let> `
+      template: html`<notification-setting-let></notification-setting-let>`
     }
   })
 
@@ -87,15 +91,15 @@ export default function bootstrap() {
     type: ADD_SETTING,
     setting: {
       seq: 30,
-      template: html` <release-note-setting-let></release-note-setting-let> `
+      template: html`<release-note-setting-let></release-note-setting-let>`
     }
   })
 
   store.dispatch({
     type: ADD_MORENDA,
     morenda: {
-      icon: html` <mwc-icon>help</mwc-icon> `,
-      name: html` <i18n-msg msgid="text.help"></i18n-msg> `,
+      icon: html`<mwc-icon>help</mwc-icon>`,
+      name: html`<i18n-msg msgid="text.help"></i18n-msg>`,
       action: () => {
         navigate('help')
       }
@@ -176,7 +180,7 @@ export default function bootstrap() {
   if (!ReleaseNoteNotice.seen) {
     i18next.on('initialized', () =>
       setTimeout(() => {
-        openPopup(html` <release-note-notice></release-note-notice> `, {
+        openPopup(html`<release-note-notice></release-note-notice>`, {
           backdrop: true,
           size: 'large',
           title: i18next.t('title.release-note')
@@ -184,6 +188,8 @@ export default function bootstrap() {
       }, 1000)
     )
   }
+  // route 함수 교체
+  this.route = applicationDynamicRoute;
 }
 
 async function loadOpaAppSettings() {
@@ -197,3 +203,32 @@ async function loadOpaAppSettings() {
     }, {})
   })
 }
+
+
+
+/**
+ * 최상위 애플리케이션의 실제 라우팅 처리 로직
+ * 
+ * @param {*} page 
+ * @returns 
+ */
+ function applicationDynamicRoute(page) {
+  // if (!page || page == '') {
+  //   return '/home'
+  // } else if (page == 'home') {
+  //   import('./pages/home-dashboard')
+  //   return page
+  // }
+
+  let modules = store.getState().app.modules;
+  let appModule = modules[modules.length - 1];
+  let appRoutes = appModule.routes;
+
+  let route = appRoutes.find(mapping => mapping.page == page)
+  if (route) {
+    import(`${route.template}`)
+    return page
+  } else {
+    return ''
+  }
+}

package/client/index.js

@@ -1,5 +1,5 @@
 // store
-export * from './store'
+// export * from './store'
 
 // actions
-export * from './actions/label-settings'
+export * from './actions/dashboard-settings'

package/client/pages/inbound/putaway-product.js

@@ -337,7 +337,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
         }
       },
       pagination: { infinite: true },
-      list: { fields: ['completed', 'product', 'palletId', 'cartonId', 'expirationDate', 'batchId', 'qty'] },
+      list: { fields: ['completed', 'sku', 'product', 'palletId', 'cartonId', 'expirationDate', 'batchId', 'qty'] },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         {
@@ -358,6 +358,13 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.carton_id'),
           width: 140
         },
+        {
+          type: 'string',
+          name: 'sku',
+          label: true,
+          header: i18next.t('field.sku'),
+          width: 120
+        },
         {
           type: 'object',
           name: 'product',
@@ -509,6 +516,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
                 completed: record.status === WORKSHEET_STATUS.DONE.value,
                 packingTypeSize: `${record.packingType}(${record.packingSize})`,
                 reusablePalletName: reusablePalletName,
+                sku: record.product.sku,
                 expirationPeriod: record.product.expirationPeriod,
                 expirationDate: record.expirationDate
               }
@@ -595,6 +603,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
               return {
                 ...record,
                 completed: record.status === WORKSHEET_STATUS.DONE.value,
+                sku: record.product.sku,
                 expirationPeriod: record.product.expirationPeriod,
                 expirationDate: record.expirationDate
               }
@@ -673,6 +682,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
             .map(record => {
               return {
                 ...record,
+                sku: record.product.sku,
                 completed: record.status === WORKSHEET_STATUS.DONE.value
               }
             })

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

@@ -610,6 +610,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
                   unitCost
                   inventoryItemCount
                   purchaseOrderNo
+                  orderProductRemark
+                  arrivalNoticeRefNo
+                  arrivalNoticeNo
                 }
                 total
               }

package/client/pages/inventory/inventory-by-product.js

@@ -476,6 +476,7 @@ class InventoryByProduct extends localize(i18next)(PageView) {
           id: item.id,
           name: item.name,
           sku: item.sku,
+          brand: item.brand,
           description: item.description,
           packingType: item.packingType,
           bizplace: item.bizplace.name,

package/client/pages/order/release-order/release-order-detail.js

@@ -869,7 +869,11 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
 
     return {
       title: i18next.t('title.release_order_detail'),
-      actions
+      actions,
+      printable: {
+        accept: ['preview'],
+        content: this
+      }
     }
   }
 
@@ -1618,7 +1622,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     try {
       const response = await client.mutate({
         mutation: gql`
-          mutation generateReleaseGoodWorksheet($releaseGoodNo: String!, $currentStatus: String) {  
+          mutation generateReleaseGoodWorksheet($releaseGoodNo: String!, $currentStatus: String) {
             generateReleaseGoodWorksheet(releaseGoodNo: $releaseGoodNo, currentStatus: $currentStatus) {
               pickingWorksheet {
                 name

package/client/pages/order/return-order/return-order-list.js

@@ -136,6 +136,7 @@ class ReturnOrderList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'name',
           header: i18next.t('field.ro'),
+          imex: { header: i18next.t('field.ro'), key: 'name', width: 50, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -143,6 +144,7 @@ class ReturnOrderList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'refNo',
           header: i18next.t('field.ref_no'),
+          imex: { header: i18next.t('field.ref_no'), key: 'refNo', width: 50, type: 'string' },
           sortable: true,
           width: 150
         },
@@ -150,6 +152,7 @@ class ReturnOrderList extends localize(i18next)(PageView) {
           type: 'date',
           name: 'etaDate',
           header: i18next.t('field.eta'),
+          imex: { header: i18next.t('field.eta'), key: 'etaDate', width: 30, type: 'string' },
           sortable: true,
           width: 120
         },
@@ -157,6 +160,7 @@ class ReturnOrderList extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'ownTransport',
           header: i18next.t('field.own_transport'),
+          imex: { header: i18next.t('field.own_transport'), key: 'ownTransport', width: 50, type: 'string' },
           sortable: true,
           width: 60
         },
@@ -164,22 +168,33 @@ class ReturnOrderList extends localize(i18next)(PageView) {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
+          imex: { header: i18next.t('field.status'), key: 'status', width: 50, type: 'string' },
           sortable: true,
           width: 120
         },
+        {
+          type: 'object',
+          name: 'creator',
+          header: i18next.t('field.created_by'),
+          imex: { header: i18next.t('field.created_by'), key: 'creator.name', width: 50, type: 'string' },
+          sortable: true,
+          width: 200
+        },
         {
           type: 'datetime',
-          name: 'updatedAt',
-          header: i18next.t('field.updated_at'),
+          name: 'createdAt',
+          header: i18next.t('field.created_at'),
+          imex: { header: i18next.t('field.created_at'), key: 'createdAt', width: 30, type: 'date' },
           sortable: true,
           width: 160
         },
         {
-          type: 'object',
-          name: 'creator',
-          header: i18next.t('field.created_by'),
+          type: 'datetime',
+          name: 'updatedAt',
+          header: i18next.t('field.updated_at'),
+          imex: { header: i18next.t('field.updated_at'), key: 'updatedAt', width: 30, type: 'date' },
           sortable: true,
-          width: 200
+          width: 160
         }
       ]
     }
@@ -244,7 +259,30 @@ class ReturnOrderList extends localize(i18next)(PageView) {
   }
 
   _exportableData() {
-    return this.dataGrist.exportRecords()
+    let records = []
+    records = this.dataGrist.data.records
+
+    var headerSetting = this.dataGrist._config.columns
+      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+      .map(column => {
+        return column.imex
+      })
+
+    var data = records.map(item => {
+      return {
+        id: item.id,
+        ...this.dataGrist._config.columns
+          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+          .reduce((record, column) => {
+            record[column.imex.key] = column.imex.key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            return record
+          }, {})
+      }
+    })
+
+    return { header: headerSetting, data: data }
   }
 }
 

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

@@ -278,6 +278,22 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
           sortable: true,
           width: 150
         },
+        {
+          type: 'string',
+          name: 'palletQty',
+          header: i18next.t('field.total_pallet'),
+          imex: { header: i18next.t('field.total_pallet'), key: 'palletQty', width: 15, type: 'datetime' },
+          sortable: true,
+          width: 100
+        },
+        {
+          type: 'string',
+          name: 'deliveryAddress1',
+          header: i18next.t('field.delivery_address'),
+          imex: { header: i18next.t('field.delivery_address'), key: 'deliveryAddress1', width: 70, type: 'datetime' },
+          sortable: true,
+          width: 300
+        },
         {
           type: 'datetime',
           name: 'createdAt',
@@ -317,6 +333,8 @@ class DeliveryOrderList extends localize(i18next)(PageView) {
             items {
               id
               name
+              deliveryAddress1
+              palletQty
               bizplace {
                 id
                 name

package/client/pages/report/custom-elccl/elccl-delivery-order-summary.js

@@ -139,7 +139,7 @@ class ElcclDeliveryOrderSummary extends connect(store)(localize(i18next)(PageVie
           name: 'deliveryDate',
           header: i18next.t('field.date'),
           imex: { header: i18next.t('field.date'), key: 'deliveryDate', width: 20, type: 'string' },
-          width: 150
+          width: 100
         },
         {
           type: 'string',
@@ -154,20 +154,34 @@ class ElcclDeliveryOrderSummary extends connect(store)(localize(i18next)(PageVie
           name: 'name',
           header: i18next.t('field.delivery_order'),
           imex: { header: i18next.t('field.delivery_order'), key: 'name', width: 30, type: 'string' },
-          width: 300
+          width: 130
         },
         {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
           imex: { header: i18next.t('field.status'), key: 'status', width: 25, type: 'string' },
-          width: 150
+          width: 100
+        },
+        {
+          type: 'string',
+          name: 'deliveryAddress1',
+          header: i18next.t('field.delivery_address'),
+          imex: { header: i18next.t('field.delivery_address'), key: 'deliveryAddress1', width: 70, type: 'string' },
+          width: 300
+        },
+        {
+          type: 'string',
+          name: 'palletQty',
+          header: i18next.t('field.total_pallet'),
+          imex: { header: i18next.t('field.total_pallet'), key: 'palletQty', width: 15, type: 'string' },
+          width: 100
         },
         {
           type: 'float',
           name: 'remark',
           header: i18next.t('field.remark'),
-          imex: { header: i18next.t('field.remark'), key: 'remark', width: 150, type: 'string' },
+          imex: { header: i18next.t('field.remark'), key: 'remark', width: 70, type: 'string' },
           width: 500
         }
       ]
@@ -177,7 +191,6 @@ class ElcclDeliveryOrderSummary extends connect(store)(localize(i18next)(PageVie
   async pageInitialized() {
     this._products = []
     this._partners = [...(await this._fetchPartners())]
-
     this._searchFields = this.searchFields
     this._config = this.gristConfig
   }
@@ -256,6 +269,8 @@ class ElcclDeliveryOrderSummary extends connect(store)(localize(i18next)(PageVie
                 remark
               }
               remark
+              palletQty
+              deliveryAddress1
               deliveryDate
               createdAt
             }
@@ -281,7 +296,6 @@ class ElcclDeliveryOrderSummary extends connect(store)(localize(i18next)(PageVie
                 product_batch: itm.inventory.batchId,
                 remark: itm.remark,
                 inventory_remark: itm.inventory.remark,
-                cross_docking: itm.crossDocking,
                 pallet:
                   itm.inventory?.reusablePallet && itm.inventory?.reusablePallet?.name
                     ? itm.inventory.reusablePallet.name

package/client/pages/report/outbound-order-details-report.js

@@ -3,27 +3,13 @@ import '@things-factory/grist-ui'
 import '../inventory/inventory-by-product-detail'
 
 import gql from 'graphql-tag'
-import {
-  css,
-  html
-} from 'lit-element'
+import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin'
 
 import { getCodeByName } from '@things-factory/code-base'
-import {
-  i18next,
-  localize
-} from '@things-factory/i18n-base'
-import {
-  client,
-  gqlContext,
-  PageView,
-  store
-} from '@things-factory/shell'
-import {
-  flattenObject,
-  isMobileDevice
-} from '@things-factory/utils'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client, gqlContext, PageView, store } from '@things-factory/shell'
+import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
 class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -314,6 +300,12 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         header: i18next.t('field.status'),
         width: 120
       },
+      {
+        type: 'string',
+        name: 'orderCreatedBy',
+        header: i18next.t('field.order_created_by'),
+        width: 170
+      },
       {
         type: 'datetime',
         name: 'orderCreatedAt',
@@ -607,6 +599,7 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         'containerNo',
         'containerSize',
         'palletQty',
+        'orderCreatedBy',
         'orderCreatedAt',
         'pickingStart',
         'pickingComplete',
@@ -737,6 +730,7 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
                 driverName
                 acceptedBy
                 acceptedAt
+                orderCreatedBy
                 orderCreatedAt
                 pickingStart
                 pickingComplete
@@ -912,6 +906,7 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         { header: i18next.t('field.driver_name'), key: 'driverName', width: 30, type: 'string' },
         { header: i18next.t('field.pallet_qty'), key: 'palletQty', width: 30, type: 'string' },
         { header: i18next.t('field.status'), key: 'status', width: 30, type: 'string' },
+        { header: i18next.t('field.order_created_by'), key: 'orderCreatedBy', width: 30, type: 'string' },
         { header: i18next.t('field.order_created_at'), key: 'orderCreatedAt', width: 30, type: 'string' },
         { header: i18next.t('field.accepted_by'), key: 'acceptedBy', width: 30, type: 'string' },
         { header: i18next.t('field.accepted_at'), key: 'acceptedAt', width: 30, type: 'string' },

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

@@ -553,7 +553,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                     auxValue2: product.auxValue2 || '',
                     bizplaceId: releaseGood.bizplace.id,
                     bizplaceName: releaseGood.bizplace.name,
-                    printQty: oi.releaseQty || 0
+                    printQty: 1
                   }
 
                   if (product.productDetails && product.productDetails.length) {

package/config/config.development.js

@@ -1,5 +1,36 @@
 module.exports = {
+  licenseKey: '5eyJQcm9kdWN0IjoiT3BlcmF0by10b29scyIsIkxpY2Vuc2UgVHlwZSI6IkV2YWx1YXRpb24iLCJQdXJjaGFzZSBEYXRlIjoiMjAyMi4wOS4wMiIsIkV4cGlyYXRpb24gRGF0ZSI6IjIwMjIuMDkuMzAiLCJIb3N0IEFkZHJlc3MiOiIxOTIuMTY4LjEuMjE5IiwiTWF4IFRhcmdldCBDb3VudCI6IjIwIiwiTWF4IERvbWFpbiBDb3VudCI6IjEiLCJQZXJtaXNzaW9ucyBGb3IgQm9hcmQgVXNhZ2UiOiJWaWV3ZXIsIE1vZGVsbGVyIiwiUGVybWlzc2lvbnMgRm9yIFRhaWxvciBUb29sIjoiUnVubmVyLCBTdHVkaW8iLCJLZXkiOiJBeGdxR0F4Tk13b0NLUm94S3dFQVNSZ3VJRDRGREM0NURWazdNUUFFTHhJUkVDWlRJd29XUWc4dkhnd01FaGNHREJvRUZob1dKaFlqQ2d3RUR3b0VPQlk0R2c4QUJEUUlLQ1lsTVFnSkdEd0hHaTRSRlRNcUhBa3FGZ3NyQVFCSkh3a2hTeHNJUUE0Z016Z1dGVHNmRWlzQ0dSUUpHZ3BMRHdraUJ3MFNPQVlRR1NJeEdoWW1GaU1KR1VrYkNTc01JaVFCRkJWTUp3Z29KaVVwQ2k0VUFoOGNMZ0lWS0NJTEFRVWJDQ1VBSmxnZERSbEhHdzBiTlNOS0p4UVZQQ01zS3dBSVNSZ0tIQVlmR3lJQkRFMElDd0lWSmgwU05obFZDQjRaQ0I4Skt3NG1TUXNJRGlraUxTc2tIVllLQ2h4Q0JnZ3lKUTBURmhRQ0ZSOHJLd0VxU1NBZUdDTU9DU29MRGpnZUdRRXBMeFFSRUMwbkNpNFpPUmNNT3dFTVRSc0dEQ29hQnhvM0dra2RDQmdwQndvZU5oVTRJeElaRnpjVkdpSVpVd29hREVzZkNBTUFHaWNXR0FBcEJCa1JOd05XQ2cwVk9SWU1PeEFtSmhvSEFTa1FGUkVBTFRVS0x5bEZId2tGQUJwT0ZoUUFQeElZS0NZdE5BZ1pERDBIQ2p3QUNURXZKQT09In0=91827',
+  port: 4000,
+  protocol: 'http',
   domainType: 'warehouse',
-  useVirtualHostBasedDomain: true,
-  accessTokenCookieKey: 'access_token.wms'
-}
+  useVirtualHostBasedDomain: false,
+  subdomainOffset: 2,
+  accessTokenCookieKey: 'access_token.wms',
+  logger: {
+    file: {
+      filename: 'logs/application-%DATE%.log',
+      datePattern: 'YYYY-MM-DD-HH',
+      zippedArchive: false,
+      maxSize: '20m',
+      maxFiles: '2d',
+      level: 'info'
+    },
+    console: {
+      level: 'silly'
+    }
+  },
+  ormconfig4Tx: null,
+  ormconfig: {
+    name: "default",
+    type: "postgres",
+    host: "localhost",
+    port: 5433,
+    database: "wmsdev",
+    username: "postgres",
+    password: "hatioLAB1008",
+    synchronize: true,
+    logging: false,
+    connectTimeoutMS: 30000,
+    extra: { poolSize: 30 },
+  }
+}

package/config/config.production.js

@@ -1,4 +1,5 @@
 module.exports = {
+  licenseKey: '5eyJQcm9kdWN0IjoiT3BlcmF0by10b29scyIsIkxpY2Vuc2UgVHlwZSI6IkV2YWx1YXRpb24iLCJQdXJjaGFzZSBEYXRlIjoiMjAyMi4wOS4wMiIsIkV4cGlyYXRpb24gRGF0ZSI6IjIwMjIuMDkuMzAiLCJIb3N0IEFkZHJlc3MiOiIxOTIuMTY4LjEuMjE5IiwiTWF4IFRhcmdldCBDb3VudCI6IjIwIiwiTWF4IERvbWFpbiBDb3VudCI6IjEiLCJQZXJtaXNzaW9ucyBGb3IgQm9hcmQgVXNhZ2UiOiJWaWV3ZXIsIE1vZGVsbGVyIiwiUGVybWlzc2lvbnMgRm9yIFRhaWxvciBUb29sIjoiUnVubmVyLCBTdHVkaW8iLCJLZXkiOiJBeGdxR0F4Tk13b0NLUm94S3dFQVNSZ3VJRDRGREM0NURWazdNUUFFTHhJUkVDWlRJd29XUWc4dkhnd01FaGNHREJvRUZob1dKaFlqQ2d3RUR3b0VPQlk0R2c4QUJEUUlLQ1lsTVFnSkdEd0hHaTRSRlRNcUhBa3FGZ3NyQVFCSkh3a2hTeHNJUUE0Z016Z1dGVHNmRWlzQ0dSUUpHZ3BMRHdraUJ3MFNPQVlRR1NJeEdoWW1GaU1KR1VrYkNTc01JaVFCRkJWTUp3Z29KaVVwQ2k0VUFoOGNMZ0lWS0NJTEFRVWJDQ1VBSmxnZERSbEhHdzBiTlNOS0p4UVZQQ01zS3dBSVNSZ0tIQVlmR3lJQkRFMElDd0lWSmgwU05obFZDQjRaQ0I4Skt3NG1TUXNJRGlraUxTc2tIVllLQ2h4Q0JnZ3lKUTBURmhRQ0ZSOHJLd0VxU1NBZUdDTU9DU29MRGpnZUdRRXBMeFFSRUMwbkNpNFpPUmNNT3dFTVRSc0dEQ29hQnhvM0dra2RDQmdwQndvZU5oVTRJeElaRnpjVkdpSVpVd29hREVzZkNBTUFHaWNXR0FBcEJCa1JOd05XQ2cwVk9SWU1PeEFtSmhvSEFTa1FGUkVBTFRVS0x5bEZId2tGQUJwT0ZoUUFQeElZS0NZdE5BZ1pERDBIQ2p3QUNURXZKQT09In0=91827',
   protocol: 'https',
   domainType: 'warehouse',
   useVirtualHostBasedDomain: true,

package/dist-server/graphql/resolvers/other/add-release-good-products.js

@@ -61,9 +61,9 @@ exports.addReleaseGoodProducts = {
                                 curOrderInv = Object.assign(Object.assign({}, existingOrderInv), { releaseQty: curOrderInv.releaseQty, releaseUomValue: curOrderInv.releaseUomValue, lockedUomValue: curOrderInv.lockedUomValue, status: sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED });
                                 let existingWorksheetDetail = await tx.getRepository(worksheet_base_1.WorksheetDetail).findOne({
                                     where: {
-                                        worksheet: pickingWorksheet,
+                                        worksheet: { id: pickingWorksheet.id },
                                         type: worksheet_base_1.WORKSHEET_TYPE.PICKING,
-                                        targetInventory: curOrderInv
+                                        targetInventory: { id: curOrderInv.id }
                                     }
                                 });
                                 existingWorksheetDetail = Object.assign(Object.assign({}, existingWorksheetDetail), { status: worksheet_base_1.WORKSHEET_STATUS.CANCELLED });
@@ -75,7 +75,7 @@ exports.addReleaseGoodProducts = {
                             curOrderInv = Object.assign(Object.assign({}, existingOrderInv), { releaseQty: curOrderInv.releaseQty, releaseUomValue: curOrderInv.releaseUomValue, lockedUomValue: curOrderInv.lockedUomValue, status: sales_base_1.ORDER_INVENTORY_STATUS.PICKED });
                             let existingWorksheetDetail = await tx.getRepository(worksheet_base_1.WorksheetDetail).findOne({
                                 where: {
-                                    targetInventory: curOrderInv
+                                    targetInventory: { id: curOrderInv.id }
                                 }
                             });
                             existingWorksheetDetail = Object.assign(Object.assign({}, existingWorksheetDetail), { status: worksheet_base_1.WORKSHEET_STATUS.PICKED });
@@ -94,9 +94,9 @@ exports.addReleaseGoodProducts = {
                                 curOrderInv = Object.assign(Object.assign({}, existingOrderInv), { releaseQty: curOrderInv.releaseQty, releaseUomValue: curOrderInv.releaseUomValue, status: sales_base_1.ORDER_INVENTORY_STATUS.PICKING });
                                 let existingWorksheetDetail = await tx.getRepository(worksheet_base_1.WorksheetDetail).findOne({
                                     where: {
-                                        worksheet: pickingWorksheet,
+                                        worksheet: { id: pickingWorksheet.id },
                                         type: worksheet_base_1.WORKSHEET_TYPE.PICKING,
-                                        targetInventory: existingOrderInv
+                                        targetInventory: { id: existingOrderInv.id }
                                     }
                                 });
                                 if (existingWorksheetDetail) {
@@ -155,11 +155,11 @@ exports.addReleaseGoodProducts = {
                         // check for existing released OrderInventory specifying product, batchId, packingType, and inventory
                         existingOrderInv = await tx.getRepository(sales_base_1.OrderInventory).findOne({
                             where: {
-                                releaseGood,
-                                product: newOrderInv.product,
+                                releaseGood: { id: releaseGood.id },
+                                product: { id: newOrderInv.product.id },
                                 batchId: newOrderInv.batchId,
                                 packingType: newOrderInv.packingType,
-                                inventory: foundInv
+                                inventory: { id: foundInv.id }
                             }
                         });
                         foundInv.lockedQty = Number(foundInv.lockedQty) + newOrderInv.releaseQty;
@@ -176,8 +176,8 @@ exports.addReleaseGoodProducts = {
                         // check for existing released OrderInventory specifying product, batchId and packingType
                         existingOrderInv = await tx.getRepository(sales_base_1.OrderInventory).findOne({
                             where: {
-                                releaseGood,
-                                product: newOrderInv.product,
+                                releaseGood: { id: releaseGood.id },
+                                product: { id: newOrderInv.product.id },
                                 batchId: newOrderInv.batchId,
                                 packingType: newOrderInv.packingType
                             }
@@ -196,9 +196,9 @@ exports.addReleaseGoodProducts = {
                                 : existingOrderInv.status });
                         let existingWorksheetDetail = await tx.getRepository(worksheet_base_1.WorksheetDetail).findOne({
                             where: {
-                                worksheet: pickingWorksheet,
+                                worksheet: { id: pickingWorksheet.id },
                                 type: worksheet_base_1.WORKSHEET_TYPE.PICKING,
-                                targetInventory: existingOrderInv
+                                targetInventory: { id: existingOrderInv.id }
                             }
                         });
                         if (existingWorksheetDetail) {
@@ -251,7 +251,7 @@ exports.addReleaseGoodProducts = {
             // Update Order Product Release Qty
             let rgOrderProducts = await tx
                 .getRepository(sales_base_1.OrderProduct)
-                .find({ where: { domain: { id: domain.id }, releaseGood } });
+                .find({ where: { domain: { id: domain.id }, releaseGood: { id: releaseGood.id } } });
             await Promise.all(rgOrderProducts.map(async (op) => {
                 const orderInventories = await tx.getRepository(sales_base_1.OrderInventory).find({
                     where: {