Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

3 天以前 ae28c33700e413d5acf60d1e48bbc9870bdef5a5

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs

@@ -181,7 +181,7 @@
                lbGuid, txt_hNo, gridView1, "hNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
@@ -339,6 +339,11 @@
                if (row != null)
                {
                    Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
                    if (string.IsNullOrEmpty(row["daa025"].ToString()))
                    {
                        MsgHelper.ShowError("生产类型不能为空！");
                        return;
                    }
                    string _LineId = row["daa015"].ToString();
                    if (string.IsNullOrEmpty(_LineId))
                    {
@@ -367,11 +372,11 @@
                        Guid = _guid,
                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
                        LineId = row["daa015"].ToString(),//产线id
                        Yjkgsj = (row["mesStartProd"].ToString()),//预计开工时间
                        Hxsj = row["daa025"].ToString(),//生产类型
                        Bz = row["daa009"].ToString(),//备注
                        Yjkgsj = (row["mesStartProd"].ToString()),//预计开工时间
                        Yjwgsj = row["mesEndProd"].ToString(),//预计完工时间
                        Pcsl = row["daa008"].ToString(),//排产数量
                        Yjwgsj = row["mesEndProd"].ToString()//预计完工时间
                        Bz = row["daa009"].ToString(),//备注
                    });
                }
            }