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

zzr99

2022-04-01 e6da0f8e1e87543202bec96bbb0f6b0f16b75330

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

@@ -42,7 +42,14 @@
        public void Sub_ClearBill()
        {
            DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
            DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage1);
            DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage2);
            initGrid();
            txtHBarCode.Text = "";
            txtHProcExchBillNo.Enabled = true;
            txtHProcNo.Enabled = true;
            txtHBarCode.Enabled = true;
            tabControl1.SelectedIndex = 0;
            txtHBarCode.Focus();
            //得到接收人信息（进站接收人默认为登录人，根据登录人用户名，找到职员同名的记录，默认写入 æŽ¥æ”¶äºº æ–‡æœ¬æ¡†ï¼›å¦‚果没找到则为空；）
            DataSet Ds;
@@ -67,6 +74,7 @@
            DBUtility.Xt_BaseBillFun.initGridMESList(grdCardList, this.Name + "grdCardList");
            DBUtility.Xt_BaseBillFun.initGridList(grdSub, this.Name);
            grdSub.SelectionMode = DataGridViewSelectionMode.CellSelect;
            grdCardList.DataSource = null;
        }

        private void Display()
@@ -549,8 +557,18 @@
            if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
                BillNew.omodel.HInterID = BillOld.omodel.HInterID;
            //主类赋值
            BillNew.omodel.HYear = 2011;
            BillNew.omodel.HPeriod = 1;
            //判断会计期是否合理
            string s = "";
            int sYear = 0;
            int sPeriod = 0;
            if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(this.txtHStationInTime.Text), ref sYear, ref sPeriod, ref s) == false)
            {
                MessageBox.Show(s, "提示");
                return false;
            }
            //
            BillNew.omodel.HYear = sYear;
            BillNew.omodel.HPeriod = sPeriod;
            BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();
            BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();
            BillNew.omodel.HICMOInterID =  DBUtility.ClsPub.isLong(this.txtHICMOBillNo.Tag);