ts-glitter 16.4.2 → 16.4.4

package/src/api-public/services/shopping.ts

@@ -4241,6 +4241,11 @@ OR JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.orderStatus')) NOT IN (-99)) `);
     async postMulProduct(content: any) {
         try {
 
+            const store_info=await new User(this.app).getConfigV2({
+                key: 'store-information',
+                user_id: 'manager',
+            });
+
             if (content.collection.length > 0) {
                 //有新類別要處理
                 await this.updateCollectionFromUpdateProduct(content.collection);
@@ -4254,19 +4259,33 @@ OR JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.orderStatus')) NOT IN (-99)) `);
                         const og_data = (await db.query(`select *
                                                          from \`${this.app}\`.\`t_manager_post\`
                                                          where id = ?`, [product.id]))[0];
-                        console.log(`product-in==>`,product)
+
 
                         if (og_data) {
+
+                            // console.log(`product-in==>`,product)
                             delete product['content']
                             delete product['preview_image'];
+                            const og_content=og_data['content']
+                            if(og_content.language_data && og_content.language_data[store_info.language_setting.def]){
+                                og_content.language_data[store_info.language_setting.def].seo=product.seo;
+                                og_content.language_data[store_info.language_setting.def].title=product.title;
+                            }
+
                             product = {
-                                ...og_data['content'],
+                                ...og_content,
                                 ...product
                             }
                             product.preview_image = og_data['content'].preview_image || [];
                             productArray[index] = product;
+
+
+                        }else{
+                            console.log(`product-not-in==>`,product)
                         }
 
+                    }else{
+                        console.log(`no-product-id==>`,product)
                     }
                     resolve(true)
                 })
@@ -4278,7 +4297,9 @@ OR JSON_UNQUOTE(JSON_EXTRACT(orderData, '$.orderStatus')) NOT IN (-99)) `);
                 INTO \`${this.app}\`.\`t_manager_post\` (id,userID,content) values ?`,
                 [
                     productArray.map((product: any) => {
+
                        if(!product.id){
+                           // console.log(`product-not-in==>`,product)
                            product.id=max_id++;
                        }
                         product.type = 'product';

package/src/api-public/services/sms-pointes.js.map

@@ -1 +1 @@
-{"version":3,"file":"sms-pointes.js","sourceRoot":"","sources":["sms-pointes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sms-pointes.js","sourceRoot":"","sources":["sms-pointes.ts"],"names":[],"mappings":"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"}

package/src/api-public/services/stock.d.ts

@@ -10,8 +10,9 @@ type ContentProduct = {
     cost: number;
     note: string;
     transfer_count: number;
-    recent_count: number;
+    recent_count?: number;
     check_count: number;
+    replenishment_count?: number;
     title?: string;
     spec?: string;
     sku?: '';
@@ -33,6 +34,13 @@ type StockHistoryData = {
         note: string;
         total_price?: number;
         product_list: ContentProduct[];
+        changeLogs: {
+            time: string;
+            text: string;
+            user: string;
+            status: number;
+            product_list?: ContentProduct[];
+        }[];
     };
 };
 export declare class Stock {
@@ -66,6 +74,7 @@ export declare class Stock {
         limit: string;
         search: string;
         type: StockHistoryType;
+        order_id: string;
     }): Promise<{
         total: any;
         data: any;

package/src/api-public/services/stock.js

@@ -6,7 +6,83 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Stock = void 0;
 const database_1 = __importDefault(require("../../modules/database"));
 const exception_1 = __importDefault(require("../../modules/exception"));
+const tool_js_1 = __importDefault(require("../../modules/tool.js"));
 const shopping_1 = require("./shopping");
+const typeConfig = {
+    restocking: {
+        name: '進貨',
+        prefixId: 'IC',
+        status: {
+            0: {
+                title: '已完成',
+                badge: 'info',
+            },
+            1: {
+                title: '已補貨',
+                badge: 'info',
+            },
+            2: {
+                title: '待進貨',
+                badge: 'warning',
+            },
+            3: {
+                title: '核對中',
+                badge: 'warning',
+            },
+            4: {
+                title: '已暫停',
+                badge: 'normal',
+            },
+            5: {
+                title: '待補貨',
+                badge: 'notify',
+            },
+            6: {
+                title: '已取消',
+                badge: 'notify',
+            },
+        },
+    },
+    transfer: {
+        name: '調撥',
+        prefixId: 'TB',
+        status: {
+            0: {
+                title: '已完成',
+                badge: 'info',
+            },
+            1: {
+                title: '已補貨',
+                badge: 'info',
+            },
+            2: {
+                title: '待調撥',
+                badge: 'warning',
+            },
+            3: {
+                title: '核對中',
+                badge: 'warning',
+            },
+            4: {
+                title: '已暫停',
+                badge: 'normal',
+            },
+            5: {
+                title: '待補貨',
+                badge: 'notify',
+            },
+            6: {
+                title: '已取消',
+                badge: 'notify',
+            },
+        },
+    },
+    checking: {
+        name: '盤點',
+        prefixId: 'PD',
+        status: {},
+    },
+};
 class Stock {
     constructor(app, token) {
         this.app = app;
@@ -231,8 +307,11 @@ class Stock {
             const formattedDate = `${year}-${month}-${day}`;
             return formattedDate;
         }
-        const sqlArr = [];
-        sqlArr.push('(status <> -1)');
+        const sqlArr = ['(status <> -1)', `(type = '${json.type}')`];
+        if (json.order_id) {
+            sqlArr.push(`(order_id = '${json.order_id}')`);
+        }
+        console.log(sqlArr);
         const sqlString = sqlArr.join(' AND ');
         try {
             const getHistoryTotal = await database_1.default.query(`SELECT count(id) as c FROM \`${this.app}\`.t_stock_history
@@ -240,6 +319,7 @@ class Stock {
                 `, []);
             const data = await database_1.default.query(`SELECT * FROM \`${this.app}\`.t_stock_history
                     WHERE 1=1 AND ${sqlString}
+                    ORDER BY created_time DESC
                     LIMIT ${page * limit}, ${limit};
                 `, []);
             data.map((rowData) => {
@@ -260,6 +340,8 @@ class Stock {
     async postHistory(json) {
         console.log('postHistory');
         console.log(json);
+        const typeData = typeConfig[json.type];
+        console.log(typeData.name);
         try {
             json.content.product_list.map((item) => {
                 delete item.title;
@@ -267,8 +349,22 @@ class Stock {
                 delete item.sku;
                 return item;
             });
+            json.content.changeLogs = [
+                {
+                    time: tool_js_1.default.convertDateTimeFormat(),
+                    status: json.status,
+                    text: `${typeData.name}單建立`,
+                    user: '',
+                },
+                {
+                    time: tool_js_1.default.convertDateTimeFormat(),
+                    status: json.status,
+                    text: `${typeData.name}單狀態改為「${typeData.status[json.status].title}」`,
+                    user: '',
+                },
+            ];
             const formatJson = JSON.parse(JSON.stringify(json));
-            formatJson.order_id = `IC${new Date().getTime()}`;
+            formatJson.order_id = `${typeData.prefixId}${new Date().getTime()}`;
             formatJson.content = JSON.stringify(json.content);
             formatJson.created_time = `${json.created_time} 00:00:00`;
             delete formatJson.id;
@@ -287,10 +383,43 @@ class Stock {
         console.log('putHistory');
         console.log(json);
         try {
-            const formatJson = JSON.parse(JSON.stringify(json));
-            formatJson.content = JSON.stringify(json.content);
-            await database_1.default.query(`UPDATE \`${this.app}\`.t_stock_history SET ? WHERE id = ?
-                `, [formatJson, json.id]);
+            const typeData = typeConfig[json.type];
+            json.content.product_list.map((item) => {
+                delete item.title;
+                delete item.spec;
+                delete item.sku;
+                return item;
+            });
+            const getHistory = await database_1.default.query(`SELECT * FROM \`${this.app}\`.t_stock_history WHERE id = ?;
+                `, [json.id]);
+            if (getHistory && getHistory[0]) {
+                const originData = getHistory[0];
+                json.content.changeLogs.push({
+                    time: tool_js_1.default.convertDateTimeFormat(),
+                    status: json.status,
+                    text: `進貨單狀態改為「${typeData.status[json.status].title}」`,
+                    user: '',
+                    product_list: (() => {
+                        if (json.status === 1 || json.status === 5) {
+                            const originList = originData.content.product_list;
+                            const updateList = JSON.parse(JSON.stringify(json.content.product_list));
+                            return updateList.map((item1) => {
+                                var _a, _b;
+                                const originVariant = originList.find((item2) => item1.variant_id === item2.variant_id);
+                                if (originVariant) {
+                                    return Object.assign({ replenishment_count: ((_a = item1.recent_count) !== null && _a !== void 0 ? _a : 0) - ((_b = originVariant.recent_count) !== null && _b !== void 0 ? _b : 0) }, item1);
+                                }
+                                return item1;
+                            });
+                        }
+                        return undefined;
+                    })(),
+                });
+                const formatJson = JSON.parse(JSON.stringify(json));
+                formatJson.content = JSON.stringify(json.content);
+                await database_1.default.query(`UPDATE \`${this.app}\`.t_stock_history SET ? WHERE id = ?
+                    `, [formatJson, json.id]);
+            }
             return { data: false };
         }
         catch (error) {

package/src/api-public/services/stock.js.map

@@ -1 +1 @@
-{"version":3,"file":"stock.js","sourceRoot":"","sources":["stock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stock.js","sourceRoot":"","sources":["stock.ts"],"names":[],"mappings":"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"}

package/src/api-public/services/stock.ts

@@ -21,8 +21,9 @@ type ContentProduct = {
     cost: number;
     note: string;
     transfer_count: number; // 預計進貨數, 預計調入數
-    recent_count: number; // 實際進貨數, 實際調入數
+    recent_count?: number; // 實際進貨數, 實際調入數
     check_count: number; // 盤點數
+    replenishment_count?: number; // 此次補貨數
     title?: string;
     spec?: string;
     sku?: '';
@@ -45,9 +46,103 @@ type StockHistoryData = {
         note: string;
         total_price?: number;
         product_list: ContentProduct[];
+        changeLogs: {
+            time: string;
+            text: string;
+            user: string;
+            status: number;
+            product_list?: ContentProduct[];
+        }[];
     };
 };
 
+const typeConfig: {
+    [key in StockHistoryType]: {
+        name: string;
+        prefixId: string;
+        status: {
+            [key in number]: {
+                title: string;
+                badge: string;
+            };
+        };
+    };
+} = {
+    restocking: {
+        name: '進貨',
+        prefixId: 'IC',
+        status: {
+            0: {
+                title: '已完成',
+                badge: 'info',
+            },
+            1: {
+                title: '已補貨',
+                badge: 'info',
+            },
+            2: {
+                title: '待進貨',
+                badge: 'warning',
+            },
+            3: {
+                title: '核對中',
+                badge: 'warning',
+            },
+            4: {
+                title: '已暫停',
+                badge: 'normal',
+            },
+            5: {
+                title: '待補貨',
+                badge: 'notify',
+            },
+            6: {
+                title: '已取消',
+                badge: 'notify',
+            },
+        },
+    },
+    transfer: {
+        name: '調撥',
+        prefixId: 'TB',
+        status: {
+            0: {
+                title: '已完成',
+                badge: 'info',
+            },
+            1: {
+                title: '已補貨',
+                badge: 'info',
+            },
+            2: {
+                title: '待調撥',
+                badge: 'warning',
+            },
+            3: {
+                title: '核對中',
+                badge: 'warning',
+            },
+            4: {
+                title: '已暫停',
+                badge: 'normal',
+            },
+            5: {
+                title: '待補貨',
+                badge: 'notify',
+            },
+            6: {
+                title: '已取消',
+                badge: 'notify',
+            },
+        },
+    },
+    checking: {
+        name: '盤點',
+        prefixId: 'PD',
+        status: {},
+    },
+};
+
 export class Stock {
     public app;
     public token;
@@ -256,7 +351,7 @@ export class Stock {
         });
         variantData = variantData[0];
         Object.entries(variant.deduction_log).forEach(([key, value]) => {
-            pbVariant.stockList[key].count = parseInt(pbVariant.stockList[key].count as string) + parseInt(value as string) ;
+            pbVariant.stockList[key].count = parseInt(pbVariant.stockList[key].count as string) + parseInt(value as string);
             pbVariant.stock = parseInt(pbVariant.stock as string) + parseInt(value as string);
             variantData.content.stockList[key].count = parseInt(variantData.content.stockList[key].count) + parseInt(value as string);
             variantData.content.stock = parseInt(variantData.content.stock) + parseInt(value as string);
@@ -275,10 +370,10 @@ export class Stock {
         const sql =
             variant.spec.length > 0
                 ? `AND JSON_CONTAINS(content->'$.spec', JSON_ARRAY(${variant.spec
-                    .map((data: string) => {
-                        return `\"${data}\"`;
-                    })
-                    .join(',')}));`
+                      .map((data: string) => {
+                          return `\"${data}\"`;
+                      })
+                      .join(',')}));`
                 : '';
 
         let variantData = await db.query(
@@ -303,11 +398,10 @@ export class Stock {
         });
         variantData = variantData[0];
         Object.entries(variant.deduction_log).forEach(([key, value]) => {
-            pbVariant.stockList[key].count = parseInt(pbVariant.stockList[key].count as string) - parseInt(value as string) ;
+            pbVariant.stockList[key].count = parseInt(pbVariant.stockList[key].count as string) - parseInt(value as string);
             pbVariant.stock = parseInt(pbVariant.stock as string) - parseInt(value as string);
             variantData.content.stockList[key].count = parseInt(variantData.content.stockList[key].count) - parseInt(value as string);
             variantData.content.stock = parseInt(variantData.content.stock) - parseInt(value as string);
-
         });
         await new Shopping(this.app, this.token).updateVariantsWithSpec(variantData.content, variant.id, variant.spec);
         await db.query(
@@ -319,7 +413,7 @@ export class Stock {
         );
     }
 
-    async getHistory(json: { page: string; limit: string; search: string; type: StockHistoryType }) {
+    async getHistory(json: { page: string; limit: string; search: string; type: StockHistoryType; order_id: string }) {
         const page = json.page ? parseInt(`${json.page}`, 10) : 0;
         const limit = json.limit ? parseInt(`${json.limit}`, 10) : 20;
 
@@ -337,10 +431,13 @@ export class Stock {
             return formattedDate;
         }
 
-        const sqlArr: string[] = [];
+        const sqlArr: string[] = ['(status <> -1)', `(type = '${json.type}')`];
 
-        sqlArr.push('(status <> -1)');
+        if (json.order_id) {
+            sqlArr.push(`(order_id = '${json.order_id}')`);
+        }
 
+        console.log(sqlArr);
         const sqlString = sqlArr.join(' AND ');
 
         try {
@@ -354,6 +451,7 @@ export class Stock {
             const data = await db.query(
                 `SELECT * FROM \`${this.app}\`.t_stock_history
                     WHERE 1=1 AND ${sqlString}
+                    ORDER BY created_time DESC
                     LIMIT ${page * limit}, ${limit};
                 `,
                 []
@@ -378,6 +476,8 @@ export class Stock {
     async postHistory(json: StockHistoryData) {
         console.log('postHistory');
         console.log(json);
+        const typeData = typeConfig[json.type];
+        console.log(typeData.name);
         try {
             json.content.product_list.map((item) => {
                 delete item.title;
@@ -385,9 +485,23 @@ export class Stock {
                 delete item.sku;
                 return item;
             });
+            json.content.changeLogs = [
+                {
+                    time: Tool.convertDateTimeFormat(),
+                    status: json.status,
+                    text: `${typeData.name}單建立`,
+                    user: '',
+                },
+                {
+                    time: Tool.convertDateTimeFormat(),
+                    status: json.status,
+                    text: `${typeData.name}單狀態改為「${typeData.status[json.status].title}」`,
+                    user: '',
+                },
+            ];
 
             const formatJson = JSON.parse(JSON.stringify(json));
-            formatJson.order_id = `IC${new Date().getTime()}`;
+            formatJson.order_id = `${typeData.prefixId}${new Date().getTime()}`;
             formatJson.content = JSON.stringify(json.content);
             formatJson.created_time = `${json.created_time} 00:00:00`;
             delete formatJson.id;
@@ -412,15 +526,58 @@ export class Stock {
         console.log(json);
 
         try {
-            const formatJson = JSON.parse(JSON.stringify(json));
-            formatJson.content = JSON.stringify(json.content);
+            const typeData = typeConfig[json.type];
+            json.content.product_list.map((item) => {
+                delete item.title;
+                delete item.spec;
+                delete item.sku;
+                return item;
+            });
 
-            await db.query(
-                `UPDATE \`${this.app}\`.t_stock_history SET ? WHERE id = ?
+            const getHistory = await db.query(
+                `SELECT * FROM \`${this.app}\`.t_stock_history WHERE id = ?;
                 `,
-                [formatJson, json.id]
+                [json.id]
             );
 
+            if (getHistory && getHistory[0]) {
+                const originData = getHistory[0] as StockHistoryData;
+
+                json.content.changeLogs.push({
+                    time: Tool.convertDateTimeFormat(),
+                    status: json.status,
+                    text: `進貨單狀態改為「${typeData.status[json.status].title}」`,
+                    user: '',
+                    product_list: (() => {
+                        if (json.status === 1 || json.status === 5) {
+                            const originList = originData.content.product_list;
+                            const updateList = JSON.parse(JSON.stringify(json.content.product_list)) as ContentProduct[];
+
+                            return updateList.map((item1) => {
+                                const originVariant = originList.find((item2) => item1.variant_id === item2.variant_id);
+                                if (originVariant) {
+                                    return {
+                                        replenishment_count: (item1.recent_count ?? 0) - (originVariant.recent_count ?? 0),
+                                        ...item1,
+                                    };
+                                }
+                                return item1;
+                            });
+                        }
+                        return undefined;
+                    })(),
+                });
+
+                const formatJson = JSON.parse(JSON.stringify(json));
+                formatJson.content = JSON.stringify(json.content);
+
+                await db.query(
+                    `UPDATE \`${this.app}\`.t_stock_history SET ? WHERE id = ?
+                    `,
+                    [formatJson, json.id]
+                );
+            }
+
             return { data: false };
         } catch (error) {
             console.error(error);

package/src/api-public/services/wallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.js","sourceRoot":"","sources":["wallet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wallet.js","sourceRoot":"","sources":["wallet.ts"],"names":[],"mappings":"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"}