commit

dabory/para/erp/ko_KR/list/list-type1/stock/stock-io-sum-bal.json

@@ -169,8 +169,9 @@
             "D1": "이월재고",
             "D2": "입고량",
             "D3": "출고량",
-            "D4": "마감재고",
+            "D4": "마감(현)재고",
             "D5": "불량재고증감",
+            "D6": "마감불량재고",
             "C4": "품목구분",
             "C5": "구분코드"
         },
@@ -186,6 +187,7 @@
             "D3": "7",
             "D4": "7",
             "D5": "7",
+            "D6": "7",
             "C4": "8",
             "C5": "8"
         },
@@ -201,6 +203,7 @@
             "D3": "decimal('stock_qty', 'nz')",
             "D4": "decimal('stock_qty', 'nz')",
             "D5": "decimal('stock_qty', 'nz')",
+            "D6": "decimal('stock_qty', 'nz')",
             "C4": "left",
             "C5": "center"
         }

dabory/para/erp/ko_KR/popup/popup-list1/stock-io-ledger-detail.json

@@ -189,7 +189,7 @@
             "$Radio": "center",
             "No": "center",
             "C1": "YY.MM.DD",
-            "C2": "deal_type('deal-type')",
+            "C2": "center",
             "C3": "left",
             "C4": "left",
             "D1": "decimal('stock_prc', 'zn')",

public/js/utils/lib.js

@@ -325,6 +325,9 @@ function format_func_decimal(...argv) {
             break;
     }
 
+    if (argv[1] === '') {
+        return ''
+    }
     return data;
 }
 
@@ -709,3 +712,14 @@ function chunk(data = [], size = 1) {
 
     return arr;
 }
+
+function addIdParameter(url, idValue) {
+    const urlObj = new URL(url, window.location.origin); // Assuming a relative URL, we need a base URL for URL parsing
+    const params = urlObj.searchParams;
+
+    if (!params.has('id')) {
+        params.append('id', idValue);
+    }
+
+    return urlObj.toString();
+}

resources/views/front/dabory/erp/list-type/type1.blade.php

@@ -910,7 +910,7 @@
                         if (type1['SelectLinkedPopupOptions'].length > 1) {
                             let select_popup_menu_html = '';
                             for (let i in type1['SelectLinkedPopupOptions']) {
-                                const href = type1['SelectLinkedPopupOptions'][i]['Linked'] + '?id=' + id
+                                const href = addIdParameter(type1['SelectLinkedPopupOptions'][i]['Linked'], id)
                                 select_popup_menu_html+=`
                             <li>
                                 <a href="${href}" target="_blank">${type1['SelectLinkedPopupOptions'][i]['Caption']}</a>
@@ -923,7 +923,7 @@
                         </a>
                         <ul class="dropdown-menu">${select_popup_menu_html}</ul>`;
                         } else {
-                            const href = type1['SelectLinkedPopupOptions'][0]['Linked'] + '?id=' + id
+                            const href = addIdParameter(type1['SelectLinkedPopupOptions'][0]['Linked'], id)
                             result = `
                         <a href="${href}" target="_blank">
                             ${format_conver_for(c1, type1.ListVars['Format'].C1, type1['ThumbContainerVars'], type1['DisplayVars']['IsSplitColumn'])}

resources/views/front/dabory/erp/popup-form1/form-a/item-form.blade.php

@@ -554,10 +554,17 @@
                     if ($('#element_in_which_to_insert').find('#modal-company').length) return;
                     $('#element_in_which_to_insert').append(html);
 
+                    const itemId = getParameterByName('id')
+                    if (itemId) {
+                        return PopupForm1FormAItemForm.fetch_item(Number(itemId))
+                    }
+
                     const isItemRegist = '{{ $isItemRegist ?? 0 }}'
                     if (isItemRegist == '1') {
                         PopupForm1FormAItemForm.btn_act_new()
                     }
+
+
                 });
             }
 

resources/views/front/dabory/erp/purchase/porder.blade.php

@@ -680,7 +680,7 @@
 
             }
             const itmtot_amt = bd_page.reduce((accumulator, bd) => {
-                return accumulator + parseFloat(bd.PorderSupply) //공급가액
+                return accumulator + parseFloat(bd.PorderSupply) + parseFloat(bd.PorderVat) // 합계금액 (공급가액 + 세액)
             }, 0)
 
             const total_qty = bd_page.reduce((accumulator, bd) => {

resources/views/front/dabory/erp/revenue/sorder.blade.php

@@ -688,7 +688,11 @@
                 first_thumb = first_sorder['TurboThumb']
             }
             const itmtot_amt = bd_page.reduce((accumulator, bd) => {
-                return accumulator + parseFloat(bd.SorderSupply)
+                return accumulator + parseFloat(bd.SorderSupply) + parseFloat(bd.SorderSupply) // 합계금액 (공급가액 + 세액)
+            }, 0)
+
+            const total_qty = bd_page.reduce((accumulator, bd) => {
+                return accumulator + parseFloat(bd.SorderQty)
             }, 0)
 
             const total_qty = bd_page.reduce((accumulator, bd) => {

resources/views/front/dabory/erp/sales/squote.blade.php

@@ -499,7 +499,7 @@
                 first_item += '(' + bd_page.length + ')'
             }
             const itmtot_amt = bd_page.reduce((accumulator, bd) => {
-                return accumulator + parseFloat(bd.SquoteSupply)
+                return accumulator + parseFloat(bd.SquoteSupply) + parseFloat(bd.SquoteVat) // 합계금액 (공급가액 + 세액)
             }, 0)
             let id = parseInt($(`#frm`).find(`input[name="Id"]`).val());
             let parameter = {

resources/views/front/dabory/erp/stock/genio.blade.php

@@ -354,7 +354,7 @@
                 first_item += '(' + GenioCorrect.bd_page.length + ')'
             }
             const itmtot_amt = GenioCorrect.bd_page.reduce((accumulator, bd) => {
-                return accumulator + parseFloat(bd.GenioSupply)
+                return accumulator + parseFloat(bd.GenioSupply) + parseFloat(bd.GenioVat) // 합계금액 (공급가액 + 세액)
             }, 0)
             let id = parseInt($(`#frm`).find(`input[name="Id"]`).val());
             let parameter = {

resources/views/front/dabory/erp/stock/tab/genio-correct.blade.php

@@ -553,6 +553,7 @@
             }
 
             GenioCorrect.add_td_last_tap_out = async function ($this, id) {
+<<<<<<< HEAD
                 let tr = $('#correct-tab').find(`input[name='bd-cursor-state']:checked`).closest('tr')
                 let index = $(tr).prevAll().length
                 // 필수텍스트가 안비어있으고 fouces out == 다음 tr 추가
@@ -582,6 +583,39 @@
                         message: @json(_e('(*)Required item(s) omitted')),
                     });
                 }
+=======
+                Btype.btn_act_save('#squote-form #frm', async function () {
+                    let tr = $('#correct-tab').find(`input[name='bd-cursor-state']:checked`).closest('tr')
+                    let index = $(tr).prevAll().length
+                    // 필수텍스트가 안비어있으고 fouces out == 다음 tr 추가
+                    if (GenioCorrect.bd_page[index].ItemId != 0 && ! window.dom_required_check($(tr).find(`input`))) {
+                        if ($($this).data('last')) {
+                            let seq_no = await Btype.get_last_seq_no('genio', $('#genio-form').find('#auto-slip-no-txt').val())
+                            GenioCorrect.bd_page[index].SeqNo = seq_no;
+                        }
+
+                        Btype.call_bd_act_api([ GenioCorrect.get_bd_parameter(GenioCorrect.bd_page[index]) ], function (page) {
+                            GenioCorrect.bd_page[index].Id = page[0].Id;
+                            GenioCorrect.custom_body_act_success_callback($this, tr);
+                            Btype.check_the_checkbox_when_changing($this, false, 'GenioCorrect')
+                        }, 'GenioCorrect');
+
+                        let itemCodeInput = $(tr).find(`input[type="text"]`).first();
+                        let itemNameInput = $(tr).find(`input[type="text"]`).eq(1);
+                        if (itemCodeInput.length > 0) {
+                            Btype.set_slip_no_btn_disabled(itemCodeInput)
+                            Btype.set_slip_no_btn_disabled(itemNameInput)
+                            // $(firstTextInput).addClass('border-0 bg-white')
+                            // $(firstTextInput).prop('readonly', true)
+                        }
+                    } else {
+                        iziToast.error({
+                            title: 'Error',
+                            message: @json(_e('(*)Required item(s) omitted')),
+                        });
+                    }
+                });
+>>>>>>> a3549ead64c49eba9dfb0a96194234817b547b6d
             }
 
             GenioCorrect.get_bd_parameter = function (bd) {

routes/web.php

@@ -183,6 +183,7 @@ Route::get('/user-clear-cache', function () {
 //    Storage::deleteDirectory('dabory-footage/users/' . session('user')['UserId']);
     Storage::deleteDirectory('dabory-footage/users');
     Storage::deleteDirectory('dabory-footage/pro');
+    Storage::deleteDirectory('dabory-footage/basic/slip-form-init');
 
     Storage::deleteDirectory('dabory-footage/members');
     ProApiCacheFacade::deleteCachedDirectory();