|
|
@@ -79,10 +79,10 @@ namespace UAS_PLCDataReader
|
|
|
private void Main_Load(object sender, EventArgs e)
|
|
|
{
|
|
|
//设备列表
|
|
|
- GridDeviceList.GetDataSQL = "SELECT 0 CHECKEDCOLUMN,DE_ID,DE_CODE,DE_NAME,DE_SPEC,DE_INDATE,DE_RUNSTATUS,DE_ADDRESS,DE_INMAN,DE_LINECODE,DE_WCCODE,DE_VENDCODE,DE_VENDNAME,DE_STEPCODE,DE_STEPNAME FROM DEVICE ORDER BY DE_CODE".ToUpper();
|
|
|
+ GridDeviceList.GetDataSQL = "SELECT 0 CHECKEDCOLUMN,DE_ID,DE_CODE,DE_NAME,DE_SPEC,DE_INDATE,DE_RUNSTATUS,DE_ADDRESS,DE_INMAN,DE_LINECODE,DE_WCCODE,DE_VENDCODE,DE_VENDNAME,DE_STEPCODE,DE_STEPNAME,DE_SOURCECODE FROM DEVICE ORDER BY DE_CODE".ToUpper();
|
|
|
GridDeviceList.TableName = "device";
|
|
|
GridDeviceList.ID = "de_id";
|
|
|
- GridDeviceList.InsertSQL = "INSERT INTO DEVICE(DE_ID,DE_CODE,DE_NAME,DE_SPEC,DE_INDATE,DE_RUNSTATUS,DE_ADDRESS,DE_INMAN,DE_LINECODE,DE_WCCODE,DE_VENDCODE,DE_VENDNAME,DE_STEPCODE,DE_STEPNAME) VALUES(DEVICE_SEQ.NEXTVAL,:DE_CODE,:DE_NAME,:DE_SPEC,:DE_INDATE,:DE_RUNSTATUS,:DE_ADDRESS,:DE_INMAN,:DE_LINECODE,:DE_WCCODE,:DE_VENDCODE,:DE_VENDNAME,:DE_STEPCODE,:DE_STEPNAME)";
|
|
|
+ GridDeviceList.InsertSQL = "INSERT INTO DEVICE(DE_ID,DE_CODE,DE_NAME,DE_SPEC,DE_INDATE,DE_RUNSTATUS,DE_ADDRESS,DE_INMAN,DE_LINECODE,DE_WCCODE,DE_VENDCODE,DE_VENDNAME,DE_STEPCODE,DE_STEPNAME,DE_SOURCECODE) VALUES(DEVICE_SEQ.NEXTVAL,:DE_CODE,:DE_NAME,:DE_SPEC,:DE_INDATE,:DE_RUNSTATUS,:DE_ADDRESS,:DE_INMAN,:DE_LINECODE,:DE_WCCODE,:DE_VENDCODE,:DE_VENDNAME,:DE_STEPCODE,:DE_STEPNAME,:DE_SOURCECODE)";
|
|
|
ButtonAddDevice.Grid = GridDeviceList;
|
|
|
ButtonSaveDevice.Grid = GridDeviceList;
|
|
|
ButtonDeleteDevice.Grid = GridDeviceList;
|
|
|
@@ -105,7 +105,7 @@ namespace UAS_PLCDataReader
|
|
|
ButtonDeleteCommandSet.Grid = GridPollingSetting;
|
|
|
|
|
|
//指令设置界面
|
|
|
- GridCommandSetting.GetDataSQL = "select 0 CHECKEDCOLUMN,dc_id,dc_code,dc_name,dc_type,dc_value,dc_sendcoding,dc_receivecoding,db_name,dc_man,to_char(dc_date,'YYYY-MM-DD HH:mi:ss')dc_date from devicecommand left join devicebrand on db_code=dc_debrand".ToUpper();
|
|
|
+ GridCommandSetting.GetDataSQL = "select 0 CHECKEDCOLUMN,dc_id,dc_code,dc_name,dc_type,dc_value,dc_sendcoding,dc_receivecoding,db_name,dc_man,dc_date from devicecommand left join devicebrand on db_code=dc_debrand".ToUpper();
|
|
|
GridCommandSetting.TableName = "devicecommand";
|
|
|
GridCommandSetting.ID = "dc_id";
|
|
|
GridCommandSetting.InsertSQL = "insert into devicecommand(dc_id,dc_code,dc_name,dc_value,dc_debrand,dc_sendcoding,dc_receivecoding,dc_man,dc_date) values(devicecommand_seq.nextval,:dc_code,:dc_name,:dc_value,'" + BaseUtil.GetComboxEditValue(Brand) + "',:dc_sendcoding,:dc_receivecoding,'" + User.UserName + "',sysdate)";
|
|
|
@@ -162,8 +162,11 @@ namespace UAS_PLCDataReader
|
|
|
ButtonSaveDevice.DoSaveAfterHandler();
|
|
|
sql.Clear();
|
|
|
sql.Append("update device set de_inman='" + User.UserName + "' where de_id=:de_id");
|
|
|
- dh.BatchInsert(sql.ToString(), new string[] { "de_id" }, ButtonSaveDevice.LastSaveID);
|
|
|
- GridDeviceList.RefreshData();
|
|
|
+ if (ButtonSaveDevice.LastSaveID != null && ButtonSaveDevice.LastSaveID.Length > 0)
|
|
|
+ {
|
|
|
+ dh.BatchInsert(sql.ToString(), new string[] { "de_id" }, ButtonSaveDevice.LastSaveID);
|
|
|
+ GridDeviceList.RefreshData();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
private void ComboxDeviceListWC_SelectedIndexChanged(object sender, EventArgs e)
|
|
|
@@ -171,7 +174,7 @@ namespace UAS_PLCDataReader
|
|
|
DeviceListQuerySQL.Clear();
|
|
|
string WC = BaseUtil.GetComboxEditValue(ComboxDeviceListWC);
|
|
|
DeviceListQuerySQL.Append("select 0 CHECKEDCOLUMN,de_id,de_code,de_name,de_spec,de_indate,de_runstatus,de_address,de_wccode,de_inman,de_linecode");
|
|
|
- DeviceListQuerySQL.Append("de_vendcode,de_vendname,de_stepcode,de_stepname from device where de_wccode='" + WC + "' order by de_code");
|
|
|
+ DeviceListQuerySQL.Append("de_vendcode,de_vendname,de_stepcode,de_stepname,DE_SOURCECODE from device where de_wccode='" + WC + "' order by de_code");
|
|
|
sql.Clear();
|
|
|
if (WC == "全部")
|
|
|
sql.Append("select li_code,li_name from line");
|
|
|
@@ -188,7 +191,7 @@ namespace UAS_PLCDataReader
|
|
|
string WC = BaseUtil.GetComboxEditValue(ComboxDeviceListWC);
|
|
|
string LC = BaseUtil.GetComboxEditValue(ComboxDeviceListLC);
|
|
|
DeviceListQuerySQL.Append("select 0 CHECKEDCOLUMN,de_id,de_code,de_name,de_spec,de_indate,de_runstatus,de_address,de_wccode, ");
|
|
|
- DeviceListQuerySQL.Append("de_vendcode,de_vendname,de_inman,de_linecode,de_stepcode,de_stepname from device ");
|
|
|
+ DeviceListQuerySQL.Append("de_vendcode,de_vendname,de_inman,de_linecode,de_stepcode,de_stepname,DE_SOURCECODE from device ");
|
|
|
if (WC != "全部" && LC != "全部")
|
|
|
DeviceListQuerySQL.Append(" where de_wccode='" + WC + "' and de_linecode='" + LC + "' ");
|
|
|
if (WC == "全部" && LC != "全部")
|
|
|
@@ -285,8 +288,11 @@ namespace UAS_PLCDataReader
|
|
|
ButtonSaveCommand.DoSaveAfterHandler();
|
|
|
sql.Clear();
|
|
|
sql.Append("update devicecommand set dc_man='" + User.UserName + "',dc_date=sysdate where dc_id=:dc_id");
|
|
|
- dh.BatchInsert(sql.ToString(), new string[] { "dc_id" }, ButtonSaveCommand.LastSaveID);
|
|
|
- GridCommandSetting.RefreshData();
|
|
|
+ if (ButtonSaveCommand.LastSaveID != null && ButtonSaveCommand.LastSaveID.Length > 0)
|
|
|
+ {
|
|
|
+ dh.BatchInsert(sql.ToString(), new string[] { "dc_id" }, ButtonSaveCommand.LastSaveID);
|
|
|
+ GridCommandSetting.RefreshData();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -519,8 +525,11 @@ namespace UAS_PLCDataReader
|
|
|
ButtonSaveCommandSet.DoSaveAfterHandler();
|
|
|
sql.Clear();
|
|
|
sql.Append("update DEVICEPOLLINGCONFIG set dpc_man='" + User.UserCode + "' where dpc_id=:dpc_id");
|
|
|
- dh.BatchInsert(sql.ToString(), new string[] { "dpc_id" }, ButtonSaveCommandSet.LastSaveID);
|
|
|
- GridPollingSetting.RefreshData();
|
|
|
+ if (ButtonSaveCommandSet.LastSaveID != null && ButtonSaveCommandSet.LastSaveID.Length > 0)
|
|
|
+ {
|
|
|
+ dh.BatchInsert(sql.ToString(), new string[] { "dpc_id" }, ButtonSaveCommandSet.LastSaveID);
|
|
|
+ GridPollingSetting.RefreshData();
|
|
|
+ }
|
|
|
}
|
|
|
/// <summary>
|
|
|
/// 设置GridView多选放大镜
|