@things-factory/sales-base 3.7.2 → 3.7.7

package/server/graphql/types/order-reverse-kitting/index.ts

@@ -3,7 +3,12 @@ import { OrderReverseKitting } from './order-reverse-kitting'
 import { OrderReverseKittingList } from './order-reverse-kitting-list'
 import { OrderReverseKittingPatch } from './order-reverse-kitting-patch'
 
-export const Mutation = ``
+export const Mutation = `
+  updateOrderReverseKitting (
+    id: String!
+    patch: OrderReverseKittingPatch!
+  ): OrderReverseKitting @transaction
+`
 
 export const Query = `
   orderReverseKittings(filters: [Filter], pagination: Pagination, sortings: [Sorting]): OrderReverseKittingList

package/server/graphql/types/order-reverse-kitting/new-order-reverse-kitting.ts

@@ -21,5 +21,6 @@ export const NewOrderReverseKitting = gql`
     remark: String
     description: String
     status: String
+    issue: String
   }
 `

package/server/graphql/types/order-reverse-kitting/order-reverse-kitting-patch.ts

@@ -21,6 +21,7 @@ export const OrderReverseKittingPatch = gql`
     remark: String
     description: String
     status: String
+    issue: String
     cuFlag: String
   }
 `

package/server/graphql/types/order-reverse-kitting/order-reverse-kitting.ts

@@ -23,6 +23,7 @@ export const OrderReverseKitting = gql`
     remark: String
     description: String
     status: String
+    issue: String
     createdAt: String
     updatedAt: String
     creator: User

package/server/graphql/types/release-good/index.ts

@@ -36,6 +36,11 @@ export const Mutation = /* GraphQL */ `
     patch: ReleaseGoodPatch!
   ): ReleaseGood @privilege(category: "order_warehouse", privilege: "mutation") @transaction
 
+  updateReleaseGoodDetails (
+    releaseGood: ReleaseGoodPatch!,
+    shippingOrder: ShippingOrderPatch
+  ): ReleaseGood @privilege(category: "order", privilege: "mutation") @transaction
+
   addReleaseGood (
     releaseGood: NewReleaseGood
     shippingOrder: ShippingOrderPatch

package/server/graphql/types/release-good/inventory-infos.ts

@@ -13,6 +13,7 @@ export const InventoryInfos = gql`
     packingType: String
     packingSize: Float
     qty: Int
+    lockedQty: Int
     weight: Float
     releaseQty: Float
     releaseWeight: Float
@@ -21,6 +22,7 @@ export const InventoryInfos = gql`
     status: String
     releaseUomValue: Float
     uomValue: Float
+    lockedUomValue: Float
     uom: String
     returnQty: Float
     returnUomValue: Float

package/server/graphql/types/release-good/release-good-detail.ts

@@ -21,6 +21,7 @@ export const ReleaseGoodDetail = gql`
     crossDocking: Boolean
     arrivalNotice: ArrivalNotice
     truckNo: String
+    dispatchmentStatus: String
     marketplaceOrderStatus: String
     billingAddress: String
     deliveryAddress1: String

package/server/graphql/types/release-good/release-good-patch.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag'
 
 export const ReleaseGoodPatch = gql`
   input ReleaseGoodPatch {
+    id: String
     name: String
     releaseDate: String
     releaseDateTime: String

package/server/graphql/types/release-good/release-good.ts

@@ -7,6 +7,8 @@ export const ReleaseGood = gql`
     type: String
     domain: Domain
     bizplace: Bizplace
+    manifest: Manifest
+    dispatchmentStatus: String
     releaseDate: String
     releaseDateTime: String
     collectionOrderNo: String

package/server/graphql/types/release-good/shipping-order-info.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag'
 
 export const ShippingOrderInfo = gql`
   type ShippingOrderInfo {
+    id: String
     containerNo: String
     containerLeavingDate: String
     containerArrivalDate: String

package/server/graphql/types/reverse-kitting-order/index.ts

@@ -32,6 +32,11 @@ export const Mutation = `
   completeReverseKittingOrder (
     name: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
+  undoReverseKittingInventory (
+    orderReverseKittingName: String!
+    palletId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 `
 
 export const Query = `
@@ -39,8 +44,10 @@ export const Query = `
   reverseKittingOrder(name: String!): ReverseKittingOrder
   executingReverseKittingOrder(name: String!): ReverseKittingOrder
   reverseKittingInventories (
-    orderReverseKittingName: String!
+    orderReverseKittingName: String!,
+    productDetailId: String
   ): [Inventory]
+  generateReverseKittingPalletId(targets: [PalletInfo], type: String!): [InventoryDetail] @transaction
 `
 
 export const Types = [ReverseKittingOrder, NewReverseKittingOrder, ReverseKittingOrderPatch, ReverseKittingOrderList]

package/server/graphql/types/shipping-order/shipping-order-patch.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag'
 
 export const ShippingOrderPatch = gql`
   input ShippingOrderPatch {
+    id: String
     name: String
     description: String
     shipName: String

package/server/utils/inventory-util.ts

@@ -81,6 +81,7 @@ export const InventoryUtil = {
               AND oi.product_id NOTNULL
               AND oi.packing_type NOTNULL
               AND oi.packing_size NOTNULL
+              AND oi.inventory_id IS NULL
             GROUP BY
               oi.batch_id,
               oi.batch_id_ref,
@@ -199,7 +200,7 @@ export const InventoryUtil = {
 
     let resultQb = await trxMgr.query(
       `
-      select joi.product_id as "productId", joi.batch_id as "batchId", joi.packing_type as "packingType", joi.release_qty as "releaseQty",
+      select joi.product_id as "productId", joi.batch_id as "batchId", joi.packing_type as "packingType", joi.uom as "uom", joi.release_qty as "releaseQty",
       sum(i.qty - coalesce(i.locked_qty,0)) - coalesce(
       (
         select sum(oi.release_qty) from order_inventories oi 
@@ -208,7 +209,7 @@ export const InventoryUtil = {
         and oi.product_id = joi.product_id
         and oi.batch_id = joi.batch_id
         and oi.packing_type = joi.packing_type
-        and oi.uom = i.uom
+        and oi.uom = joi.uom
         and oi.domain_id = $1
         and oi.bizplace_id = $2
       ),0) as "availableQty",
@@ -220,10 +221,10 @@ export const InventoryUtil = {
         and oi.product_id = joi.product_id
         and oi.batch_id = joi.batch_id
         and oi.packing_type = joi.packing_type
-        and oi.uom = i.uom
+        and oi.uom = joi.uom
         and oi.domain_id = $1
         and oi.bizplace_id = $2
-      ),0) as "availableUomValue", i.uom
+      ),0) as "availableUomValue"
       from json_populate_recordset(NULL::order_inventories,'${json_oi}') joi
       left join inventories i on joi.product_id = i.product_id 
       and joi.batch_id = i.batch_id
@@ -231,7 +232,7 @@ export const InventoryUtil = {
       and joi.uom = i.uom
       and i.domain_id = $1
       and i.bizplace_id = $2
-      group by joi.product_id, joi.batch_id, joi.packing_type, joi.release_qty, i.uom
+      group by joi.product_id, joi.batch_id, joi.packing_type, joi.release_qty, joi.uom
     `,
       [warehouseDomain.id, partnerBizplace.id]
     )
@@ -331,6 +332,10 @@ async function getConditions(
             whereClause += `AND LOWER("batchId") LIKE '${value.toLowerCase()}'`
             break
 
+          case 'batchIdRef':
+            whereClause += `AND LOWER("batchIdRef") LIKE '${value.toLowerCase()}'`
+            break
+
           case 'productName':
             const products: Product[] = await trxMgr.getRepository(Product).find({
               select: ['id'],
@@ -415,19 +420,19 @@ async function getConditions(
           case 'batch_product':
             productWhereClause += `
               AND (i.batch_id, p.id, i.packing_type) ${operator === 'in' ? 'IN' : 'NOT IN'} (${value
-              .map(
-                (v: { batchId: string; productId: string; packingType: string }) =>
-                  `('${v.batchId}', '${v.productId}', '${v.packingType}')`
-              )
-              .join()})
+                .map(
+                  (v: { batchId: string; productId: string; packingType: string }) =>
+                    `('${v.batchId}', '${v.productId}', '${v.packingType}')`
+                )
+                .join()})
             `
             break
 
           case 'batch_bundle':
             bundleWhereClause += `
               ${bundleWhereClause == '' ? 'WHERE' : 'AND'} pb.id ${operator === 'in' ? 'IN' : 'NOT IN'} (${value
-              .map((v: { productId: string }) => `('${v.productId}')`)
-              .join()})
+                .map((v: { productId: string }) => `('${v.productId}')`)
+                .join()})
             `
             break
         }

package/server/utils/order-no-generator.ts

@@ -8,51 +8,63 @@ export class OrderNoGenerator {
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static purchaseOrder() {
+  static collectionOrder() {
     const currentDate = new Date()
-    return `PO-${currentDate.getFullYear()}${
+    return `CO-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static jobSheet(domainName) {
+  static cycleCount() {
     const currentDate = new Date()
-    return `${domainName}-${currentDate.getFullYear()}${
+    return `CC-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static goodsReceiveNote() {
+  static deliveryOrder() {
     const currentDate = new Date()
-    return `GRN-${currentDate.getFullYear()}${
+    return `DO-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static cycleCount() {
+  static goodsReceiveNote() {
     const currentDate = new Date()
-    return `CC-${currentDate.getFullYear()}${
+    return `GRN-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static stockTake() {
+  static jobSheet(domainName) {
     const currentDate = new Date()
-    return `ST-${currentDate.getFullYear()}${
+    return `${domainName}-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static shippingOrder() {
+  static manifest() {
     const currentDate = new Date()
-    return `SO-${currentDate.getFullYear()}${
+    return `LM-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static returnOrder() {
+  static orderInventory() {
+    return uuid()
+  }
+
+  static orderProduct() {
+    return `OP-${uuid()}`
+  }
+
+  static orderVas() {
+    return `OV-${uuid()}`
+  }
+
+  static purchaseOrder() {
     const currentDate = new Date()
-    return `RTO-${currentDate.getFullYear()}${
+    return `PO-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
@@ -64,46 +76,34 @@ export class OrderNoGenerator {
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static orderProduct() {
-    return `OP-${uuid()}`
+  static releaseVas() {
+    return uuid()
   }
 
-  static collectionOrder() {
+  static retailReplenishmentOrder() {
     const currentDate = new Date()
-    return `CO-${currentDate.getFullYear()}${
+    return `RR-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static deliveryOrder() {
+  static returnOrder() {
     const currentDate = new Date()
-    return `DO-${currentDate.getFullYear()}${
+    return `RTO-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static orderInventory() {
-    return uuid()
-  }
-
-  static releaseVas() {
-    return uuid()
-  }
-
-  static vasOrder() {
+  static shippingOrder() {
     const currentDate = new Date()
-    return `VO-${currentDate.getFullYear()}${
+    return `SO-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
-  static orderVas() {
-    return `OV-${uuid()}`
-  }
-
-  static retailReplenishmentOrder() {
+  static stockTake() {
     const currentDate = new Date()
-    return `RR-${currentDate.getFullYear()}${
+    return `ST-${currentDate.getFullYear()}${
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
@@ -114,4 +114,11 @@ export class OrderNoGenerator {
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
+
+  static vasOrder() {
+    const currentDate = new Date()
+    return `VO-${currentDate.getFullYear()}${
+      currentDate.getMonth() + 1
+    }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
+  }
 }