RFID関連修正

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/OperationListJSON.java

@@ -61,6 +61,8 @@ public class OperationListJSON extends AcmsCommonJSON {
     public static final String OperationGroupMasterIdList = "operationGroupMasterIdList";
 
     public static final String QuickReport = "quickReport";
+    public static final String PermitCode = "permitCode";
+    public static final String PermitCodeRequiredFlg = "permitCodeRequiredFlg";
 
     public List<OperationDto> operationList;
 
@@ -92,6 +94,8 @@ public class OperationListJSON extends AcmsCommonJSON {
                 dto.enableReportEdit = operationJson.has(EnableReportEdit) ? operationJson.getInt(EnableReportEdit) : 0;          // 作業編集区分
                 dto.enableAddReport = operationJson.has(EnableAddReport) ? operationJson.getInt(EnableAddReport) : 0;          // 作業追加区分
                 dto.quickReport = operationJson.has(QuickReport) ? operationJson.getInt(QuickReport) : 0;
+                dto.permitCode = operationJson.has(PermitCode) ? operationJson.getString(PermitCode) : "";
+                dto.permitCodeRequiredFlg = operationJson.has(PermitCodeRequiredFlg) ? operationJson.getInt(PermitCodeRequiredFlg) : 0;
 
                 // 作業終了更新日
                 if (operationJson.has(OperationLastEditDate)) {

ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java

@@ -26,6 +26,8 @@ public class ABookKeys {
     public static final String ENABLE_REPORT_HISTORY = "enableReportHistory";
     public static final String ENABLE_ADD_REPORT = "enableAddReport";
     public static final String QUICK_REPORT = "quickReport";
+    public static final String PERMIT_CODE_REQUIRED_FLG = "permitCodeRequiredFlg";
+    public static final String PERMIT_CODE = "permitCode";
 
     public static final String OPERATION_GROUPMASTER_LIST = "operationGroupMasterList";
     public static final String OPERATION_GROUPMASTER_ID = "operationGroupMasterId";

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

@@ -324,6 +324,8 @@ public class OperationDao extends AbstractDao {
         sql.append("        top.enable_report_update, ");
         sql.append("        top.enable_report_edit, ");
         sql.append("        top.enable_add_report, ");
+        sql.append("        top.permit_code, ");
+        sql.append("        top.permit_code_required_flg, ");
         sql.append("        CASE ");
         sql.append("            WHEN report_type = 1 THEN ( ");
         sql.append("                SELECT strftime('%Y/%m/%d %H:%M', datetime(ttr.report_start_date, 'localtime')) || ' ~ ' || strftime('%Y/%m/%d %H:%M', datetime(ttr.report_end_date, 'localtime')) ");

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java

@@ -2019,6 +2019,8 @@ public class OperationLogic extends AbstractLogic {
                 operationJson.put(ABookKeys.ENABLE_REPORT_HISTORY, operationList.get(i).enableReportHistory);
                 operationJson.put(ABookKeys.ENABLE_ADD_REPORT, operationList.get(i).enableAddReport);
                 operationJson.put(ABookKeys.QUICK_REPORT, operationList.get(i).quickReport);
+                operationJson.put(ABookKeys.PERMIT_CODE, operationList.get(i).permitCode);
+                operationJson.put(ABookKeys.PERMIT_CODE_REQUIRED_FLG, operationList.get(i).permitCodeRequiredFlg);
                 operationJson.put(ABookKeys.CONTENT_ID, operationList.get(i).contentId);
                 operationJsonArray.put(operationJson);
             }

check @ 0a9dd91e

-Subproject commit 8a479a471350e0353559b3785e955dc7c30dab0b
+Subproject commit 0a9dd91eab004d76ae2fec60aae676d3c5058d30

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java

@@ -406,6 +406,21 @@ public class OperationListActivity extends ABVUIActivity {
             String searchOperationListStr = mOperationLogic.createOperationListJson(operationList, null);
             return searchOperationListStr;
         }
+
+        @JavascriptInterface
+        public void startScan() {
+            //TODO ConnectScanner
+        }
+
+        @JavascriptInterface
+        public void stopScan() {
+            //TODO DisconnectScanner
+        }
+    }
+
+    //TODO Method called when code is scanned
+    public void onScanned(String code) {
+        mCheckWebView.loadUrl("javascript:CHK.scanResult(" + code + ");");
     }
 
     // 共通資料画面表示