@things-factory/worksheet-base 4.3.247 → 4.3.249

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

@@ -198,11 +198,11 @@ async function isInventoryExpiring(inventory) {
         product = inventory.product;
     }
     const { expirationDate } = inventory;
-    const { isRequiredCheckExpiry, expirationPeriod } = product;
-    if (!isRequiredCheckExpiry || !expirationPeriod || expirationDate <= 0)
+    const { isRequiredCheckExpiry, minInboundShelfLife } = product;
+    if (!isRequiredCheckExpiry || !minInboundShelfLife || expirationDate <= 0)
         return false;
     let date = new Date();
-    const acceptBefore = new Date(date.setDate(date.getDate() + expirationPeriod));
+    const acceptBefore = new Date(date.setDate(date.getDate() + minInboundShelfLife));
     const expiryDate = new Date(expirationDate);
     return expiryDate < acceptBefore;
 }
@@ -220,11 +220,11 @@ async function isInventoryObsolete(inventories) {
             product = inventory.product;
         }
         let { expirationDate } = inventories[i];
-        const { shelfLife } = product;
-        if (shelfLife && expirationDate) {
+        const { minOutboundShelfLife } = product;
+        if (minOutboundShelfLife && expirationDate) {
             let date = new Date();
             expirationDate = new Date(expirationDate);
-            const releaseBefore = new Date(expirationDate.setDate(expirationDate.getDate() - shelfLife));
+            const releaseBefore = new Date(expirationDate.setDate(expirationDate.getDate() - minOutboundShelfLife));
             if (date > releaseBefore) {
                 obsoleteInventories.push(inventories[i].id);
             }

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

@@ -1 +1 @@
-{"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":";;;AAAA,qCAAkE;AAIlE,+DAAsD;AAEtD,mEAAsH;AAEtH;;;;;;;GAOG;AACI,KAAK,UAAU,oBAAoB,CACxC,MAAc,EACd,QAAkB,EAClB,OAAa,EACb,MAAsB;IAEtB,MAAM,OAAO,GAA0B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,0BAAS,CAAC,KAAI,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAA;IACnG,MAAM,YAAY,GAAyB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,yBAAQ,CAAC,KAAI,IAAA,uBAAa,EAAC,yBAAQ,CAAC,CAAA;IACrG,MAAM,iBAAiB,GAAW,MAAM,OAAO,CAAC,KAAK,CAAC;QACpD,MAAM;QACN,MAAM,EAAE,iCAAgB,CAAC,MAAM;QAC/B,QAAQ;KACT,CAAC,CAAA;IAEF,IAAI,CAAC,iBAAiB,IAAI,QAAQ,CAAC,MAAM,KAAK,gCAAe,CAAC,KAAK,EAAE;QACnE,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,iCAC7B,QAAQ,KACX,MAAM,EAAE,gCAAe,CAAC,KAAK,EAC7B,OAAO,IACP,CAAA;KACH;SAAM,IAAI,iBAAiB,IAAI,QAAQ,CAAC,MAAM,KAAK,gCAAe,CAAC,KAAK,EAAE;QACzE,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,iCAC7B,QAAQ,KACX,MAAM,EAAE,gCAAe,CAAC,QAAQ,EAChC,OAAO,IACP,CAAA;KACH;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC;AA7BD,oDA6BC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,MAAc,EACd,QAAkB,EAClB,QAAgB,EAChB,MAAsB;IAEtB,MAAM,OAAO,GAA0B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,0BAAS,CAAC,KAAI,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAA;IACnG,MAAM,mBAAmB,GAAW,MAAM,OAAO,CAAC,KAAK,CAAC;QACtD,MAAM;QACN,QAAQ;QACR,QAAQ;KACT,CAAC,CAAA;IAEF,OAAO,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACrC,CAAC;AAdD,wDAcC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,wBAAwB,CAC5C,MAAc,EACd,QAAkB,EAClB,QAAgB,EAChB,OAAe,EACf,OAAyB,EACzB,WAAmB,EACnB,MAAsB;;IAEtB,MAAM,WAAW,GAAwB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,sBAAO,CAAC,KAAI,IAAA,uBAAa,EAAC,sBAAO,CAAC,CAAA;IACjG,MAAM,OAAO,GAA0B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,0BAAS,CAAC,KAAI,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAA;IAEnG,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,YAAY,GAAY,MAAM,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAChE,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAA;QAC5E,OAAO,GAAG,YAAY,CAAA;KACvB;IAED,MAAM,GAAG,GAAc,MAAM,OAAO,CAAC,OAAO,CAAC;QAC3C,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE;QACrC,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC,CAAA;IAEF,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO;QAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,gCAAgC,OAAO,EAAE,EAAE,CAAA;IAErH,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,OAAK,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,0CAAE,EAAE,CAAA;QAClC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,+BAA+B,OAAO,CAAC,IAAI,EAAE,EAAE,CAAA;IAE9F,IAAI,WAAW,KAAK,GAAG,CAAC,WAAW;QACjC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,oCAAoC,WAAW,EAAE,EAAE,CAAA;IAElG,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAA;AAChC,CAAC;AAhCD,4DAgCC;AAED;;;;GAIG;AACI,KAAK,UAAU,qBAAqB,CACzC,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,EAAE,oBAAoB,EAAE,EACrH,MAAc,EACd,MAAqB;IAErB,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAC1E,EAAE,CAAC,kBAAkB,CAAC,aAAa,EAAE,MAAM,CAAC;SACzC,kBAAkB,CAAC,cAAc,EAAE,KAAK,CAAC;SACzC,SAAS,CAAC,yCAAyC,EAAE,MAAM,EAAE,uCAAuC,CAAC;SACrG,SAAS,CAAC,QAAQ,CAAC,EAAE,CACpB,QAAQ;SACL,MAAM,CAAC,+BAA+B,EAAE,YAAY,CAAC;SACrD,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC;SAC/B,KAAK,CAAC,kCAAkC,CAAC;SACzC,QAAQ,CAAC,2FAA2F,CAAC;SACrG,QAAQ,CAAC,yCAAyC,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CACrF;SACA,SAAS,CAAC,QAAQ,CAAC,EAAE,CACpB,QAAQ;SACL,MAAM,CAAC,qCAAqC,EAAE,iBAAiB,CAAC;SAChE,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC;SAC/B,KAAK,CAAC,kCAAkC,CAAC;SACzC,QAAQ,CAAC,2FAA2F,CAAC;SACrG,QAAQ,CAAC,yCAAyC,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CACrF;SACA,QAAQ,CAAC,+BAA+B,CAAC;SACzC,QAAQ,CAAC,0BAA0B,CAAC;SACpC,QAAQ,CAAC,qCAAqC,CAAC;SAC/C,QAAQ,CAAC,qCAAqC,CAAC;SAC/C,QAAQ,CAAC,oBAAoB,CAAC;SAC9B,QAAQ,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;SAC1D,QAAQ,CAAC,yCAAyC,EAAE;QACnD,aAAa,EAAE,CAAC,8BAAa,CAAC,UAAU,EAAE,8BAAa,CAAC,OAAO,CAAC;KACjE,CAAC;SACD,QAAQ,CAAC,0BAA0B,CAAC;SACpC,QAAQ,CACP,mKAAmK,CACpK;SACA,aAAa,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,SAAS;QACT,WAAW;QACX,WAAW;QACX,GAAG;KACJ,CAAC,CAAA;IAEJ,IAAI,OAAO,KAAK,EAAE,EAAE;QAClB,EAAE,CAAC,QAAQ,CAAC,6BAA6B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;KACxD;IAED,IAAI,UAAU,EAAE;QACd,EAAE,CAAC,QAAQ,CAAC,mCAAmC,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAA;KAC7E;IAED,IAAI,MAAM,GAAG,CAAC,CAAA;IAEd,EAAE,CAAC,UAAU,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;IAErC,QAAQ,eAAe,CAAC,WAAW,EAAE,EAAE;QACrC,KAAK,MAAM;YACT,EAAE,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;YACvC,IAAI,oBAAoB,EAAE;gBACxB,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;oBACtC,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;iBACvD;aACF;YACD,MAAK;QAEP,KAAK,MAAM;YACT,EAAE,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAA;YACxC,IAAI,oBAAoB,EAAE;gBACxB,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;oBACtC,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;iBACvD;aACF;YACD,MAAK;QAEP,KAAK,MAAM;YACT,EAAE,CAAC,OAAO,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAA;YAC5C,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;YAC1C,IAAI,oBAAoB,EAAE;gBACxB,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;oBACtC,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;iBACvD;aACF;YACD,MAAK;QAEP,KAAK,MAAM;YACT,EAAE,CAAC,OAAO,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;YAC7C,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;YAC1C,IAAI,oBAAoB,EAAE;gBACxB,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;oBACtC,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;iBACvD;aACF;YACD,MAAK;QAEP,KAAK,UAAU;YACb,IAAI,oBAAoB,EAAE;gBACxB,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;oBACtC,IAAI,MAAM,KAAK,CAAC,EAAE;wBAChB,EAAE,CAAC,OAAO,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;qBACpD;yBAAM;wBACL,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;qBACvD;oBACD,EAAE,MAAM,CAAA;iBACT;aACF;;gBAAM,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;YACzC,MAAK;KACR;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC,iBAAiB,EAAE,CAAA;IACtD,MAAM,KAAK,GAAG,QAAQ;SACnB,GAAG,CAAC,CAAC,GAAc,EAAE,GAAW,EAAE,EAAE;QACnC,MAAM,GAAG,GAAW,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,GAAG,IAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAC9C,MAAM,QAAQ,GAAW,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,IAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7D,MAAM,SAAS,GAAW,GAAG,CAAC,SAAS,IAAI,CAAC,CAAA;QAC5C,MAAM,cAAc,GAAW,GAAG,CAAC,cAAc,IAAI,CAAC,CAAA;QACtD,MAAM,UAAU,GAAW,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC7D,MAAM,eAAe,GAAW,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAEzE,uCACK,GAAG,KACN,GAAG,EAAE,GAAG,GAAG,SAAS,GAAG,UAAU,EACjC,QAAQ,EAAE,QAAQ,GAAG,cAAc,GAAG,eAAe,IACtD;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,GAAc,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAA;IAE1C,MAAM,KAAK,GAAW,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAA;IACzC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;AACzB,CAAC;AAnID,sDAmIC;AAEM,KAAK,UAAU,mBAAmB,CAAC,SAAoB;IAC5D,IAAI,CAAC,SAAS,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAC9D,IAAI,OAAO,GAAwB,SAAS,CAAC,OAAO,CAAA;IACpD,IAAI,CAAC,OAAO,EAAE;QACZ,SAAS,GAAG,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE;YAC/D,SAAS,EAAE,CAAC,SAAS,CAAC;SACvB,CAAC,CAAA;QACF,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;KAC5B;IAED,MAAM,EAAE,cAAc,EAAE,GAAG,SAAS,CAAA;IACpC,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAA;IAE9D,IAAI,CAAC,qBAAqB,IAAI,CAAC,mBAAmB,IAAI,cAAc,IAAI,CAAC;QAAE,OAAO,KAAK,CAAA;IAEvF,IAAI,IAAI,GAAS,IAAI,IAAI,EAAE,CAAA;IAC3B,MAAM,YAAY,GAAS,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,mBAAmB,CAAC,CAAC,CAAA;IACvF,MAAM,UAAU,GAAS,IAAI,IAAI,CAAC,cAAc,CAAC,CAAA;IAEjD,OAAO,UAAU,GAAG,YAAY,CAAA;AAClC,CAAC;AApBD,kDAoBC;AAEM,KAAK,UAAU,mBAAmB,CAAC,WAAwB;IAChE,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,IAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAExE,IAAI,mBAAmB,GAAG,EAAE,CAAA;IAE5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,IAAI,OAAO,GAAwB,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;QACzD,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,SAAS,GAAc,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;gBACnF,SAAS,EAAE,CAAC,SAAS,CAAC;aACvB,CAAC,CAAA;YACF,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;SAC5B;QAED,IAAI,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;QACvC,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAA;QAExC,IAAI,oBAAoB,IAAI,cAAc,EAAE;YAC1C,IAAI,IAAI,GAAS,IAAI,IAAI,EAAE,CAAA;YAC3B,cAAc,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAA;YAEzC,MAAM,aAAa,GAAS,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAA;YAE7G,IAAI,IAAI,GAAG,aAAa,EAAE;gBACxB,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;aAC5C;SACF;KACF;IAED,OAAO,mBAAmB,CAAA;AAC5B,CAAC;AA9BD,kDA8BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.247",
+  "version": "4.3.249",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,25 +23,25 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^4.3.237",
-    "@things-factory/biz-base": "^4.3.237",
+    "@things-factory/auth-base": "^4.3.248",
+    "@things-factory/biz-base": "^4.3.248",
     "@things-factory/document-template-base": "^4.3.237",
-    "@things-factory/id-rule-base": "^4.3.237",
-    "@things-factory/integration-accounting": "^4.3.239",
-    "@things-factory/integration-base": "^4.3.238",
-    "@things-factory/integration-lmd": "^4.3.239",
-    "@things-factory/integration-marketplace": "^4.3.239",
-    "@things-factory/integration-powrup": "^4.3.244",
-    "@things-factory/integration-sellercraft": "^4.3.239",
-    "@things-factory/integration-sftp": "^4.3.239",
-    "@things-factory/marketplace-base": "^4.3.239",
-    "@things-factory/notification": "^4.3.237",
-    "@things-factory/sales-base": "^4.3.246",
-    "@things-factory/setting-base": "^4.3.237",
+    "@things-factory/id-rule-base": "^4.3.248",
+    "@things-factory/integration-accounting": "^4.3.248",
+    "@things-factory/integration-base": "^4.3.248",
+    "@things-factory/integration-lmd": "^4.3.248",
+    "@things-factory/integration-marketplace": "^4.3.248",
+    "@things-factory/integration-powrup": "^4.3.248",
+    "@things-factory/integration-sellercraft": "^4.3.248",
+    "@things-factory/integration-sftp": "^4.3.248",
+    "@things-factory/marketplace-base": "^4.3.248",
+    "@things-factory/notification": "^4.3.248",
+    "@things-factory/sales-base": "^4.3.249",
+    "@things-factory/setting-base": "^4.3.248",
     "@things-factory/shell": "^4.3.237",
-    "@things-factory/transport-base": "^4.3.237",
-    "@things-factory/warehouse-base": "^4.3.246",
+    "@things-factory/transport-base": "^4.3.248",
+    "@things-factory/warehouse-base": "^4.3.249",
     "uuid": "^9.0.0"
   },
-  "gitHead": "1d7ff6cba871a66a8edceba43299d3c7517c62f3"
+  "gitHead": "ebd830d0d88c40b83c406c8f7f663c8fa345b2d5"
 }

package/server/controllers/inbound/putaway-worksheet-controller.ts

@@ -284,7 +284,8 @@ export class PutawayWorksheetController extends VasWorksheetController {
             LOCATION_TYPE.BIN,
             LOCATION_TYPE.QUARANTINE,
             LOCATION_TYPE.RESERVE,
-            LOCATION_TYPE.STORAGE
+            LOCATION_TYPE.STORAGE,
+            LOCATION_TYPE.DAMAGE
           ])
         },
         relations: ['warehouse']

package/server/controllers/outbound/picking-worksheet-controller.ts

@@ -7,6 +7,7 @@ import { generateId } from '@things-factory/id-rule-base'
 import { Powrup } from '@things-factory/integration-powrup'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { Product, ProductBarcode, ProductDetail } from '@things-factory/product-base'
+
 import {
   GenerateBatchPickInfo,
   ORDER_INVENTORY_STATUS,
@@ -20,6 +21,8 @@ import {
   OrderToteSeal,
   OrderVas,
   ReleaseGood,
+  InventoryUtil,
+  ORDER_TYPES,
   PowrupController
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
@@ -34,13 +37,14 @@ import {
   Location,
   LOCATION_TYPE,
   Tote,
-  TOTE_STATUS
+  TOTE_STATUS,
+  ProductDetailStock
 } from '@things-factory/warehouse-base'
 
 import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { SellercraftController } from '../../controllers'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { isInventoryObsolete, WorksheetNoGenerator } from '../../utils'
+import { isInventoryObsolete, WorksheetNoGenerator, inventoriesByStrategy } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class PickingWorksheetController extends VasWorksheetController {
@@ -113,6 +117,10 @@ export class PickingWorksheetController extends VasWorksheetController {
         })
       })
 
+      const worksheetPickingAssignment: Setting = await this.trxMgr.getRepository(Setting).findOne({
+        where: { domain: this.domain, category: 'id-rule', name: 'enable-worksheet-picking-activation-assignment' }
+      })
+
       const worksheetSetting: Setting = await this.trxMgr.getRepository(Setting).findOne({
         where: {
           domain: this.domain,
@@ -136,24 +144,42 @@ export class PickingWorksheetController extends VasWorksheetController {
       worksheet.updater = this.user
       worksheet = await this.trxMgr.getRepository(Worksheet).save(worksheet)
 
-      if (orderInventories.some((oi: OrderInventory) => oi.inventory?.id)) {
-        const hasInventoryOIs: OrderInventory[] = orderInventories.filter(
-          (orderInventory: OrderInventory) => orderInventory.inventory !== null
-        )
+      if (orderInventories?.length > 0) {
+        if (orderInventories.some((oi: OrderInventory) => oi.inventory?.id)) {
+          const hasInventoryOIs: OrderInventory[] = orderInventories.filter(
+            (orderInventory: OrderInventory) => orderInventory.inventory !== null
+          )
 
-        worksheet.worksheetDetails = await this.createWorksheetDetails(
-          worksheet,
-          WORKSHEET_TYPE.BATCH_PICKING,
-          hasInventoryOIs
-        )
-      }
+          worksheet.worksheetDetails = await this.createWorksheetDetails(
+            worksheet,
+            WORKSHEET_TYPE.BATCH_PICKING,
+            hasInventoryOIs
+          )
+        }
 
-      orderInventories.forEach((oi: OrderInventory) => {
-        oi.refWorksheetId = worksheet.id
-        oi.status = oi.inventory?.id ? ORDER_INVENTORY_STATUS.READY_TO_PICK : ORDER_INVENTORY_STATUS.PENDING_SPLIT
-        oi.updater = this.user
-      })
-      await this.updateOrderTargets(orderInventories)
+        orderInventories.forEach((oi: OrderInventory) => {
+          oi.refWorksheetId = worksheet.id
+          oi.status = oi.inventory?.id ? ORDER_INVENTORY_STATUS.READY_TO_PICK : ORDER_INVENTORY_STATUS.PENDING_SPLIT
+          oi.updater = this.user
+        })
+
+        await this.updateOrderTargets(orderInventories)
+      } else {
+        let orderProducts: OrderProduct[] = []
+        releaseGoods.map((releaseGood: ReleaseGood) => {
+          const foundOPs: OrderProduct[] = releaseGood.orderProducts
+          foundOPs.map((op: OrderProduct) => {
+            orderProducts.push(op)
+          })
+        })
+        if (worksheetPickingAssignment && orderProducts?.length > 0) {
+          worksheet.worksheetDetails = await this.createWorksheetDetails(
+            worksheet,
+            WORKSHEET_TYPE.BATCH_PICKING,
+            orderProducts
+          )
+        }
+      }
 
       releaseGoods = releaseGoods.map((releaseGood: ReleaseGood) => {
         return {
@@ -192,6 +218,9 @@ export class PickingWorksheetController extends VasWorksheetController {
       'releaseGood.domain',
       'releaseGood.lastMileDelivery',
       'releaseGood.bizplace.domain',
+      'releaseGood.orderProducts',
+      'releaseGood.orderProducts.productDetail',
+      'releaseGood.orderProducts.productDetail.product',
       'releaseGood.orderPackages',
       'releaseGood.orderPackages.orderPackageItems',
       'releaseGood.orderPackages.orderPackageItems.orderProduct',
@@ -206,17 +235,25 @@ export class PickingWorksheetController extends VasWorksheetController {
       'worksheetDetails.targetInventory.product'
     ])
 
-    const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails.filter(x => x.status == 'DEACTIVATED')
-    const targetInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => {
-      let targetInventory: OrderInventory = wsd.targetInventory
-      targetInventory.status = ORDER_INVENTORY_STATUS.PICKING
-      targetInventory.updater = this.user
+    let worksheetDetails: WorksheetDetail[]
+    let releaseGood: ReleaseGood = worksheet.releaseGood
 
-      return targetInventory
-    })
-    this.updateOrderTargets(targetInventories)
+    // assign inventory if unassigned
+    if (!releaseGood.assignedInventory) {
+      worksheetDetails = await this.assignInventoriesForUnassignedOrder(worksheet)
+      worksheet.worksheetDetails = worksheetDetails
+      releaseGood.assignedInventory = true
+    } else {
+      worksheetDetails = worksheet.worksheetDetails.filter(x => x.status == 'DEACTIVATED')
+      const targetInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => {
+        let targetInventory: OrderInventory = wsd.targetInventory
+        targetInventory.status = ORDER_INVENTORY_STATUS.PICKING
+        targetInventory.updater = this.user
 
-    let releaseGood: ReleaseGood = worksheet.releaseGood
+        return targetInventory
+      })
+      this.updateOrderTargets(targetInventories)
+    }
     releaseGood.status = ORDER_STATUS.PICKING
     releaseGood.updater = this.user
     this.updateRefOrder(releaseGood)
@@ -311,6 +348,11 @@ export class PickingWorksheetController extends VasWorksheetController {
   async activateBatchPicking(worksheetNo: string): Promise<Worksheet> {
     let worksheet: Worksheet = await this.findActivatableWorksheet(worksheetNo, WORKSHEET_TYPE.BATCH_PICKING, [
       'worksheetDetails',
+      'worksheetDetails.targetProduct',
+      'worksheetDetails.targetProduct.bizplace',
+      'worksheetDetails.targetProduct.product',
+      'worksheetDetails.targetProduct.productDetail',
+      'worksheetDetails.targetProduct.releaseGood',
       'worksheetDetails.targetInventory',
       'worksheetDetails.targetInventory.releaseGood',
       'worksheetDetails.targetInventory.releaseGood.domain',
@@ -321,15 +363,21 @@ export class PickingWorksheetController extends VasWorksheetController {
       'bizplace.company.domain'
     ])
 
-    const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails.filter(x => x.status == 'DEACTIVATED')
-    const targetInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => {
-      let targetInventory: OrderInventory = wsd.targetInventory
-      targetInventory.status = ORDER_INVENTORY_STATUS.PICKING
-      targetInventory.updater = this.user
+    let worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails.filter(x => x.status == 'DEACTIVATED')
 
-      return targetInventory
-    })
-    this.updateOrderTargets(targetInventories)
+    if (worksheet.worksheetDetails.find(wsd => wsd.targetProduct.releaseGood.assignedInventory == false)) {
+      worksheetDetails = await this.assignInventoriesForUnassignedMergedOrder(worksheet)
+      worksheet.worksheetDetails = worksheetDetails
+    } else {
+      const targetInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => {
+        let targetInventory: OrderInventory = wsd.targetInventory
+        targetInventory.status = ORDER_INVENTORY_STATUS.PICKING
+        targetInventory.updater = this.user
+
+        return targetInventory
+      })
+      this.updateOrderTargets(targetInventories)
+    }
 
     worksheet = await this.activateWorksheet(worksheet, worksheetDetails, [])
 
@@ -419,7 +467,8 @@ export class PickingWorksheetController extends VasWorksheetController {
           return {
             ...releaseGood,
             status: ORDER_STATUS.PICKING,
-            updater: this.user
+            updater: this.user,
+            assignedInventory: true
           }
         })
       )
@@ -1970,4 +2019,245 @@ export class PickingWorksheetController extends VasWorksheetController {
       })
     }
   }
+
+  async assignInventoriesForUnassignedOrder(worksheet: Worksheet): Promise<any> {
+    const releaseGood = worksheet.releaseGood
+    const orderProducts = releaseGood.orderProducts
+    let finalOrderInventories: OrderInventory[] = []
+    let newWorksheetDetails: WorksheetDetail[] = []
+    const inventoryAssignmentSetting: Setting = await this.trxMgr.getRepository(Setting).findOne({
+      where: { domain: this.domain, name: 'rule-for-inventory-assignment' }
+    })
+
+    for (let op of orderProducts) {
+      let locationSortingRules = []
+      if (inventoryAssignmentSetting) {
+        let locationSetting = JSON.parse(inventoryAssignmentSetting.value)
+        for (const key in locationSetting) {
+          locationSortingRules.push({ name: key, desc: locationSetting[key] == 'ASC' ? false : true })
+        }
+      }
+
+      let assignedOrderInventories: OrderInventory[] = await InventoryUtil.autoAssignInventoryForRelease(
+        op,
+        op.productDetail.product,
+        op.productDetail,
+        locationSortingRules,
+        releaseGood.bizplace,
+        this.domain,
+        this.trxMgr,
+        op.batchId
+      )
+
+      assignedOrderInventories = assignedOrderInventories.map(aoi => {
+        delete aoi.id
+        return {
+          ...aoi,
+          orderProduct: op,
+          status: ORDER_INVENTORY_STATUS.PICKING,
+          name: OrderNoGenerator.orderInventory(),
+          domain: this.domain,
+          bizplace: { id: releaseGood.bizplace.id },
+          releaseGood
+        }
+      })
+
+      finalOrderInventories.push(...assignedOrderInventories)
+
+      await this.trxMgr
+        .getRepository(OrderProduct)
+        .update({ id: op.id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: this.user })
+    }
+
+    for (let oi of finalOrderInventories) {
+      // update inventory locked qty and uom value
+      oi = await this.trxMgr.getRepository(OrderInventory).save({ ...oi })
+
+      await this.trxMgr.getRepository(Inventory).update(oi.inventory.id, {
+        lockedQty: (oi.inventory?.lockedQty || 0) + oi.releaseQty,
+        lockedUomValue: (oi.inventory?.lockedUomValue || 0) + oi.releaseUomValue,
+        updater: this.user
+      })
+
+      // update product detail stock deduct unassigned qty and unassigned uom value
+      await this.trxMgr
+        .getRepository(ProductDetailStock)
+        .createQueryBuilder()
+        .update(ProductDetailStock)
+        .set({
+          unassignedQty: () => `"unassigned_qty" - ${oi.releaseQty}`,
+          unassignedUomValue: () => `"unassigned_uom_value" - ${oi.releaseUomValue}`
+        })
+        .where({ productDetail: oi.productDetail.id })
+        .execute()
+
+      const worksheetDetail: WorksheetDetail = Object.assign(new WorksheetDetail(), {
+        domain: this.domain,
+        bizplace: { id: releaseGood.bizplace.id },
+        worksheet,
+        name: WorksheetNoGenerator.pickingDetail(),
+        seq: 0,
+        targetInventory: oi,
+        targetProduct: oi.orderProduct,
+        type: WORKSHEET_TYPE.PICKING,
+        status: WORKSHEET_STATUS.DEACTIVATED,
+        creator: this.user,
+        updater: this.user
+      })
+
+      newWorksheetDetails.push(worksheetDetail)
+    }
+    newWorksheetDetails = await this.trxMgr.getRepository(WorksheetDetail).save(newWorksheetDetails)
+
+    return newWorksheetDetails
+  }
+
+  async assignInventoriesForUnassignedMergedOrder(worksheet: Worksheet): Promise<any> {
+    //const releaseGood = worksheet.releaseGood
+    const orderProducts = worksheet.worksheetDetails.map(wsd => wsd.targetProduct)
+    const releaseGoodIds = [...new Set(orderProducts.map(op => op.releaseGood.id))]
+    let newWorksheetDetails: WorksheetDetail[] = []
+
+    const inventoryAssignmentSetting: Setting = await this.trxMgr.getRepository(Setting).findOne({
+      where: { domain: this.domain, name: 'rule-for-inventory-assignment' }
+    })
+
+    for (let i = 0; i < orderProducts.length; i++) {
+      let pInventoryList = inventoriesByStrategy(
+        {
+          ...orderProducts[i],
+          worksheetId: worksheet.id,
+          bizplaceId: worksheet.bizplace.id,
+          locationSortingRules: inventoryAssignmentSetting ? JSON.parse(inventoryAssignmentSetting.value) : false,
+          pickingStrategy: orderProducts[i].product.pickingStrategy
+        },
+        this.domain,
+        this.trxMgr
+      )
+
+      let idx = 0
+      let [inventoryList] = await Promise.all([pInventoryList])
+
+      let { releaseQty, releaseUomValue } = orderProducts[i]
+
+      while (releaseQty > 0 && idx < inventoryList.items.length) {
+        let targetInventory: Inventory = await this.trxMgr
+          .getRepository(Inventory)
+          .findOne({ where: { id: inventoryList.items[idx].id } })
+
+        let inventoryAvailableQty = targetInventory.qty - (targetInventory?.lockedQty || 0)
+        let inventoryAvailableUomValue = targetInventory.uomValue - (targetInventory?.lockedUomValue || 0)
+
+        if (inventoryAvailableQty > 0) {
+          let allocatedQty = 0,
+            allocatedUomValue = 0
+          if (inventoryAvailableQty < releaseQty) {
+            idx = idx + 1
+            allocatedQty = inventoryAvailableQty
+            allocatedUomValue = inventoryAvailableUomValue
+          } else {
+            allocatedQty = releaseQty
+            allocatedUomValue = releaseUomValue
+          }
+
+          releaseQty = releaseQty - allocatedQty
+          releaseUomValue = releaseUomValue - allocatedUomValue
+
+          //// Update inventory locked quantity
+          await this.trxMgr
+            .getRepository(Inventory)
+            .createQueryBuilder('inv')
+            .update(Inventory)
+            .set({
+              lockedUomValue: () => `COALESCE(locked_uom_value,0) + ${allocatedUomValue}`,
+              lockedQty: () => `COALESCE(locked_qty,0) + ${allocatedQty}`
+            })
+            .where('id = :id', { id: targetInventory.id })
+            .execute()
+
+          // update product detail stock deduct unassigned qty and unassigned uom value
+          await this.trxMgr
+            .getRepository(ProductDetailStock)
+            .createQueryBuilder()
+            .update(ProductDetailStock)
+            .set({
+              unassignedQty: () => `"unassigned_qty" - ${allocatedQty}`,
+              unassignedUomValue: () => `"unassigned_uom_value" - ${allocatedUomValue}`
+            })
+            .where({ productDetail: orderProducts[i].productDetail.id })
+            .execute()
+
+          // update order product status to ASSIGNED
+          await this.trxMgr
+            .getRepository(OrderProduct)
+            .update({ id: orderProducts[i].id }, { status: ORDER_PRODUCT_STATUS.ASSIGNED, updater: this.user })
+
+          // Create new order inventory with status -> READY_TO_PICK, type -> RELEASE_OF_GOODS
+          let newTargetInventory: OrderInventory = new OrderInventory()
+          newTargetInventory = {
+            domain: this.domain,
+            bizplace: orderProducts[i].bizplace,
+            name: OrderNoGenerator.orderInventory(),
+            releaseGood: orderProducts[i].releaseGood,
+            batchId: orderProducts[i].batchId,
+            status: ORDER_INVENTORY_STATUS.PICKING,
+            type: ORDER_TYPES.RELEASE_OF_GOODS,
+            refWorksheetId: worksheet.id,
+            product: orderProducts[i].product,
+            productDetail: orderProducts[i].productDetail,
+            packingType: orderProducts[i].packingType,
+            packingSize: parseFloat(orderProducts[i].packingSize),
+            creator: this.user,
+            inventory: targetInventory,
+            releaseQty: allocatedQty,
+            releaseUomValue: allocatedUomValue,
+            uom: orderProducts[i].uom,
+            orderProduct: orderProducts[i]
+          }
+          newTargetInventory = await this.trxMgr.getRepository(OrderInventory).save(newTargetInventory)
+
+          if (idx == 0) {
+            let updatedWorksheetDetail = {
+              ...worksheet.worksheetDetails[i],
+              targetInventory: newTargetInventory,
+              worksheet,
+              bizplace: worksheet.bizplace,
+              domain: this.domain,
+              updater: this.user,
+              creator: this.user
+            }
+            await this.trxMgr.getRepository(WorksheetDetail).update(worksheet.worksheetDetails[i].id, {
+              targetInventory: newTargetInventory,
+              worksheet,
+              bizplace: worksheet.bizplace,
+              domain: this.domain,
+              updater: this.user,
+              creator: this.user
+            })
+
+            newWorksheetDetails.push(updatedWorksheetDetail)
+          } else {
+            let newWorksheetDetail = {
+              ...worksheet.worksheetDetails[i],
+              name: WorksheetNoGenerator.batchPickingDetail(),
+              targetInventory: newTargetInventory,
+              worksheet,
+              bizplace: worksheet.bizplace,
+              domain: this.domain,
+              updater: this.user,
+              creator: this.user
+            }
+            delete newWorksheetDetail.id
+
+            newWorksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).save(newWorksheetDetail)
+            newWorksheetDetails.push(newWorksheetDetail)
+          }
+        } else {
+          idx = idx + 1
+        }
+      }
+      await this.trxMgr.getRepository(ReleaseGood).update(releaseGoodIds, { assignedInventory: true })
+    }
+    return newWorksheetDetails
+  }
 }

package/server/entities/warehouse-bizplace-onhand-inventory.ts

@@ -12,8 +12,8 @@ import { ViewColumn, ViewEntity } from 'typeorm'
     i.uom,
     i.product_id as "product_id",
     null as "product_bundle_id",
-    COALESCE(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0))) AS "remain_qty",
-    COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0))) AS "remain_uom_value",
+    COALESCE(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - SUM(COALESCE(pds.unassigned_qty, 0))) AS "remain_qty",
+    COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0))) AS "remain_uom_value",
     COALESCE(sum(COALESCE(i.qty, 0::double precision))) AS "qty",
     COALESCE(sum(COALESCE(i.uom_value, 0::double precision))) AS "uom_value",
     COALESCE(sum(COALESCE(i.transfer_qty, 0::double precision))) AS "transfer_qty",
@@ -22,6 +22,7 @@ import { ViewColumn, ViewEntity } from 'typeorm'
     FROM inventories i
     INNER JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id AND l2.type NOT IN ('QUARANTINE', 'RESERVE')
     INNER JOIN products p ON p.id = i.product_id
+    LEFT JOIN product_detail_stocks pds on pds.product_detail_id = i.product_detail_id
     WHERE i.status = 'STORED' AND CASE WHEN i.expiration_date is not null and p.shelf_life is not null then CURRENT_DATE < i.expiration_date - p.shelf_life else true end
     AND i.obsolete is false
     GROUP by
@@ -51,14 +52,15 @@ import { ViewColumn, ViewEntity } from 'typeorm'
     FROM product_bundles pb
     INNER JOIN (
       SELECT i.domain_id, i.bizplace_id, pbs.product_id, pbs.product_bundle_id, min(pbs.bundle_qty),
-      (SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0))) / min(pbs.bundle_qty) AS "available_qty",
-      (SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0))) / min(pbs.bundle_qty)  AS "available_uom_value",
+      (SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - SUM(COALESCE(pds.unassigned_qty, 0))) / min(pbs.bundle_qty) AS "available_qty",
+      (SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0))) / min(pbs.bundle_qty)  AS "available_uom_value",
       (sum(COALESCE(i.qty, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "qty",
       (sum(COALESCE(i.uom_value, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "uom_value",
       (sum(COALESCE(i.transfer_qty, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "transfer_qty",
       (sum(COALESCE(i.transfer_uom_value, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "transfer_uom_value"
       FROM product_bundle_settings pbs 
       LEFT JOIN inventories i ON i.product_id = pbs.product_id AND i.status = 'STORED' AND i.obsolete = false
+      LEFT JOIN product_detail_stocks pds ON pds.product_detail_id = i.product_detail_id
       INNER JOIN products p ON p.id = pbs.product_id AND CASE WHEN i.expiration_date is not null and p.shelf_life is not null then CURRENT_DATE < i.expiration_date - p.shelf_life else true end
       INNER JOIN locations l ON i.location_id = l.id AND i.domain_id = l.domain_id AND l.type NOT IN ('QUARANTINE', 'RESERVE') 
       GROUP by