到货单版本冲突

lu

5 天以前 c2e1de823e648ca7e62bc868d8aaf9ad5c65a287

 DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs

@@ -42,6 +42,18 @@
            //其它出库单仓管员
            sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
            sb.Append(" values(newid(),'" + lb_qtckdcgy.Text.Trim() + "','" + txt_qtckdcgy.Text.Trim() + "','" + layoutControlItem6.Text.Trim() + "')");
            //采购退货申请采购员
            sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
            sb.Append(" values(newid(),'" + lb_cgthsqcgy.Text.Trim() + "','" + txt_cgthsqcgy.Text.Trim() + "','" + layoutControlItem12.Text.Trim() + "')");
            //生产退料超%则要计划审核，即批准
            sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
            sb.Append(" values(newid(),'" + lb_sctlbfb.Text.Trim() + "','" + txt_sctlbfb.Text.Trim() + "','" + layoutControlItem14.Text.Trim() + "')");
            //销售员
            sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
            sb.Append(" values(newid(),'" + lb_FSalesManId.Text.Trim() + "','" + txt_FSalesManId.Text.Trim() + "','" + layoutControlItem16.Text.Trim() + "')");
            //齐套入库
            sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
            sb.Append(" values(newid(),'" + lb_qtRk.Text.Trim() + "','" + txt_qtRk.Text.Trim() + "','" + layoutControlItem18.Text.Trim() + "')");
            var _obj = new
            {
                sql = sb.ToString(),
@@ -112,6 +124,21 @@
                            txt_qtckdcgy.Text = row["parameterValue"].ToString();
                            continue;
                        }
                        if (row["remark"].ToString() == layoutControlItem12.Text)
                        {
                            txt_cgthsqcgy.Text = row["parameterValue"].ToString();
                            continue;
                        }
                        if (row["remark"].ToString() == layoutControlItem14.Text)
                        {
                            txt_sctlbfb.Text = row["parameterValue"].ToString();
                            continue;
                        }
                        if (row["remark"].ToString() == layoutControlItem18.Text)
                        {
                            txt_qtRk.Text = row["parameterValue"].ToString();
                            continue;
                        }
                    }
                }
                else