~yxj/MES-WEB-API.git

parent: 82694a18 | 补丁 | 提交 | ignore whitespace

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

2021-11-11 46c53aa04801e0f0d9b02a82bd14e607488d0f27

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

4个文件已修改

	WorkM/流转卡管理/MES_StationEntrustInBill.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WorkM/流转卡管理/MES_StationEntrustOutBill.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WorkM/流转卡管理/MES_StationInBill.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WorkM/流转卡管理/MES_StationOutBill.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WorkM/Á÷×ª¿¨¹ÜÀí/MES_StationEntrustInBill.cs

@@ -525,8 +525,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.HInnerBillNo = this.txtHInnerBillNo.Text.Trim();
            BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();

 WorkM/Á÷×ª¿¨¹ÜÀí/MES_StationEntrustOutBill.cs

@@ -750,8 +750,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.txtHStationOutTime.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.HInnerBillNo = this.txtHInnerBillNo.Text.Trim();
            BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();

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

@@ -557,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);

 WorkM/Á÷×ª¿¨¹ÜÀí/MES_StationOutBill.cs

@@ -674,8 +674,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.txtHStationOutTime.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);

			@@ -525,8 +525,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.HInnerBillNo = this.txtHInnerBillNo.Text.Trim();
			BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();

			@@ -750,8 +750,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.txtHStationOutTime.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.HInnerBillNo = this.txtHInnerBillNo.Text.Trim();
			BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();

			@@ -557,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);

			@@ -674,8 +674,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.txtHStationOutTime.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);