JLApi.git - Gitblit

			@@ -40,26 +40,26 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工单已关闭,不允许开报工操作!";
			mes.message = "当前工单已关闭,不允许开报工操作!";
			mes.data = null;
			return mes;
			}

			//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.isbott,A.isend,L.org_code,L.org_name
			sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.stepprice,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend,L.torg_code,L.torg_name
			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 TMateriel_Info P on M.materiel_code=P.partcode
			left join TOrganization L on M.wkshp_code=L.org_code
			left join TOrganization L on M.wkshp_code=L.torg_code
			where A.wo_code=@ordercode and A.step_code=@stepcode";
			dynamicParams.Add("@ordercode", ordercode);
			dynamicParams.Add("@stepcode", stepcode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			if (data.Rows.Count > 0)
			{
			rt.wkshopcode = data.Rows[0]["org_code"].ToString(); //车间编码
			rt.wkshopname = data.Rows[0]["org_name"].ToString(); //车间名称
			rt.wkshopcode = data.Rows[0]["torg_code"].ToString(); //车间编码
			rt.wkshopname = data.Rows[0]["torg_name"].ToString(); //车间名称
			rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //工单号
			rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //产品编码
			rt.partname = data.Rows[0]["PARTNAME"].ToString(); //产品名称
			@@ -67,6 +67,7 @@
			rt.stepcode = data.Rows[0]["STEPCODE"].ToString(); //工序编码
			rt.stepname = data.Rows[0]["STEPNAME"].ToString(); //工序名称
			rt.stepdesc = data.Rows[0]["DESCR"].ToString(); //工序描述
			rt.stepprice= data.Rows[0]["STEPPRICE"].ToString(); //工序工价
			rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量

			flwtype = data.Rows[0]["FLWTYPE"].ToString();//获取工序属性
			@@ -75,7 +76,7 @@
			rt.seq = data.Rows[0]["SEQ"].ToString();//工序序号

			//获取当前工序下道工序
			sql = @"select A.isbott,A.isend,T.stepcode,T.stepname from TK_Wrk_Step A
			sql = @"select A.isbott,A.isend,T.stepcode,T.stepname,A.stepprice from TK_Wrk_Step A
			left join TStep T on A.step_code=T.stepcode
			where A.wo_code=@ordercode and A.seq=@seq+1 ";
			dynamicParams.Add("@ordercode", ordercode);
			@@ -85,18 +86,20 @@
			{
			rt.nextstepcode = dt.Rows[0]["STEPCODE"].ToString();//下道工序编码
			rt.nextstepname = dt.Rows[0]["STEPNAME"].ToString();//下道工序名称
			rt.nextstepprice = dt.Rows[0]["STEPPRICE"].ToString(); //下道工序工价
			}
			if (isend == "Y") //当前工序是末道工序
			{
			rt.nextstepcode = "";//data.Rows[0]["STEPCODE"].ToString();//当前工序编码
			rt.nextstepname = "";// data.Rows[0]["STEPNAME"].ToString();//当前工序名称
			rt.nextstepprice = "";// data.Rows[0]["STEPPRICE"].ToString();//当前工序工价
			}
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序任务不存在!";
			mes.message = "当前工序任务不存在!";
			mes.data = null;
			return mes;
			}
			@@ -122,7 +125,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序无可报工数量!";
			mes.message = "当前工序无可报工数量!";
			mes.data = null;
			return mes;
			}
			@@ -133,7 +136,7 @@
			rt.reportqty = good_qty + ng_qty + laborbad_qty+ materielbad_qty; //已报数量=报工数量+不良数量+工废数量+料废数量
			mes.code = "200";
			mes.count = 1;
			mes.Message = "查找成功!";
			mes.message = "查找成功!";
			mes.data = rt;
			}
			}
			@@ -144,7 +147,7 @@
			rt.reportqty = 0; //已报数量
			mes.code = "200";
			mes.count = 1;
			mes.Message = "查找成功!";
			mes.message = "查找成功!";
			mes.data = rt;
			}

			@@ -187,7 +190,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + "无可报数量!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + "无可报数量!";
			mes.data = null;
			return mes;
			}
			@@ -197,7 +200,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许报工!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许报工!";
			mes.data = null;
			return mes;
			}
			@@ -206,7 +209,7 @@
			rt.reportqty = good_qty + ng_qty + laborbad_qty+ materielbad_qty;//已报数量=本道报工总数量+本道报工总不良+本道工废总数+本道料废总数
			mes.code = "200";
			mes.count = 1;
			mes.Message = "弹窗报工界面!";
			mes.message = "弹窗报工界面!";
			mes.data = rt;
			}
			}
			@@ -214,7 +217,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许报工!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许报工!";
			mes.data = null;
			return mes;
			}
			@@ -239,7 +242,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + "无可报数量!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + "无可报数量!";
			mes.data = null;
			return mes;
			}
			@@ -249,7 +252,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格收料为0,本道不允许开报工!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格收料为0,本道不允许开报工!";
			mes.data = null;
			return mes;
			}
			@@ -258,7 +261,7 @@
			rt.reportqty = good_qty + ng_qty + laborbad_qty+materielbad_qty; //已报数量=本道报工总数量+本道报工总不良+本道总工废数+本道总料废数
			mes.code = "200";
			mes.count = 1;
			mes.Message = "查找成功!";
			mes.message = "查找成功!";
			mes.data = rt;
			}
			}
			@@ -266,7 +269,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许开报工,请前往外协操作页执行!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许开报工,请前往外协操作页执行!";
			mes.data = null;
			return mes;
			}
			@@ -289,7 +292,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许开报工!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许开报工!";
			mes.data = null;
			return mes;
			}
			@@ -298,14 +301,14 @@
			rt.reportqty = 0; //已报数量
			mes.code = "200";
			mes.count = 1;
			mes.Message = "查找成功!";
			mes.message = "查找成功!";
			mes.data = rt;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许报工!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许报工!";
			mes.data = null;
			return mes;
			}
			@@ -325,7 +328,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格收料为0,本道不允许开报工!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格收料为0,本道不允许开报工!";
			mes.data = null;
			return mes;
			}
			@@ -334,14 +337,14 @@
			rt.reportqty = 0; //已报数量
			mes.code = "200";
			mes.count = 1;
			mes.Message = "查找成功!";
			mes.message = "查找成功!";
			mes.data = rt;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许报工,请前往外协操作页执行!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许报工,请前往外协操作页执行!";
			mes.data = null;
			return mes;
			}
			@@ -352,7 +355,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "未找到当前工序的上道工序信息,请联系管理员核实!";
			mes.message = "未找到当前工序的上道工序信息,请联系管理员核实!";
			mes.data = null;
			return mes;
			}
			@@ -362,7 +365,7 @@
			case "W": //外协工序
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工单工序任务为外协,请前往外协操作标签页操作!";
			mes.message = "当前工单工序任务为外协,请前往外协操作标签页操作!";
			mes.data = null;
			break;
			default: //自制+外协工序
			@@ -374,7 +377,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			return mes;
			}
			@@ -410,26 +413,26 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工单已关闭,不允许开报工操作!";
			mes.message = "当前工单已关闭,不允许开报工操作!";
			mes.data = null;
			return mes;
			}

			//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.isbott,A.isend,L.org_code,L.org_name
			sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.stepprice,A.status,A.plan_qty,A.isbott,A.isend,L.torg_code,L.torg_name
			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 TMateriel_Info P on M.materiel_code=P.partcode
			left join TOrganization L on M.wkshp_code=L.org_code
			left join TOrganization L on M.wkshp_code=L.torg_code
			where A.wo_code=@ordercode and A.step_code=@stepcode";
			dynamicParams.Add("@ordercode", ordercode);
			dynamicParams.Add("@stepcode", stepcode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			if (data.Rows.Count > 0)
			{
			rt.wkshopcode = data.Rows[0]["org_code"].ToString(); //车间编码
			rt.wkshopname = data.Rows[0]["org_name"].ToString(); //车间名称
			rt.wkshopcode = data.Rows[0]["torg_code"].ToString(); //车间编码
			rt.wkshopname = data.Rows[0]["torg_name"].ToString(); //车间名称
			rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //工单号
			rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //产品编码
			rt.partname = data.Rows[0]["PARTNAME"].ToString(); //产品名称
			@@ -438,14 +441,14 @@
			rt.stepname = data.Rows[0]["STEPNAME"].ToString(); //工序名称
			rt.stepdesc = data.Rows[0]["DESCR"].ToString(); //工序描述
			rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //任务数量

			rt.stepprice = data.Rows[0]["STEPPRICE"].ToString(); //工序工价
			flwtype = data.Rows[0]["FLWTYPE"].ToString();//获取工序属性
			isbott = data.Rows[0]["ISBOTT"].ToString();//首道工序
			isend = data.Rows[0]["ISEND"].ToString();//末道工序
			rt.seq = data.Rows[0]["SEQ"].ToString();//工序序号

			//获取当前工序下道工序
			sql = @"select A.isbott,A.isend,T.stepcode,T.stepname from TK_Wrk_Step A
			sql = @"select A.isbott,A.isend,T.stepcode,T.stepname,A.stepprice from TK_Wrk_Step A
			left join TStep T on A.step_code=T.stepcode
			where A.wo_code=@ordercode and A.seq=@seq+1 ";
			dynamicParams.Add("@ordercode", ordercode);
			@@ -455,18 +458,20 @@
			{
			rt.nextstepcode = dt.Rows[0]["STEPCODE"].ToString();//下道工序编码
			rt.nextstepname = dt.Rows[0]["STEPNAME"].ToString();//下道工序名称
			rt.nextstepprice = dt.Rows[0]["STEPPRICE"].ToString(); //下道工序工价
			}
			if (isend == "Y") //当前工序是末道工序
			{
			rt.nextstepcode = "";// data.Rows[0]["STEPCODE"].ToString();//当前工序编码
			rt.nextstepname = "";// data.Rows[0]["STEPNAME"].ToString();//当前工序名称
			rt.nextstepprice = ""; //data.Rows[0]["NEXTSTEPPRICE"].ToString();//下道工序工价
			}
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前扫码工序任务不存在!";
			mes.message = "当前扫码工序任务不存在!";
			mes.data = null;
			return mes;
			}
			@@ -478,7 +483,7 @@
			case "Z":
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前标签为自制标签,请前往自制操作标签页扫码!";
			mes.message = "当前标签为自制标签,请前往自制操作标签页扫码!";
			mes.data = null;
			break;
			case "W":
			@@ -502,7 +507,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序无可发料数量!";
			mes.message = "当前工序无可发料数量!";
			mes.data = null;
			return mes;
			}
			@@ -514,7 +519,7 @@
			rt.startqty = kfqty; //发料数量=剩余可发数量
			mes.code = "200";
			mes.count = 2;
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.data = rt;
			}
			}
			@@ -526,7 +531,7 @@
			rt.startqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //发料数量=任务数量
			mes.code = "200";
			mes.count = 2;
			mes.Message = "弹窗发料界面!";
			mes.message = "弹窗发料界面!";
			mes.data = rt;
			}
			}
			@@ -570,7 +575,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + "无可发数量!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + "无可发数量!";
			mes.data = null;
			return mes;
			}
			@@ -580,7 +585,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许发料!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许发料!";
			mes.data = null;
			return mes;
			}
			@@ -591,7 +596,7 @@

			mes.code = "200";
			mes.count = 2;
			mes.Message = "弹窗发料界面!";
			mes.message = "弹窗发料界面!";
			mes.data = rt;
			}
			}
			@@ -599,7 +604,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许发料!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许发料!";
			mes.data = null;
			return mes;
			}
			@@ -624,7 +629,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + "无可发数量!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + "无可发数量!";
			mes.data = null;
			return mes;
			}
			@@ -634,7 +639,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格收料为0,本道不允许发料!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格收料为0,本道不允许发料!";
			mes.data = null;
			return mes;
			}
			@@ -645,7 +650,7 @@

			mes.code = "200";
			mes.count = 2;
			mes.Message = "弹窗发料界面!";
			mes.message = "弹窗发料界面!";
			mes.data = rt;
			}
			}
			@@ -653,7 +658,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未发料,本道不允许发料!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未发料,本道不允许发料!";
			mes.data = null;
			return mes;
			}
			@@ -677,7 +682,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许发料!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格产出为0,本道不允许发料!";
			mes.data = null;
			return mes;
			}
			@@ -688,7 +693,7 @@

			mes.code = "200";
			mes.count = 2;
			mes.Message = "弹窗发料界面!";
			mes.message = "弹窗发料界面!";
			mes.data = rt;

			}
			@@ -696,7 +701,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许发料!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未报工,本道不允许发料!";
			mes.data = null;
			return mes;
			}
			@@ -717,7 +722,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + "无可发数量!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + "无可发数量!";
			mes.data = null;
			return mes;
			}
			@@ -727,7 +732,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格收料为0,本道不允许发料!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 合格收料为0,本道不允许发料!";
			mes.data = null;
			return mes;
			}
			@@ -738,7 +743,7 @@

			mes.code = "200";
			mes.count = 2;
			mes.Message = "弹窗发料界面!";
			mes.message = "弹窗发料界面!";
			mes.data = rt;
			}
			}
			@@ -746,7 +751,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许发料!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 的上道工序：" + data0.Rows[0]["STEPNAME"].ToString() + " 未收料,本道不允许发料!";
			mes.data = null;
			return mes;
			}
			@@ -757,7 +762,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "未找到当前工序的上道工序信息,请联系管理员核实!";
			mes.message = "未找到当前工序的上道工序信息,请联系管理员核实!";
			mes.data = null;
			return mes;
			}
			@@ -773,7 +778,7 @@
			case "Z"://自制
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前标签为自制标签,请前往自制操作标签页扫码!";
			mes.message = "当前标签为自制标签,请前往自制操作标签页扫码!";
			mes.data = null;
			break;
			case "W":
			@@ -781,7 +786,7 @@
			{
			//1.首道工序时，判断是否有发料记录
			sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code,
			isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty
			isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.laborbad_qty),0) as laborbad_qty,isnull(sum(R.materielbad_qty),0) as materielbad_qty
			from TK_Wrk_OutRecord R
			left join TCustomer C on R.wx_code=C.code
			where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='F'
			@@ -793,7 +798,7 @@
			{
			//1.首道工序时，判断是否有收料记录
			sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code,
			isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty
			isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.laborbad_qty),0) as laborbad_qty,isnull(sum(R.materielbad_qty),0) as materielbad_qty
			from TK_Wrk_OutRecord R
			left join TCustomer C on R.wx_code=C.code
			where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'
			@@ -815,7 +820,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 无可收料数量!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 无可收料数量!";
			mes.data = null;
			return mes;
			}
			@@ -840,12 +845,13 @@
			fqty = g.Sum(i => (decimal)i["fqty"]),
			sqty = g.Sum(i => (decimal)i["sqty"]),
			ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
			bad_qty = g.Sum(i => (decimal)i["bad_qty"])
			laborbad_qty = g.Sum(i => (decimal)i["laborbad_qty"]),
			materielbad_qty = g.Sum(i => (decimal)i["materielbad_qty"])
			}).ToList();

			mes.code = "200";
			mes.count = 3;
			mes.Message = "弹窗收料界面!";
			mes.message = "弹窗收料界面!";
			mes.data = rt;
			}

			@@ -872,12 +878,13 @@
			fqty = g.Sum(i => (decimal)i["fqty"]),
			sqty = g.Sum(i => (decimal)i["sqty"]),
			ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
			bad_qty = g.Sum(i => (decimal)i["bad_qty"])
			laborbad_qty = g.Sum(i => (decimal)i["laborbad_qty"]),
			materielbad_qty = g.Sum(i => (decimal)i["materielbad_qty"])
			}).ToList();

			mes.code = "200";
			mes.count = 3;
			mes.Message = "弹窗收料界面!";
			mes.message = "弹窗收料界面!";
			mes.data = rt;
			}
			}
			@@ -885,7 +892,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 未发料,请先发料!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 未发料,请先发料!";
			mes.data = null;
			return mes;
			}
			@@ -903,7 +910,7 @@
			{
			//1.非首道工序时，判断本道是否有发料记录
			sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code,
			isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty
			isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.laborbad_qty),0) as laborbad_qty,isnull(sum(R.materielbad_qty),0) as materielbad_qty
			from TK_Wrk_OutRecord R
			left join TCustomer C on R.wx_code=C.code
			where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='F'
			@@ -915,7 +922,7 @@
			{
			//2.非首道工序时，判断本道是否有收料记录
			sql = @"select R.wo_code,R.step_code,R.wx_code as code,C.name,R.materiel_code,
			isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.bad_qty),0) as bad_qty
			isnull(sum(R.fqty),0) as fqty,isnull(sum(R.sqty),0) as sqty,isnull(sum(R.ng_qty),0) as ng_qty,isnull(sum(R.laborbad_qty),0) as laborbad_qty,isnull(sum(R.materielbad_qty),0) as materielbad_qty
			from TK_Wrk_OutRecord R
			left join TCustomer C on R.wx_code=C.code
			where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'
			@@ -936,7 +943,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 无可收料数量!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 无可收料数量!";
			mes.data = null;
			return mes;
			}
			@@ -961,12 +968,13 @@
			fqty = g.Sum(i => (decimal)i["fqty"]),
			sqty = g.Sum(i => (decimal)i["sqty"]),
			ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
			bad_qty = g.Sum(i => (decimal)i["bad_qty"])
			laborbad_qty = g.Sum(i => (decimal)i["laborbad_qty"]),
			materielbad_qty = g.Sum(i => (decimal)i["materielbad_qty"])
			}).ToList();

			mes.code = "200";
			mes.count = 3;
			mes.Message = "弹窗收料界面!";
			mes.message = "弹窗收料界面!";
			mes.data = rt;
			}
			}
			@@ -991,11 +999,12 @@
			fqty = g.Sum(i => (decimal)i["fqty"]),
			sqty = g.Sum(i => (decimal)i["sqty"]),
			ng_qty = g.Sum(i => (decimal)i["ng_qty"]),
			bad_qty = g.Sum(i => (decimal)i["bad_qty"])
			laborbad_qty = g.Sum(i => (decimal)i["laborbad_qty"]),
			materielbad_qty = g.Sum(i => (decimal)i["materielbad_qty"])
			}).ToList();
			mes.code = "200";
			mes.count = 3;
			mes.Message = "弹窗收料界面!";
			mes.message = "弹窗收料界面!";
			mes.data = rt;
			}
			}
			@@ -1003,7 +1012,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 未发料,请先发料!";
			mes.message = "当前工序：" + data.Rows[0]["STEPNAME"].ToString() + " 未发料,请先发料!";
			mes.data = null;
			return mes;
			}
			@@ -1012,7 +1021,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "未找到当前工序的上道工序信息,请联系管理员核实!";
			mes.message = "未找到当前工序的上道工序信息,请联系管理员核实!";
			mes.data = null;
			return mes;
			}
			@@ -1030,7 +1039,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			return mes;
			}