MESWMS-WEBS.git

			@@ -34309,6 +34309,11 @@
			sErrMsg = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[0]["HRemark"]);
			return null;
			}
			else if (DBUtility.ClsPub.isLong(dsTBarCode.Tables[0].Rows[0][0]) == 2)
			{
			sErrMsg = "此模块不允许反向拆码！";
			return null;
			}
			else
			{
			if (HBillType == "1203")
			@@ -36229,8 +36234,51 @@
			sErrMsg = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[0]["HRemark"]);
			return null;
			}
			else if (DBUtility.ClsPub.isLong(dsTBarCode.Tables[0].Rows[0][0]) == 2)
			{
			sErrMsg = "此模块不允许反向拆码！";
			return null;
			}
			else
			{
			if (HBillType == "1203")
			{
			HSourceBillNo = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[0]["HSourceBillNo"]);
			HSourceBillType = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[0]["HSourceBillType"]);
			//oBar = get_SourceBarCode_OtherIn(HBillID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HOWNERID, ref sErrMsg);
			//if (oBar == null)
			//{
			// return null;
			//}
			//SourceFlag = true;

			Int64 sMulSourceFlag = 0; //多源单标志（0为非多源单模式，1为多源单模式）
			if (oSystemParameter.omodel.Kf_OtherInBill_MulSourceBill.ToUpper() == "Y") //系统参数其他入库单-多源单模式
			{
			sMulSourceFlag = 1;
			}

			//将源单信息存入条码出入库临时表
			DataSet dsyd = oCn.RunProcReturn("exec h_p_WMS_AddSourceBarCode_OtherIn " + HBillID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + sMulSourceFlag.ToString() + ",'" + HMaker + "'," + HOWNERID.ToString(), "h_p_WMS_AddSourceBarCode_OtherIn");
			if (dsyd == null \|\| dsyd.Tables[0].Rows.Count == 0)
			{
			sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HBillID + "；将条码对应源单信息存入条码出入库临时表失败！";
			return null;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(dsyd.Tables[0].Rows[0][0]) == 0)
			{
			SourceFlag = true;
			}
			else
			{
			sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HBillID + "；" + DBUtility.ClsPub.isStrNull(dsyd.Tables[0].Rows[0]["HRemark"]);
			return null;
			}
			}
			}

			for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
			{
			sBarCode_New = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCode"]);
			@@ -36242,7 +36290,6 @@
			oBar.HSupName = sHSupName;
			oBar.HDeptID = sHDeptID;
			oBar.HDeptName = sHDeptName;
			SourceFlag = true;
			}
			else
			{
			@@ -37029,6 +37076,16 @@
			sErrMsg = "获取整托条码信息发生错误！";
			return null;
			}
			if (DBUtility.ClsPub.isLong(dsTBarCode.Tables[0].Rows[0][0]) == 1)
			{
			sErrMsg = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[0]["HRemark"]);
			return null;
			}
			else if (DBUtility.ClsPub.isLong(dsTBarCode.Tables[0].Rows[0][0]) == 2)
			{
			sErrMsg = "此模块不允许反向拆码！";
			return null;
			}
			else
			{
			for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)