~yxj/MES-WEB-API.git

			@@ -124,6 +124,7 @@
			long HCenterID = list[0].HCenterID;//工作中心ID
			string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
			long HPRDOrgID = list[0].HPRDOrgID;//组织ID
			double HmaterOutqty = list[0].HmaterOutqty;//白坯发布
			//单据完整性判断
			if (HMaterID <= 0)
			{
			@@ -191,6 +192,7 @@
			",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
			",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
			",HProcNo,HOrderProcNO,HMainInterID,HPRDOrgID" +
			",HmaterOutqty" +
			") " +
			" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
			@@ -199,7 +201,7 @@
			"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
			"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
			",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
			") ");
			","+ HmaterOutqty + ") ");
			}
			else if ("Modify".Equals(eventType))
			{
			@@ -227,6 +229,7 @@
			",HProcExchBillNo='" + HProcExchBillNo + "'" +
			",HMaterID=" + HMaterID +
			",HProcID=" + HProcID +
			",HmaterOutqty=" + HmaterOutqty +
			",HICMOQty=" + HICMOQty +
			",HPlanQty=" + HPlanQty +
			",HStationInTime=getdate()" +
			@@ -378,6 +381,51 @@
			}
			#endregion


			#region 工序进站接收单流水号回车获取工序信息
			[Route("Cj_StationInBill/txtHProcNo_KeyDown_qiaoyi")]
			[HttpGet]
			public object txtHProcNo_KeyDown_qiaoyi(string sBillNo, string sProcNo)
			{
			try
			{
			if (sBillNo.Equals("") \|\| sProcNo.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条形码不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//得到信息（委外标记为0时，流转标记为1时）
			ds = oCN.RunProcReturn("select top 2 * from h_v_Sc_ProcessExchangeBillList where 单据号= '" + sBillNo + "' and 下道流转工序<>'转' and 委外标记=0 and 流转标记=1 and cast(工序号 as int)<='" + sProcNo + "' order by cast(工序号 as int) desc", "h_v_Sc_ProcessExchangeBillList");
			//Ds = oCn.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 单据号= '" + sBillNo + "' and 工序号='" + sProcNo + "' and 委外标记=0 and 流转标记=1 ", "h_v_Sc_ProcessExchangeBillList");
			//写入信息
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "工序号错误或者当前工序号不允许进站，请重新输入！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion



			@@ -929,14 +977,22 @@
			DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
			if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "只能删除本人的单据！";
			objJsonResult.data = null;
			return objJsonResult;
			if (oSystemParameter.omodel.MES_StationInBill_DeleteCtl == "Y")
			{
			if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "只能删除本人的单据！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}


			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet ds;
			@@ -967,6 +1023,17 @@
			return objJsonResult;
			}

			ds = oCn.RunProcReturn($"exec h_p_DelOutInBill {HInterID},'MES_StationInBill_DeleteRelationCtl'", "h_p_DelOutInBill");

			if (ds.Tables[0].Rows[0][0].ToString() == "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "系统参数控制,已有下道工序,不能删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//写入删除日志
			string WorkList = "删除进站单：" + oBill.omodel.HBillNo;
			if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))