MES-WEB-API.git

			@@ -771,16 +771,16 @@
			return objJsonResult;
			}
			oCN.Commit();
			#region 生成金蝶单据（先保存到mes本地，通过本地调用生成金蝶单据）
			if (!jindieCloud(msg1))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回金蝶单据失败"; //成功！
			objJsonResult.data = null;
			return objJsonResult;
			}
			#endregion
			//#region 生成金蝶单据（先保存到mes本地，通过本地调用生成金蝶单据）
			//if (!jindieCloud(msg1))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "返回金蝶单据失败"; //成功！
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//#endregion
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "单据保存成功！";
			@@ -798,25 +798,24 @@
			return objJsonResult;
			}
			}
			public bool jindieCloud(string msg1)
			[Route("Cg_POOrderBill/jindieCloud")]
			[HttpPost]
			public bool jindieCloud(int HSupID,int MaterID)
			{
			Int64 HInterID = 0;
			string HBillNo = "";
			string sErrMsg = "";
			HInterID = DBUtility.ClsPub.CreateBillID_Prod("1102", ref sErrMsg);
			HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("1102", ref sErrMsg, true);
			WebS.ClsCg_POOrderBillMain websLsmain = new WebS.ClsCg_POOrderBillMain();
			//WebS.ClsCg_POInStockBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString(); //主表数据
			string msg3 = sArray[1].ToString(); //子表数据
			int OperationType = int.Parse(sArray[2].ToString()); // 数据类型 1添加 3修改
			string user = sArray[3].ToString();
			string msg_allVal = sArray[4].ToString(); //主表+子表所有数据
			msg2 = "[" + msg2.ToString() + "]";
			List<ClsCg_POOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(msg2);
			websLsmain.HInterID = mainList[0].HInterID;
			websLsmain.HDate = mainList[0].HDate;
			websLsmain.HBillNo = mainList[0].HBillNo;
			websLsmain.HSupID = mainList[0].HSupID;
			websLsmain.HEmpID = mainList[0].HEmpID;
			websLsmain.HSTOCKORGID = mainList[0].HUSEORGID;
			websLsmain.HBillType = mainList[0].HBillType;

			websLsmain.HInterID = HInterID;
			websLsmain.HDate = DateTime.Now;
			websLsmain.HBillNo = HBillNo;
			websLsmain.HSupID = HSupID;
			websLsmain.HEmpID = MaterID;
			websLsmain.HSTOCKORGID = 100038;
			//websLsmain.HBillType = mainList[0].HBillType;
			if (!oWebs.set_Bill_New(websLsmain, "1100", ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			@@ -825,7 +824,7 @@
			objJsonResult.data = null;
			return false;
			}
			objJsonResult = AddBillMould(msg1);
			objJsonResult = AddBillMould(HBillNo, MaterID, HSupID);
			if (objJsonResult.code == "0")
			{
			objJsonResult.code = "0";
			@@ -836,40 +835,40 @@
			}
			return true;
			}
			public json AddBillMould(string msg1)
			public json AddBillMould(string HBillNo,int MaterID,int HSupID)
			{
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			//string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			//string msg2 = sArray[0].ToString();
			//string msg3 = sArray[1].ToString();
			try
			{
			msg2 = "[" + msg2.ToString() + "]";
			List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
			List<Gy_Mould> mainList1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg3);
			//msg2 = "[" + msg2.ToString() + "]";
			//List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
			//List<Gy_Mould> mainList1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg3);
			string BillType = "3899";
			//得到mainid
			long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
			DateTime HDate = mainList[0].HDate;//日期
			//string HBillNo = HBillNo;//递入type得到的单据号
			DateTime HDate = DateTime.Now;//日期
			int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
			double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
			string HMouldNo = HInterID+"xxx";
			string HBarCode = HBillNo+"xxx";
			string HName = mainList[0].HName??"测试模具";
			string HModel = mainList[0].HModel?? "测试";
			string HModel2 = mainList[0].HModel2 ?? "测试";
			string HDiameter = mainList[0].HDiameter ?? "测试";
			string HSubjoin = mainList[0].HSubjoin ?? "测试";
			string HSubjoin2 = mainList[0].HSubjoin2 ?? "测试";
			string HPICNo = mainList[0].HPICNo ?? "测试";
			string HWorkMaterModel = mainList[0].HWorkMaterModel ?? "测试";
			long HMaterID = mainList1[0].HMaterID;
			string HName = "测试模具";
			string HModel = "测试";
			string HModel2 = "测试";
			string HDiameter = "测试";
			string HSubjoin = "测试";
			string HSubjoin2 = "测试";
			string HPICNo = "测试";
			string HWorkMaterModel = "测试";
			long HMaterID = MaterID;
			long HMouleTypeID = 1;
			long HUnitID = mainList1[0].HUnitID;
			long HUnitID = 1;
			DateTime HOutComDate = DateTime.Now;
			string HOutComNo = mainList[0].HOutComNo ?? "测试";
			string HOutComNo = "测试";
			long HDeptID = 0;
			long HSupID = mainList[0].HSupID;
			//long HSupID = HSupID;
			string HMouldStatus = "0";
			long HWHID = 0;
			long HRoutingID = 0;
			@@ -900,8 +899,8 @@
			int HNowWHID = 0;
			int HNowSPID = 0;
			string HMouldUseStatus = "test";
			int HCREATEORGID = mainList[0].HCREATEORGID;
			int HUSEORGID = mainList[0].HUSEORGID;
			int HCREATEORGID = 100038;
			int HUSEORGID = 100038;
			bool HTransPackFlag = false; //周转容器标记
			bool HSendPackFlag = false; //发货容器标记
			int HMouldLength =0; //长