JLApi.git - Gitblit

			@@ -27,7 +27,7 @@


			#region[ERP订单查询]
			public static ToMessage ErpOrderSearch(string erporderstus,string wkshopcode, string erpordercode, string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
			public static ToMessage ErpOrderSearch(string erporderstus, string wkshopcode, string erpordercode, string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
			{
			var dynamicParams = new DynamicParameters();
			string search = "";
			@@ -281,12 +281,13 @@
			{
			list.Clear();
			string result = "";
			var groupedModels = obj.GroupBy(m => m.erpordercode);
			//var groupedModels = obj.GroupBy(m => m.erpordercode);
			var groupedModels = obj.GroupBy(s => s.erpordercode).Select(g => new { erpordercode = g.Key }).ToList();
			foreach (var group in groupedModels)
			{
			string erpordercode = group.Key;
			string erpordercode = group.erpordercode;
			int count = 1;
			foreach (var model in group)
			foreach (var model in obj.Where(s => s.erpordercode==erpordercode).ToList())
			{
			//获取当前最大工单号
			sql = @"select isnull(max(cast(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code)) as numeric)),0) as worknumb
			@@ -510,7 +511,7 @@


			#region[MES工单查询]
			public static ToMessage MesOrderSearch(string mesorderstus,string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
			public static ToMessage MesOrderSearch(string mesorderstus, string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
			{
			var dynamicParams = new DynamicParameters();
			string search = "";
			@@ -581,7 +582,7 @@
			var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
			A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,A.data_sources,A.isstep
			from TK_Wrk_Man A
			left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code
			left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code and A.sbid=W.sbid
			left join TMateriel_Info B on A.materiel_code=B.partcode
			left join TOrganization C on A.wkshp_code=C.torg_code
			left join TSecStck D on A.stck_code=D.code
			@@ -667,7 +668,7 @@
			var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
			A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,S.laborbad_qty,S.materielbad_qty
			from TK_Wrk_Man A
			left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code
			left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code and A.sbid=W.sbid
			left join (select wo_code,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty from TK_Wrk_Step where (laborbad_qty+materielbad_qty)>0 group by wo_code) S on A.wo_code=S.wo_code
			left join TMateriel_Info B on A.materiel_code=B.partcode
			left join TOrganization C on A.wkshp_code=C.torg_code
			@@ -1034,6 +1035,40 @@
			}
			#endregion

			#region[MES工单查找历史引用最新工序信息]
			public static ToMessage MesOrderNewStepContent(string wkshopcode, string partcode, User us)
			{
			var sql = "";
			List<object> list = new List<object>();
			var dynamicParams = new DynamicParameters();
			try
			{
			//MES工单查找历史引用最新工序信息
			sql = @"select S.wo_code,S.seq,S.step_code,S.stepprice,isbott,isend from (
			select top 1 wo_code from TK_Wrk_Man
			where wkshp_code=@wkshopcode and materiel_code=@partcode
			order by lm_date desc
			) as A
			inner join TK_Wrk_Step S on A.wo_code=S.wo_code";
			dynamicParams.Add("@wkshopcode", wkshopcode);
			dynamicParams.Add("@partcode", partcode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			mes.code = "200";
			mes.count = data.Rows.Count;
			mes.data = data;
			mes.message = "查询成功!";
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			}
			#endregion


			#region[MES工单派发提交]
			public static ToMessage MesOrderDistribution(string[] wocodelist, User us)
			@@ -1096,7 +1131,7 @@


			#region[工单关闭列表查询]
			public static ToMessage MesOrderClosedSearch(string mesorderstus,string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
			public static ToMessage MesOrderClosedSearch(string mesorderstus, string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
			{
			var dynamicParams = new DynamicParameters();
			string search = "";