Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes

ouyangqing

2021-01-20 11d20b4fb7a3e97c88477f78f1f5393238e2f3a3

 SCM/µ¥¾Ý×ÊÁÏ/Sc_ICMOReportToBarCode.cs

@@ -1,4 +1,4 @@
using System;

using System;

using System.Collections.Generic;

using System.ComponentModel;

using System.Data;

@@ -552,12 +552,10 @@
                else if (sType == "Sample")

                {

                    sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text) + "B";

                    txtHCheckerResult.Text = "";

                }

                else

                {

                    sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);

                    txtHCheckerResult.Text = "";

                }

                //sTMNumber = HNumber + ";" + DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);



@@ -774,7 +772,6 @@
                Report.FieldByName("组员").AsString = ClsPub.isStrNull(txtHEmpID.Text) + ";" + ClsPub.isStrNull(txtHEmpID2.Text) + ";" + ClsPub.isStrNull(txtHEmpID3.Text);

                Report.FieldByName("数量").AsString = ClsPub.isStrNull(txtHSJQty.Text);

                Report.FieldByName("旧物料编码").AsString = ClsPub.isStrNull(txtHOldMaterNumber.Text);

                Report.FieldByName("不良原因").AsString = ClsPub.isStrNull(txtHCheckerResult.Text);

                //Report.FieldByName("源单单号").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSourceBillNoCol].Value);

                //Report.FieldByName("销售订单号").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSeOrderBillNo2Col].Value);

                //Report.FieldByName("生产车间").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HDeptName2Col].Value);

@@ -1277,8 +1274,6 @@
            {

                txtHReasonList.Text = "";

                txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;

                txtHCheckerResult.Text = "";

                txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text;

                if (SaveBadReasonBill())

                {

                    MessageBox.Show("保存不良原因成功！");

@@ -1411,8 +1406,6 @@
            {

                txtHReasonList.Text = "";

                txtHReasonList.Text = oGy_BadReasonList.txtHBadReason.Text;

                txtHCheckerResult.Text = "";

                txtHCheckerResult.Text = oGy_BadReasonList.txtHBadReason.Text;

                oGy_BadReasonList = null;

                if (SaveBill("SaveDown"))

                {