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

zzr99

2022-04-21 055b64bfcdcb83aafa2986566df3fba49ed2eb98

 WorkM/Á÷ת¿¨¹ÜÀí/Sc_ProcessExchangeBill.cs

@@ -1288,11 +1288,11 @@
                    return false;
                }
                //txtHMateOutBatchNo
                if (DBUtility.ClsPub.isStrNull(txtHMateOutBatchNo.Text) == "")
                {
                    MessageBox.Show("原料批次不能为空！", "提示");
                    return false;
                }
                //if (DBUtility.ClsPub.isStrNull(txtHMateOutBatchNo.Text) == "")
                //{
                //    MessageBox.Show("原料批次不能为空！", "提示");
                //    return false;
                //}

            }
            //单据号是否重复
@@ -1347,16 +1347,19 @@
            string s = "";
            int sYear = 0;
            int sPeriod = 0;
            if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(dtpHDate.Value, ref sYear, ref sPeriod, ref s) == false)
            {
                MessageBox.Show(s, "提示");
                return false;
            }
            //if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(dtpHDate.Value, ref sYear, ref sPeriod, ref s) == false)
            //{
            //    MessageBox.Show(s, "提示");
            //    return false;
            //}
            sYear = ClsPub.isDate(dtpHDate.Value).Year;
            sPeriod = ClsPub.isDate(dtpHDate.Value).Month;
            //源单信息
            //BillNew.omodel.HMainSourceBillType = cmbSourceBillType.Text;
            //
            BillNew.omodel.HYear = sYear;
            BillNew.omodel.HPeriod = sPeriod;
            BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;  //组织
            //固定赋值=================================
            BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();  //在赋值类前就处理好字符串和数字
            BillNew.omodel.HDate = this.dtpHDate.Value;