Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2022-07-25 061a166a87fd30ae6a4e61785e3c36a1c313f8a6

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -172,6 +172,10 @@
                    {
                        omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_WHSPCtl")     //校验-是否校对仓库仓位
                    {
                        omodel.Kf_MateOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产退料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
                    {
@@ -480,6 +484,10 @@
                    {
                        omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_WHSPCtl")     //校验-是否校对仓库仓位
                    {
                        omodel.Kf_MoveStockBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //补料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
                    {

 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -30,6 +30,7 @@
        public string Kf_MateOutBill_SimpleMode;   //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
        public string Kf_MateOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
        public string Kf_MateOutBillCheck_MustQtyCtl;   //校验数量控制
        public string Kf_MateOutBillCheck_WHSPCtl;   //校验-是否校对仓库仓位
        //生产退料
        public string Kf_MateOutBackBill_AutoCheck;
        public string Kf_MateOutBackBill_ERPMode;
@@ -120,6 +121,7 @@
        public string Kf_MoveStockBill_BarCodeMustSameSourceBill;   // æ¡ç å¿…须同源单一致
        public string Kf_MoveStockBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
        public string Kf_MoveStockBillCheck_MustQtyCtl;   //校验数量控制
        public string Kf_MoveStockBillCheck_WHSPCtl;   //校验-是否校对仓库仓位
        //补料单
        public string Kf_MateReplenishOutBill_AutoCheck;
        public string Kf_MateReplenishOutBill_ERPMode;

 WorkM/±¨±í·ÖÎö/Mes_OrderProcFlowAllReport.cs

@@ -255,24 +255,24 @@
                }
            }

            for (int j = HRecProc1Col; j < grdMain.Columns.Count-2; j++)
            {
                if (checkBox1.Checked == false)
                {
                    if (ClsPub.isStrNull(grdMain.Columns[j].HeaderText).ToUpper().Trim().Contains("不合格") == true)
                    {
                        grdMain.Columns[j].Visible = false;
                    }
                    else
                    {
                        grdMain.Columns[j].Visible = true;
                    }
                }
                else
                {
                    grdMain.Columns[j].Visible = true;
                }
            }
            //for (int j = HRecProc1Col; j < grdMain.Columns.Count-2; j++)
            //{
            //    if (checkBox1.Checked == false)
            //    {
            //        if (ClsPub.isStrNull(grdMain.Columns[j].HeaderText).ToUpper().Trim().Contains("不合格") == true)
            //        {
            //            grdMain.Columns[j].Visible = false;
            //        }
            //        else
            //        {
            //            grdMain.Columns[j].Visible = true;
            //        }
            //    }
            //    else
            //    {
            //        grdMain.Columns[j].Visible = true;
            //    }
            //}
            //
        }


 WorkM/±¨±í·ÖÎö/Mes_OrderProcFlowAllReport.designer.cs

@@ -132,14 +132,14 @@
            // eXCELToolStripMenuItem
            // 
            this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
            this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
            this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
            this.eXCELToolStripMenuItem.Text = "EXCEL";
            this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
            // 
            // cSVToolStripMenuItem
            // 
            this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
            this.cSVToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
            this.cSVToolStripMenuItem.Size = new System.Drawing.Size(136, 26);
            this.cSVToolStripMenuItem.Text = "CSV";
            this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
            // 
@@ -398,6 +398,7 @@
            this.chkHShowUnFinish.TabIndex = 86;
            this.chkHShowUnFinish.Text = "只显示未完工";
            this.chkHShowUnFinish.UseVisualStyleBackColor = true;
            this.chkHShowUnFinish.Visible = false;
            // 
            // checkBox1
            // 
@@ -408,6 +409,7 @@
            this.checkBox1.TabIndex = 85;
            this.checkBox1.Text = "显示不合格";
            this.checkBox1.UseVisualStyleBackColor = true;
            this.checkBox1.Visible = false;
            // 
            // txtHOrderProcNo
            // 
@@ -501,6 +503,7 @@
            this.grdSum.Margin = new System.Windows.Forms.Padding(4);
            this.grdSum.Name = "grdSum";
            this.grdSum.ReadOnly = true;
            this.grdSum.RowHeadersWidth = 51;
            this.grdSum.RowTemplate.Height = 23;
            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
            this.grdSum.Size = new System.Drawing.Size(1432, 24);
@@ -517,6 +520,7 @@
            this.grdMain.Margin = new System.Windows.Forms.Padding(4);
            this.grdMain.Name = "grdMain";
            this.grdMain.ReadOnly = true;
            this.grdMain.RowHeadersWidth = 51;
            this.grdMain.RowTemplate.Height = 23;
            this.grdMain.Size = new System.Drawing.Size(1432, 414);
            this.grdMain.TabIndex = 54;