DDMesApi.git - Gitblit

			@@ -138,7 +138,7 @@
			}
			if (i == Convert.ToInt32(ordernum)) //最后一单时
			{
			sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,m_po,lm_user,lm_date) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@m_po,@username,@CreateDate)";
			sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate)";
			list.Add(new
			{
			str = sql,
			@@ -151,6 +151,7 @@
			plan_qty = cdqty + (decimal.Parse(markqty) - sumqty), //末单下单数量=切分数量+(下单数量-累计切分下单数量)
			stck_code = warehousecode,
			materiel_code = partcode,
			sourceid=erporderid,
			m_po = erpordercode,
			username = username,
			CreateDate = DateTime.Now.ToString()
			@@ -161,7 +162,7 @@
			else
			{

			sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,m_po,lm_user,lm_date) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@m_po,@username,@CreateDate)";
			sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate)";
			list.Add(new
			{
			str = sql,
			@@ -174,6 +175,7 @@
			plan_qty = cdqty,
			stck_code = warehousecode,
			materiel_code = partcode,
			sourceid = erporderid,
			m_po = erpordercode,
			username = username,
			CreateDate = DateTime.Now.ToString()
			@@ -356,8 +358,8 @@
			}
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"select 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.m_po,U.username as lm_user,A.lm_date
			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
			from TK_Wrk_Man A
			left join TMateriel_Info B on A.materiel_code=B.partcode
			left join TOrganization C on A.wkshp_code=C.org_code
			@@ -621,7 +623,7 @@
			#endregion

			#region[MES工单删除]
			public static ToMessage DeleteMesOrder(string wocode, string m_po, string orderqty)
			public static ToMessage DeleteMesOrder(string souceid, string wocode, string m_po, string orderqty)
			{
			var sql = "";
			List<object> list = new List<object>();
			@@ -637,21 +639,22 @@
			if (m_po != "" && m_po != null)
			{
			//查询生产订单表数据
			sql = @"select * from TKimp_Ewo where wo=@m_po";
			sql = @"select * from TKimp_Ewo where wo=@m_po and id=@souceid";
			dynamicParams.Add("@m_po", m_po);
			dynamicParams.Add("@souceid", souceid);
			var data0 = DapperHelper.selectdata(sql, dynamicParams);
			decimal relse_qty = decimal.Parse(data0.Rows[0]["RELSE_QTY"].ToString());//以下单数量
			if ((relse_qty - decimal.Parse(orderqty)) == 0) //全部撤销订单状态回写未开始,已下单数量为0
			{
			//回写订单表状态及已下单数量
			sql = @"update TKimp_Ewo set status='NEW',relse_qty=0 where wo=@m_po";
			list.Add(new { str = sql, parm = new { m_po = m_po } });
			sql = @"update TKimp_Ewo set status='NEW',relse_qty=0 where wo=@m_po and id=@souceid";
			list.Add(new { str = sql, parm = new { m_po = m_po, souceid= souceid } });
			}
			else
			{
			//回写订单表状态及已下单数量
			sql = @"update TKimp_Ewo set status='CREATING',relse_qty=relse_qty-@orderqty where wo=@m_po";
			list.Add(new { str = sql, parm = new { m_po = m_po, orderqty = decimal.Parse(orderqty) } });
			sql = @"update TKimp_Ewo set status='CREATING',relse_qty=relse_qty-@orderqty where wo=@m_po and id=@souceid";
			list.Add(new { str = sql, parm = new { m_po = m_po, souceid= souceid, orderqty = decimal.Parse(orderqty) } });
			}
			}
			//删除工单工序表
			@@ -1827,7 +1830,7 @@
			dynamicParams.Add("@wo_code", mesordercode);
			dynamicParams.Add("@step_code", stepcode);
			var da1 = DapperHelper.selectdata(sql, dynamicParams);
			var dr = da1.AsEnumerable().ToList().Select(x => x.Field<int>("NAME")).ToList();
			var dr = da1.AsEnumerable().ToList().Select(x => x.Field<string>("NAME")).ToList();
			string wxstring = (string.Join(",", dr.Select(x => x.ToString()).ToArray()));
			mes.code = "300";
			mes.count = 0;
			@@ -1853,6 +1856,18 @@
			//}
			if (data.Rows.Count > 0)
			{
			decimal sum_sqty = data.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum(); //获取同单号,同工序,同外协供应商收料总数量
			decimal sum_fqty = da.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum(); //获取同单号,同工序,同外协供应商发料总数量
			if ((sum_sqty + decimal.Parse(sqty) + decimal.Parse(ngqty)) > sum_fqty) //已收料总数+当前收料数量+不良数量>总发料数量
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "操作失败,当前收料数量+不良数量,不能大于待收数量:" + (sum_fqty- sum_sqty) + "!";
			mes.data = null;
			return mes;
			}


			//获取主表最大ID
			sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_OutRecord')+1,1) as id";
			var dt = DapperHelper.selecttable(sql);