@things-factory/worksheet-base 5.0.0-alpha.5 → 5.0.0-alpha.8

package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.js

@@ -1,36 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateArrivalNoticeWorksheetResolver = void 0;
+exports.generateArrivalNoticeWorksheet = exports.generateArrivalNoticeWorksheetResolver = void 0;
 const sales_base_1 = require("@things-factory/sales-base");
 const controllers_1 = require("../../../../controllers");
 const entities_1 = require("../../../../entities");
 exports.generateArrivalNoticeWorksheetResolver = {
     async generateArrivalNoticeWorksheet(_, { arrivalNoticeNo, bufferLocation }, context) {
-        var _a;
         const { tx, domain, user } = context.state;
-        let unloadingWorksheet = await generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation);
-        if (!((_a = unloadingWorksheet.arrivalNotice) === null || _a === void 0 ? void 0 : _a.id)) {
-            unloadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
-                where: unloadingWorksheet,
-                relations: ['arrivalNotice']
-            });
-        }
-        let arrivalNotice = unloadingWorksheet.arrivalNotice;
-        const crossDocking = unloadingWorksheet.arrivalNotice.crossDocking;
-        if (crossDocking) {
-            arrivalNotice = await tx
-                .getRepository(sales_base_1.ArrivalNotice)
-                .findOne({ where: { domain: domain, name: arrivalNoticeNo }, relations: ['releaseGood'] });
-            const releaseGoodNo = arrivalNotice.releaseGood.name;
-            const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
-            await pickingWSCtrl.generatePickingWorksheet(releaseGoodNo);
-        }
-        const vasWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
-            where: { domain: domain, arrivalNotice }
-        });
-        return { unloadingWorksheet, vasWorksheet };
+        return await generateArrivalNoticeWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation);
     }
 };
+async function generateArrivalNoticeWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation) {
+    var _a;
+    let unloadingWorksheet = await generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation);
+    if (!((_a = unloadingWorksheet.arrivalNotice) === null || _a === void 0 ? void 0 : _a.id)) {
+        unloadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
+            where: unloadingWorksheet,
+            relations: ['arrivalNotice']
+        });
+    }
+    let arrivalNotice = unloadingWorksheet.arrivalNotice;
+    const crossDocking = unloadingWorksheet.arrivalNotice.crossDocking;
+    if (crossDocking) {
+        arrivalNotice = await tx
+            .getRepository(sales_base_1.ArrivalNotice)
+            .findOne({ where: { domain: domain, name: arrivalNoticeNo }, relations: ['releaseGood'] });
+        const releaseGoodNo = arrivalNotice.releaseGood.name;
+        const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
+        await pickingWSCtrl.generatePickingWorksheet(releaseGoodNo);
+    }
+    const vasWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
+        where: { domain: domain, arrivalNotice }
+    });
+    return { unloadingWorksheet, vasWorksheet };
+}
+exports.generateArrivalNoticeWorksheet = generateArrivalNoticeWorksheet;
 async function generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation) {
     const worksheetController = new controllers_1.UnloadingWorksheetController(tx, domain, user);
     return await worksheetController.generateUnloadingWorksheet(arrivalNoticeNo, bufferLocation.id);

package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-arrival-notice-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.ts"],"names":[],"mappings":";;;AACA,2DAA0D;AAG1D,yDAAkG;AAClG,mDAAgD;AAEnC,QAAA,sCAAsC,GAAG;IACpD,KAAK,CAAC,8BAA8B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,OAAY;;QAC5F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,IAAI,kBAAkB,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,cAAc,CAAC,CAAA;QAE5G,IAAI,CAAC,CAAA,MAAA,kBAAkB,CAAC,aAAa,0CAAE,EAAE,CAAA,EAAE;YACzC,kBAAkB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBAC7D,KAAK,EAAE,kBAAkB;gBACzB,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;SACH;QAED,IAAI,aAAa,GAAkB,kBAAkB,CAAC,aAAa,CAAA;QACnE,MAAM,YAAY,GAAY,kBAAkB,CAAC,aAAa,CAAC,YAAY,CAAA;QAE3E,IAAI,YAAY,EAAE;YAChB,aAAa,GAAG,MAAM,EAAE;iBACrB,aAAa,CAAC,0BAAa,CAAC;iBAC5B,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;YAE5F,MAAM,aAAa,GAAW,aAAa,CAAC,WAAW,CAAC,IAAI,CAAA;YAC5D,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAClG,MAAM,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;SAC5D;QAED,MAAM,YAAY,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE;SACzC,CAAC,CAAA;QAEF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,CAAA;IAC7C,CAAC;CACF,CAAA;AAED,KAAK,UAAU,0BAA0B,CACvC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,cAA8B;IAE9B,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,OAAO,MAAM,mBAAmB,CAAC,0BAA0B,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE,CAAC,CAAA;AACjG,CAAC"}
+{"version":3,"file":"generate-arrival-notice-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.ts"],"names":[],"mappings":";;;AACA,2DAA0D;AAG1D,yDAAkG;AAClG,mDAAgD;AAEnC,QAAA,sCAAsC,GAAG;IACpD,KAAK,CAAC,8BAA8B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,OAAY;QAC5F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,8BAA8B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,cAAc,CAAC,CAAA;IAChG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,8BAA8B,CAClD,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,cAA8B;;IAE9B,IAAI,kBAAkB,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,cAAc,CAAC,CAAA;IAE5G,IAAI,CAAC,CAAA,MAAA,kBAAkB,CAAC,aAAa,0CAAE,EAAE,CAAA,EAAE;QACzC,kBAAkB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAC7D,KAAK,EAAE,kBAAkB;YACzB,SAAS,EAAE,CAAC,eAAe,CAAC;SAC7B,CAAC,CAAA;KACH;IAED,IAAI,aAAa,GAAkB,kBAAkB,CAAC,aAAa,CAAA;IACnE,MAAM,YAAY,GAAY,kBAAkB,CAAC,aAAa,CAAC,YAAY,CAAA;IAE3E,IAAI,YAAY,EAAE;QAChB,aAAa,GAAG,MAAM,EAAE;aACrB,aAAa,CAAC,0BAAa,CAAC;aAC5B,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QAE5F,MAAM,aAAa,GAAW,aAAa,CAAC,WAAW,CAAC,IAAI,CAAA;QAC5D,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAClG,MAAM,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;KAC5D;IAED,MAAM,YAAY,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;QACxE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE;KACzC,CAAC,CAAA;IAEF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,CAAA;AAC7C,CAAC;AAlCD,wEAkCC;AAED,KAAK,UAAU,0BAA0B,CACvC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,cAA8B;IAE9B,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,OAAO,MAAM,mBAAmB,CAAC,0BAA0B,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE,CAAC,CAAA;AACjG,CAAC"}

package/dist-server/index.js

@@ -20,5 +20,6 @@ __exportStar(require("./entities"), exports);
 __exportStar(require("./graphql"), exports);
 __exportStar(require("./graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet"), exports);
 __exportStar(require("./graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details"), exports);
+__exportStar(require("./graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet"), exports);
 __exportStar(require("./migrations"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,mHAAgG;AAChG,+GAA4F;AAC5F,+CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,mHAAgG;AAChG,+GAA4F;AAC5F,qHAAkG;AAClG,+CAA4B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "5.0.0-alpha.5",
+  "version": "5.0.0-alpha.8",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,21 +24,21 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^5.0.0-alpha.5",
-    "@things-factory/biz-base": "^5.0.0-alpha.5",
-    "@things-factory/document-template-base": "^5.0.0-alpha.5",
-    "@things-factory/id-rule-base": "^5.0.0-alpha.5",
-    "@things-factory/integration-lmd": "^5.0.0-alpha.5",
-    "@things-factory/integration-marketplace": "^5.0.0-alpha.5",
-    "@things-factory/integration-sellercraft": "^5.0.0-alpha.5",
-    "@things-factory/integration-sftp": "^5.0.0-alpha.5",
-    "@things-factory/marketplace-base": "^5.0.0-alpha.5",
-    "@things-factory/notification": "^5.0.0-alpha.5",
-    "@things-factory/sales-base": "^5.0.0-alpha.5",
-    "@things-factory/setting-base": "^5.0.0-alpha.5",
-    "@things-factory/shell": "^5.0.0-alpha.5",
-    "@things-factory/transport-base": "^5.0.0-alpha.5",
-    "@things-factory/warehouse-base": "^5.0.0-alpha.5"
+    "@things-factory/auth-base": "^5.0.0-alpha.8",
+    "@things-factory/biz-base": "^5.0.0-alpha.8",
+    "@things-factory/document-template-base": "^5.0.0-alpha.8",
+    "@things-factory/id-rule-base": "^5.0.0-alpha.8",
+    "@things-factory/integration-lmd": "^5.0.0-alpha.8",
+    "@things-factory/integration-marketplace": "^5.0.0-alpha.8",
+    "@things-factory/integration-sellercraft": "^5.0.0-alpha.8",
+    "@things-factory/integration-sftp": "^5.0.0-alpha.8",
+    "@things-factory/marketplace-base": "^5.0.0-alpha.8",
+    "@things-factory/notification": "^5.0.0-alpha.8",
+    "@things-factory/sales-base": "^5.0.0-alpha.8",
+    "@things-factory/setting-base": "^5.0.0-alpha.8",
+    "@things-factory/shell": "^5.0.0-alpha.8",
+    "@things-factory/transport-base": "^5.0.0-alpha.8",
+    "@things-factory/warehouse-base": "^5.0.0-alpha.8"
   },
-  "gitHead": "379449b7be7b3d8220f1cac9ab684b812117edfd"
+  "gitHead": "45da542dc9c876c0a1fa1837f1606210ae600b73"
 }

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.ts

@@ -8,34 +8,44 @@ import { Worksheet } from '../../../../entities'
 export const generateArrivalNoticeWorksheetResolver = {
   async generateArrivalNoticeWorksheet(_: any, { arrivalNoticeNo, bufferLocation }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    let unloadingWorksheet = await generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation)
-
-    if (!unloadingWorksheet.arrivalNotice?.id) {
-      unloadingWorksheet = await tx.getRepository(Worksheet).findOne({
-        where: unloadingWorksheet,
-        relations: ['arrivalNotice']
-      })
-    }
-
-    let arrivalNotice: ArrivalNotice = unloadingWorksheet.arrivalNotice
-    const crossDocking: boolean = unloadingWorksheet.arrivalNotice.crossDocking
-
-    if (crossDocking) {
-      arrivalNotice = await tx
-        .getRepository(ArrivalNotice)
-        .findOne({ where: { domain: domain, name: arrivalNoticeNo }, relations: ['releaseGood'] })
-
-      const releaseGoodNo: string = arrivalNotice.releaseGood.name
-      const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-      await pickingWSCtrl.generatePickingWorksheet(releaseGoodNo)
-    }
-
-    const vasWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
-      where: { domain: domain, arrivalNotice }
+    return await generateArrivalNoticeWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation)
+  }
+}
+
+export async function generateArrivalNoticeWorksheet(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  arrivalNoticeNo: string,
+  bufferLocation: { id: string }
+) {
+  let unloadingWorksheet = await generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation)
+
+  if (!unloadingWorksheet.arrivalNotice?.id) {
+    unloadingWorksheet = await tx.getRepository(Worksheet).findOne({
+      where: unloadingWorksheet,
+      relations: ['arrivalNotice']
     })
+  }
+
+  let arrivalNotice: ArrivalNotice = unloadingWorksheet.arrivalNotice
+  const crossDocking: boolean = unloadingWorksheet.arrivalNotice.crossDocking
 
-    return { unloadingWorksheet, vasWorksheet }
+  if (crossDocking) {
+    arrivalNotice = await tx
+      .getRepository(ArrivalNotice)
+      .findOne({ where: { domain: domain, name: arrivalNoticeNo }, relations: ['releaseGood'] })
+
+    const releaseGoodNo: string = arrivalNotice.releaseGood.name
+    const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
+    await pickingWSCtrl.generatePickingWorksheet(releaseGoodNo)
   }
+
+  const vasWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
+    where: { domain: domain, arrivalNotice }
+  })
+
+  return { unloadingWorksheet, vasWorksheet }
 }
 
 async function generateUnloadingWorksheet(

package/server/index.ts

@@ -5,4 +5,5 @@ export * from './entities'
 export * from './graphql'
 export * from './graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet'
 export * from './graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details'
+export * from './graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet'
 export * from './migrations'