ZQHApi.git - Gitblit

			@@ -57,7 +57,7 @@
			if (shopcode != null \|\| shopcode != "") //产线编码不为空
			{
			string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[]
			//查询产线下已开工的加工单信息
			//查询产线下已开工的加工单信息(当年)
			sql = @"select * from (
			select distinct E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname,S.good_qty,S.ng_qty,S.bad_qty from TK_Wrk_Record A
			inner join TK_Wrk_Man P on A.wo_code=P.wo_code
			@@ -67,8 +67,8 @@
			left join (
			select wo_code,sum(good_qty) as good_qty,sum(ng_qty) as ng_qty,sum(bad_qty) as bad_qty from TK_Wrk_Step where isend='Y' group by wo_code
			) S on P.wo_code=S.wo_code
			where P.status<>'CLOSED' and P.status<>'NEW' and P.wkshp_code in @shopcode and A.style='S' and A.step_seq='1'
			) as AA where AA.plan_qty>(AA.good_qty+aa.bad_qty+AA.ng_qty)";
			where P.status<>'CLOSED' and P.status<>'NEW' and P.wkshp_code in @shopcode and A.style='S' and A.step_seq='1' and year(P.lm_date) = YEAR(GETDATE())
			) as AA where AA.plan_qty>=(AA.good_qty+aa.bad_qty+AA.ng_qty)";
			var data0 = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });

			if (data0.Rows.Count > 0)
			@@ -93,7 +93,7 @@
			lineone.children = new List<TreeTwo>();

			//查新工单下工序信息
			sql = @"select A.seq,T.stepcode,T.stepname,A.plan_qty,A.good_qty,A.ng_qty,A.status
			sql = @"select A.seq,T.stepcode,T.stepname,A.plan_qty,A.start_qty,A.good_qty,A.ng_qty,A.status
			from TK_Wrk_Step A
			left join TStep T on A.step_code=T.stepcode
			where A.wo_code=@wo_code";
			@@ -105,6 +105,7 @@
			string stepcode = data1.Rows[k]["STEPCODE"].ToString();//工序编码
			string stepname = data1.Rows[k]["STEPNAME"].ToString();//工序名称
			string planqty = data1.Rows[k]["PLAN_QTY"].ToString();//任务数量
			string startqty = data1.Rows[k]["START_QTY"].ToString();//开工数量
			string good_qty = data1.Rows[k]["GOOD_QTY"].ToString();//报工数量
			string ng_qty = data1.Rows[k]["NG_QTY"].ToString();//不良数量
			string status = data1.Rows[k]["STATUS"].ToString();//状态
			@@ -113,6 +114,7 @@
			linetwo.stepcode = stepcode;
			linetwo.stepname = stepname;
			linetwo.planqty = planqty;
			linetwo.startqty = startqty;
			linetwo.goodqty = good_qty;
			linetwo.ngqty = ng_qty;
			linetwo.status = status;
			@@ -157,7 +159,7 @@
			string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[]
			try
			{
			//获取任务列表信息
			//获取任务列表信息(当年)
			sql = @"select A.*,ROW_NUMBER() OVER(ORDER BY (case when A.warning<=2 then A.planenddate end) asc ,A.planstartdate asc) AS RowNum from(
			select A.status,A.lm_date,E.saleOrderCode,A.wo_code,M.partcode,M.partname,M.partspec,U.name,
			A.plan_qty,B.good_qty,B.ng_qty,E.planstartdate,E.planenddate, datediff(day,getdate(),E.planenddate) warning
			@@ -167,7 +169,7 @@
			left join TMateriel_Info M on A.materiel_code=M.partcode
			left join TUom U on M.uom_code=U.code
			where A.status<>'CLOSED' and A.wkshp_code in @shopcode and A.is_delete<>'1' and B.isend='Y'
			and A.plan_qty>(B.good_qty+B.ng_qty+B.bad_qty)
			and A.plan_qty>=(B.good_qty+B.ng_qty+B.bad_qty) and year(A.lm_date) = YEAR(GETDATE())
			)as A ";
			var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
			mes.code = "200";
			@@ -401,9 +403,9 @@
			}
			#endregion



			#region[大岛仓库看板,左上产品待入库列表]

			#region[正清和仓库看板,左上产品待入库列表]
			public static ToMessage WareHouseTopLeftData()
			{
			string sql = "";
			@@ -427,7 +429,7 @@
			}
			#endregion

			#region[大岛仓库看板,左下产品待发货列表]
			#region[正清和仓库看板,左下产品待发货列表]
			public static ToMessage WareHouseTopBottomData()
			{
			string sql = "";
			@@ -451,7 +453,7 @@
			}
			#endregion

			#region[大岛仓库看板,右上成品库、半成品库top5库存排行]
			#region[正清和仓库看板,右上成品库、半成品库top5库存排行]
			public static ToMessage WareHouseRightTopData()
			{
			string sql = "";
			@@ -474,7 +476,7 @@
			}
			#endregion

			#region[大岛仓库看板,右下原料库库top5库存排行]
			#region[正清和仓库看板,右下原料库库top5库存排行]
			public static ToMessage WareHouseRightBottomData()
			{
			string sql = "";
			@@ -498,21 +500,106 @@
			#endregion


			#region[车间看板公告]
			public static ToMessage WkspReportNotice(string shopcode)

			#region[正清和车间综合看板,左上生产订单]
			public static ToMessage WorkShopCompreLeftTop(string wkshopcode)
			{
			string sql = "";
			var sql = "";
			var dynamicParams = new DynamicParameters();
			Dictionary<object, object> dir = new Dictionary<object, object>();
			Dictionary<object, object> dir0 = new Dictionary<object, object>();
			Dictionary<object, object> dir1 = new Dictionary<object, object>();
			try
			{
			string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[]
			//获取车间公告信息
			sql = @"select contents from TSystemAnnouncement
			where wksp_code in @shopcode";
			var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
			string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[]
			sql = @"select * from h_v_DDKanBan_WorkShopCompreLeftTop";
			var data = DapperHelper.selecttable(sql);
			sql = @"select * from h_v_DDKanBan_WorkShopCompreLeftCenter";
			var data1 = DapperHelper.selecttable(sql);
			for (int i = 0; i < wkshoplist.Length; i++)
			{
			var top0 = data.AsEnumerable()
			.Where(row => row.Field<string>("wkshp_code") == wkshoplist[i].ToString()) // 添加查询条件
			.Select(group => new
			{
			wkshp_code = group.Field<string>("wkshp_code"),
			plan_qty = group.Field<decimal>("plan_qty"),
			good_qty = group.Field<decimal>("good_qty")
			}).DefaultIfEmpty(new { wkshp_code = wkshoplist[i].ToString(), plan_qty = 0m, good_qty = 0m })//为空时指定默认值
			.ToList();
			dir0.Add(wkshoplist[i].ToString(), top0);

			var top1 = data1.AsEnumerable()
			.Where(row => row.Field<string>("wkshp_code") == wkshoplist[i].ToString()) // 添加查询条件
			.Select(group => new
			{
			wkshp_code = group.Field<string>("wkshp_code"),
			plan_qty = group.Field<decimal>("plan_qty"),
			quantity = group.Field<decimal>("quantity")
			}).DefaultIfEmpty(new { wkshp_code = wkshoplist[i].ToString(), plan_qty = 0m,quantity = 0m })//为空时指定默认值
			.ToList();
			dir1.Add(wkshoplist[i].ToString(), top1);
			}
			dir.Add("LeftTop", dir0);
			dir.Add("LeftBottom", dir1);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.data = data;
			mes.data = dir;
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.data = null;
			}
			return mes;
			}
			#endregion

			#region[正清和车间综合看板,右上销售订单]
			public static ToMessage WorkShopCompreRightTop()
			{
			var sql = "";
			Dictionary<object, object> dir = new Dictionary<object, object>();
			try
			{
			sql = @"select * from h_v_DDKanBan_WorkShopCompreRightTop";
			var data = DapperHelper.selecttable(sql);
			sql = @"select * from h_v_DDKanBan_WorkShopCompreRightCenter";
			var data1 = DapperHelper.selecttable(sql);
			dir.Add("RightTop", data);
			dir.Add("RightBottom", data1);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.data = dir;
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.data = null;
			}
			return mes;
			}
			#endregion

			#region[正清和车间综合看板,右下库存]
			public static ToMessage WorkShopCompreRightBottom()
			{
			var sql = "";
			Dictionary<object, object> dir = new Dictionary<object, object>();
			try
			{
			sql = @"select * from h_v_DDKanBan_WorkShopCompreRightBottom";
			var data = DapperHelper.selecttable(sql);
			dir.Add("Y", data.Rows[0]["BaseQuantity"].ToString());
			dir.Add("B", data.Rows[1]["BaseQuantity"].ToString());
			dir.Add("C", data.Rows[2]["BaseQuantity"].ToString());
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.data = dir;
			}
			catch (Exception e)
			{