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

yxj

2022-06-07 a637a8ff0609f462fad4c983dba293da340de57a

 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()
@@ -403,6 +411,12 @@
            //
            txtHProcExchBillNo.Enabled = false;
            txtHProcNo.Enabled = false;

            //加载 é…ä»¶ç»‘定清单




        }

        //单据完整性判断          æœªå®Œæˆ
@@ -549,8 +563,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);
@@ -954,6 +978,7 @@
                    txtHGroupID.Tag = 0;
                    txtHGroupName.Text = "";
                }
                txtHQty.Focus();
            }
        }

@@ -1008,7 +1033,12 @@
                {
                    Sub_WriteInForm_SM2(Ds.Tables[0], i);
                }
                txtHQty.Focus();
                //如果系统参数启用了 è¿›ç«™å•ç»‘定配件清单则 ä»Žç”Ÿäº§ç”¨æ–™æ¸…单中获取工序BOM写入 ä¸´æ—¶è¡¨ï¼Œå¹¶åŠ è½½è¡¨æ ¼

                //刷新表体网格数据 

                //
                txtHGroupID.Focus();
            }
        }

@@ -1418,5 +1448,22 @@
        {
            this.Sub_AddBill();
        }

        //配件条形码 å›žè½¦äº‹ä»¶
        private void txtHBarCode_Mater_KeyDown(object sender, KeyEventArgs e)
        {
            if (e.KeyCode == Keys.Return)
            {
                //先判断 ä¸´æ—¶è¡¨ä¸­æ˜¯å¦æœ‰æ•°æ®

                //判断条形码是否在条码档案中

                //判断条形码是否合理

                //写入 æ‰«ç è®°å½•è¡¨

                //刷新表体网格数据

            }
    }
}