~yxj/MES-WEB-API.git

			@@ -98,6 +98,51 @@
			return objJsonResult;
			}

			#region 末道工序汇报入库
			/// <summary>
			/// 末道工序汇报入库列表
			/// </summary>
			/// <param name="sWhere"></param>
			/// <param name="user"></param>
			/// <returns></returns>
			[Route("Sc_ProcessMangement/Sc_ProcessReportList_Last")]
			[HttpGet]
			public object Sc_ProcessReportList_Last(string sWhere, string user)
			{
			try
			{
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			string sql1 = "select * from h_v_Sc_ProcessReportList_Last where 1 = 1 and HLastProc='是'";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessReportList_Last");

			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

			#region 工序汇报入库
			/// <summary>
			/// 获取工序汇报入库单列表
			@@ -121,16 +166,11 @@
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc order by hmainid desc", "h_v_MES_StationOutBillList_LastProc");
			}
			else
			{
			string sql1 = "select * from h_v_MES_StationOutBillList_LastProc where 1 = 1 ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList_LastProc");
			}

			string sql1 = "select * from h_v_Sc_ProcessReportList_Last where 1 = 1 and HFstProc='是' ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessReportList_Last");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			@@ -167,16 +207,26 @@
			//根据工序汇报单主ID获取工序汇报入库单的数据
			DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
			DataRow dr = ds.Tables[0].Rows[0];

			//保存
			oCN.BeginTran();
			//生产汇报单主表
			oCN.RunProc("Insert Into Sc_ICMOReportBillMain " +
			DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain where HBillNo='{HBillNo}'" , "Sc_ICMOReportBillMain");
			if (DsTable.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "已入库,请不要重复入库";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//生产汇报单主表
			oCN.RunProc("Insert Into Sc_ICMOReportBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" +
			",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
			",HGroupID,HDeptID,HDeptNumber" +
			",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
			") " +
			" values('3711','3711'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
			" values('3711','3711'," + HInterID.ToString() + ",'" + BillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
			",DATENAME(YEAR,GETDATE()),0,'','" + dr["HEmpID"].ToString() + "','" + dr["操作员代码"].ToString() +
			"','" + dr["HGroupID"].ToString() + "',0,''" +
			",'" + BillNo.ToString() + "'," + InterID.ToString() + ", 0,'3791'" +
			@@ -220,7 +270,7 @@
			model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //生产组织1
			model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //单据日期1
			model.Add("FHZYMESFLAG", "是");// 是否为MES同步
			model.Add("FBillNo", HBillNo);
			model.Add("FBillNo", BillNo);

			JArray Fentity = new JArray();

			@@ -260,19 +310,6 @@
			FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //包装标识
			FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //批号
			FentityModel.Add("F_bsv_Text", dr1["工序流转卡号"].ToString()); //流转卡号
			//批号
			//FFLOWID FFLOWLINEID FRULEID FSTABLENAME
			//f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72 3 PRD_MO2MORPT T_PRD_MOENTRY
			//业务流程图：FEntity_Link_FFlowId
			//推进路线：FEntity_Link_FFlowLineId
			//转换规则：FEntity_Link_FRuleId
			//源单表内码：FEntity_Link_FSTableId
			//源单表：FEntity_Link_FSTableName
			//源单内码：FEntity_Link_FSBillId
			//源单分录内码：FEntity_Link_FSId
			//原始携带量：FEntity_Link_FBaseQuaQtyOld
			//修改携带量：FEntity_Link_FBaseQuaQty

			JArray Fentity2 = new JArray();
			JObject FentityModel2 = new JObject();
			FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72");
			@@ -334,6 +371,8 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo+"'");

			oCN.Commit();
			objJsonResult.code = "0";
			@@ -439,7 +478,7 @@
			model.Add("FOwnerId0", new JObject() { ["FNumber"] = dr1["HPrdOrgNumber"].ToString() }); //
			model.Add("FIsEntrust", "false");//
			model.Add("FCurrId", new JObject() { ["FNumber"] = "PRE001" }); //
			model.Add("FBillNo", HBillNo);
			model.Add("FBillNo", BillNo);

			JArray Fentity = new JArray();

			@@ -579,6 +618,8 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");

			oCN.Commit();
			objJsonResult.code = "0";
			@@ -817,6 +858,8 @@
			return objJsonResult;
			}

			oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");

			oCN.Commit();
			oCN.RunProc("update sc_stationoutbillmain set HBFFlag =1 where HProcExchBillNo = '" + BillNo + "'");
			objJsonResult.code = "0";