MES-WEB-API.git

			@@ -90,6 +90,7 @@
			WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
			string sExpressNumber = "";
			WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
			//WebSoBar = oWebs.get_ba(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			@@ -156,6 +157,76 @@
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = e.Message + ";" + e.StackTrace;
			objJsonResult.data = null;
			return objJsonResult;
			}

			}


			[Route("kf_PoStockInBill/JX_Json")]
			[HttpGet]
			public Object JX_Json(string sBarCodeNew,Int64 HOrgID)
			{
			try
			{
			string[] sArray = sBarCodeNew.Split('@');
			string HMaterNumber = "";
			HMaterNumber = sArray[0];
			Int64 HQty = 0;
			HQty = ClsPub.isInt(sArray[4]);
			string HBarchNo = "";
			HBarchNo = sArray[6];

			Int64 HMaterID = 0;

			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet Dss;
			Dss = oCn.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
			string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);

			DataSet Dss1;
			Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
			HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
			string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
			string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
			Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);

			string HTM = "";
			HTM = HOrgNumber + HMaterID + HBarchNo;
			string ModName = "85";
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
			oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
			",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
			",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
			",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
			") values ("
			+ "'" + HTM + "','批次条码'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
			+ ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
			+ ", 0,0,'','',0"
			+ ", 0,'',0,0,0,''"
			+ ",0,'','','',getdate()"
			+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
			+ ",0,0,0"
			+ ",'" + HMaterName + "','" + HMaterModel + "','',0,'','')");


			string sExpressNumber = "";
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = HTM;
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -409,6 +480,55 @@
			return objJsonResult;
			}
			}






			[Route("Kf_QCStockInCheckBill_Fast/BarCode_Json")]
			[HttpGet]
			public object BarCode_Json(string HBarCode)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json where 条码编号 ='" + HBarCode.ToString() + "'" , "h_v_QCStockInCheckBill_Json");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！";
			objJsonResult.data = null;
			return objJsonResult;
			//DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}








			/// <summary>
			@@ -1474,8 +1594,25 @@
			DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
			var hinterID = list[0].HInterID;
			var FID = list[0].FID;

			#region 校验是否扫描条码
			var HInterID = list[0].HInterID;
			string jysql = string.Format(@"select * from KF_PonderationBillMain_Temp where HSourceInterID = {0}", HInterID);
			DataTable jyDt =oCn.RunProcReturn(jysql, "jysql").Tables[0];
			if (jyDt.Rows.Count == 0 \|\| jyDt == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "请扫描条码";
			objJsonResult.data = null;
			return objJsonResult;
			}
			#endregion
			#region 金蝶审核后会重新同步单据到mes 故不需要更新mes的收料通知单
			/*
			oCn.BeginTran();
			string sql = string.Empty;

			foreach (var item in list)
			{
			if (item.HSQty == 0)
			@@ -1484,6 +1621,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", "");
			@@ -1502,10 +1648,10 @@
			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>();
			@@ -1519,7 +1665,7 @@
			}
			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";
			@@ -1559,13 +1705,7 @@

			}

			sql = string.Format(@"update Cg_POInStockBillMain set
			HBillStatus = 2 ,
			HCheckDate = getdate()
			where HInterID in ({0})", HInterID);
			oCn.RunProc(sql);//更新mes状态
			//更新成功后同步更新金蝶
			oCn.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "操作成功！";
			@@ -1574,7 +1714,7 @@
			}
			catch (Exception e)
			{
			oCn.RollBack();
			//oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "异常！" + e.ToString();
			@@ -1596,8 +1736,9 @@
			{
			try
			{
			//var code = HBarcode.Split('#')[0];
			//校验条码是否存在
			string sql = $"select* from Gy_BarCodeBill where HSourceInterID ={HInterID} and HBarCode = '{HBarcode}'";
			string sql = $"select HItemID,HSourceBillNo 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)
			{
			@@ -1607,6 +1748,29 @@
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			else
			{
			//存入条码临时表
			sql = $"delete from KF_PonderationBillMain_Temp Where HBillNo='{ds.Tables[0].Rows[0]["HSourceBillNo"]}' ";
			oCn.RunProc(sql);
			sql = string.Format(@"Insert into KF_PonderationBillMain_Temp
			(HInterID,HBillNo,HBillType,HMaterID,HProcID,HWhID,HSCWHID
			,HStockPlaceID,HOutStockPlaceID,HGroupID,HQty,HQtyMust,HPieceQty
			,HAuxPropID,HBatchNo,HBarCode,HAddr,HMaker,HMakeDate
			,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HMTONo
			,HSTOCKORGID,HOWNERID,HExpressNumber,HSubBillType
			,HRelationInterID,HRelationEntryID,HRelationBillNo,HRedBlueFlag
			,HCusID)
			select HInterID,HSourceBillNo,HBillType,HMaterID,0,0,0
			,0,0,0,HQty,HQty,0
			,HAuxPropID,HBatchNo,'','','System',getdate()
			,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HMTONo
			,HSTOCKORGID,HOWNERID,'',HBillType
			,0,0,'',0
			,0 from Gy_BarCodeBill
			where HItemID = {0}", ds.Tables[0].Rows[0]["HItemID"]);
			oCn.RunProc(sql);
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;