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

wtt

2024-11-13 175b53e6f0adb40a0d861981f56f120615d55897

 WarM/²Ö¿â¹ÜÀí/Kf_SellOutBill_BarCodeNote.cs

@@ -325,6 +325,8 @@
                txtHMoney.Text = DSet.Tables[0].Rows[0]["本单金额"].ToString();
                txtHCreditDifference.Text = DSet.Tables[0].Rows[0]["信用差额"].ToString();
                HInterID = DBUtility.ClsPub.isLong(DSet.Tables[0].Rows[0]["HInterID"]);
                txtHMaker.Text = DSet.Tables[0].Rows[0]["制单人"].ToString();
                txtHChecker.Text = DSet.Tables[0].Rows[0]["审核人"].ToString();

                //返回基本信息、码单信息
                grdMain.DataSource = DSet.Tables[1].DefaultView;
@@ -401,6 +403,7 @@
            else
            {
                cmbHBillStatus.Text="已审核";
                txtHChecker.Text = HMaker.ToString();
                sh.Enabled = false;
                fsh.Enabled = true;
                pic1.Visible = true;
@@ -415,9 +418,15 @@
        #region  //反审核销售出库单
        private void fsh_Click(object sender, EventArgs e)
        {
            if(HInterID==0)
            {
                MessageBox.Show("请先选择对应销售出库单！", "提示");
                return;
            }
            if (BillOld.AbandonCheck(HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
            {
                cmbHBillStatus.Text = "创建";
                txtHChecker.Text = "";
                sh.Enabled = true;
                fsh.Enabled = false;
                pic1.Visible = false;
@@ -505,6 +514,8 @@
                Report.FieldByName("单据状态").AsString = cmbHBillStatus.Text;
                Report.FieldByName("本单金额").AsString = txtHMoney.Text;
                Report.FieldByName("信用差额").AsString = txtHCreditDifference.Text;
                Report.FieldByName("制单人").AsString = txtHMaker.Text;
                Report.FieldByName("审核人").AsString = txtHChecker.Text;
            }
            catch (Exception e)
            {
@@ -586,6 +597,8 @@
                Report.FieldByName("单据状态").AsString = cmbHBillStatus.Text;
                Report.FieldByName("本单金额").AsString = txtHMoney.Text;
                Report.FieldByName("信用差额").AsString = txtHCreditDifference.Text;
                Report.FieldByName("制单人").AsString = txtHMaker.Text;
                Report.FieldByName("审核人").AsString = txtHChecker.Text;
            }
            catch (Exception e)
            {