~yxj/MES-WEB-API.git

			@@ -121,6 +121,8 @@

			public json AddBillMain(string msg1)
			{
			string sErrMsg = "";
			oSystemParameter.ShowBill(ref sErrMsg);
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			@@ -180,6 +182,50 @@
			int IsProNo = mainList[0].IsProNo;//是否转工序
			HName_LongShan = mainList[0].HName;//工艺路线名称


			if (oSystemParameter.omodel.WMS_CampanyName == "")
			{
			if (HPicNumVer == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "图号版本不能为空!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HPicNumAssemble == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "总装图号不能为空!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HMaterTexture == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "材质不能为空!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HProductNum == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "成品编号不能为空!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HVerNum == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "版本不能为空!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (OperationType == 2)
			{
			ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 单据号='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
			@@ -244,29 +290,9 @@
			return objJsonResult;
			}

			string sErrMsg = "";
			if (oSystemParameter.ShowBill(ref sErrMsg))
			if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
			{
			if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1)
			{
			ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1 and HNumber='9999' ", "Gy_Process");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未设置转工序!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//设置转工序
			oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
			}
			}
			else if (IsProNo == 1 && OperationType == 1)
			if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1)
			{
			ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1 and HNumber='9999' ", "Gy_Process");

			@@ -283,6 +309,23 @@
			oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
			}
			}
			else if (IsProNo == 1 && OperationType == 1)
			{
			ds = oCN.RunProcReturn("select * from Gy_Process Where HTProcessFlag = 1 and HNumber='9999' ", "Gy_Process");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未设置转工序!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//设置转工序
			oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
			}



			//是否勾选默认工艺路线