From 061a166a87fd30ae6a4e61785e3c36a1c313f8a6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 25 七月 2022 14:27:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 8 ++++++++
WorkM/报表分析/Mes_OrderProcFlowAllReport.designer.cs | 8 ++++++--
WorkM/报表分析/Mes_OrderProcFlowAllReport.cs | 36 ++++++++++++++++++------------------
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2 ++
4 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index d313bbe..e9ab141 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/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")
{
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index bc770e9..16be230 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/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;
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
index 98e06f8..9ef9d4a 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/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;
+ // }
+ //}
//
}
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
index bc136d3..d4691dc 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/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;
--
Gitblit v1.9.1