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

zzr99

2021-11-29 d03d898e83d04d94b771a3326d48b55c67057c2b

 BaseSet/公用资料/生产基础资料/Gy_Process.cs

@@ -500,7 +500,17 @@
                }
                else
                {
                    txtHWasterWHID.Text = ""; 
                    txtHWasterWHID.Text = "";
                }
                //
                if (oWH.GetInfoByID(oProcHlp.omodel.HBadCountDevelopWHID))
                {
                    txtHBadCountDevelopWHID.Text = oWH.omodel.HName;
                    txtHBadCountDevelopWHID.Tag = oWH.omodel.HItemID.ToString();
                }
                else
                {
                    txtHBadCountDevelopWHID.Text = "";
                }
                //
                txtHNumber.Text = oProcHlp.omodel.HNumber.ToString();
@@ -609,6 +619,7 @@
            oProc.oModel.HProcMulID = DBUtility.ClsPub.isLong(txtHProcMulID.Tag.ToString());
            oProc.oModel.HBadWHID = DBUtility.ClsPub.isLong(txtHBadWHID.Tag.ToString());
            oProc.oModel.HWasterWHID = DBUtility.ClsPub.isLong(txtHWasterWHID.Tag.ToString());
            oProc.oModel.HBadCountDevelopWHID = DBUtility.ClsPub.isLong(txtHBadCountDevelopWHID.Tag.ToString());
            oProc.oModel.HTypeFlow = chkHTypeFlow.Checked;
            oProc.oModel.HTypeCount = chkHTypeCount.Checked;
            oProc.oModel.HAutoTrunFlag = chkHAutoTrunFlag.Checked;
@@ -736,6 +747,20 @@
            }
        }

        private void cmdHBadCountDevelopWHID_Click(object sender, EventArgs e)
        {
            DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
            if (oWare.RefreshView())
            {
                this.txtHBadCountDevelopWHID.Text = oWare.oModel.HName;
                this.txtHBadCountDevelopWHID.Tag = oWare.oModel.HItemID.ToString();
            }
            else
            {
                this.txtHBadCountDevelopWHID.Text = "";
            }
        }

        private void txtHBadWHID_TextChanged(object sender, EventArgs e)
        {
            if (txtHBadWHID.Text.Length == 0)
@@ -751,5 +776,14 @@
                txtHWasterWHID.Tag = "0";
            }
        }

        private void txtHBadCountDevelopWHID_TextChanged(object sender, EventArgs e)
        {
            if (txtHBadCountDevelopWHID.Text.Length == 0)
            {
                txtHBadCountDevelopWHID.Tag = "0";
            }
        }

    }
}