|
|
@ -52,14 +52,6 @@ static const char *sql_upgrade_workorder = |
|
|
"Time TEXT,lock INT,State INT,ProgramID VARCHAR,Machines VARCHAR,color VARCHAR,ColorNumber VARCHAR,Client VARCHAR,ClothWeight VARCHAR," |
|
|
"Time TEXT,lock INT,State INT,ProgramID VARCHAR,Machines VARCHAR,color VARCHAR,ColorNumber VARCHAR,Client VARCHAR,ClothWeight VARCHAR," |
|
|
"ClothSpecies VARCHAR,BathRatio VARCHAR,Total VARCHAR,USER VARCHAR,ColorName VARCHAR,Remark TEXT); "; |
|
|
"ClothSpecies VARCHAR,BathRatio VARCHAR,Total VARCHAR,USER VARCHAR,ColorName VARCHAR,Remark TEXT); "; |
|
|
|
|
|
|
|
|
static const char *sql_upgrade_run_table = |
|
|
|
|
|
"CREATE TABLE RUN (WorkOrder VARCHAR,DYELOT VARCHAR,ProgramID VARCHAR,Program VARCHAR,ReDye INT DEFAULT (0)," |
|
|
|
|
|
"Mode VARCHAR,Step INT,StepID VARCHAR,StepName VARCHAR,ParameterName VARCHAR,P1 DOUBLE,P2 DOUBLE,P3 DOUBLE," |
|
|
|
|
|
"P4 DOUBLE,P5 DOUBLE,P6 INT,P7 INT,P8 INT,P9 INT,P10 INT,Remark VARCHAR,StepTime INT,StepID_S1 VARCHAR," |
|
|
|
|
|
"StepID_S2 VARCHAR,StepID_S3 VARCHAR,StepName_S1 VARCHAR,StepName_S2 VARCHAR,StepName_S3 VARCHAR,P1_S1 DOUBLE," |
|
|
|
|
|
"P1_S2 DOUBLE,P1_S3 DOUBLE,P2_S1 DOUBLE,P2_S2 DOUBLE,P2_S3 DOUBLE,P3_S1 DOUBLE,P3_S2 DOUBLE,P3_S3 DOUBLE," |
|
|
|
|
|
"P4_S1 DOUBLE,P4_S2 DOUBLE,P4_S3 DOUBLE,P5_S1 DOUBLE,P5_S2 DOUBLE,P5_S3 DOUBLE); "; |
|
|
|
|
|
|
|
|
|
|
|
static const char *sql_upgrade_dyelot_table = |
|
|
static const char *sql_upgrade_dyelot_table = |
|
|
"CREATE TABLE Dyelot (WorkOrder VARCHAR,Dyelot VARCHAR,ReDye INT,Machine VARCHAR,Step INT,Tank INT,State INT,ProductCode VARCHAR," |
|
|
"CREATE TABLE Dyelot (WorkOrder VARCHAR,Dyelot VARCHAR,ReDye INT,Machine VARCHAR,Step INT,Tank INT,State INT,ProductCode VARCHAR," |
|
|
"ProductName VARCHAR,ProductType INT,Grams FLOAT,Amount FLOAT,CALL_TIME VARCHAR,DispenseEndTime VARCHAR,Type INT); "; |
|
|
"ProductName VARCHAR,ProductType INT,Grams FLOAT,Amount FLOAT,CALL_TIME VARCHAR,DispenseEndTime VARCHAR,Type INT); "; |
|
|
@ -219,12 +211,6 @@ void db_sqlite_init_full(void) |
|
|
}else{ |
|
|
}else{ |
|
|
LOG_E("[DataBASE]WorkOrder Creation failed "); |
|
|
LOG_E("[DataBASE]WorkOrder Creation failed "); |
|
|
} |
|
|
} |
|
|
if(sqlite3_exec(g_db,sql_upgrade_run_table, 0, 0, 0)==0) |
|
|
|
|
|
{ |
|
|
|
|
|
LOG_D("[DataBASE]RUN Created successfully "); |
|
|
|
|
|
}else{ |
|
|
|
|
|
LOG_E("[DataBASE]RUN Creation failed "); |
|
|
|
|
|
} |
|
|
|
|
|
if(sqlite3_exec(g_db,sql_upgrade_dyelot_table, 0, 0, 0)==0) |
|
|
if(sqlite3_exec(g_db,sql_upgrade_dyelot_table, 0, 0, 0)==0) |
|
|
{ |
|
|
{ |
|
|
LOG_D("[DataBASE]Dyelot Created successfully "); |
|
|
LOG_D("[DataBASE]Dyelot Created successfully "); |
|
|
@ -409,7 +395,7 @@ rt_err_t db_send_command(enum db_cmd_type type, const char* sql, rt_int32_t time |
|
|
|
|
|
|
|
|
// 等待数据库线程处理完成
|
|
|
// 等待数据库线程处理完成
|
|
|
rt_err_t result = rt_sem_take(sem, wait_ticks); |
|
|
rt_err_t result = rt_sem_take(sem, wait_ticks); |
|
|
//rt_sem_delete(sem);
|
|
|
rt_sem_delete(sem); |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -417,7 +403,7 @@ rt_err_t db_send_command(enum db_cmd_type type, const char* sql, rt_int32_t time |
|
|
void thread_DB_SQLite(void) |
|
|
void thread_DB_SQLite(void) |
|
|
{ |
|
|
{ |
|
|
rt_thread_t tid; |
|
|
rt_thread_t tid; |
|
|
tid = rt_thread_create("db_sql", db_sqlite, RT_NULL, 1024 *48, 20, 10); |
|
|
tid = rt_thread_create("db_sql", db_sqlite, RT_NULL, 1024 *16, 18, 10); |
|
|
|
|
|
|
|
|
if (tid != RT_NULL) |
|
|
if (tid != RT_NULL) |
|
|
{ |
|
|
{ |
|
|
|