accountingweb-api and ttc-api: initial with modified .env

Signed-off-by: supphakitd <67319010028@technictrang.ac.th>

exthernal-accountingwep-api/src/controllers/accountingAddController.js

@@ -4,12 +4,14 @@ import { sendError } from '../utils/response.js'
 import { GeneralService } from '../share/generalservice.js';
 import { trim_all_array } from '../utils/trim.js'
 import { verifyToken, generateToken } from '../utils/token.js'
+import { Interface } from '../interfaces/Interface.js';
 
 export class accountingAdd {
 
     constructor() {
         this.generalService = new GeneralService();
         this.accountingAddService = new AccountingAddService();
+        this.Interface = new Interface();
     }
 
     async onNavigate(req, res) {
@@ -22,20 +24,43 @@ export class accountingAdd {
     async onAccountingAdd(req, res, database) {
         let idx = -1
         let aryResult = []
+        let latSeq = []
         try {
-            let token = req.body.request.token;
+            let token = req.headers.authorization?.split(' ')[1];
             const decoded = verifyToken(token);
 
-            let num = req.body.request.actnum;
-            database = decoded.organization
+            let actnum = req.body.request.actnum;
+            database = decoded.organization;
 
-            aryResult = await this.accountingAddService.getAccountingAdd(database, num);
+            aryResult = await this.accountingAddService.getAccountingAdd(database, actnum);
+            latSeq = await this.accountingAddService.getLatestAccountingSeq(database);
         } catch (error) {
             idx = 1;
         } finally {
             if (idx === 1) return sendError('เกิดข้อผิดพลาดไม่คาดคิดเกิดขึ้น', 'Unexpected error');
-            if (!aryResult) return sendError('ไม่พบการมีอยู่ของข้อมูล', 'Cannot Find Any Data');
-            return aryResult
+            // if (!aryResult) return sendError('ไม่พบการมีอยู่ของข้อมูล', 'Cannot Find Any Data');
+
+            if (aryResult == 0) {
+                let prommis = await this.makeArySave(req, latSeq[0].actseq);
+                return prommis
+            } else {
+                return sendError('คีย์หลักซ้ำในระบบ', 'Duplicate Primary Key');
+            }
         }
     }
+
+
+    async makeArySave(req, seq) {
+        let arysave = {
+            methods: 'post',
+            actseq: seq + 1,
+            actnum: req.body.request.actnum,
+            actacpdtm: req.body.request.actacpdtm,
+            actcat: req.body.request.actcat,
+            actqty: req.body.request.actqty,
+            actcmt: req.body.request.actcmt,
+            acttyp: req.body.request.acttyp
+        }
+        return this.Interface.saveInterface('actmst', arysave, req);
+    }
 }

exthernal-accountingwep-api/src/controllers/reportController.js

@@ -68,11 +68,17 @@ export class reportController {
                     totalIncome: totalIncome.toFixed(2),
                     totalExpense: totalExpense.toFixed(2),
                     netProfit: netProfit.toFixed(2),
-                    profitRate: profitRate.toFixed(2) + ' %',
-                    adjustedProfitRate: adjustedProfitRate.toFixed(2) + ' %',
-                    period: '30 วัน'
                 };
 
+                // ✅ 3.5) Create actdata table with required fields grouped by actnum
+                var actdata = data.map(row => ({
+                    actnam: row.actnam,
+                    actcat: row.actcat,
+                    actqty: row.actqty,
+                    actcmt: row.actcmt,
+                    actacpdtm: row.actacpdtm
+                }));
+
                 // ✅ 4) ดึงสีจาก dtlmst (แนะนำให้เรียกจาก service เพิ่ม)
                 // ตัวอย่างสมมติ: คุณไป query มาจาก service ก่อนหน้าแล้วได้เป็น object แบบนี้
                 // key = ชื่อหมวด (actcatnam หรือ code), value = color
@@ -127,8 +133,9 @@ export class reportController {
                 console.error('calculate summary/pie error:', err);
             }
             let arydiy = {
+                actdata,
                 summary,
-                pie
+                pie,
             }
 
             return arydiy;

exthernal-accountingwep-api/src/services/accountingAddService.js

@@ -6,15 +6,29 @@ export class AccountingAddService {
     this.generalService = new GeneralService()
   }
 
-  async getAccountingAdd(database, name) {
+  async getAccountingAdd(database, number) {
     const sql = `
       SELECT 
         actseq,
-        actnam
+        actnum
       FROM ${database}.actmst
-      WHERE actnam = $1
-  `
-    const params = [name]
+      WHERE actnum = $1
+    `
+
+    const params = [number]
+    const result = await this.generalService.executeQueryParam(database, sql, params);
+    return result
+  }
+
+  async getLatestAccountingSeq(database) {
+    const sql = `
+      SELECT 
+        actseq
+      FROM ${database}.actmst
+      WHERE actseq=(SELECT max(actseq) FROM ${database}.actmst)
+    `
+
+    const params = []
     const result = await this.generalService.executeQueryParam(database, sql, params);
     return result
   }

exthernal-accountingwep-api/src/services/accountingSumService.js

@@ -23,7 +23,6 @@ export class AccountingSumService {
     return result
   }
 
-
     async getCategoryColorMap(database) {
     const sql = `
         SELECT dtlcod, dtlnam, dtlmsc as dtlclr

exthernal-accountingwep-api/src/services/reportService.js

@@ -9,8 +9,9 @@ export class ReportService {
   async getReportController(database, number) {
     const sql = `
       SELECT 
+        ${database}.translatedtl('ACTTYP', acttyp) AS actnam,
         acttyp,
-        actcat,
+        ${database}.translatedtl_multi(ARRAY['ACTCAT_INC','ACTCAT_EXP'], actcat) AS actcat,
         actqty,
         actcmt,
         actacpdtm