Index: /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php	(revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php	(revision 19686)
@@ -55,4 +55,5 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrProductType = $masterData->getMasterData("mtb_product_type");
         $this->tpl_subtitle = '配送業者設定';
         $this->mode = isset($_POST['mode']) ? $_POST['mode'] : '';
@@ -132,4 +133,5 @@
                 $this->objFormParam->addParam("名称", "service_name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
                 $this->objFormParam->addParam("伝票No.確認URL", "confirm_url", STEXT_LEN, "n", array("URL_CHECK", "MAX_LENGTH_CHECK"), "http://");
+                $this->objFormParam->addParam("取扱商品種別", "product_type_id", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
 
                 for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
@@ -153,5 +155,4 @@
     }
 
-    
     /**
      * 配送情報を登録する
@@ -168,4 +169,5 @@
         $sqlval['service_name'] = $arrRet['service_name'];
         $sqlval['confirm_url'] = $arrRet['confirm_url'];
+        $sqlval['product_type_id'] = $arrRet['product_type_id'];
         $sqlval['creator_id'] = $_SESSION['member_id'];
         $sqlval['update_date'] = 'Now()';
@@ -214,5 +216,5 @@
                     if(strcmp($arrRet[$keyname], "") != 0) {
                         $sqlval = array('fee' => $arrRet[$keyname]);
-                        $objQuery->update("dtb_delivfee", $sqlval, "deliv_id = ? AND pref = ?", array($deliv_id, $cnt));
+                        $objQuery->update("dtb_delivfee", $sqlval, "deliv_id = ? AND fee_id = ?", array($deliv_id, $cnt));
                     }
                 }
@@ -251,5 +253,5 @@
                         $sqlval['pref'] = $cnt;
                         // INSERTの実行
-                        $sqlval['fee_id'] = $objQuery->nextVal('dtb_delivfee_fee_id');
+                        $sqlval['fee_id'] = $cnt;
                         $objQuery->insert("dtb_delivfee", $sqlval);
                     }
@@ -260,5 +262,4 @@
         return $deliv_id;
     }
-    
 
     /* 配送業者情報の取得 */
@@ -270,5 +271,5 @@
 
         // 配送業者一覧の取得
-        $col = "deliv_id, name, service_name, confirm_url";
+        $col = "deliv_id, name, service_name, confirm_url, product_type_id";
         $where = "deliv_id = ?";
         $table = "dtb_deliv";
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 19686)
@@ -79,5 +79,14 @@
 
   </table>
-  
+
+  <h2>取扱商品種別</h2>
+  <!--{assign var=key value="product_type_id"}-->
+  <table>
+    <tr>
+      <th>商品種別</th>
+      <td><span class="attention"><!--{$arrErr[$key]}--></span><!--{html_radios name=$key options=$arrProductType selected=$arrForm[$key].value}--></td>
+    </tr>
+  </table>
+
   <!--{if $smarty.const.INPUT_DELIV_FEE}-->
   <h2>配送料登録</h2>
Index: /branches/version-2_5-dev/html/install/index.php
===================================================================
--- /branches/version-2_5-dev/html/install/index.php	(revision 19675)
+++ /branches/version-2_5-dev/html/install/index.php	(revision 19686)
@@ -957,5 +957,4 @@
                  array("dtb_customer", "customer_id"),
                  array("dtb_deliv", "deliv_id"),
-                 array("dtb_delivfee", "fee_id"),
                  array("dtb_holiday", "holiday_id"),
                  array("dtb_kiyaku", "kiyaku_id"),
Index: /branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 19678)
+++ /branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 19686)
@@ -233,51 +233,51 @@
 INSERT INTO dtb_deliv (deliv_id, product_type_id, name, service_name, confirm_url, rank, status, del_flg, creator_id, create_date, update_date) VALUES (1, 1, 'サンプル業者', 'サンプル業者', NULL, 1, 1, 0, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 1, '1000', 1);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 2, '1000', 2);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 3, '1000', 3);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 4, '1000', 4);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 5, '1000', 5);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 6, '1000', 6);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 7, '1000', 7);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 8, '1000', 8);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 9, '1000', 9);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 10, '1000', 10);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 11, '1000', 11);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 12, '1000', 12);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 13, '1000', 13);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 14, '1000', 14);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 15, '1000', 15);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 16, '1000', 16);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 17, '1000', 17);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 18, '1000', 18);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 19, '1000', 19);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 20, '1000', 20);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 21, '1000', 21);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 22, '1000', 22);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 23, '1000', 23);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 24, '1000', 24);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 25, '1000', 25);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 26, '1000', 26);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 27, '1000', 27);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 28, '1000', 28);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 29, '1000', 29);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 30, '1000', 30);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 31, '1000', 31);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 32, '1000', 32);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 33, '1000', 33);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 34, '1000', 34);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 35, '1000', 35);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 36, '1000', 36);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 37, '1000', 37);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 38, '1000', 38);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 39, '1000', 39);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 40, '1000', 40);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 41, '1000', 41);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 42, '1000', 42);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 43, '1000', 43);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 44, '1000', 44);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 45, '1000', 45);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 46, '1000', 46);
-INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 47, '1000', 47);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 1, 1000, 1);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 2, 1000, 2);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 3, 1000, 3);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 4, 1000, 4);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 5, 1000, 5);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 6, 1000, 6);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 7, 1000, 7);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 8, 1000, 8);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 9, 1000, 9);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 10, 1000, 10);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 11, 1000, 11);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 12, 1000, 12);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 13, 1000, 13);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 14, 1000, 14);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 15, 1000, 15);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 16, 1000, 16);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 17, 1000, 17);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 18, 1000, 18);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 19, 1000, 19);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 20, 1000, 20);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 21, 1000, 21);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 22, 1000, 22);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 23, 1000, 23);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 24, 1000, 24);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 25, 1000, 25);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 26, 1000, 26);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 27, 1000, 27);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 28, 1000, 28);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 29, 1000, 29);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 30, 1000, 30);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 31, 1000, 31);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 32, 1000, 32);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 33, 1000, 33);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 34, 1000, 34);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 35, 1000, 35);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 36, 1000, 36);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 37, 1000, 37);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 38, 1000, 38);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 39, 1000, 39);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 40, 1000, 40);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 41, 1000, 41);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 42, 1000, 42);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 43, 1000, 43);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 44, 1000, 44);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 45, 1000, 45);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 46, 1000, 46);
+INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 47, 1000, 47);
 
 INSERT INTO dtb_delivtime (deliv_id, time_id, deliv_time) VALUES (1, 1, '午前');
Index: /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 19678)
+++ /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 19686)
@@ -179,5 +179,5 @@
     deliv_id int NOT NULL,
     fee_id int  NOT NULL,
-    fee text NOT NULL,
+    fee numeric NOT NULL,
     pref smallint,
     PRIMARY KEY (deliv_id, fee_id)
Index: /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 19678)
+++ /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 19686)
@@ -179,5 +179,5 @@
     deliv_id int NOT NULL,
     fee_id int NOT NULL,
-    fee text NOT NULL,
+    fee numeric NOT NULL,
     pref smallint,
     PRIMARY KEY (deliv_id, fee_id)