@things-factory/sales-base 5.0.14 → 5.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "5.0.14",
+  "version": "5.0.15",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,17 +24,17 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/attachment-base": "^5.0.14",
-    "@things-factory/auth-base": "^5.0.14",
-    "@things-factory/biz-base": "^5.0.14",
-    "@things-factory/code-base": "^5.0.14",
-    "@things-factory/integration-sftp": "^5.0.14",
-    "@things-factory/notification": "^5.0.14",
-    "@things-factory/product-base": "^5.0.14",
-    "@things-factory/setting-base": "^5.0.14",
-    "@things-factory/shell": "^5.0.14",
-    "@things-factory/transport-base": "^5.0.14",
-    "@things-factory/warehouse-base": "^5.0.14"
+    "@things-factory/attachment-base": "^5.0.15",
+    "@things-factory/auth-base": "^5.0.15",
+    "@things-factory/biz-base": "^5.0.15",
+    "@things-factory/code-base": "^5.0.15",
+    "@things-factory/integration-sftp": "^5.0.15",
+    "@things-factory/notification": "^5.0.15",
+    "@things-factory/product-base": "^5.0.15",
+    "@things-factory/setting-base": "^5.0.15",
+    "@things-factory/shell": "^5.0.15",
+    "@things-factory/transport-base": "^5.0.15",
+    "@things-factory/warehouse-base": "^5.0.15"
   },
-  "gitHead": "9ceaa39746fcf42953e429fab2001353cd821ded"
+  "gitHead": "87b738da786f92983d009d72548918be93e4ae2c"
 }

package/server/service/order-inventory/order-inventory-query.ts

@@ -678,50 +678,35 @@ export class OrderInventoryQuery {
     @Args() params: ListParam,
     @Arg('productTypes', type => [String], { nullable: true }) productTypes?: string[]
   ): Promise<OrderInventoryList> {
-    const { domain }: { domain: Domain } = context.state
-    let filters = params.filters
-
-    const rgParam = filters.find(
-      (filter: filterInterface) => filter.name === 'releaseGoodNo' && filter.operator === 'eq'
-    )
-
-    if (rgParam && !filters.some(filter => filter.name === 'releaseGood')) {
-      if (!rgParam.value) filters = params.filters.filter(filter => filter.name !== 'releaseGoodNo')
-      else {
-        const foundReleaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
-          where: {
-            name: rgParam.value,
-            domain
-          }
-        })
-
-        if (foundReleaseGood) {
-          filters = params.filters.filter(filter => filter.name !== 'releaseGoodNo')
-          params.filters = [...filters, { name: 'releaseGood', operator: 'eq', value: foundReleaseGood.id }]
-        } else throw new Error(`Cannot find result for order "${rgParam.value}"`)
-      }
-    }
+    const { domain } = context.state
 
     const qb = getQueryBuilderFromListParams({
       repository: getRepository(OrderInventory),
       params,
       domain,
       alias: 'oi',
-      searchables: ['bizplace', 'product']
+      searchables: ['bizplace', 'product', 'releaseGood', 'lot'],
+      filtersMap: {
+        lot: {
+          /* 조인 테이블의 필터대상 컬럼이름을 디폴트('name')에서 다른 컬럼('sku')로 변경 */
+          relationColumn: 'inventory',
+          columnName: 'palletId'
+        }
+      }
     })
 
-    const [items, total] = await qb
-      .leftJoinAndSelect('oi.releaseGood', 'rg')
+    qb.leftJoinAndSelect('oi.releaseGood', 'rg')
       .leftJoinAndSelect('rg.deliverTo', 'deliverTo')
       .leftJoinAndSelect('deliverTo.bizplace', 'deliverToBizplace')
-      .leftJoinAndSelect('oi.product', 'p')
       .leftJoinAndSelect('oi.inventory', 'i')
+      .leftJoinAndSelect('oi.product', 'p')
       .leftJoinAndSelect('oi.bizplace', 'b')
       .andWhere('oi.type = :oiType', { oiType: 'RELEASE_OF_GOODS' })
       .andWhere('p.type IN (:...productTypes)', {
         productTypes: productTypes
       })
-      .getManyAndCount()
+
+    const [items, total] = await qb.getManyAndCount()
 
     return { items, total }
   }

package/dist-server/utils/datetime-util.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DateTimeConverter = exports.DateGenerator = void 0;
-class DateGenerator {
-    static generateDate() {
-        const today = new Date();
-        const year = today.getFullYear();
-        const month = today.getMonth();
-        const day = today.getDate();
-        const yy = String(year).substr(String(year).length - 2);
-        const mm = String(month + 1).padStart(2, '0');
-        const dd = String(day).padStart(2, '0');
-        return yy + mm + dd;
-    }
-}
-exports.DateGenerator = DateGenerator;
-class DateTimeConverter {
-    static date(dateTime) {
-        let unloadDate = '';
-        if (dateTime) {
-            const unloadDateTime = new Date(dateTime);
-            var year = unloadDateTime.getFullYear();
-            var month = (1 + unloadDateTime.getMonth()).toString();
-            month = month.length > 1 ? month : '0' + month;
-            var day = unloadDateTime.getDate().toString();
-            day = day.length > 1 ? day : '0' + day;
-            unloadDate = day + '-' + month + '-' + year;
-        }
-        return unloadDate;
-    }
-    static datetime(dateTime, timezone) {
-        let unloadDate = '';
-        if (dateTime) {
-            const datetime = Number(dateTime);
-            const timezoneOffset = timezone * 60000;
-            const newUnloadDate = new Date(datetime - timezoneOffset).toISOString().slice(0, -1);
-            var dateTimeParts = newUnloadDate.split('T');
-            //handle date parts
-            var dateParts = dateTimeParts[0].split('-');
-            var newDate = DateTimeConverter.date(dateParts);
-            //handle time part
-            var timeParts = dateTimeParts[1].slice(0, -7);
-            unloadDate = newDate + ' ' + timeParts;
-        }
-        return unloadDate;
-    }
-}
-exports.DateTimeConverter = DateTimeConverter;
-//# sourceMappingURL=datetime-util.js.map

package/dist-server/utils/datetime-util.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"datetime-util.js","sourceRoot":"","sources":["../../server/utils/datetime-util.ts"],"names":[],"mappings":";;;AAAA,MAAa,aAAa;IACxB,MAAM,CAAC,YAAY;QACjB,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAA;QACxB,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,EAAE,CAAA;QAChC,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,EAAE,CAAA;QAE3B,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACvD,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;QAC7C,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;QAEvC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;IACrB,CAAC;CACF;AAbD,sCAaC;AAED,MAAa,iBAAiB;IAC5B,MAAM,CAAC,IAAI,CAAC,QAAQ;QAClB,IAAI,UAAU,GAAG,EAAE,CAAA;QACnB,IAAI,QAAQ,EAAE;YACZ,MAAM,cAAc,GAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC/C,IAAI,IAAI,GAAG,cAAc,CAAC,WAAW,EAAE,CAAA;YAEvC,IAAI,KAAK,GAAG,CAAC,CAAC,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;YACtD,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAA;YAE9C,IAAI,GAAG,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAA;YAC7C,GAAG,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAA;YAEtC,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,KAAK,GAAG,GAAG,GAAG,IAAI,CAAA;SAC5C;QACD,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ;QAChC,IAAI,UAAU,GAAG,EAAE,CAAA;QACnB,IAAI,QAAQ,EAAE;YACZ,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;YACjC,MAAM,cAAc,GAAG,QAAQ,GAAG,KAAK,CAAA;YACvC,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YAEpF,IAAI,aAAa,GAAQ,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAEjD,mBAAmB;YACnB,IAAI,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC3C,IAAI,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAE/C,kBAAkB;YAClB,IAAI,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YAE7C,UAAU,GAAG,OAAO,GAAG,GAAG,GAAG,SAAS,CAAA;SACvC;QACD,OAAO,UAAU,CAAA;IACnB,CAAC;CACF;AAtCD,8CAsCC","sourcesContent":["export class DateGenerator {\n  static generateDate() {\n    const today = new Date()\n    const year = today.getFullYear()\n    const month = today.getMonth()\n    const day = today.getDate()\n\n    const yy = String(year).substr(String(year).length - 2)\n    const mm = String(month + 1).padStart(2, '0')\n    const dd = String(day).padStart(2, '0')\n\n    return yy + mm + dd\n  }\n}\n\nexport class DateTimeConverter {\n  static date(dateTime) {\n    let unloadDate = ''\n    if (dateTime) {\n      const unloadDateTime: Date = new Date(dateTime)\n      var year = unloadDateTime.getFullYear()\n\n      var month = (1 + unloadDateTime.getMonth()).toString()\n      month = month.length > 1 ? month : '0' + month\n\n      var day = unloadDateTime.getDate().toString()\n      day = day.length > 1 ? day : '0' + day\n\n      unloadDate = day + '-' + month + '-' + year\n    }\n    return unloadDate\n  }\n\n  static datetime(dateTime, timezone) {\n    let unloadDate = ''\n    if (dateTime) {\n      const datetime = Number(dateTime)\n      const timezoneOffset = timezone * 60000\n      const newUnloadDate = new Date(datetime - timezoneOffset).toISOString().slice(0, -1)\n\n      var dateTimeParts: any = newUnloadDate.split('T')\n\n      //handle date parts\n      var dateParts = dateTimeParts[0].split('-')\n      var newDate = DateTimeConverter.date(dateParts)\n\n      //handle time part\n      var timeParts = dateTimeParts[1].slice(0, -7)\n\n      unloadDate = newDate + ' ' + timeParts\n    }\n    return unloadDate\n  }\n}\n"]}