~yxj/MES-WEB-API.git

			@@ -54,6 +54,8 @@
			//return dal.GetList(sWhere);
			}



			/// <summary>
			/// 获取物料列表
			/// </summary>
			@@ -1994,6 +1996,11 @@
			DAL.Cls_S_IF_ProductInBill_Lite dal = new DAL.Cls_S_IF_ProductInBill_Lite();
			return dal.DisSourceBillList(sWhere);
			}
			public DataSet GetKf_MoveStockRequestBillList(string sWhere)
			{
			DAL.Cls_S_IF_MoveStockRequestBill_Lite dal = new DAL.Cls_S_IF_MoveStockRequestBill_Lite();
			return dal.DisSourceBillList(sWhere);
			}
			#endregion

			#region 其他入库（红字） *
			@@ -3834,6 +3841,28 @@
			}
			}

			//根据托条码获取条码档案列表唯一码信息
			public DataSet GetBarCode(string HBarCode)
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			//
			try
			{
			DataSet DS = oCn.RunProcReturn("select HBarCode,HQty from Sc_PackUnionBillSub where HBarCode_Pack ='" + HBarCode.ToString() + "'", "Sc_PackUnionBillSub", ref DBUtility.ClsPub.sExeReturnInfo);
			//DataSet DS = oCn.RunProcReturn("Select * from h_v_Sc_AssemblyBill Where HInterID=" + HInterID.ToString() + " and HBillType='" + sBillType + "' " + sWhere, "h_v_Sc_AssemblyBill", ref DBUtility.ClsPub.sExeReturnInfo);
			if (DS.Tables[0].Rows.Count == 0)
			return null;
			else
			{
			return DS;
			}
			}
			catch (Exception e)
			{
			throw (e);
			}
			}

			public DataSet GetHBW(long HBadType)
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			@@ -3991,6 +4020,25 @@
			//sErrMsg = "保存调拨单失败！" + sErrMsg;
			//return false;
			}

			public bool set_MoveStockStepOutBill(WebAPI.WebS.ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ref string sErrMsg)
			{
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveMoveStockStepOutBill_New(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			{
			sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + sErrMsg;
			return false;
			}


			}


			//删除记录
			public bool set_DelPonderationBillMain_Temp_InterIDAndSource(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType, ref string sErrMsg)
			{
			@@ -4024,6 +4072,68 @@
			return false;
			}
			}
			//删除单据临时表信息
			public bool DeleteBill_AN(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType, ref string sErrMsg)
			{
			//DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
			//if (dal.DeleteByInterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType))
			//{
			// sErrMsg = "删除成功！";
			// return true;
			//}
			//else
			//{
			// sErrMsg = "删除失败！";
			// return false;
			//}
			WebS.WebService1 oWebs = new WebS.WebService1();

			if (oWebs.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			sErrMsg = "删除成功！";
			return true;
			}
			else
			{
			sErrMsg = "删除失败！";
			return false;
			}

			//if (WebSoBar == null)
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//else
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 1;
			// objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			// objJsonResult.data = WebSoBar;
			// return objJsonResult;
			//}

			}

			//删除单据临时表信息
			public bool DeleteBill(Int64 sHInterID, string HBillNo, string HBillType, string HBarCode, ref string sErrMsg)
			{
			DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
			if (dal.DeleteBill(sHInterID, HBillNo, HBillType, HBarCode))
			{
			sErrMsg = "删除成功！";
			return true;
			}
			else
			{
			sErrMsg = "删除失败！";
			return false;
			}
			}

			//public Model.ClsGy_BarCodeBill_WMS_Model_View get_InfoByBarCode_Source(string sBarCode, Int64 sInterID, ref bool sBool, ref string sErrMsg)
			//{
			// SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			@@ -4056,7 +4166,7 @@
			// return null;
			// }
			//}


			#endregion

			#region 外购入库
			@@ -4410,11 +4520,20 @@


			//返回缓存列表信息同步资料
			public DataSet GetKf_PonderationBillMain_TempList_New(string sHBillType, string sHMaker, Int64 sHOWNERID)
			{
			DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
			return dal.GetKf_PonderationBillMain_TempList_New(sHBillType, sHMaker, sHOWNERID);
			}


			//返回缓存列表信息同步资料
			public DataSet GetKf_PonderationBillMain_TempList(string sHBillType, string sWhere)
			{
			DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
			return dal.GetKf_PonderationBillMain_TempList(sHBillType, sWhere);
			}




			@@ -4486,6 +4605,33 @@
			return false;
			}
			}

			public bool set_SaveICMOReportBill_Json(WebAPI.WebS.ClsSc_ICMOReportBillMain oMain, string sHSourceType, ref string sErrMsg)
			{
			//BLL.ClsKf_POStockInBill bll = new BLL.ClsKf_POStockInBill();
			//return bll.set_SavePOStockInBill_New(oMain, sHSourceType, ref DBUtility.ClsPub.sExeReturnInfo);
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveICMOReportBill_New(oMain, sHSourceType, ref sErrMsg))
			{
			//判断是否反写成功
			//if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
			//{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			//}
			//else
			//{
			// sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
			// return true;
			//}
			}
			else
			{
			sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + sErrMsg;
			return false;
			}
			}


			/// <summary>
			/// 生成外购入库单K3
			@@ -7786,5 +7932,74 @@
			return ds;
			}
			#endregion

			//返回条码临时表
			/// <summary>
			/// 返回条码临时表
			/// </summary>
			public DataSet GetBarCode_Temp(long HInterID, long HMaterID, Int64 HAuxPropID, string HMTONo, Int64 HWhID, Int64 HSPID, Int64 HSCWhID, Int64 HSCSPID, string HBatchNo, Int64 HSourceInterID, Int64 HSourceEntryID, string sBillType, string sWhere)
			{
			DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
			return dal.GetBarCodeByID_View(HInterID, sBillType, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sWhere);
			}

			//删除出入库条码临时表(根据条码)
			public bool set_DelPonderationBillMain_Temp_BarCode(long HInterID, string sBarCode, string sHBillType, ref string sErrMsg)
			{
			DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
			if (dal.DeleteByBarCode(HInterID, sBarCode, sHBillType))
			{
			sErrMsg = "删除成功！";
			return true;
			}
			else
			{
			sErrMsg = "删除失败！";
			return false;
			}
			}


			/// <summary>
			/// 返回扫码明细信息
			/// </summary>
			public DataSet GetBarcodeList(long HInterID, string HBillNo, string sBillType, ref string sMouldManagerCtl, ref string sFIFOCtl, ref string sErrMsg)
			{
			DAL.ClsKF_PonderationBillMain_Temp_View bll = new DAL.ClsKF_PonderationBillMain_Temp_View();
			return bll.GetBillEntry_TmpList(HInterID, HBillNo, sBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref sErrMsg);
			//DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
			//return dal.GetInfoByID_View(HInterID, sBillType, sWhere);
			}

			//撤销缓存列表选中数据
			public bool RescindBillList(Int64 sHInterID, string sBillNo, string sBillType, ref string sErrMsg)
			{
			DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
			if (dal.DeleteICStockBillAndWMS(sHInterID, sBillNo, sBillType, ref sErrMsg))
			{
			sErrMsg = "删除成功！";
			return true;
			}
			else
			{
			sErrMsg = "删除失败！";
			return false;
			}
			}

			//返回缓存列表已上传列表信息
			public DataSet GetDisBillUpdateLoad_Json(string sHBillType, string HMaker, Int64 HOrgID)
			{
			DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
			return dal.GetKf_ICStockBillList(sHBillType, HMaker, HOrgID);
			}

			//返回缓存列表查询已上传列表信息
			public DataSet GetQueryBillUpdateLoad_Json(string BillType, string HBillNo, string HSourceBillNo)
			{
			DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
			return dal.GetKf_ICStockBillQueryList(BillType, HBillNo, HSourceBillNo);
			}

			}
			}