MES-WEB-API.git

			@@ -995,12 +995,12 @@
			bool flag3 = dataSet5.Tables[0].Rows.Count > 0;
			if (!flag3)
			{
			POStockInBillController postockInBillController = new POStockInBillController();
			//扫源单方法
			postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
			//POStockInBillController postockInBillController = new POStockInBillController();
			////扫源单方法
			//postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);

			//WEBSController webscontroller4 = new WEBSController();
			//object obj4 = webscontroller4.Get_SourceBarCode_PoStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID,1, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo);
			WEBSController webscontroller4 = new WEBSController();
			object obj4 = webscontroller4.get_SourceBarCode_POStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID);



			@@ -1066,8 +1066,11 @@
			bool flag4 = dataSet6.Tables[0].Rows.Count > 0;
			if (!flag4)
			{
			POStockInBillController postockInBillController2 = new POStockInBillController();
			postockInBillController2.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
			//POStockInBillController postockInBillController2 = new POStockInBillController();
			//postockInBillController2.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);

			WEBSController webscontroller4 = new WEBSController();
			object obj4 = webscontroller4.get_SourceBarCode_POStockIn_Json(hinterid, HBillNo, HBillType, text5, "1103", HMaker, HOrgID);
			}
			}
			}
			@@ -3918,8 +3921,8 @@
			List<Model.ClsKf_POStockInBillMain> lsmain = new List<Model.ClsKf_POStockInBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getPOStockInBillMainByJson(msg1);
			lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			//lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			//lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			string sSourceBillType = lsmain[0].HBillType;

			WebAPI.WebS.ClsKf_POStockInBillMain websLsmain = new WebS.ClsKf_POStockInBillMain();
			@@ -4436,6 +4439,7 @@
			jobject16.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString());
			jobject16.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString());
			jobject16.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString());
			jobject16.Add("FGiveAway", dataRow2["FGIVEAWAY"].ToString());//是否赠品
			//jobject16.Add("FPrice", dataRow2["FPRICE"].ToString());
			//jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString());
			//jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString());
			@@ -5009,7 +5013,16 @@
			{
			try
			{
			string _msg = msg["msg"].ToString();
			string HMaker =""; //制单人
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string _msg = sArray[0].ToString();
			if(sArray.Length>1)
			{
			HMaker = sArray[1].ToString();
			}

			_msg = _msg.Replace("\\", "");
			_msg = _msg.Replace("\n", "");
			List<Models.ReciveBill_FastModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ReciveBill_FastModel>>(_msg);
			@@ -5057,6 +5070,7 @@
			,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,
			E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
			,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
			,C.FGIVEAWAY AS FGIVEAWAY
			FROM CG_POINSTOCKBILLSUB B
			JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
			JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
			@@ -5140,6 +5154,7 @@
			FentityModel.Add("FPrice", item["FPRICE"].ToString());//单价
			FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//含税单价
			FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//税率
			FentityModel.Add("FGiveAway", item["FGIVEAWAY"].ToString());//是否赠品

			JArray Fentity2 = new JArray();
			JObject FentityModel2 = new JObject();
			@@ -5168,7 +5183,8 @@
			["IsVerifyBaseDataField"] = "false",
			["Model"] = model
			};
			var loginRet = InvokeHelper.Login();
			//登录
			var loginRet = InvokeHelper.LoginUser(HMaker);
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess == 0)
			{
			@@ -5214,7 +5230,54 @@
			LogService.Write("收料通知单审核无数据：" + sql);
			}
			}
			else //夏宝，更新erp信息
			else if(FCusName.Contains("夏宝"))
			{
			JObject jsonRoot = new JObject();
			jsonRoot.Add("Creator", "");
			jsonRoot.Add("NeedUpDateFields", new JArray());
			jsonRoot.Add("NeedReturnFields", new JArray());
			jsonRoot.Add("IsDeleteEntry", "True"); //注意IsDeleteEntry参数，如为True，则原分录行的FEntryId未在分录json出现的行，将会被删除（如无需删除分录行，可改为fasle）
			jsonRoot.Add("SubSystemId", "");
			jsonRoot.Add("IsVerifyBaseDataField", "");

			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("FActReceiveQty ", item.HSQty); ;
			Entry.Add(jsonFPOOrderEntry);
			}
			jsonModel.Add("FDetailEntity", Entry);
			jsonRoot.Add("Model", jsonModel);
			//登录
			var loginRet = InvokeHelper.LoginUser(HMaker);
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = loginRet;
			objJsonResult.data = null;
			return objJsonResult;
			}
			var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
			//LogService.Write(result);
			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;
			}
			}
			else //更新erp信息
			{
			JObject jsonRoot = new JObject();
			jsonRoot.Add("Creator", "");
			@@ -5238,7 +5301,8 @@
			}
			jsonModel.Add("FDetailEntity", Entry);
			jsonRoot.Add("Model", jsonModel);
			var loginRet = InvokeHelper.Login();
			//登录
			var loginRet = InvokeHelper.LoginUser(HMaker);
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess <= 0)
			{
			@@ -5311,6 +5375,82 @@

			}

			[Route("POStockInBillList/AuditPOInStockBillPost_TianKang")]
			[HttpGet]
			public object AuditPOInStockBill_TianKang(long FID,string user)
			{
			try
			{
			//string _msg = msg["msg"].ToString();
			//_msg = _msg.Replace("\\", "");
			//_msg = _msg.Replace("\n", "");
			//List<Models.ReciveBill_FastModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ReciveBill_FastModel>>(_msg);
			//DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
			//var hinterID = list[0].HInterID;
			//var FID = list[0].FID;
			//string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);//客户名称
			//var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
			//string sql = string.Empty;

			var json = new
			{
			Ids = FID,
			};
			//LogService.Write(json);
			//登录
			var loginRet = InvokeHelper.LoginUser(user);
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = loginRet;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//提交
			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:" + json.ToString());
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "金蝶收料通知单提交失败" + _result;
			objJsonResult.data = null;
			return objJsonResult;

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

			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "操作成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			//oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "异常！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 到货确认扫条码校验
			/// </summary>
			@@ -5329,9 +5469,11 @@
			string sql = string.Empty;
			if (FCusName.Contains("安瑞"))
			sql = $"select top 1 HItemID,HSourceBillNo,HQty,HSourceInterID,HSourceEntryID from Gy_BarCodeBill where HSourceInterID =(select distinct HSourceInterID from Cg_POInStockBillSub where HInterID ={HInterID}) and HBarCode = '{HBarcode}' and HBarCodeType ='箱号内条码'";
			else if(FCusName.Contains("添康科技"))
			sql = $"select top 1 HItemID,HSourceBillNo,HQty,HSourceInterID,HSourceEntryID,HMaterID,HBatchNo,HProduceDate,HExpiryDate from Gy_BarCodeBill where HSourceInterID = {HInterID} and HBarCode = '{HBarcode}' and HBarCodeType ='箱号内条码'";
			else
			sql = $"select HItemID,HSourceBillNo,HQty,HSourceInterID,HSourceEntryID 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");
			DataSet ds = oCn.RunProcReturn(sql, "Gy_BarCodeBill");
			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";