Pārlūkot izejas kodu

Merge branch 'master' of http://git.daboryhost.com:10880/youhk/youhk_test_repository

hokky 4 mēneši atpakaļ
vecāks
revīzija
b0a63c740d

BIN
.DS_Store


+ 1 - 1
app/Helpers/File.php

@@ -26,7 +26,7 @@ class File
         $mediaLibraryService->setGateToken(session('GateToken')['main']);
         $setup = $mediaLibraryService->getSetup('post');
         $path = $mediaLibraryService->getCurrSetupFilePath($setup);
-
+        $path = preg_replace('/\/$/', '', $path);
         $filePath = \Storage::disk(getDisk())->put($path, $file);
 
         return '/' . $filePath;

+ 69 - 0
app/Http/Controllers/Api/BlankerController.php

@@ -0,0 +1,69 @@
+<?php
+
+
+namespace App\Http\Controllers\Api;
+
+
+use App\Helpers\Utils;
+use Illuminate\Http\Request;
+use App\Services\CallApiService;
+use Themes\blanker\pro\app\Services\BlankerService;
+
+class BlankerController
+{
+    /**
+     * @var CallApiService
+     */
+    private $callApiService;
+    private $blankerService;
+
+    public function __construct(CallApiService $callApiService, BlankerService $blankerService)
+    {
+        $this->callApiService = $callApiService;
+        $this->blankerService = $blankerService;
+    }
+
+    public function currPrice()
+    {
+        $printingJson = request('PrintingJson');
+        $result = response()->json($this->blankerService->colrow(
+            $printingJson['p'],
+            $printingJson['p3'],
+            $printingJson['e_size_type'],
+            $printingJson['abcd_value'],
+            $printingJson['pri_r'],
+            $printingJson['opsens5'],
+            $printingJson['ii2'],
+            $printingJson['ii3'],
+            request('OuterWidth'),
+            request('OuterHeight'),
+            request('OuterWidth'),
+            request('OuterHeight'),
+        ))->getData(true);
+
+        $this->callApiService->setGateToken();
+        $gateToken = session()->get('GateToken');
+        $response = $this->callApiService->callApi([
+            'url' => 'item-pick',
+            'data' => [
+                'Page' => [
+                    [
+                        'Id' => (int)request('ItemId'),
+                    ]
+                ]
+            ],
+            'headers' => ['GateToken' => $gateToken['main']]
+        ]);
+
+
+        if ($this->callApiService->verifyApiError($response)) {
+            return response()->json($response['body'], 401);
+        }
+
+        $item = $response['Page'][0];
+        return response()->json([
+            'ItemName' => $item['ItemName'],
+            'CurrPrice' => $result['total_op'],
+        ]);
+    }
+}

+ 9 - 6
app/Services/CallApiService.php

@@ -32,7 +32,7 @@ class CallApiService
 
         try {
             $response = Request::post(
-                $this->buildUrl($request['url'], $type),
+                $this->buildUrl($request['url'], $type, $request['strong_type'] ?? null),
                 $this->buildHeader($request['headers'] ?? [], $type),
                 $this->buildQuery($request['data'], $request['url'])
             );
@@ -82,10 +82,12 @@ class CallApiService
         }
     }
 
-    private function buildUrl($url, $type): string
+    private function buildUrl($url, $type, $strongType): string
     {
         if ($type === 'custom') {
             return $url;
+        } else if ($strongType) {
+            return env('STRONG_' . strtoupper($strongType) . '_API_URL') . '/' . $url;
         }
 
         return config("app.api.{$type}.url") . $url;
@@ -206,16 +208,17 @@ class CallApiService
             $request['data'] = json_decode($request['data']);
         }
 
-        if ($request['strong_type']) {
-            $request['url'] = env('STRONG_' . strtoupper($request['strong_type']) . '_API_URL') . '/' . $request['url'];
-            $request['type'] = 'custom';
-        }
+//        if ($request['strong_type']) {
+//            $request['url'] = env('STRONG_' . strtoupper($request['strong_type']) . '_API_URL') . '/' . $request['url'];
+//            $request['type'] = 'custom';
+//        }
 
         $response = $this->callApi([
             'url' => $request['url'],
             'data' => $request['data'],
             'headers' => $request['headers'],
             'type' => $request['type'],
+            'strong_type' => $request['strong_type']
         ], true);
 
         if ($request['para_cache'] && ! isset($response['apiStatus'])) {

+ 42 - 42
composer.lock

@@ -222,16 +222,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.315.0",
+            "version": "3.315.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "a7f6026f00771025c32548dac321541face0dedc"
+                "reference": "0d9911bf67e0f2c4b6965d7f10840b11f323e6b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a7f6026f00771025c32548dac321541face0dedc",
-                "reference": "a7f6026f00771025c32548dac321541face0dedc",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0d9911bf67e0f2c4b6965d7f10840b11f323e6b2",
+                "reference": "0d9911bf67e0f2c4b6965d7f10840b11f323e6b2",
                 "shasum": ""
             },
             "require": {
@@ -311,9 +311,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.315.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.315.2"
             },
-            "time": "2024-06-26T18:08:22+00:00"
+            "time": "2024-06-28T19:07:22+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -6026,16 +6026,16 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "v8.5.1",
+            "version": "v8.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
-                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152"
+                "reference": "ef8c59c02e54315ad6ab44113b42522878040010"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
-                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/ef8c59c02e54315ad6ab44113b42522878040010",
+                "reference": "ef8c59c02e54315ad6ab44113b42522878040010",
                 "shasum": ""
             },
             "require": {
@@ -6085,9 +6085,9 @@
             ],
             "support": {
                 "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
-                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.5.1"
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.5.2"
             },
-            "time": "2024-02-15T16:41:13+00:00"
+            "time": "2024-06-28T16:34:52+00:00"
         },
         {
             "name": "simplesoftwareio/simple-qrcode",
@@ -6501,16 +6501,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.40",
+            "version": "v5.4.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "aa73115c0c24220b523625bfcfa655d7d73662dd"
+                "reference": "6473d441a913cb997123b59ff2dbe3d1cf9e11ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/aa73115c0c24220b523625bfcfa655d7d73662dd",
-                "reference": "aa73115c0c24220b523625bfcfa655d7d73662dd",
+                "url": "https://api.github.com/repos/symfony/console/zipball/6473d441a913cb997123b59ff2dbe3d1cf9e11ba",
+                "reference": "6473d441a913cb997123b59ff2dbe3d1cf9e11ba",
                 "shasum": ""
             },
             "require": {
@@ -6580,7 +6580,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.40"
+                "source": "https://github.com/symfony/console/tree/v5.4.41"
             },
             "funding": [
                 {
@@ -6596,7 +6596,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:33:22+00:00"
+            "time": "2024-06-28T07:48:55+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -6733,16 +6733,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v5.4.40",
+            "version": "v5.4.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c6c8f965a87b22d5005a7806783c7f10ae7e58cd"
+                "reference": "c25da5cc2de4e6f96b3a0a2813050355a20dd0e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c6c8f965a87b22d5005a7806783c7f10ae7e58cd",
-                "reference": "c6c8f965a87b22d5005a7806783c7f10ae7e58cd",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c25da5cc2de4e6f96b3a0a2813050355a20dd0e1",
+                "reference": "c25da5cc2de4e6f96b3a0a2813050355a20dd0e1",
                 "shasum": ""
             },
             "require": {
@@ -6784,7 +6784,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v5.4.40"
+                "source": "https://github.com/symfony/error-handler/tree/v5.4.41"
             },
             "funding": [
                 {
@@ -6800,7 +6800,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:33:22+00:00"
+            "time": "2024-06-09T18:59:35+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -7107,16 +7107,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v5.4.40",
+            "version": "v5.4.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "3ad03183c6985adc2eece16f239f8cfe1c4ccbe3"
+                "reference": "aad4078e1210343b7cd5acb803c02f8b02f002b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3ad03183c6985adc2eece16f239f8cfe1c4ccbe3",
-                "reference": "3ad03183c6985adc2eece16f239f8cfe1c4ccbe3",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aad4078e1210343b7cd5acb803c02f8b02f002b2",
+                "reference": "aad4078e1210343b7cd5acb803c02f8b02f002b2",
                 "shasum": ""
             },
             "require": {
@@ -7200,7 +7200,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.4.40"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.4.41"
             },
             "funding": [
                 {
@@ -7216,20 +7216,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-02T15:53:08+00:00"
+            "time": "2024-06-28T11:42:41+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.4.40",
+            "version": "v5.4.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "8c6dc1fb0b1f990aa15086abcde66dbde3a9bdad"
+                "reference": "c71c7a1aeed60b22d05e738197e31daf2120bd42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/8c6dc1fb0b1f990aa15086abcde66dbde3a9bdad",
-                "reference": "8c6dc1fb0b1f990aa15086abcde66dbde3a9bdad",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/c71c7a1aeed60b22d05e738197e31daf2120bd42",
+                "reference": "c71c7a1aeed60b22d05e738197e31daf2120bd42",
                 "shasum": ""
             },
             "require": {
@@ -7285,7 +7285,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.4.40"
+                "source": "https://github.com/symfony/mime/tree/v5.4.41"
             },
             "funding": [
                 {
@@ -7301,7 +7301,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:33:22+00:00"
+            "time": "2024-06-28T09:36:24+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -8327,16 +8327,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.40",
+            "version": "v5.4.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "142877285aa974a6f7685e292ab5ba9aae86b143"
+                "reference": "065a9611e0b1fd2197a867e1fb7f2238191b7096"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/142877285aa974a6f7685e292ab5ba9aae86b143",
-                "reference": "142877285aa974a6f7685e292ab5ba9aae86b143",
+                "url": "https://api.github.com/repos/symfony/string/zipball/065a9611e0b1fd2197a867e1fb7f2238191b7096",
+                "reference": "065a9611e0b1fd2197a867e1fb7f2238191b7096",
                 "shasum": ""
             },
             "require": {
@@ -8393,7 +8393,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.40"
+                "source": "https://github.com/symfony/string/tree/v5.4.41"
             },
             "funding": [
                 {
@@ -8409,7 +8409,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:33:22+00:00"
+            "time": "2024-06-28T09:20:55+00:00"
         },
         {
             "name": "symfony/translation",

BIN
dabory/.DS_Store


+ 133 - 0
dabory/para/erp/ko_KR/copy/body-copy/stock/genio-genio.json

@@ -0,0 +1,133 @@
+{
+    "General": {
+        "Title": "재고조정 항목 복사",
+        "PageApi": "body-copy-page",
+        "ActApi": "body-copy-mact"
+    },
+
+    "QueryVars": {
+        "QueryName": "stock/genio-genio",
+        "GroupBy": "dbr_genio_bd.id"
+    },
+
+    "LastSeqNoVars": {
+		"TableName": "genio"
+	},
+
+    "BodyCopyPageVars": {
+		"SlipNoField": "genio_no"
+	},
+
+    "//FormVars": "ListVars[0]-Caption,",
+    "FormVars": [
+        {
+            "SlipNoButton": "재고조정 번호",
+            "ItemCodeButton": "품목코드",
+            "CompanyNameButton": "업체명",
+            "AutoCreateSlipChecked": "",
+            "ShowOnlyClosedChecked": "종결처리만 표시",
+            "BalanceOption": "잔량",
+            "DayFromTodayOption": "배송예정 일수",
+            "SelectedItems": "선택항목",
+            "SelectedQty": "선택수량"
+        }
+    ],
+
+    "// BalanceOptions": "",
+    "BalanceOptions": [
+        {
+            "Value": "bal_qty > 0",
+            "Caption": "있는 경우만"
+        },
+        {
+            "Value": "bal_qty >= -900000000",
+            "Caption": "없는 경우도 표함"
+        }
+    ],
+    "// OrderByOptions": "OrderBy Options//첫번째 Value가 Default",
+    "OrderByOptions": [
+        {
+            "Value": "genio_no desc",
+            "Caption": "전표번호 역순"
+        },
+        {
+            "Value": "genio_no asc",
+            "Caption": "전표번호 정렬"
+        },
+        {
+            "Value": "company_name asc",
+            "Caption": "업체명 정렬"
+        },
+        {
+            "Value": "company_name desc",
+            "Caption": "업체명 역순"
+        },
+        {
+            "Value": "item_code asc",
+            "Caption": "품목코드 정렬"
+        },
+        {
+            "Value": "item_code desc",
+            "Caption": "품목코드 역순"
+        }
+    ],
+
+    "// ListVars": "ListVars[0]-caption, ListVars[2]-size(%), ListVars[3]-align",
+    "ListVars": [
+        {
+            "$Check": "$Check",
+            "No": "번호",
+            "SlipNo": "재고조정 번호",
+            "CompanyName": "공급업체",
+            "ItemCode": "품목코드",
+            "ItemName": "품명",
+            "SubName": "서브명",
+            "OrderQty": "수량",
+            "BalQty": "복사수량",
+            "Ref": "관련정보"
+        },
+        {
+            "$Check": "3",
+            "No": "5",
+            "SlipNo": "10",
+            "CompanyName": "10",
+            "ItemCode": "10",
+            "ItemName": "30",
+            "SubName": "8",
+            "OrderQty": "8",
+            "BalQty": "8",
+            "Ref": "10"
+        },
+        {
+            "$Check": "center",
+            "No": "center",
+            "SlipNo": "center",
+            "CompanyName": "left",
+            "ItemCode": "center",
+            "ItemName": "left",
+            "SubName": "left",
+            "OrderQty": "right",
+            "BalQty": "right",
+            "Ref": "left"
+        }
+    ],
+
+    "//BodyCopyPopupVars": "[0]-filter, [1]-component, [2]-parameter",
+    "BodyCopyPopupVars": [
+        {
+            "SlipNo": "slip_no",
+            "CompanyName": "company_name",
+            "ItemCode": "item_code"
+        },
+        {
+            "SlipNo": "slip",
+            "CompanyName": "company",
+            "ItemCode": "item"
+        },
+        {
+            "SlipNo": "/search/slip-search/sales/genio",
+            "CompanyName": "/search/company-search/company",
+            "ItemCode": "/search/item-search/supplier"
+        }
+    ]
+}

+ 34 - 0
dabory/para/erp/ko_KR/copy/copy-to-another/stock/genio-genio.json

@@ -0,0 +1,34 @@
+{
+    "General": {
+        "Title": "상품재고에서 상품재고로 복사",
+        "ActApi": "copy-to-another",
+        "PickApi": "genio-pick",
+        "SourceTable": "stock/genio",
+        "TargetTable": "genio"
+    },
+
+    "//FormVars": "ListVars[0]-Caption",
+    "FormVars": [
+        {
+            "SourceButton": "복사할 수불번호",
+            "TargetButton": "복사될 수불번호",
+            "EqualLabel": "복사할 번호를 복사될 번호의 컬럼에 복사하기",
+            "ItemCopyLabel": "전체 품목 복사 선택",
+            "CopyItemRadio": "복사 함",
+            "DontCopyRadio": "복사 않음"
+        }
+    ],
+
+    "//CopyToAnotherPopupVars": "[0]-filter, [1]-component, [2]-parameter",
+    "CopyToAnotherPopupVars": [
+        {
+            "Source": "slip_no"
+        },
+        {
+            "Source": "slip"
+        },
+        {
+            "Source": "/search/slip-search/stock/genio"
+        }
+    ]
+}

+ 3 - 3
dabory/para/erp/ko_KR/form/form-a/company.json

@@ -31,13 +31,13 @@
             "MainContact": "담당자명",
             "MobileNo": "담당자전화",
             "Email": "이메일",
-            "CardChar4": "카드4자리*",
+            "CardChar4": "카드4자리",
             "TelNo": "전화번호",
             "FaxNo": "팩스번호",
             "FullName": "상호",
             "President": "대표자",
-            "ZipCode": "우편번호*",
-            "Addr1": "주소*",
+            "ZipCode": "우편번호",
+            "Addr1": "주소",
             "Addr2": "주소상세",
             "BizType": "업태",
             "DealItem": "종목",

+ 43 - 4
dabory/para/erp/ko_KR/form/form-b/genio.json

@@ -20,10 +20,43 @@
             "Caption": "저장 후 추가",
             "Parameter": ""
         },
+        {
+            "Value": "copy-to-another",
+            "Caption": "복사",
+            "Parameter": "stock/genio-genio"
+        },
         {
             "Value": "delete",
             "Caption": "삭제",
             "Parameter": ""
+        },
+        {
+            "Value": "rpt-print",
+            "Caption": "인쇄",
+            "Parameter": ""
+        },
+        {
+            "Value": "rpt-custom",
+            "Caption": "커스텀 인쇄",
+            "Parameter": ""
+        },
+        {
+            "Value": "linked",
+            "Caption": "고객업체 등록",
+            "Parameter": "",
+            "Linked": "/dabory/erp/master-data/company?bpa=eyJtZW51X25hbWUiOiJcdWFjNzBcdWI3OThcdWNjOTggXHVhZDAwXHViOWFjIiwibWVudV9jb2RlIjoiMDMxMDAwIiwiZGlzYWJsZV9sX21lbnUiOiIwIiwiZW5hYmxlX3JfbWVudSI6IjAiLCJwZXJtaXNzaW9uIjp7ImlzX215bWVudSI6IjAiLCJpc19saXN0IjoiMSIsImlzX3JlYWQiOiIxIiwiaXNfY3JlYXRlIjoiMSIsImlzX3VwZGF0ZSI6IjEiLCJpc19kZWxldGUiOiIxIiwiaXNfbmV3dGFiIjoiMCJ9LCJwYWdlX3VyaSI6IlwvZGFib3J5XC9lcnBcL21hc3Rlci1kYXRhXC9jb21wYW55IiwicGFyYV9uYW1lIjoiXC9mb3JtXC9mb3JtLWFcL2NvbXBhbnkiLCJ0aGVtZV9kaXIiOiIiLCJtYWluX2FwcF9pZCI6MCwiZ3Vlc3RfYXBwX2lkIjowLCJjdXN0b21fdmFyIjoiIn0="
+        },
+        {
+            "Value": "linked",
+            "Caption": "상용구 등록",
+            "Parameter": "",
+            "Linked": "https://newerp.daboryhost.com/dabory/erp/basic-settings/etc?bpa=eyJtZW51X25hbWUiOiJcdWMwYzFcdWM2YTlcdWFkNmMgXHViNGYxXHViODVkIiwibWVudV9jb2RlIjoiNzcyMDA4IiwiZGlzYWJsZV9sX21lbnUiOiIwIiwiZW5hYmxlX3JfbWVudSI6IjAiLCJwZXJtaXNzaW9uIjp7ImlzX215bWVudSI6IjAiLCJpc19saXN0IjoiMSIsImlzX3JlYWQiOiIxIiwiaXNfY3JlYXRlIjoiMSIsImlzX3VwZGF0ZSI6IjEiLCJpc19kZWxldGUiOiIxIiwiaXNfbmV3dGFiIjoiMCJ9LCJwYWdlX3VyaSI6IlwvZGFib3J5XC9lcnBcL2Jhc2ljLXNldHRpbmdzXC9ldGMiLCJwYXJhX25hbWUiOiJcL2Zvcm1cL2Zvcm0tYlwvZXRjIiwidGhlbWVfZGlyIjoiIiwibWFpbl9hcHBfaWQiOjAsImd1ZXN0X2FwcF9pZCI6MCwiY3VzdG9tX3ZhciI6IiJ9"
+        },
+        {
+            "Value": "linked",
+            "Caption": "영업구분 등록",
+            "Parameter": "",
+            "Linked": "/dabory/erp/basic-settings/sgroup?bpa=eyJtZW51X25hbWUiOiJcdWM2MDFcdWM1YzVcdWFkNmNcdWJkODQiLCJtZW51X2NvZGUiOiI3NzIwMDMiLCJkaXNhYmxlX2xfbWVudSI6IjAiLCJlbmFibGVfcl9tZW51IjoiMCIsInBlcm1pc3Npb24iOnsiaXNfbXltZW51IjoiMCIsImlzX2xpc3QiOiIxIiwiaXNfcmVhZCI6IjEiLCJpc19jcmVhdGUiOiIxIiwiaXNfdXBkYXRlIjoiMSIsImlzX2RlbGV0ZSI6IjEiLCJpc19uZXd0YWIiOiIwIn0sInBhZ2VfdXJpIjoiXC9kYWJvcnlcL2VycFwvYmFzaWMtc2V0dGluZ3NcL3Nncm91cCIsInBhcmFfbmFtZSI6IlwvZm9ybVwvZm9ybS1hXC9zZ3JvdXAiLCJ0aGVtZV9kaXIiOiIiLCJtYWluX2FwcF9pZCI6MCwiZ3Vlc3RfYXBwX2lkIjowLCJjdXN0b21fdmFyIjoiIn0="
         }
     ],
 
@@ -41,13 +74,19 @@
     "BodySelectOptions": [
         {
             "Value": "multi-delete",
-            "Caption": "품목 일괄 삭제",
+            "Caption": "항목 삭제",
             "Parameter": ""
         },
         {
             "Value": "multi-update",
-            "Caption": "품목 일괄 수정",
+            "Caption": "항목 수정",
             "Parameter": ""
+        },
+        {
+            "Value": "linked",
+            "Caption": "품목 등록",
+            "Parameter": "",
+            "Linked": "/dabory/erp/master-data/item?bpa=eyJtZW51X25hbWUiOiJcdWMwYzFcdWQ0ODggXHViNGYxXHViODVkIiwibWVudV9jb2RlIjoiMDIxMDAwIiwiZGlzYWJsZV9sX21lbnUiOiIwIiwiZW5hYmxlX3JfbWVudSI6IjAiLCJwZXJtaXNzaW9uIjp7ImlzX215bWVudSI6IjAiLCJpc19saXN0IjoiMSIsImlzX3JlYWQiOiIxIiwiaXNfY3JlYXRlIjoiMSIsImlzX3VwZGF0ZSI6IjEiLCJpc19kZWxldGUiOiIxIiwiaXNfbmV3dGFiIjoiMCJ9LCJwYWdlX3VyaSI6IlwvZGFib3J5XC9lcnBcL21hc3Rlci1kYXRhXC9pdGVtIiwicGFyYV9uYW1lIjoiXC9mb3JtXC9mb3JtLWFcL2l0ZW0iLCJ0aGVtZV9kaXIiOiIiLCJtYWluX2FwcF9pZCI6MCwiZ3Vlc3RfYXBwX2lkIjowLCJjdXN0b21fdmFyIjoiIn0="
         }
     ],
 
@@ -55,7 +94,7 @@
     "FormVars": [
         {
             "SaveButton": "저장",
-            "AddNewBdButton": "목 추가",
+            "AddNewBdButton": "목 추가",
             "AutoSlipNo": "수불번호*",
             "GenioDate": "수불일자*",
             "DealType": "거래구분*",
@@ -70,7 +109,7 @@
             "Column2": "공란2",
             "UserName": "사용자명*",
             "Remarks": "비고",
-            "Genio": "일반수불처리",
+            "Genio": "일반 재고 변경 등록",
             "Moutio": "자재소모내역"
         },
         {

+ 2 - 0
down

@@ -0,0 +1,2 @@
+docker-compose down
+

+ 2 - 2
index.html

@@ -71,7 +71,7 @@ table.content_title td {
 		<td>
 			<table class="content">
 				<tr>
-					<td><a href="http://kloxong.org" title="Go to Kloxo Next Generation website"><img style="margin:5px; padding:5px; height:50px" class="logo" src="./images/kloxong.png" alt="kloxong-logo"></a></td>
+					<td><a href="http://mratwork.com/" title="Go to Kloxo-MR website"><img style="margin:5px; padding:5px; height:50px" class="logo" src="./images/kloxo-mr.png" alt="kloxo-mr-logo"></a></td>
 				</tr>
 
 			</table>
@@ -87,7 +87,7 @@ table.content_title td {
 			<tr>
 				<td><br>
 				<br>
-				<b>Kloxo Next Generation Default Page for solution.dabory.com</b> </td>
+				<b>Kloxo-MR Default Page for newerp.daboryhost.com</b> </td>
 			</tr>
 		</table>
 		<br>

+ 787 - 0
public/blanker-item.json

@@ -0,0 +1,787 @@
+{
+    "category": null,
+    "code_num": null,
+    "str_position": "0|0|0|0|0|0|0",
+    "price_stat": "0",
+    "opp_display5": "0",
+    "opp_display6": "0",
+    "separate": "1",
+    "p": {
+        "c": {
+            "n": "\uaddc\uaca9mm",
+            "l": [
+                {
+                    "n": "\ube44\uaddc\uaca9",
+                    "c1": "\uc6f9\uc785\ub825",
+                    "c2": "\uc6f9\uc785\ub825",
+                    "w1": "3",
+                    "w2": "3"
+                },
+                {
+                    "n": "40*40",
+                    "c1": "40",
+                    "c2": "40",
+                    "w1": "43",
+                    "w2": "43",
+                    "t": "A"
+                },
+                {
+                    "n": "50*50",
+                    "c1": "50",
+                    "c2": "50",
+                    "w1": "53",
+                    "w2": "53",
+                    "t": "A"
+                },
+                {
+                    "n": "60*60",
+                    "c1": "60",
+                    "c2": "60",
+                    "w1": "63",
+                    "w2": "63",
+                    "t": "A"
+                },
+                {
+                    "n": "70*70",
+                    "c1": "70",
+                    "c2": "70",
+                    "w1": "73",
+                    "w2": "73",
+                    "t": "A"
+                },
+                {
+                    "n": "80*80",
+                    "c1": "80",
+                    "c2": "80",
+                    "w1": "83",
+                    "w2": "83",
+                    "t": "A"
+                },
+                {
+                    "n": "100*100",
+                    "c1": "100",
+                    "c2": "100",
+                    "w1": "103",
+                    "w2": "103",
+                    "t": "A"
+                }
+            ]
+        },
+        "r": [
+            {
+                "n": "\uc7ac\uc9c8 | \ubaa8\uc591",
+                "o": "c",
+                "t": "\uc2a4\ub178\uc6b0\uc9c0 \uad8c\uc7a5\uc6a9\uc9c0 \uc785\ub2c8\ub2e4.",
+                "l": [
+                    {
+                        "n": "\ube44\ucf54\ud305\uc544\ud2b8\uc9c0",
+                        "l": [
+                            {
+                                "n": "\uc6d0\ud615.\ud0c0\uc6d0\ud615152"
+                            },
+                            {
+                                "n": "\uc0ac\uac01(\ub77c\uc6b4\ub4dc)\ud615"
+                            },
+                            {
+                                "n": "\ub760\uc2a4\ud2f0\ucee4"
+                            },
+                            {
+                                "n": "\ub2e4\uac01\ud615(\uaf2d\uc9d3\uc8108\uac1c\uc774\ud558)"
+                            }
+                        ]
+                    },
+                    {
+                        "n": "\uc720\uad11\ucf54\ud305\uc544\ud2b8\uc9c0",
+                        "l": [
+                            {
+                                "n": "\uc6d0\ud615.\ud0c0\uc6d0\ud615"
+                            },
+                            {
+                                "n": "\uc0ac\uac01(\ub77c\uc6b4\ub4dc)\ud615"
+                            },
+                            {
+                                "n": "\ub760\uc2a4\ud2f0\ucee4"
+                            },
+                            {
+                                "n": "\ub2e4\uac01\ud615(\uaf2d\uc9d3\uc8108\uac1c\uc774\ud558)"
+                            }
+                        ]
+                    },
+                    {
+                        "n": "\ube44\ucf54\ud305\ucd08\uac15\uc811"
+                    }
+                ]
+            },
+            {
+                "n": "\uc778\uc1c4\ub3c4\uc218",
+                "o": "c",
+                "t": null,
+                "l": [
+                    {
+                        "n": "\ub2e8\uba744\ub3c4"
+                    },
+                    {
+                        "n": "\uceec\ub7ec8\ub3c4"
+                    }
+                ]
+            }
+        ],
+        "p": [
+            [
+                [
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": null,
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": null,
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": null,
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": null,
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": null,
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": null,
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": null,
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": null,
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ],
+                [
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    },
+                    {
+                        "v": "10",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ]
+            ],
+            [
+                [
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "25",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "26",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "27",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "28",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "23",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "30",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "32",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "33",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ],
+                [
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    },
+                    {
+                        "v": "10",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ]
+            ],
+            [
+                [
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "30",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "31",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "33",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "34",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "27",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "32",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "33",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "35",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ],
+                [
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    },
+                    {
+                        "v": "10",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ]
+            ],
+            [
+                [
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "40",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "41",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "42",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "35",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "28",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "33",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "35",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "37",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ],
+                [
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    },
+                    {
+                        "v": "10",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ]
+            ],
+            [
+                [
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "50",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "51",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "52",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "53",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "30",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "34",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "35",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "37",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ],
+                [
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    },
+                    {
+                        "v": "10",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ]
+            ],
+            [
+                [
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "60",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "61",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "53",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "55",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "31",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "35",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "37",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "38",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ],
+                [
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    },
+                    {
+                        "v": "10",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ]
+            ],
+            [
+                [
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "30",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "66",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "67",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "68",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0",
+                        "l": [
+                            {
+                                "v": "32",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "40",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "42",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            },
+                            {
+                                "v": "45",
+                                "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                            }
+                        ]
+                    },
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ],
+                [
+                    {
+                        "v": "0",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    },
+                    {
+                        "v": "10",
+                        "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                    }
+                ]
+            ]
+        ]
+    },
+    "pfo": {
+        "c": {
+            "l": {
+                "1": {
+                    "n": null
+                },
+                "2": {
+                    "n": null
+                },
+                "3": {
+                    "n": null
+                },
+                "4": {
+                    "n": null
+                },
+                "5": {
+                    "n": null
+                },
+                "6": {
+                    "n": null
+                }
+            }
+        },
+        "r": [
+            {
+                "n": null,
+                "l": [
+                    {
+                        "n": null
+                    },
+                    {
+                        "n": null
+                    },
+                    {
+                        "n": null
+                    }
+                ]
+            },
+            {
+                "n": null,
+                "l": [
+                    {
+                        "n": null
+                    },
+                    {
+                        "n": null
+                    }
+                ]
+            }
+        ]
+    },
+    "pfd": {
+        "c": {
+            "l": {
+                "1": {
+                    "n": null
+                },
+                "2": {
+                    "n": null
+                },
+                "3": {
+                    "n": null
+                },
+                "4": {
+                    "n": null
+                },
+                "5": {
+                    "n": null
+                },
+                "6": {
+                    "n": null
+                }
+            }
+        },
+        "r": [
+            {
+                "n": null,
+                "l": [
+                    {
+                        "n": null
+                    },
+                    {
+                        "n": null
+                    },
+                    {
+                        "n": null
+                    }
+                ]
+            },
+            {
+                "n": null,
+                "l": [
+                    {
+                        "n": null
+                    },
+                    {
+                        "n": null
+                    }
+                ]
+            }
+        ]
+    },
+    "p3": {
+        "p": [
+            [
+                [
+                    {
+                        "v": null,
+                        "o": null,
+                        "l": [
+                            {
+                                "v": "100:2,500:12:25:0.02|2,500:10,000:14:25:0.05|10,000:40,000:30:25:0.05|40,000:90,000:30:25:0.05|0:0:0:0:0|0:0:0:0:0|0:0:0:0:0|::::|::::",
+                                "o": "N||"
+                            },
+                            {
+                                "v": "900:2,500:12:25:0.02|2500:10,000:14:25:0.05|10,000:40,000:30:25:0.05|40,000:90,000:30:25:0.05|::::|::::|::::|::::|::::|::::",
+                                "o": "N||"
+                            },
+                            {
+                                "v": "100:2,500:12:25:0.02|2,500:10,000:14:25:0.05|10,000:40,000:30:25:0.05|40,000:90,000:90:25:0.05|::::|::::|::::|::::|::::|::::",
+                                "o": "N||"
+                            },
+                            {
+                                "v": "100:10,000:12:25:0.02|10,000:90,001:13:25:0.03|::::|::::|::::|::::|::::|::::|::::|::::",
+                                "o": "N||"
+                            }
+                        ]
+                    },
+                    {
+                        "v": null,
+                        "o": null,
+                        "l": [
+                            {
+                                "v": "900:1,600:12:0:0|1,600:2,500:13:30:0.02|2,500:3,600:14:30:0.02|3,600:4,900:15:30:0.05|4,900:8,200:16:30:0.05|8,200:20,000:17:30:0.05|20,000:100,000:18:30:0.05|0::::|::::|::::",
+                                "o": "N||"
+                            },
+                            {
+                                "v": "100:40,000:12:25:0.05|40,000:90,000:13:25:0.04|::::|::::|::::|::::|::::|::::|::::|::::",
+                                "o": "N||"
+                            },
+                            {
+                                "v": "100:10,000:12:25:0.02|10,000:90,001:13:25:0.03|::::|::::|::::|::::|::::|::::|::::|::::",
+                                "o": "N||"
+                            },
+                            {
+                                "v": "100:10,000:12:25:0.02|10,000:90,001:13:25:0.03|0:0:::|::::|::::|::::|::::|::::|::::|::::",
+                                "o": "N||"
+                            }
+                        ]
+                    },
+                    {
+                        "v": "100:10,000:15:25:0.03|10,000:90,001:17:30:0.05|::::|::::|::::|::::|::::|::::|::::|::::",
+                        "o": "N||"
+                    }
+                ],
+                [
+                    {
+                        "v": null,
+                        "o": null
+                    },
+                    {
+                        "v": null,
+                        "o": null
+                    }
+                ]
+            ]
+        ],
+        "unit": "mm",
+        "bprice": null,
+        "w_min": "30",
+        "h_min": "30",
+        "w_max": "280",
+        "h_max": "290"
+    },
+    "viewnidx": [
+        "\uc635\uc158"
+    ],
+    "optionpagecnt0": "1",
+    "op_numq": [
+        "0"
+    ],
+    "op_titleq0": [
+        "\ucd94\uac00\ub514\uc790\uc778"
+    ],
+    "op_numqs0": [
+        null
+    ],
+    "op_nameq0": [
+        "\uc120\ud0dd\ud558\uae30",
+        "\uc55e\uc7a5\ub514\uc790\uc778",
+        "\uc55e,\ub4a4\ub514\uc790\uc778"
+    ],
+    "op_priq0": [
+        null,
+        "100,000",
+        "200,000"
+    ],
+    "op_rate_0": [
+        null,
+        null,
+        null
+    ],
+    "pf": {
+        "c": {
+            "l": {
+                "1": {
+                    "n": "\/uploads\/2024\/06\/14\/post\/Svl6g3rABhBKrILqm1CrLNAhLHRcuKAAPIVrUagl.jpg"
+                }
+            }
+        },
+        "r": [
+            {
+                "l": {
+                    "1": {
+                        "n": "\/uploads\/2024\/06\/14\/post\/HZNDuVGIWknOszOoiUEeo9RZPVxIqV7kUaBcYS80.jpg"
+                    }
+                },
+                "n": null
+            }
+        ]
+    }
+}

+ 2 - 2
public/chat-ui/build/chatUI.css

@@ -12,10 +12,10 @@
 body {
     margin: 0;
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-    font-size: 1rem;
+    /*font-size: 1rem;
     font-weight: 400;
     line-height: 1.5;
-    color: #212529;
+    color: #212529;*/
     text-align: left;
     background-color: #fff;
 	}

+ 5 - 0
public/js/modals-controller/b-type/common.js

@@ -220,6 +220,10 @@
 
         // $($($this).closest('tr')).children(`td:eq(${Btype.get_first_required_th_index(table)})`).find('input').focus();
 
+        // $($($this).closest('tr')).children(`td:eq(${Btype.get_first_required_th_index(table)})`).find('input').focus();
+        let currentElement = $($this);
+        currentElement.focus();
+        currentElement.select();
     };
 
     Btype.table_td_focus = function ($this) {
@@ -285,6 +289,7 @@
                 {Id: item_id }
             ]
         })
+        console.log('response : ', response);
         let item = response.data.Page[0];
         let next_input = eval(namespace).set_item_data_to_textbox(item)
 

+ 2 - 2
public/js/plugins/codemirror/mode/julia/index.html

@@ -174,9 +174,9 @@ x ? y : z
 if else elseif while for
  begin let end do
 try catch finally return break continue
-global local const 
+global local const
 export import importall using
-function macro module baremodule 
+function macro module baremodule
 type immutable quote
 true false enumerate
 

+ 652 - 0
public/printing-curr-price-req.json

@@ -0,0 +1,652 @@
+{
+    "ItemId": 6,
+    "PrintingJson": {
+        "p": {
+            "c": {
+                "n": "규격mm",
+                "l": [
+                    {
+                        "n": "비규격",
+                        "c1": "웹입력",
+                        "c2": "웹입력",
+                        "w1": "3",
+                        "w2": null
+                    },
+                    {
+                        "n": "40*40",
+                        "c1": "40",
+                        "c2": "40",
+                        "w1": "43",
+                        "w2": "43",
+                        "t": "A"
+                    },
+                    {
+                        "n": "50*50",
+                        "c1": "50",
+                        "c2": "50",
+                        "w1": "53",
+                        "w2": "53",
+                        "t": "A"
+                    },
+                    {
+                        "n": "60*60",
+                        "c1": "60",
+                        "c2": "60",
+                        "w1": "63",
+                        "w2": "63",
+                        "t": "A"
+                    },
+                    {
+                        "n": "70*70",
+                        "c1": "70",
+                        "c2": "70",
+                        "w1": "73",
+                        "w2": "73",
+                        "t": "A"
+                    },
+                    {
+                        "n": "80*80",
+                        "c1": "80",
+                        "c2": "80",
+                        "w1": "83",
+                        "w2": "83",
+                        "t": "A"
+                    },
+                    {
+                        "n": "100*100",
+                        "c1": "100",
+                        "c2": "100",
+                        "w1": "103",
+                        "w2": "103",
+                        "t": "A"
+                    }
+                ]
+            },
+            "r": [
+                {
+                    "n": "재질 | 모양",
+                    "o": "c",
+                    "t": "스노우지 권장용지 입니다.",
+                    "l": [
+                        {
+                            "n": "비코팅아트지",
+                            "l": [
+                                {
+                                    "n": "원형.타원형"
+                                },
+                                {
+                                    "n": "사각(라운드)형"
+                                },
+                                {
+                                    "n": "띠스티커"
+                                },
+                                {
+                                    "n": "다각형(꼭짓점8개이하)"
+                                }
+                            ]
+                        },
+                        {
+                            "n": "유광코팅아트지",
+                            "l": [
+                                {
+                                    "n": "원형.타원형"
+                                },
+                                {
+                                    "n": "사각(라운드)형"
+                                },
+                                {
+                                    "n": "띠스티커"
+                                },
+                                {
+                                    "n": "다각형(꼭짓점8개이하)"
+                                }
+                            ]
+                        },
+                        {
+                            "n": "비코팅초강접"
+                        }
+                    ]
+                },
+                {
+                    "n": "인쇄도수",
+                    "o": "c",
+                    "t": null,
+                    "l": [
+                        {
+                            "n": "단면4도"
+                        },
+                        {
+                            "n": "컬러8도"
+                        }
+                    ]
+                }
+            ],
+            "p": [
+                [
+                    [
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": null,
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": null,
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": null,
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": null,
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": null,
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": null,
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": null,
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": null,
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ],
+                    [
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        },
+                        {
+                            "v": "10",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ]
+                ],
+                [
+                    [
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "25",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "26",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "27",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "28",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "23",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "30",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "32",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "33",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ],
+                    [
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        },
+                        {
+                            "v": "10",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ]
+                ],
+                [
+                    [
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "30",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "31",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "33",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "34",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "27",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "32",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "33",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "35",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ],
+                    [
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        },
+                        {
+                            "v": "10",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ]
+                ],
+                [
+                    [
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "40",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "41",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "42",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "35",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "28",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "33",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "35",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "37",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ],
+                    [
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        },
+                        {
+                            "v": "10",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ]
+                ],
+                [
+                    [
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "50",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "51",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "52",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "53",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "30",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "34",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "35",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "37",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ],
+                    [
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        },
+                        {
+                            "v": "10",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ]
+                ],
+                [
+                    [
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "60",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "61",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "53",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "55",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "31",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "35",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "37",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "38",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ],
+                    [
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        },
+                        {
+                            "v": "10",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ]
+                ],
+                [
+                    [
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "30",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "66",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "67",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "68",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "r": null,
+                            "l": [
+                                {
+                                    "v": "32",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "40",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "42",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                },
+                                {
+                                    "v": "45",
+                                    "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                                }
+                            ]
+                        },
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ],
+                    [
+                        {
+                            "v": "0",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        },
+                        {
+                            "v": "10",
+                            "r": "1000:0::0|2000:3::0|3000:5::0|5000:7::0|7000:9::0|10000:12::0|20000:15::0|30000:20::0|50000:25::0"
+                        }
+                    ]
+                ]
+            ]
+        },
+        "p3": {
+            "p": [
+                [
+                    [
+                        {
+                            "v": null,
+                            "o": null,
+                            "l": [
+                                {
+                                    "v": "100:2,500:12:25:0.02|2,500:10,000:14:25:0.05|10,000:40,000:30:25:0.05|40,000:90,000:30:25:0.05|0:0:0:0:0|0:0:0:0:0|0:0:0:0:0|::::|::::",
+                                    "o": "N||"
+                                },
+                                {
+                                    "v": "900:2,500:12:25:0.02|2500:10,000:14:25:0.05|10,000:40,000:30:25:0.05|40,000:90,000:30:25:0.05|::::|::::|::::|::::|::::|::::",
+                                    "o": "N||"
+                                },
+                                {
+                                    "v": "100:2,500:12:25:0.02|2,500:10,000:14:25:0.05|10,000:40,000:30:25:0.05|40,000:90,000:90:25:0.05|::::|::::|::::|::::|::::|::::",
+                                    "o": "N||"
+                                },
+                                {
+                                    "v": "100:10,000:12:25:0.02|10,000:90,001:13:25:0.03|::::|::::|::::|::::|::::|::::|::::|::::",
+                                    "o": "N||"
+                                }
+                            ]
+                        },
+                        {
+                            "v": null,
+                            "o": null,
+                            "l": [
+                                {
+                                    "v": "900:1,600:12:0:0|1,600:2,500:13:30:0.02|2,500:3,600:14:30:0.02|3,600:4,900:15:30:0.05|4,900:8,200:16:30:0.05|8,200:20,000:17:30:0.05|20,000:100,000:18:30:0.05|0::::|::::|::::",
+                                    "o": "N||"
+                                },
+                                {
+                                    "v": "100:40,000:12:25:0.05|40,000:90,000:13:25:0.04|::::|::::|::::|::::|::::|::::|::::|::::",
+                                    "o": "N||"
+                                },
+                                {
+                                    "v": "100:10,000:12:25:0.02|10,000:90,001:13:25:0.03|::::|::::|::::|::::|::::|::::|::::|::::",
+                                    "o": "N||"
+                                },
+                                {
+                                    "v": "100:10,000:12:25:0.02|10,000:90,001:13:25:0.03|0:0:::|::::|::::|::::|::::|::::|::::|::::",
+                                    "o": "N||"
+                                }
+                            ]
+                        },
+                        {
+                            "v": "100:10,000:15:25:0.03|10,000:90,001:17:30:0.05|::::|::::|::::|::::|::::|::::|::::|::::",
+                            "o": "N||"
+                        }
+                    ],
+                    [
+                        {
+                            "v": null,
+                            "o": null
+                        },
+                        {
+                            "v": null,
+                            "o": null
+                        }
+                    ]
+                ]
+            ],
+            "unit": "mm",
+            "bprice": null,
+            "w_min": "30",
+            "h_min": "30",
+            "w_max": "280",
+            "h_max": "290"
+        },
+        "e_size_type": "1",
+        "abcd_value": "수량||1000",
+        "pri_r": [
+            {
+                "e_value3": "0||재질 | 모양||0||비코팅아트지||0||원형.타원형"
+            },
+            {
+                "e_value3": null,
+                "e_value2": "1||인쇄도수||0||단면4도"
+            }
+        ],
+        "opsens5": 0,
+        "ii2": "0",
+        "ii3": "0"
+    },
+    "OuterWidth": "50",
+    "OuterHeight": "50",
+    "InnerWidth": "53",
+    "innerHeight": "53"
+}

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

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

+ 3 - 1
resources/views/front/dabory/erp/sales/squote.blade.php

@@ -299,7 +299,7 @@
             if (formB['SlipCommonSetup']['IsNewRecAutoSlipNo']) {
                 $('.is-new-rec-auto-slip-no').text('자동채번')
                 $('#auto-slip-no-txt').prop('disabled', true)
-                get_last_slip_no()
+                // get_last_slip_no()
             }
 
             if (formB['SlipCommonSetup']['IsLastSlipGet']) {
@@ -446,11 +446,13 @@
         function btn_act_copy_to_another(parameter_name) {
             let data = formB['HeadSelectOptions'].filter(selectOption => selectOption['ModalClassName'] == parameter_name)[0];
             // $(`#modal-copy-to-another.${parameter_name}`).find('.target-slip-no-txt').data('slip-no', $('#auto-slip-no-txt').val())
+            console.log('parameter : ', data['Parameter']);
             $(`#modal-copy-to-another.${parameter_name}`).find('.source-slip-no-txt').val($('#auto-slip-no-txt').val())
             $('.sales').find('.modal-btn').data('target', 'copy-to-another')
             $('.sales').find('.modal-btn').data('variable', data['Parameter'])
             $('.sales').find('.modal-btn').data('class', parameter_name)
             $('.sales').find('.modal-btn').trigger('click')
+            console.log('test : ', $(`#modal-copy-to-another.${parameter_name}`))
         }
 
         function bd_update_due_to_vat_rate_change() {

+ 59 - 0
resources/views/front/dabory/erp/stock/genio.blade.php

@@ -6,6 +6,17 @@
     <div class="row">
         <div class="col-xl-12">
             <div class="mb-1 pt-2 text-right">
+                <button type="button" hidden
+                    class="btn btn-success btn-open-modal window item-modal-btn"
+                    data-target="item"
+                    data-clicked="Btype.get_item_id"
+                    data-variable="itemModal">
+                </button>
+
+                <button type="button" hidden
+                    class="btn btn-success btn-open-modal modal-btn">
+                </button>
+
                 <button type="button"
                     class="btn btn-success btn-open-modal"
                     data-target="slip"
@@ -218,6 +229,28 @@
 
 @endsection
 
+@foreach ($formB['HeadSelectOptions'] as $selectOption)
+    @if (! empty($selectOption['Parameter']))
+        @push('modal')
+            @include($selectOption['BladeRoute'], [
+                'moealSetFile' => $selectOption['Parameter'],
+                'modalClassName' => $selectOption['ModalClassName']
+            ])
+        @endpush
+    @endif
+@endforeach
+
+@foreach ($formB['BodySelectOptions'] as $selectOption)
+    @if (! empty($selectOption['Parameter']))
+        @push('modal')
+            @include($selectOption['BladeRoute'], [
+                'moealSetFile' => $selectOption['Parameter'],
+                'modalClassName' => $selectOption['ModalClassName']
+            ])
+        @endpush
+    @endif
+@endforeach
+
 @section('modal')
     @include('front.outline.static.slip', ['moealSetFile' => $genioModal])
     @include('front.outline.static.company', ['moealSetFile' => $companyModal])
@@ -263,10 +296,15 @@
             }
 
             $('.genio-act').on('click', function () {
+                console.log($(this).data('value'));
+                console.log($(this).data('parameter')); //여기까진 들어옴
+                console.log('여기서 문제? : ', str_replace_hyphen($(this).data('parameter'), '/'));
                 // console.log($(this).data('value'))
                 switch( $(this).data('value') ) {
+
                     case 'save': Btype.btn_act_save('#genio-form #frm'); break;
                     case 'new': btn_act_new(); break;
+                    case 'copy-to-another': btn_act_copy_to_another(str_replace_hyphen($(this).data('parameter'), '/')); break;
                     case 'save-and-new': Btype.btn_act_save_and_new('#genio-form #frm'); break;
                     case 'delete': Btype.btn_act_del('#genio-form #frm'); break;
                 }
@@ -381,6 +419,20 @@
             $('#our-contact-select').html(our_contact);
         }
 
+        // start head act btn
+        function btn_act_copy_to_another(parameter_name) {
+            console.log('parameter_name : ',parameter_name);
+            let data = formB['HeadSelectOptions'].filter(selectOption => selectOption['ModalClassName'] == parameter_name)[0];
+            console.log('parameter : ', data['Parameter']);
+            // $(`#modal-copy-to-another.${parameter_name}`).find('.target-slip-no-txt').data('slip-no', $('#auto-slip-no-txt').val())
+            $(`#modal-copy-to-another.${parameter_name}`).find('.source-slip-no-txt').val($('#auto-slip-no-txt').val())
+            $('.stock').find('.modal-btn').data('target', 'copy-to-another')
+            $('.stock').find('.modal-btn').data('variable', data['Parameter'])
+            $('.stock').find('.modal-btn').data('class', parameter_name)
+            $('.stock').find('.modal-btn').trigger('click')
+            console.log('test : ', $(`#modal-copy-to-another.${parameter_name}`))
+        }
+
         function bd_update_due_to_vat_rate_change() {
             let data = [];
 
@@ -479,5 +531,12 @@
         var formB = {!! json_encode($formB) !!};
         let slipInit = null;
 
+        console.log('genioModal : ', genioModal);
+        console.log('companyModal : ', companyModal);
+        console.log('itemModal : ', itemModal);
+        console.log('slipCacheData : ', slipCacheData);
+        console.log('pickCacheData : ', pickCacheData);
+        console.log('formB : ', formB);
+
     </script>
 @endsection

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

@@ -118,9 +118,9 @@
         });
 
         $('#genio-table-body').on('click', 'tr', function() {
-            console.log('genio-table-body click'); //20240627 추가1
                 // Find the input element with name="bd-cursor-state" within the clicked row
                 const $bdCursorStateInput = $(this).find('input[name="bd-cursor-state"]');
+                // console.log('bdCursorStateInput : ', $bdCursorStateInput)
                 if ($bdCursorStateInput.length) {
                     $($bdCursorStateInput).prop('checked', true)
                     Btype.bd_cursor_click($bdCursorStateInput)

+ 7 - 1
resources/views/front/outline/static/copy-to-another.blade.php

@@ -1,5 +1,7 @@
 <!--- copy-to-anther --->
-@php $modalClassName = $modalClassName ?? ''; @endphp
+@php $modalClassName = $modalClassName ?? '';
+var_dump($moealSetFile['General']['Title']);
+@endphp
 <div class="modal fade {{ $modalClassName }}" id="modal-copy-to-another" aria-hidden="true" data-backdrop="static" style="display: none; z-index: 1050; overflow: auto;">
     <div class="modal-dialog m-auto pt-4" style="width: 480px;">
         <button type="button" hidden
@@ -66,6 +68,10 @@
     });
 </script>
 
+@php
+ var_dump($moealSetFile['CopyToAnotherPopupVars']['Display']);
+@endphp
+
 @foreach ($moealSetFile['CopyToAnotherPopupVars']['Display'] as $key => $i)
     @if ($moealSetFile['CopyToAnotherPopupVars']['Display'][$key] != 'd-none')
         @push('modal')

+ 1 - 2
resources/views/front/outline/static/slip.blade.php

@@ -1,12 +1,11 @@
 <!--- slip-search --->
 @php $modalClassName = $modalClassName ?? '';
-//var_dump($moealSetFile);
 @endphp
 
 <div class="modal fade modal-brown {{ $modalClassName }}" id="modal-slip" aria-hidden="true" data-backdrop="static" style="display: none; z-index: 1060;">
     <div class="modal-dialog m-auto pt-4" style="max-width: 1250px !important;">
         <div class="modal-content">
-            <div class="modal-header bg-primary"><!--p-2-->
+            <div class="modal-header bg-primary test111"><!--p-2-->
                 <h4 class="modal-title text-white" id="myModalLabel"></h4>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fas fa-times"></i></button>
             </div>

+ 2 - 0
routes/api.php

@@ -19,6 +19,8 @@ Route::middleware('auth:api')->get('/user', function (Request $request) {
     return $request->user();
 });
 
+Route::post('/printing-curr-price', [App\Http\Controllers\Api\BlankerController::class, 'currPrice']);
+
 Route::get('/projects', [App\Http\Controllers\Api\SodiumController::class, 'prjectIndex']);
 Route::post('/projects', [App\Http\Controllers\Api\SodiumController::class, 'prjectStore']);
 Route::put('/projects', [App\Http\Controllers\Api\SodiumController::class, 'prjectUpdate']);

+ 0 - 22
settings_erp.sh

@@ -1,38 +1,16 @@
 #!/bin/bash
-theme_file="erponly"
 main_dir="/var/www/html"
 del_vendor_dir="/var/www/html/vendor"
 s_vendor_dir="/home/vendor"
 
 # vendor 디렉토리 삭제
 rm -rf "$del_vendor_dir"
-
 # home 경로에 vendor 디렉토리 생성
 mkdir -p "$s_vendor_dir"
-
 # /var/www/html 경로 이동
 cd "$main_dir"
-
 # vendor 심볼릭 링크 생성
 ln -s "$s_vendor_dir" vendor
-
-# resources 심볼릭 링크 생성
-# resources_link="$main_dir/public/themes/$theme_file/pro/resources"
-# if [ -d "$main_dir/public/themes/$theme_file/pro" ]; then
-#     cd "$main_dir/public/themes/$theme_file/pro"
-# else
-#     mkdir -p "$main_dir/public/themes/$theme_file/pro"
-#     cd "$main_dir/public/themes/$theme_file/pro"
-# fi
-
-# # 기존의 resources 심볼릭 링크나 디렉토리가 있으면 삭제
-# if [ -e "$resources_link" ]; then
-#     rm -rf "$resources_link"
-# fi
-
-# 새로운 resources 심볼릭 링크 생성
-# ln -s "$main_dir/dabory/themes/$theme_file/pro/resources" resources
-
 cd "$main_dir"
 # composer update 실행
 composer update

+ 4 - 0
start

@@ -0,0 +1,4 @@
+
+docker_id="$1"
+
+docker-compose up -d --"${docker_id}"