~yxj/MES-WEB-API.git

			@@ -21,131 +21,6 @@
			DataSet ds1;


			///// <summary>
			///// test
			/////参数：string sql。
			/////返回值：object。
			///// </summary>
			//[Route("Cj_StationInBill/AddBill")]
			//[HttpPost]
			//public object AddBill([FromBody] JObject oMain)
			//{
			// var _value = oMain["oMain"].ToString();
			// string msg1 = _value.ToString();
			// try
			// {
			// //委外工序发出反序列化
			// msg1 = "[" + msg1.ToString() + "]";
			// List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
			// string BillType = "3790";
			// long HInterID = list[0].HInterID;//递入type得到的单据ID
			// string HBillNo = list[0].HBillNo;//递入type得到的单据号
			// int HBillStatus = 0;
			// string HMaker = list[0].HMaker;//制单人
			// int HYear = 2021;
			// long HPeriod = 1;
			// string HRemark = list[0].HRemark;//备注
			// long HICMOInterID = list[0].HICMOInterID;//任务单ID
			// string HICMOBillNo = list[0].HICMOBillNo;//任务单
			// int HProcPlanInterID = 0;
			// int HProcPlanEntryID = 0;
			// string HProcPlanBillNo = "";
			// int HProcExchInterID = 0;
			// int HProcExchEntryID = 0;
			// string HProcExchBillNo = list[0].HProcExchBillNo;//流转卡
			// long HMaterID = list[0].HMaterID;//产品ID
			// long HProcID = list[0].HProcID;//当前工序
			// double HICMOQty = list[0].HICMOQty;//任务单数量
			// double HPlanQty = list[0].HPlanQty;//流转卡数量
			// long HSourceID = list[0].HSourceID;//生产资源ID
			// long HGroupID = list[0].HGroupID;//班组ID
			// long HDeptID = 0;
			// long HEmpID = list[0].HEmpID;//接收人ID
			// string HBarCode = list[0].HBarCode;//条形码
			// string HAddr = "";
			// string HBarCodeMaker = "";
			// long HSupID = 0;
			// double HQty = list[0].HQty;//接收数量
			// double HPrice = 0;
			// double HMoney = 0;
			// double HPieceQty = list[0].HPieceQty;//接收件数
			// string HSourceName = list[0].HSourceName;//生产资源名称
			// long HCenterID = list[0].HCenterID;//工作中心ID
			// long HProcNo = list[0].HProcNo;//流水号
			// string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号

			// ListModels oListModels = new ListModels();

			// DAL.ClsSc_StationInBill BillNew = new DAL.ClsSc_StationInBill();

			// BillNew.omodel.HInterID = HInterID;
			// BillNew.omodel.HYear = HYear;
			// BillNew.omodel.HPeriod = HPeriod;
			// BillNew.omodel.HBillNo = HBillNo;
			// BillNew.omodel.HICMOBillNo = HICMOBillNo;
			// BillNew.omodel.HICMOInterID = HICMOInterID;
			// BillNew.omodel.HProcExchInterID = HProcExchInterID;
			// BillNew.omodel.HProcExchEntryID = HProcExchEntryID;
			// BillNew.omodel.HProcExchBillNo = HProcExchBillNo;
			// BillNew.omodel.HProcID = HProcID;
			// BillNew.omodel.HMaterID = HMaterID;
			// BillNew.omodel.HStationInTime = DateTime.Now;
			// BillNew.omodel.HEmpID = HEmpID;
			// BillNew.omodel.HSourceID = HSourceID;
			// BillNew.omodel.HGroupID = HGroupID;
			// BillNew.omodel.HICMOQty = HICMOQty;
			// BillNew.omodel.HPlanQty = HPlanQty;
			// BillNew.omodel.HQty = HQty;
			// BillNew.omodel.HPieceQty = HPieceQty;
			// BillNew.omodel.HSourceName = HSourceName;
			// BillNew.omodel.HCenterID = HCenterID;
			// BillNew.omodel.HBillStatus = HBillStatus;
			// BillNew.omodel.HMaker = HMaker;
			// BillNew.omodel.HRemark = HRemark;
			// BillNew.omodel.HProcPlanInterID = HProcPlanInterID;
			// BillNew.omodel.HProcPlanEntryID = HProcPlanEntryID;
			// BillNew.omodel.HProcPlanBillNo = HProcPlanBillNo;
			// BillNew.omodel.HDeptID = HDeptID;
			// BillNew.omodel.HBarCode = HBarCode;
			// BillNew.omodel.HAddr = HAddr;
			// BillNew.omodel.HBarCodeMaker = HBarCodeMaker;
			// BillNew.omodel.HSupID = HSupID;
			// BillNew.omodel.HPrice = HPrice;
			// BillNew.omodel.HMoney = HMoney;

			// BillNew.omodel.HProcNo = HProcNo;
			// BillNew.omodel.HOrderProcNO = HOrderProcNO;
			// bool bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);

			// //提示
			// if (bResult == true)
			// {
			// objJsonResult.code = "1";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "单据存盘完毕!单据号:" + HBillNo.Trim();
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// else
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "保存失败!原因:" + ClsPub.sExeReturnInfo;
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// }
			// catch (Exception e)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "Exception！" + e.ToString();
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			//}


			/// <summary>
			/// 新增单据-保存按钮
			///参数：string sql。
			@@ -485,9 +360,9 @@
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Cj_StationInBill/list")]
			[Route("Cj_StationInBill/get_Display")]
			[HttpGet]
			public object list(string sWhere)
			public object get_Display(string sWhere)
			{
			try
			{
			@@ -505,7 +380,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.Message = "查询数据异常，请与管理员联系！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -513,7 +388,7 @@
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.Message = "返回记录成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			@@ -522,7 +397,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.Message = "查询数据异常，请与管理员联系！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -567,7 +442,83 @@
			}
			}

			#region [审核]
			[Route("Cj_StationInBill/set_CheckBill")]
			[HttpGet]
			public object set_CheckBill(int HInterID,string CurUserName)
			{
			try
			{
			string ModRightNameCheck = "MES_StationInBill_Check";
			//审核权限
			if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			Int64 lngBillKey = 0;
			lngBillKey = HInterID;
			if (lngBillKey == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID为0！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
			//查看是否已审核,关闭,作废
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (oBill.omodel.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能再次审核";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//审核
			if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion


			//