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

zzr99

2022-05-20 db54c83e9cd007498dd6bb696879930dd3b6462a

 BaseSet/¹«ÓÃ×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.cs

@@ -533,6 +533,16 @@
                    txtHWWWasterWHID.Text = "";
                }
                //
                if (oWH.GetInfoByID(oProcHlp.omodel.HWHID))
                {
                    txtHWHID.Text = oWH.omodel.HName;
                    txtHWHID.Tag = oWH.omodel.HItemID.ToString();
                }
                else
                {
                    txtHWHID.Text = "";
                }
                //
                txtHNumber.Text = oProcHlp.omodel.HNumber.ToString();
                txtHRemark.Text = oProcHlp.omodel.HRemark;
                txtHProcCheckNote.Text = oProcHlp.omodel.HProcCheckNote;
@@ -642,6 +652,7 @@
            oProc.oModel.HBadCountDevelopWHID = DBUtility.ClsPub.isLong(txtHBadCountDevelopWHID.Tag.ToString());
            oProc.oModel.HWWBadWHID = DBUtility.ClsPub.isLong(txtHWWBadWHID.Tag.ToString());
            oProc.oModel.HWWWasterWHID = DBUtility.ClsPub.isLong(txtHWWWasterWHID.Tag.ToString());
            oProc.oModel.HWHID = DBUtility.ClsPub.isLong(txtHWHID.Tag.ToString());
            oProc.oModel.HTypeFlow = chkHTypeFlow.Checked;
            oProc.oModel.HTypeCount = chkHTypeCount.Checked;
            oProc.oModel.HAutoTrunFlag = chkHAutoTrunFlag.Checked;
@@ -853,10 +864,27 @@
            }
        }

        //良品仓
        private void cmdHWHID_Click(object sender, EventArgs e)
        {
            DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
            if (oWare.RefreshView())
            {
                this.txtHWHID.Text = oWare.oModel.HName;
                this.txtHWHID.Tag = oWare.oModel.HItemID.ToString();
            }
            else
            {
                this.txtHWHID.Text = "";
            }
        }





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