~yxj/MES-WEB-API.git

			@@ -29,6 +29,8 @@
			public string MaterialCode { get; set; }
			public string MaterialName { get; set; }
			public string MaterialModel { get; set; }
			public string Arbitrarily { get; set; }
			public string HBillStatus { get; set; }
			public int? HOrgID;
			}

			@@ -61,7 +63,7 @@
			JIT_SendGoodsBill com = JsonConvert.DeserializeObject<JIT_SendGoodsBill>(sWhere.ToString());

			ds = oCN.RunProcReturn($"exec h_p_JIT_DeptCheckGoodsBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.HDeptName}'," +
			$"'{com.MaterialCode}','{com.MaterialName}','{com.MaterialModel}','{com.HOrgID}'", "h_p_JIT_DeptCheckGoodsBillList_Query");
			$"'{com.MaterialCode}','{com.MaterialName}','{com.MaterialModel}','{com.HOrgID}','{com.HBillStatus}'", "h_p_JIT_DeptCheckGoodsBillList_Query");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -115,5 +117,107 @@
			}
			}
			#endregion

			#region 车间收料列表撤销确认收料
			[Route("Cj_SendGoodsBill/DeptCheckGoodsBillList_revoke")]
			[HttpGet]
			public object DeptCheckGoodsBillList_revoke(string HInterID, string HEntryID, string User)
			{
			try
			{
			//查看权限
			if (!DBUtility.ClsPub.Security_Log("JIT_SendGoodsBill_Check", 1, false, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无审核权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.RunProc($"update JIT_SendGoodsBillMain set HChecker='' ,HCheckDate=null,HBillStatus=1 where HInterID='{HInterID}'");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "已完成撤销";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 车间收料列表删除
			[Route("Cj_SendGoodsBill/DeleteBill")]
			[HttpGet]
			public object DeleteBill(string HInterID,string HEntryID, string User)
			{
			try
			{
			DataSet dataset = new DataSet();
			//获取车间配送单据数据
			dataset = oCN.RunProcReturn($"select * from JIT_SendGoodsBillMain a inner join JIT_SendGoodsBillSub b on a.HInterID = b.HInterID where a.HInterID={HInterID} and HEntryID={HEntryID} ", "JIT_SendGoodsBillMain");

			var HQty = double.Parse(dataset.Tables[0].Rows[0]["HQty"].ToString());

			//获取拣料配送单的数据
			ds = oCN.RunProcReturn($"select * from JIT_ComplementGoodsBillMain a inner join JIT_ComplementGoodsBillSub b on a.HInterID = b.HInterID where a.HInterID={(dataset.Tables[0].Rows[0]["HMainSourceInterID"].ToString())} and b.HMaterID={(dataset.Tables[0].Rows[0]["HMaterID"].ToString())} and b.HWHID={(dataset.Tables[0].Rows[0]["HWHID"].ToString())} ", "JIT_ComplementGoodsBillMain");

			//获取拣料配送单_LK表数据
			ds = oCN.RunProcReturn($"select * from JIT_ComplementGoodsBillSub_LK where HInterID={(ds.Tables[0].Rows[0]["HInterID"].ToString())} and HSendQTY<>0 order by HSendQTY", "JIT_SendGoodsBillMain");

			for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
			{
			var HSendQTY = double.Parse(ds.Tables[0].Rows[i]["HSendQTY"].ToString());

			//修改调拨数量
			oCN.RunProc($"update JIT_ComplementGoodsBillSub_LK set HSendQTY=HSendQTY-{(HSendQTY > HQty ? HQty : HSendQTY)} where HInterID={ds.Tables[0].Rows[i]["HInterID"].ToString()} and HEntryID={ds.Tables[0].Rows[i]["HEntryID"].ToString()} ");

			HQty -= HSendQTY;
			if (HQty <= 0)
			{
			break;
			}
			}

			dataset = oCN.RunProcReturn($"select * from JIT_SendGoodsBillMain a inner join JIT_SendGoodsBillSub b on a.HInterID = b.HInterID where a.HInterID={HInterID} ", "JIT_SendGoodsBillMain");

			//删除数据
			if (dataset.Tables[0].Rows.Count != 1)
			{
			oCN.RunProc($"delete from JIT_SendGoodsBillSub where HInterID='{HInterID}' and HEntryID={HEntryID} ");
			}
			else
			{

			oCN.RunProc($"delete from JIT_SendGoodsBillMain where HInterID='{HInterID}'");
			oCN.RunProc($"delete from JIT_SendGoodsBillSub where HInterID='{HInterID}' and HEntryID={HEntryID} ");
			}



			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "已完成删除";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}