增加排班管理代码，到货计划增加超采比例，物料信息增加超采比例字段

cdk

7 小时以前 5029c8357635c9556e63bd78f262d860df51e7fb

 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs

@@ -20,7 +20,7 @@
        private List<FilterEntity> _filterList = new List<FilterEntity>();
        private readonly string _webServiceName = "MesQmCheckitemManager/";
        public string strType = "";//iqc type
        public decimal dfValue = 1;  //iqc的样品数量默认5，否则1
        public decimal dfValue = 1;  //iqc的样品数量默认5，否则看下面
        private string dftSsampleSizeName = "GB/T2828.1-2012/ISO";//默认
        private string dftSsampleSizeNo = "GB/T2828.1-2012/ISO";//默认
        private string dftFcheckLevel = "2.一般检验水平(II)";//默认检验水平
@@ -47,16 +47,28 @@
            //类型，iqc,ipqc巡检，ipqc首检查,fqc，iqc的样品值默认为5，其它为1
            txt_ftype.Text = strType;
            if (strType == QcSeason.iqc.ToString())
                dfValue = 5;
            {
                dfValue = 5; 
                gvMx1.Columns["funit"].Visible = true;
                gvMx1.Columns["funit"].VisibleIndex = 13;
                gvMx1.Columns["fcheckType"].Visible = false;
            }
            if (strType == QcSeason.fqc.ToString())
            {
                dfValue = 0;
                gvMx1.Columns["ypsl"].Visible = false;
            }
            if (strType == QcSeason.ipqc首检.ToString())
            {
                dfValue = 0;
                gvMx1.Columns["ypsl"].Visible = false;
               
            }
            //如果是ipqc巡检，显示工位
            if (strType != QcSeason.ipqc巡检.ToString())
            {
                gvMx1.Columns["stationName"].Visible = false;
            }
            //如果是ipqc首检，显示认证
            if (strType != QcSeason.ipqc首检.ToString())
            {
                gvMx1.Columns["isRzxx"].Visible = false;
                gvMx1.Columns["fcheckType"].Visible = false;
            }
            //新行初始值
            this.gvMx1.InitNewRow += (s, e) =>
@@ -319,7 +331,7 @@
                        }
                        if (string.IsNullOrEmpty(row["ypsl"].ToString()))
                        {
                            MsgHelper.ShowError("样品数量平不能为空！");
                            MsgHelper.ShowError("样品数量不能为空！");
                            return;
                        }
                        string _Fstand = row["Fstand"].ToString();
@@ -371,6 +383,7 @@
                            stationName = row["stationName"].ToString(),
                            FcheckType = row["FcheckType"].ToString(),
                            isRzxx = _isRzxx,
                            Funit = row["funit"].ToString(),
                        });
                    }
                }
@@ -391,9 +404,9 @@
                        JsonConvert.SerializeObject(_obj));
                    var _rtn =
                        UtilityHelper.ReturnToDynamic(strJson);
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        lbGuid.Text = _rtn.rtnData;
                        toolBarMenu1.isSetBtn = true;
                        var gridViews = new List<GridView>();
@@ -402,10 +415,12 @@
                        toolBarMenu1.currentAction = "";
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                    }
                    else
                        MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            }
            catch (Exception ex)
@@ -458,7 +473,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
@@ -472,7 +487,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
@@ -512,12 +527,12 @@
                }
                else
                {
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -542,13 +557,14 @@
                case 2:
                    strMsg = "批准";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
@@ -589,7 +605,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -645,7 +661,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
@@ -671,7 +687,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
@@ -692,7 +708,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
@@ -716,7 +732,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
@@ -739,6 +755,9 @@
                ,"1.50---(AQL_0_150)"
                ,"2.00---(AQL_0_200)"
                ,"2.50---(AQL_0_250)"
                ,"4.00---(AQL_0_400)"
                ,"6.50---(AQL_0_650)"
                ,"10.00---(AQL_1_000)"
            });
        }
        /// <summary>