ZQHApi.git - Gitblit

			@@ -1636,9 +1636,11 @@
			}
			//根据条件查询工单工序任务(自制工序)
			sql = @"select A.status,A.wo_code,B.route_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
			S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.plan_startdate,A.plan_enddate,B.lm_date
			S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.plan_startdate,A.plan_enddate,B.lm_date,
			B.m_po,W.saleOrderCode
			from TK_Wrk_Step A
			left join TK_Wrk_Man B on A.wo_code=B.wo_code
			left join TKimp_Ewo W on B.m_po=W.wo and B.materiel_code=W.materiel_code
			left join TMateriel_Info M on B.materiel_code=M.partcode
			left join TStep S on A.step_code=S.stepcode
			left join TOrganization F on B.wkshp_code=F.org_code
			@@ -1757,9 +1759,11 @@
			}
			//根据条件查询工单工序任务(外协工序)
			sql = @"select A.status,A.wo_code,B.route_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
			S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.plan_startdate,A.plan_enddate,B.lm_date
			S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.plan_startdate,A.plan_enddate,B.lm_date,
			B.m_po,W.saleOrderCode
			from TK_Wrk_Step A
			left join TK_Wrk_Man B on A.wo_code=B.wo_code
			left join TKimp_Ewo W on B.m_po=W.wo and B.materiel_code=W.materiel_code
			left join TMateriel_Info M on B.materiel_code=M.partcode
			left join TStep S on A.step_code=S.stepcode
			left join TOrganization F on B.wkshp_code=F.org_code
			@@ -1868,9 +1872,11 @@
			}
			//根据条件查询工单工序任务,且不良数量大于0
			sql = @"select A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isend,
			S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,B.lm_date
			S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,B.lm_date,
			B.m_po,W.saleOrderCode
			from TK_Wrk_Step A
			left join TK_Wrk_Man B on A.wo_code=B.wo_code
			left join TKimp_Ewo W on B.m_po=W.wo and B.materiel_code=W.materiel_code
			left join TMateriel_Info M on B.materiel_code=M.partcode
			left join TStep S on A.step_code=S.stepcode
			left join TOrganization F on B.wkshp_code=F.org_code
			@@ -1938,10 +1944,12 @@
			}
			}
			//1.根据工单+工序查找当前工序是否首道工序
			sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.isbott,A.isend
			sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.good_qty,A.ng_qty,A.bad_qty,A.isbott,A.isend,
			M.m_po,W.saleOrderCode
			from TK_Wrk_Step A
			left join TStep T on A.step_code=T.stepcode
			left join TK_Wrk_Man M on A.wo_code=M.wo_code
			left join TKimp_Ewo W on M.m_po=W.wo and M.materiel_code=W.materiel_code
			left join TMateriel_Info P on M.materiel_code=P.partcode
			where A.wo_code=@ordercode and A.step_code=@stepcode";
			dynamicParams.Add("@ordercode", ordercode);
			@@ -1950,6 +1958,8 @@
			if (data.Rows.Count > 0)
			{
			rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //工单号
			rt.saleOrderCode = data.Rows[0]["saleOrderCode"].ToString(); //销售订单号
			rt.m_po = data.Rows[0]["m_po"].ToString(); //订单号
			rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //产品编码
			rt.partname = data.Rows[0]["PARTNAME"].ToString(); //产品名称
			rt.partspec = data.Rows[0]["PARTSPEC"].ToString(); //产品规格
			@@ -3395,7 +3405,7 @@


			#region[MES工单批量关闭查询]
			public static ToMessage MesOrderBitchClosedSearch(string stu_torgcode, string stu_torgtypecode, string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
			public static ToMessage MesOrderBitchClosedSearch(string stu_torgcode, string stu_torgtypecode, string mesorderstus, 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 = "";
			@@ -3430,6 +3440,11 @@
			{
			search += "and A.m_po like '%'+@sourceorder+'%' ";
			dynamicParams.Add("@sourceorder", sourceorder);
			}
			if (saleordercode != "" && saleordercode != null)
			{
			search += "and W.saleOrderCode like '%'+@saleordercode+'%' ";
			dynamicParams.Add("@saleordercode", saleordercode);
			}
			if (ordertype != "" && ordertype != null)
			{
			@@ -3469,11 +3484,12 @@
			// --------------查询指定数据--------------
			var total = 0; //总条数
			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.org_name as wkshp_name,
			A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,U.username as lm_user,A.lm_date
			A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,W.saleOrderCode,U.username as lm_user,A.lm_date
			,(select sum(S.good_qty) from TK_Wrk_Step S where S.wo_code=A.wo_code and S.isend='Y') as good_qty
			,(select sum(S.ng_qty) from TK_Wrk_Step S where S.wo_code=A.wo_code and S.isend='Y') as ng_qty
			,(select sum(S.bad_qty) from TK_Wrk_Step S where S.wo_code=A.wo_code and S.isend='Y') as bad_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 TMateriel_Info B on A.materiel_code=B.partcode
			left join TOrganization C on A.wkshp_code=C.org_code
			left join T_Sec_Stck D on A.stck_code=D.code