RFID連動作業

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DBConnector.java

@@ -19,7 +19,7 @@ import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
 public class DBConnector {
 	private static volatile DBConnector dbConnector = null;
 	public static final String DatabaseName = "ABVJE";
-	public static final int DatabaseVersion = DatabaseVersions.Ver1_2_362;
+	public static final int DatabaseVersion = DatabaseVersions.Ver1_4_0;
 
 	protected SQLiteDatabase db = null;
 

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/DatabaseVersions.java

@@ -6,6 +6,7 @@ public class DatabaseVersions {
 	public static final int Ver1_1_0 = 11;
 	public static final int Ver1_2_0 = 21;
 	public static final int Ver1_2_3 = 22;
+	public static final int Ver1_4_0 = 41;
 	//連続作業機能追加
 	public static final int Ver1_2_360 = 23;
 	//チャット機能追加(1.2.360障害対応。)

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java

@@ -116,6 +116,16 @@ public class OperationDao extends AbstractDao {
             dto.quickReport = cursor.getInt(column);
         }
 
+        column = cursor.getColumnIndex("permit_code");
+        if (column != -1) {
+            dto.permitCode = cursor.getString(column);
+        }
+
+        column = cursor.getColumnIndex("permit_code_required_flg");
+        if (column != -1) {
+            dto.permitCodeRequiredFlg = cursor.getInt(column);
+        }
+
         return dto;
     }
 
@@ -191,15 +201,17 @@ public class OperationDao extends AbstractDao {
                         + "enable_report_history, "
                         + "enable_report_edit,"
                         + "enable_add_report,"
-                        + "quick_report) "
+                        + "quick_report,"
+                        + "permit_code,"
+                        + "permit_code_required_flg) "
                         + "values "
-                        + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+                        + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
                 dto.getInsertValues());
     }
 
     public boolean update(OperationDto dto) {
-        long count = update("update t_operation "
-                        + "set "
+        long count = update("UPDATE t_operation "
+                        + "SET "
                         + "operation_name=?, "
                         + "operation_descriptions=?, "
                         + "operation_start_date=?, "
@@ -215,8 +227,10 @@ public class OperationDao extends AbstractDao {
                         + "enable_report_history=?, "
                         + "enable_report_edit=?, "
                         + "enable_add_report=?, "
-                        + "quick_report=? "
-                        + "where operation_id=?",
+                        + "quick_report=?, "
+                        + "permit_code=?, "
+                        + "permit_code_required_flg=? "
+                        + "WHERE operation_id=?",
                 dto.getUpdateValues());
         return count > 0;
     }

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TOperation.java

@@ -40,6 +40,8 @@ public class TOperation extends SQLiteTableScript {
         sql.append("      , enable_add_report SMALLINT NOT NULL DEFAULT 0 ");
         sql.append("      , operation_open_date DATETIME ");
         sql.append("      , quick_report SMALLINT NOT NULL DEFAULT 0 ");
+        sql.append("      , permit_code TEXT ");
+        sql.append("      , permit_code_required_flg ");
         sql.append("      , PRIMARY KEY (operation_id) ");
         sql.append(" ) ");
         ddl.add(sql.toString());
@@ -58,6 +60,10 @@ public class TOperation extends SQLiteTableScript {
         if (oldVersion < DatabaseVersions.Ver1_2_3) {
             ddl.add("ALTER TABLE t_operation ADD COLUMN quick_report SMALLINT NOT NULL DEFAULT 0 ");
         }
+        if (oldVersion < DatabaseVersions.Ver1_4_0) {
+            ddl.add("ALTER TABLE t_operation ADD COLUMN permit_code TEXT ");
+            ddl.add("ALTER TABLE t_operation ADD COLUMN permit_code_required_flg SMALLINT ");
+        }
         return ddl;
     }
 

ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/OperationDto.java

@@ -32,6 +32,8 @@ public class OperationDto extends AbstractDto {
     public int enableReportEdit;    // 作業編集可能区分
     public int enableAddReport;     // 作業追加区分
     public int quickReport;         // 簡易帳票区分
+    public String permitCode;         // 許可スキャンコード
+    public int permitCodeRequiredFlg;         // 許可スキャン必須フラグ
 
     public List<OperationGroupMasterRelationDto> operationGroupMasterRelationDtoList; // 作業種別に紐づく作業Dto
 
@@ -49,12 +51,12 @@ public class OperationDto extends AbstractDto {
 
     @Override
     public Object[] getInsertValues() {
-        return new Object[] { operationId, operationName, operationDescriptions, operationStartDate, operationEndDate, operationType, reportType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportCycle, enableReportUpdate, enableReportHistory, enableReportEdit, enableAddReport, quickReport  };
+        return new Object[] { operationId, operationName, operationDescriptions, operationStartDate, operationEndDate, operationType, reportType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportCycle, enableReportUpdate, enableReportHistory, enableReportEdit, enableAddReport, quickReport, permitCode, permitCodeRequiredFlg};
     }
 
     @Override
     public Object[] getUpdateValues() {
-        return new Object[] { operationName, operationDescriptions, operationStartDate, operationEndDate, operationType, reportType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportCycle, enableReportUpdate, enableReportHistory, enableReportEdit, enableAddReport, quickReport, operationId };
+        return new Object[] { operationName, operationDescriptions, operationStartDate, operationEndDate, operationType, reportType, lastEditDate, contentCreatingFlg, editLockFlg, needSyncFlg, reportCycle, enableReportUpdate, enableReportHistory, enableReportEdit, enableAddReport, quickReport, permitCode, permitCodeRequiredFlg, operationId };
     }
 
     @Override

check @ c6486df4

-Subproject commit 8f311eaa70017a25b07676c7a9131bc7cf8413c6
+Subproject commit c6486df4bde19d95a9723aa72a9bb13a558d6935