MES-WEB-API.git

			@@ -1474,8 +1474,12 @@
			DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
			var hinterID = list[0].HInterID;
			var FID = list[0].FID;

			#region 金蝶审核后会重新同步单据到mes 故不需要更新mes的收料通知单
			/*
			oCn.BeginTran();
			string sql = string.Empty;

			foreach (var item in list)
			{
			if (item.HSQty == 0)
			@@ -1484,6 +1488,15 @@
			oCn.RunProc(sql);
			}
			oCn.RunProc("exec h_p_Cg_UpDatePOOrderRelation_Del " + hinterID);//删除关联关系
			sql = string.Format(@"update Cg_POInStockBillMain set
			HBillStatus = 2 ,
			HCheckDate = getdate()
			where HInterID in ({0})", HInterID);
			oCn.RunProc(sql);//更新mes状态
			//更新成功后同步更新金蝶
			oCn.Commit();
			**/
			#endregion

			JObject jsonRoot = new JObject();
			jsonRoot.Add("Creator", "");
			@@ -1496,17 +1509,16 @@
			JObject jsonModel = new JObject();
			jsonModel.Add("FID", FID);
			JArray Entry = new JArray();

			foreach (var item in list)
			{
			if (item.HSQty == 0)
			continue;
			JObject jsonFPOOrderEntry = new JObject();
			jsonFPOOrderEntry.Add("FEntryID", item.FEntryID);
			jsonFPOOrderEntry.Add("FHQty ", item.HSQty); ;
			jsonFPOOrderEntry.Add("FActReceiveQty ", item.HSQty); ;
			Entry.Add(jsonFPOOrderEntry);
			}
			jsonModel.Add("FEntity", Entry);
			jsonModel.Add("FDetailEntity", Entry);
			jsonRoot.Add("Model", jsonModel);
			var loginRet = InvokeHelper.Login();
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			@@ -1518,20 +1530,49 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//LogService.Write("jsonRoot:" + jsonRoot.ToString());
			var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
			//LogService.Write(result);
			if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
			if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			LogService.Write("收料通知单修改失败jsonRoot:" + jsonRoot.ToString());
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "金蝶收料通知单更新失败" + result;
			objJsonResult.data = null;
			return objJsonResult;
			}
			var json = new
			{
			Ids = FID,
			};
			//提交
			var _result = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
			var _saveObj = JObject.Parse(_result);
			if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			LogService.Write("收料通知单提交失败jsonRoot:" + jsonRoot.ToString());
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "金蝶收料通知单提交失败" + _result;
			objJsonResult.data = null;
			return objJsonResult;

			//更新成功后同步更新金蝶
			oCn.Commit();
			}
			//审核
			_result = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
			_saveObj = JObject.Parse(_result);
			if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			LogService.Write("收料通知单审核失败jsonRoot:" + jsonRoot.ToString());
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "金蝶收料通知单审核失败jsonRoot" + _result;
			objJsonResult.data = null;
			return objJsonResult;

			}


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "操作成功！";
			@@ -1540,7 +1581,7 @@
			}
			catch (Exception e)
			{
			oCn.RollBack();
			//oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "异常！" + e.ToString();
			@@ -1562,8 +1603,9 @@
			{
			try
			{
			//var code = HBarcode.Split('#')[0];
			//校验条码是否存在
			string sql = $"select* from Gy_BarCodeBill where HSourceInterID ={HInterID} and HBarCode = '{HBarcode}'";
			string sql = $"select* from Gy_BarCodeBill where HSourceInterID ={HInterID} and HBarCode = '{HBarcode.Split('#')[0]}' and HQty = {HBarcode.Split('#')[1]}";
			DataSet ds = oCn.RunProcReturn(sql, "H_v_SRM_POOrderBillList");
			if (ds.Tables[0].Rows.Count == 0)
			{