|
|
@@ -33,7 +33,7 @@ namespace UAS_MES_NEW.Query
|
|
|
li_code.Condition = "li_statuscode='AUDITED'";
|
|
|
li_code.DbChange += Li_code_DbChange;
|
|
|
//初始提示
|
|
|
- OperateResult.AppendText(">>请选择线别,输入人员编号后回车执行" + (UpLoadMan.Checked ? "上线" : "下线") + ";下线也可勾选列表后点\"确认下线\"批量处理\n", Color.Black);
|
|
|
+ OperateResult.AppendText(">>请选择线别,输入人员工号后回车执行" + (UpLoadMan.Checked ? "上线" : "下线") + ";下线也可勾选列表后点\"确认下线\"批量处理\n", Color.Black);
|
|
|
LoadGridData();
|
|
|
em_code.Focus();
|
|
|
}
|
|
|
@@ -53,8 +53,8 @@ namespace UAS_MES_NEW.Query
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
- /// 人员编号输入框,回车后按选中的模式执行上线/下线
|
|
|
- /// 兼容两种输入格式:①只输入工号(名称从 SOPEMPLOYEEDETAIL 查) ②扫描/输入「工号/人员姓名」(直接解析,不再查表)
|
|
|
+ /// 人员工号输入框,回车后按选中的模式执行上线/下线
|
|
|
+ /// 只接受工号,不解析姓名,也不校验人员是否存在于 SOPEMPLOYEEDETAIL
|
|
|
/// </summary>
|
|
|
private void em_code_KeyDown(object sender, KeyEventArgs e)
|
|
|
{
|
|
|
@@ -106,17 +106,11 @@ namespace UAS_MES_NEW.Query
|
|
|
private void DoEmCode()
|
|
|
{
|
|
|
string linecode = li_code.Text.Trim();
|
|
|
- string emcode = "";
|
|
|
- string emname = "";
|
|
|
- //解析输入内容:扫描枪输出「工号/人员姓名」两段格式,手工输入则只有工号
|
|
|
- if (!SplitEmInfo(em_code.Text, out emcode, out emname))
|
|
|
- {
|
|
|
- OperateResult.AppendText("<<扫描内容格式有误,应为「工号/人员姓名」\n", Color.Red, em_code);
|
|
|
- return;
|
|
|
- }
|
|
|
+ //只取工号:扫描枪或手工输入均只记工号,不做姓名解析
|
|
|
+ string emcode = em_code.Text.Trim();
|
|
|
if (emcode == "")
|
|
|
{
|
|
|
- OperateResult.AppendText("<<人员编号不能为空\n", Color.Red, em_code);
|
|
|
+ OperateResult.AppendText("<<人员工号不能为空\n", Color.Red, em_code);
|
|
|
return;
|
|
|
}
|
|
|
if (UpLoadMan.Checked)
|
|
|
@@ -127,19 +121,6 @@ namespace UAS_MES_NEW.Query
|
|
|
OperateResult.AppendText("<<请先选择线别\n", Color.Red, li_code);
|
|
|
return;
|
|
|
}
|
|
|
- //上线:扫描格式已带姓名则直接用;只输入工号时才去 SOPEMPLOYEEDETAIL 取名称
|
|
|
- if (emname == "")
|
|
|
- {
|
|
|
- //同一 sed_emcode 可能多条,取最大值聚合
|
|
|
- emname = dh.getFieldDataByCondition("SOPEMPLOYEEDETAIL", "max(sed_emname)", "sed_emcode='" + emcode + "'").ToString().Trim();
|
|
|
- if (emname == "")
|
|
|
- {
|
|
|
- OperateResult.AppendText("<<" + emcode + "人员编号不存在\n", Color.Red, em_code);
|
|
|
- em_code.Clear();
|
|
|
- em_code.Focus();
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
//一个人只能同时一条线上线:若已在别的线体上线,先把原线体自动下线,再在新线体上线
|
|
|
DataTable dtOn = (DataTable)dh.ExecuteSql("select lm_linecode from loadman where lm_emcode='" + emcode + "' and lm_downtime is null", "select");
|
|
|
if (dtOn.Rows.Count > 0)
|
|
|
@@ -157,9 +138,9 @@ namespace UAS_MES_NEW.Query
|
|
|
dh.ExecuteSql("update loadman set lm_downtime=sysdate where lm_emcode='" + emcode + "' and lm_downtime is null", "update");
|
|
|
OperateResult.AppendText(">>" + emcode + "已从" + oldLineCode + "自动下线\n", Color.Black);
|
|
|
}
|
|
|
- dh.ExecuteSql("insert into loadman(lm_id,lm_linecode,lm_emcode,lm_emname,lm_uptime,lm_inman)" +
|
|
|
- "values(loadman_seq.nextval,'" + linecode + "','" + emcode + "','" + emname + "',sysdate,'" + User.UserName + "')", "insert");
|
|
|
- OperateResult.AppendText("<<" + emcode + " " + emname + " 在" + linecode + "上线成功\n", Color.Green, em_code);
|
|
|
+ dh.ExecuteSql("insert into loadman(lm_id,lm_linecode,lm_emcode,lm_uptime,lm_inman)" +
|
|
|
+ "values(loadman_seq.nextval,'" + linecode + "','" + emcode + "',sysdate,'" + User.UserName + "')", "insert");
|
|
|
+ OperateResult.AppendText("<<" + emcode + " 在" + linecode + "上线成功\n", Color.Green, em_code);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -173,10 +154,7 @@ namespace UAS_MES_NEW.Query
|
|
|
return;
|
|
|
}
|
|
|
dh.ExecuteSql("update loadman set lm_downtime=sysdate where lm_emcode='" + emcode + "' and lm_downtime is null", "update");
|
|
|
- //姓名优先取扫描解析出的,否则用 loadman 里记录的名称
|
|
|
- string downName = emname == "" ? dh.getFieldDataByCondition("loadman", "max(lm_emname)",
|
|
|
- "lm_emcode='" + emcode + "' and lm_downtime is null").ToString().Trim() : emname;
|
|
|
- OperateResult.AppendText("<<" + emcode + (downName == "" ? "" : " " + downName) + " 已从"
|
|
|
+ OperateResult.AppendText("<<" + emcode + " 已从"
|
|
|
+ dtOn.Rows[0]["lm_linecode"].ToString() + "下线\n", Color.Green, em_code);
|
|
|
}
|
|
|
//数据变更后刷新
|
|
|
@@ -185,34 +163,6 @@ namespace UAS_MES_NEW.Query
|
|
|
em_code.Focus();
|
|
|
}
|
|
|
|
|
|
- /// <summary>
|
|
|
- /// 解析人员输入内容,兼容两种格式:
|
|
|
- /// ①「工号/人员姓名」(扫描枪常用格式,分隔符支持 / \ 全角/ 竖线 | ,也兼容空格和中文顿号) → 工号与姓名都带出
|
|
|
- /// ②只有工号(手工输入) → 姓名返回空串,由调用方决定是否去 SOPEMPLOYEEDETAIL 查
|
|
|
- /// 分隔符在首尾或出现多次时视为格式错误,返回 false
|
|
|
- /// </summary>
|
|
|
- private bool SplitEmInfo(string input, out string emcode, out string emname)
|
|
|
- {
|
|
|
- emcode = "";
|
|
|
- emname = "";
|
|
|
- if (input == null)
|
|
|
- return true;
|
|
|
- string text = input.Trim();
|
|
|
- if (text == "")
|
|
|
- return true;
|
|
|
- string[] sep = new string[] { "/", "\\", "/", "|", "|", " ", " ", "、" };
|
|
|
- string[] parts = text.Split(sep, StringSplitOptions.RemoveEmptyEntries);
|
|
|
- if (parts.Length == 0)
|
|
|
- return true;
|
|
|
- emcode = parts[0].Trim();
|
|
|
- if (parts.Length > 1)
|
|
|
- emname = parts[1].Trim();
|
|
|
- //带分隔符却没解析出两段,说明格式不对(如以分隔符开头或多余分隔符)
|
|
|
- if (text.IndexOfAny(new char[] { '/', '\\', '/', '|', '|', ' ', ' ', '、' }) >= 0 && (emcode == "" || emname == ""))
|
|
|
- return false;
|
|
|
- return true;
|
|
|
- }
|
|
|
-
|
|
|
/// <summary>
|
|
|
/// 全选/取消全选(切换式):点击时若已全部勾选则全部取消,否则全部勾选
|
|
|
/// 只操作复选框单元格的值,不触发数据刷新
|
|
|
@@ -274,7 +224,6 @@ namespace UAS_MES_NEW.Query
|
|
|
DataGridViewRow row;
|
|
|
string lmId;
|
|
|
string emcode;
|
|
|
- string emname;
|
|
|
string linecode;
|
|
|
int sucCount = 0;
|
|
|
int failCount = 0;
|
|
|
@@ -288,18 +237,17 @@ namespace UAS_MES_NEW.Query
|
|
|
continue;
|
|
|
lmId = row.Cells["lm_id"].Value.ToString();
|
|
|
emcode = row.Cells["lm_emcode"].Value == null ? "" : row.Cells["lm_emcode"].Value.ToString();
|
|
|
- emname = row.Cells["lm_emname"].Value == null ? "" : row.Cells["lm_emname"].Value.ToString();
|
|
|
linecode = row.Cells["lm_linecode"].Value == null ? "" : row.Cells["lm_linecode"].Value.ToString();
|
|
|
try
|
|
|
{
|
|
|
dh.ExecuteSql("update loadman set lm_downtime=sysdate where lm_id='" + lmId + "' and lm_downtime is null", "update");
|
|
|
sucCount++;
|
|
|
- OperateResult.AppendText("<<" + emcode + " " + emname + " 已从" + linecode + "下线\n", Color.Green);
|
|
|
+ OperateResult.AppendText("<<" + emcode + " 已从" + linecode + "下线\n", Color.Green);
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
failCount++;
|
|
|
- OperateResult.AppendText("<<" + emcode + " " + emname + " 下线失败:" + ex.Message + "\n", Color.Red);
|
|
|
+ OperateResult.AppendText("<<" + emcode + " 下线失败:" + ex.Message + "\n", Color.Red);
|
|
|
}
|
|
|
}
|
|
|
OperateResult.AppendText(">>本次下线成功 " + sucCount + " 人" + (failCount > 0 ? ",失败 " + failCount + " 人" : "") + "\n", Color.Black);
|
|
|
@@ -312,7 +260,7 @@ namespace UAS_MES_NEW.Query
|
|
|
{
|
|
|
if (UpLoadMan.Checked)
|
|
|
{
|
|
|
- OperateResult.AppendText(">>已切换到上线模式,输入人员编号回车上线\n", Color.Black);
|
|
|
+ OperateResult.AppendText(">>已切换到上线模式,输入人员工号回车上线\n", Color.Black);
|
|
|
em_code.Focus();
|
|
|
}
|
|
|
}
|
|
|
@@ -321,23 +269,19 @@ namespace UAS_MES_NEW.Query
|
|
|
{
|
|
|
if (DownLoadMan.Checked)
|
|
|
{
|
|
|
- OperateResult.AppendText(">>已切换到下线模式,输入人员编号回车下线,或勾选列表后点\"确认下线\"批量下线\n", Color.Black);
|
|
|
+ OperateResult.AppendText(">>已切换到下线模式,输入人员工号回车下线,或勾选列表后点\"确认下线\"批量下线\n", Color.Black);
|
|
|
em_code.Focus();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
/// 刷新DGV:只取未下线的人员,已选线别时只显示当前线别
|
|
|
- /// 人员名称直接取 loadman.lm_emname(上线时已写入),不再关联 SOPEMPLOYEEDETAIL;
|
|
|
- /// 兼容历史数据:lm_emname 为空时才回退到 SOPEMPLOYEEDETAIL 取名称
|
|
|
- /// (SOPEMPLOYEEDETAIL 同一 sed_emcode 可能有多条,先按其聚合去重;上线时间 to_char 到秒)
|
|
|
+ /// 只显示工号,不关联 SOPEMPLOYEEDETAIL(上线时间 to_char 到秒)
|
|
|
/// </summary>
|
|
|
private void LoadGridData()
|
|
|
{
|
|
|
- string sql = "select lm.lm_id,lm.lm_linecode,lm.lm_emcode,lm.lm_emname,"
|
|
|
- + "nvl(lm.lm_emname,se.sed_emname) emname,"
|
|
|
+ string sql = "select lm.lm_id,lm.lm_linecode,lm.lm_emcode,"
|
|
|
+ "to_char(lm.lm_uptime,'yyyy-mm-dd hh24:mi:ss') lm_uptime,lm.lm_inman from loadman lm"
|
|
|
- + " left join (select sed_emcode,max(sed_emname) sed_emname from SOPEMPLOYEEDETAIL group by sed_emcode) se on lm.lm_emcode=se.sed_emcode"
|
|
|
+ " where lm.lm_downtime is null";
|
|
|
if (li_code.Text != "")
|
|
|
sql += " and lm.lm_linecode='" + li_code.Text + "'";
|