ZQHApi.git - Gitblit

			@@ -98,7 +98,7 @@
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"select A.id, A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
			A.stck_code,D.name as stck_name,A.saleOrderCode,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate
			A.stck_code,D.name as stck_name,A.saleOrderCode,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate,A.sbid
			from TKimp_Ewo A
			left join TMateriel_Info B on A.materiel_code=B.partcode
			left join TOrganization C on A.wkshp_code=C.org_code
			@@ -313,6 +313,79 @@
			mes.code = "300";
			mes.count = 0;
			mes.Message = "订单关闭失败!";
			mes.data = null;
			}
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.data = null;
			}
			return mes;
			}
			#endregion

			#region[ERP订单删除]
			public static ToMessage DeleteErpOrder(string erporderid, string erpordercode, string username)
			{
			var sql = "";
			List<object> list = new List<object>();
			var dynamicParams = new DynamicParameters();
			try
			{
			sql = @"select * from TK_Wrk_Man where m_po=@erpordercode and sourceid=@erporderid and status<>'NEW'";
			dynamicParams.Add("@erpordercode", erpordercode);
			dynamicParams.Add("@erporderid", erporderid);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			if (data.Rows.Count > 0)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前订单下有工单已派发或已开工或已完工(关闭),不允许删除!";
			mes.data = null;
			return mes;
			}
			else
			{
			//删除工单
			sql = @"delete TK_Wrk_Man where m_po=@wo and sourceid=@erporderid";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			wo = erpordercode,
			erporderid = erporderid
			}
			});
			//删除订单
			sql = @"delete TKimp_Ewo where wo=@wo and id=@erporderid";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			wo = erpordercode,
			erporderid = erporderid
			}
			});
			}
			bool aa = DapperHelper.DoTransaction(list);
			LogHelper.WriteLogData(aa.ToString());
			if (aa)
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "订单删除成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "订单删除失败!";
			mes.data = null;
			}
			}
			@@ -1805,21 +1878,10 @@
			}
			//根据条件查询工单工序报工(收料)记录,且不良数量大于0
			//存储过程名
			//sql = @"h_p_IFCLD_MesReportDefectHandleSelect";
			sql = @"select MM.record_id as m_id,MM.wo_code,A.materiel_code,S.seq,MM.step_code,T.stepname,A.id,
			S.plan_qty,A.good_qty as report_qty,MM.defect_qty as ng_qty,A.bad_qty as badqty,'Z' as style,MM.verify,
			MM.defect_code,STUFF((SELECT ',' + P.name
			FROM TDefect P
			WHERE CHARINDEX(',' + P.code + ',', ',' + MM.defect_code + ',') > 0
			FOR XML PATH('')), 1, 1, '') AS defect_name
			from CSR_WorkRecord_Defect MM
			inner join TK_Wrk_Record A on MM.record_id=a.id
			inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
			inner join TStep T on MM.step_code=T.stepcode
			where MM.wo_code=@ordercode and MM.step_code=@stepcode and MM.style='B' and A.style='B' and A.ng_qty>0";
			sql = @"h_p_IFCLD_MesReportDefectHandleSelect";
			dynamicParams1.Add("@ordercode", ordercode);
			dynamicParams1.Add("@stepcode", stepcode);
			DataTable dt = DapperHelper.selectdata(sql, dynamicParams1);
			DataTable dt = DapperHelper.selectProcedure(sql, dynamicParams1);
			if (dt.Rows.Count > 0)
			{
			list.Add("data1", rt);
			@@ -2018,7 +2080,7 @@
			try
			{
			//班组获取人员列表
			sql = @"select U.username,U.username
			sql = @"select U.usercode,U.username
			from TGroup G
			inner join TGroupUser T on G.group_code=T.group_code
			left join TUser U on T.user_code=U.usercode
			@@ -2331,9 +2393,9 @@
			//写入缺陷记录表
			for (int i = 0; i < groupedItems.Count; i++)
			{
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "B", lm_user = username, lm_date = date } });
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "B", lm_user = username, lm_date = date } });

			}
			}
			@@ -2402,9 +2464,9 @@
			//写入缺陷记录表
			for (int i = 0; i < groupedItems.Count; i++)
			{
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "B", lm_user = username, lm_date = date } });
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "B", lm_user = username, lm_date = date } });

			}
			}
			@@ -2630,9 +2692,9 @@
			//写入缺陷记录表
			for (int i = 0; i < groupedItems.Count; i++)
			{
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "S", lm_user = username, lm_date = date } });
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "S", lm_user = username, lm_date = date } });

			}
			}
			@@ -2679,9 +2741,9 @@
			//写入缺陷记录表
			for (int i = 0; i < groupedItems.Count; i++)
			{
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "S", lm_user = username, lm_date = date } });
			sql = @"insert into CSR_WorkRecord_Defect(record_id,wo_code,partnumber,step_seq,step_code,defect_qty,defect_pendqty,defect_code,remarks,style,lm_user,lm_date)
			values(@record_id,@wo_code,@partcode,@stepseq,@stepcode,@ngqty,@defect_pendqty,@defect_code,@remarks,@style,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { record_id = int.Parse(dt.Rows[0]["ID"].ToString()), wo_code = mesordercode, partcode = partcode, stepseq = stepseq, stepcode = stepcode, ngqty = groupedItems[i].badqty, defect_pendqty= groupedItems[i].badqty, defect_code = groupedItems[i].defect_code, remarks = remarks, style = "S", lm_user = username, lm_date = date } });

			}
			}
			@@ -2754,7 +2816,7 @@
			str = sql,
			parm = new
			{
			m_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
			m_id = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
			repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString())
			}
			@@ -2771,18 +2833,33 @@
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
			id = int.Parse(json.Data.Rows[i]["ID"].ToString())
			id = int.Parse(json.Data.Rows[i]["M_ID"].ToString())
			}
			});
			//写入报工缺陷处理记录表
			sql = @"insert into CSR_WorkRecord_DefectHandle(record_subid,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
			values(@record_subid,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
			//回写缺陷记录表的待处理数量
			sql = @"update CSR_WorkRecord_Defect set defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
			where wo_code=@wo_code and step_code=@step_code and id=@id and style='B'";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			record_subid = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
			repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
			id = int.Parse(json.Data.Rows[i]["ID"].ToString())
			}
			});
			//写入报工缺陷处理记录表
			sql = @"insert into CSR_WorkRecord_DefectHandle(defect_id,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
			values(@defect_id,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			defect_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			partcode = json.Data.Rows[i]["MATERIEL_CODE"].ToString(),
			stepseq = json.Data.Rows[i]["SEQ"].ToString(),
			@@ -2810,7 +2887,7 @@
			str = sql,
			parm = new
			{
			m_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
			m_id = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
			repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString())
			}
			@@ -2827,18 +2904,33 @@
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
			id = int.Parse(json.Data.Rows[i]["ID"].ToString())
			id = int.Parse(json.Data.Rows[i]["M_ID"].ToString())
			}
			});
			//写入报工缺陷处理记录表
			sql = @"insert into CSR_WorkRecord_DefectHandle(record_subid,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
			values(@record_subid,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
			//回写缺陷记录表的待处理数量
			sql = @"update CSR_WorkRecord_Defect set defect_pendqty=defect_pendqty-@repair_qty-@bad_qty,bad_qty=bad_qty+@bad_qty
			where wo_code=@wo_code and step_code=@step_code and id=@id and style='S'";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			record_subid = int.Parse(json.Data.Rows[i]["M_ID"].ToString()),
			repair_qty = decimal.Parse(json.Data.Rows[i]["REPAIR_QTY"].ToString()),
			bad_qty = decimal.Parse(json.Data.Rows[i]["BAD_QTY"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			step_code = json.Data.Rows[i]["STEP_CODE"].ToString(),
			id = int.Parse(json.Data.Rows[i]["ID"].ToString())
			}
			});
			//写入报工缺陷处理记录表
			sql = @"insert into CSR_WorkRecord_DefectHandle(defect_id,wo_code,partnumber,step_seq,step_code,repair_qty,bad_qty,defect_code,style,lm_user,lm_date)
			values(@defect_id,@wo_code,@partcode,@stepseq,@stepcode,@repair_qty,@bad_qty,@defect_code,@style,@lm_user,@lm_date)";
			list.Add(new
			{
			str = sql,
			parm = new
			{
			defect_id = int.Parse(json.Data.Rows[i]["ID"].ToString()),
			wo_code = json.Data.Rows[i]["WO_CODE"].ToString(),
			partcode = json.Data.Rows[i]["MATERIEL_CODE"].ToString(),
			stepseq = json.Data.Rows[i]["SEQ"].ToString(),