From b8f449dca8e53bbd5c0e424befe07c8207c10032 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 11 十二月 2018 13:48:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
index 5024dc6..20e7edf 100644
--- a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
@@ -5,6 +5,7 @@
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dao.impl.Batt_rtstateDAOImpl;
+import com.fgkj.dao.impl.Battinf_applyImpl;
import com.fgkj.dao.impl.Database_backupImpl;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Database_backup;
@@ -118,7 +119,18 @@
int station_next=station_max+1;
return station_next;
}
-
+ //鏌ヨ褰撳墠鏈�澶х殑dev_id
+ public static int searchmaxdev_id(){
+ int dev_id=0;
+ int devid_inf=(new BattInfImpl()).searchMaxdevId_binf();
+ int devid_apply=(new Battinf_applyImpl()).searchMaxdevId_apply();
+ if(devid_inf>=devid_apply){
+ dev_id=devid_inf+1;
+ }else{
+ dev_id=devid_apply+1;
+ }
+ return dev_id;
+ }
//褰撳battinf琛ㄤ腑鏁版嵁杩涜澧炲垹鏀圭殑鎿嶄綔鏃讹紝鍏堝浠絛b_battinf.tb_battinf
public static boolean backup_battinf(){
boolean en=false;
--
Gitblit v1.9.1