X-Git-Url: https://satomichan.jp/gitweb/?p=nucalgen;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fjp%2Fsatomichan%2Fnucalgen%2FNucalgen.java;h=9eb18fcb5a579bdb36a2b4f0fcbff66ae3dfe5cb;hp=bb80aa3e9c1f0f236a804b3f28fe01af0c1e7d51;hb=33a043c52b68b0feb72f4f3a84d648793f223b83;hpb=ae346b58f26e920407f6abc8315068ffe6fb2579

diff --git a/src/main/java/jp/satomichan/nucalgen/Nucalgen.java b/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
index bb80aa3..9eb18fc 100644
--- a/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
+++ b/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
@@ -102,8 +102,9 @@ public class Nucalgen {
 			for(int i = rowIndex; i < lines + 3; i++,rowIndex++) {
 				Row thisRow = calcSheet.createRow(rowIndex);
 
+				//「食品名」
 				thisRow.createCell(1).setCellStyle(csPool.getCellStyle("00000", false));
-				thisRow.createCell(2).setCellFormula("IFERROR(VLOOKUP(B" + (rowIndex + 1) + ",成分表!$B$12:$BL$2500,3,FALSE),\"\")");
+				thisRow.createCell(2).setCellFormula("IFERROR(VLOOKUP(B" + (rowIndex + 1) + ",成分表!$B$13:$BL$2500,3,FALSE),\"\")");
 				thisRow.createCell(3).setCellStyle(csPool.getCellStyle("", false));
 
 				colIndex = 4;
@@ -113,7 +114,7 @@ public class Nucalgen {
 
 					String div100 = aColumn.isUseRawValue() ? "" :  "/ 100 * $D" + (rowIndex + 1);
 
-					thisCell.setCellFormula("IFERROR(VLOOKUP($B" + (rowIndex + 1) + "," + aColumn.getTable() + "!$B$12:$BL$2500,MATCH(\"" + aColumn.getName() + "\"," + aColumn.getTable() + "!$B$11:$BL$11,0),FALSE) " + div100 + ",\"\")");
+					thisCell.setCellFormula("IFERROR(VLOOKUP($B" + (rowIndex + 1) + "," + aColumn.getTable() + "!$B$13:$BL$2500,MATCH(\"" + aColumn.getName() + "\"," + aColumn.getTable() + "!$B$12:$BL$12,0),FALSE) " + div100 + ",\"\")");
 					colIndex++;
 
 					usedTableList.add(aColumn.getTable());