From 78ccddadb87e0d4dd7f74733a031393395db2869 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 29 五月 2024 14:38:39 +0800
Subject: [PATCH] nothing

---
 VueWebApi/DLL/DAL/ProductionManagementDAL.cs |  440 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 347 insertions(+), 93 deletions(-)

diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 9bcf340..a57039c 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -124,7 +124,8 @@
                     //鑾峰彇鏈�澶у崟鎹彿
                     if (i == 1)  //棣栧崟鑾峰彇宸ュ崟鍙�
                     {
-                        sql = @"select isnull(max(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code))),0)+1 as worknumb from TK_Wrk_Man where m_po=@erpordercode";
+                        sql = @"select isnull(max(cast(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code)) as numeric)),0)+1 as worknumb   
+                                from TK_Wrk_Man where m_po=@erpordercode";
                         dynamicParams.Add("@erpordercode", erpordercode);
                         var data = DapperHelper.selectdata(sql, dynamicParams);
                         num = Convert.ToInt32(data.Rows[0]["WORKNUMB"].ToString());
@@ -384,6 +385,83 @@
         }
         #endregion
 
+        #region[MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ]
+        public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+        {
+            var dynamicParams = new DynamicParameters();
+            string search = "";
+            try
+            {
+                if (mesordercode != "" && mesordercode != null)
+                {
+                    search += "and A.wo_code like '%'+@mesordercode+'%' ";
+                    dynamicParams.Add("@mesordercode", mesordercode);
+                }
+                if (sourceorder != "" && sourceorder != null)
+                {
+                    search += "and A.m_po like '%'+@sourceorder+'%' ";
+                    dynamicParams.Add("@sourceorder", sourceorder);
+                }
+                if (partcode != "" && partcode != null)
+                {
+                    search += "and A.materiel_code like '%'+@partcode+'%' ";
+                    dynamicParams.Add("@partcode", partcode);
+                }
+                if (partname != "" && partname != null)
+                {
+                    search += "and B.partname like '%'+@partname+'%' ";
+                    dynamicParams.Add("@partname", partname);
+                }
+                if (partspec != "" && partspec != null)
+                {
+                    search += "and B.partspec like '%'+@partspec+'%' ";
+                    dynamicParams.Add("@partspec", partspec);
+                }
+                if (createdate != "" && createdate != null)
+                {
+                    search += "and CONVERT(varchar(100),A.lm_date,23)=@createdate ";
+                    dynamicParams.Add("@createdate", createdate);
+                }
+                if (creatuser != "" && creatuser != null)
+                {
+                    search += "and U.username like '%'+@creatuser+'%' ";
+                    dynamicParams.Add("@creatuser", creatuser);
+                }
+
+                if (search == "")
+                {
+                    search = "and 1=1 ";
+                }
+                // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+                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,S.bad_qty
+                            from TK_Wrk_Man A
+                            left join (select wo_code,sum(bad_qty) as bad_qty from  TK_Wrk_Step where bad_qty>0 group by wo_code) S on A.wo_code=S.wo_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 
+                            left join TFlw_Rout E on A.route_code=E.code
+                            left join T_Sec_Stck F on A.stck_code=F.code 
+                            left join TUser U on A.lm_user=U.usercode 
+                            where A.is_delete<>'1'  and A.status='START' and A.wotype='PO' and S.bad_qty>0 " + search;
+                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+                mes.code = "200";
+                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.count = total;
+                mes.data = data.ToList();
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
         #region[浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛]
         public static ToMessage PartSelectRoute(string partcode)
         {
@@ -475,6 +553,100 @@
         }
         #endregion
 
+        #region[宸ュ崟娲惧彂閫夋嫨宸ヨ壓璺嚎鎴栭�夋嫨鐢熶骇杞﹂棿鏃跺垽鏂粦瀹氭潯浠禲
+        public static ToMessage SelectRouteOrWkshop(string partcode, string routecode, string wkshopcode)
+        {
+            string sql = "";
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                mes.code = "200";
+                mes.Message = "";
+                mes.data = null;
+                //鍒ゆ柇宸ヨ壓璺嚎瀵瑰簲宸ュ簭鏄惁閮芥湁鍏宠仈宸ヤ綔绔�
+                sql = @"select B.step_code,C.eqp_code from TFlw_Rout A
+                        inner join TFlw_Rtdt B on A.code=B.rout_code
+                        left join TFlw_Rteqp C on B.step_code=C.step_code
+                        where A.code=@routecode";
+                dynamicParams.Add("@routecode", routecode);
+                var dtck = DapperHelper.selectdata(sql, dynamicParams);
+                for (int i = 0; i < dtck.Rows.Count; i++)
+                {
+                    if (dtck.Rows[i].IsNull("eqp_code"))
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.Message = "褰撳墠宸ヨ壓璺嚎瀵瑰簲宸ュ簭銆�" + dtck.Rows[i]["step_code"].ToString() + "銆戯紝鏈叧鑱旇澶囷紝璇峰叧鑱旀墍鏈夊伐搴忓搴旇澶�!";
+                        mes.data = null;
+                        return mes;
+                    }
+                }
+                //鍒ゆ柇宸ヨ壓璺嚎瀵瑰簲宸ュ簭鍏宠仈鐨勫伐浣滅珯鏄惁鏈夎缃妭鎷嶅伐浠�
+                sql = @"select AA.step_code,AA.eqp_code,AA.flwtype,S.unprice  from (
+                        select A.code,B.step_code,C.eqp_code,S.flwtype from TFlw_Rout A
+                        inner join TFlw_Rtdt B on A.code=B.rout_code
+                        left join TFlw_Rteqp C on B.step_code=C.step_code
+                        left join TStep S on B.step_code=S.stepcode
+                        where A.code=@route_code
+                        ) as AA
+                        left join (select * from TPrteEqp_Stad   where materiel_code=@partcode and route_code=@route_code) as S on
+                        AA.code=S.route_code and AA.step_code=S.step_code and AA.eqp_code=S.eqp_code";
+                dynamicParams.Add("@partcode", partcode);
+                dynamicParams.Add("@route_code", routecode);
+                var dtc = DapperHelper.selectdata(sql, dynamicParams);
+                for (int i = 0; i < dtc.Rows.Count; i++)
+                {
+                    if (dtc.Rows[i]["flwtype"].ToString() == "Z") //鍒ゆ柇宸ュ簭鏄惁涓鸿嚜鍒�
+                    {
+                        if (dtc.Rows[i].IsNull("unprice") || decimal.Parse(dtc.Rows[i]["unprice"].ToString()) == 0)
+                        {
+                            mes.code = "300";
+                            mes.count = 0;
+                            mes.Message = "鑺傛媿宸ヤ环涓細褰撳墠浜у搧銆�" + partcode + "銆戯紝瀵瑰簲宸ヨ壓璺嚎銆�" + routecode + "銆戞湭璁剧疆(鎴栨湭璁剧疆鍏�)鎴栧伐浠峰皬浜庣瓑浜�0!";
+                            mes.data = null;
+                            return mes;
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿]
+        public static ToMessage AddMesOrderCodeSearch()
+        {
+            string sql = "";
+            string wo_code = "";
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                //鑾峰彇鍗曟嵁鍙�
+                sql = @"SELECT 'SGPO'+CONVERT(varchar(12) , getdate(), 112 )+'_'+cast(isnull(max(cast(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code)) as numeric)),0)+1 as varchar) as numct
+                        FROM TK_Wrk_Man where wo_code like '%SGPO%'";
+                var data = DapperHelper.selecttable(sql);
+                mes.code = "200";
+                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.data = data.Rows[0]["numct"].ToString();
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
         #region[MES宸ュ崟鏂板銆佺紪杈戞彁浜
         public static ToMessage AddUpdateMesOrder(string mesorderstus, string sourceorder, string ordertype, string mesordercode, string partcode, string mesqty, string routecode, string wkshopcode, string planstartdate, string planenddate, string orderlev, string username, string opertype)
         {
@@ -533,6 +705,25 @@
                             CreateDate = DateTime.Now.ToString()
                         }
                     });
+
+                    //鍐欏叆宸ュ崟宸ヨ壓璺嚎宸ュ簭宸ヤ环澶嶅埗琛�
+                    sql = @"insert into TWoPrteEqp_Stad(wo,materiel_code,eqp_code,stand_value,opc_conver,route_code,unprice,eqp_value,cavity_qty,wkspcode,lm_user,lm_date,torg_code,is_delete,step_code)
+                           select distinct @mesordercode as wo,S.materiel_code,S.eqp_code,S.stand_value,S.opc_conver,S.route_code,S.unprice,
+                           S.eqp_value,S.cavity_qty,S.wkspcode,S.lm_user,S.lm_date,S.torg_code,S.is_delete,S.step_code
+                           from TFlw_Rtdt A
+                           inner join TFlw_Rteqp C on A.step_code=C.step_code
+                           inner join (select *   from TPrteEqp_Stad  where materiel_code=@materiel_code and route_code=@routecode) as S on C.step_code=S.step_code and C.eqp_code=S.eqp_code";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            mesordercode = mesordercode,
+                            materiel_code = partcode,
+                            routecode = routecode
+                        }
+                    });
+
                     //if (is_aps == "Y")  //鏄惁鎺掔▼
                     //{
                     //    string sql1 = "select id from TBom_Main  where materiel_code='" + PartNumber + "' and status='Y' and version='" + VsionId + "'";
@@ -600,6 +791,35 @@
                             CreateDate = DateTime.Now.ToString()
                         }
                     });
+
+                    //鍒犻櫎宸ュ崟宸ヨ壓璺嚎宸ュ簭宸ヤ环澶嶅埗琛�
+                    sql = @"delete TWoPrteEqp_Stad where wo=@mesordercode";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            mesordercode = mesordercode
+                        }
+                    });
+                    //鍐欏叆宸ュ崟宸ヨ壓璺嚎宸ュ簭宸ヤ环澶嶅埗琛�
+                    sql = @"insert into TWoPrteEqp_Stad(wo,materiel_code,eqp_code,stand_value,opc_conver,route_code,unprice,eqp_value,cavity_qty,wkspcode,lm_user,lm_date,torg_code,is_delete,step_code)
+                           select distinct @mesordercode as wo,S.materiel_code,S.eqp_code,S.stand_value,S.opc_conver,S.route_code,S.unprice,
+                           S.eqp_value,S.cavity_qty,S.wkspcode,S.lm_user,S.lm_date,S.torg_code,S.is_delete,S.step_code
+                           from TFlw_Rtdt A
+                           inner join TFlw_Rteqp C on A.step_code=C.step_code
+                           inner join (select *   from TPrteEqp_Stad  where materiel_code=@materiel_code and route_code=@routecode) as S on C.step_code=S.step_code and C.eqp_code=S.eqp_code";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            mesordercode = mesordercode,
+                            materiel_code = partcode,
+                            routecode = routecode
+                        }
+                    });
+
                     bool aa = DapperHelper.DoTransaction(list);
                     if (aa)
                     {
@@ -760,6 +980,40 @@
                          left join TMateriel_Info P on M.materiel_code=P.partcode
                         where A.wo_code=@wo_code order by A.seq";
                 dynamicParams.Add("@wo_code", wo_code);
+                var data = DapperHelper.selectdata(sql, dynamicParams);
+                mes.code = "200";
+                mes.Message = "鏌ヨ鎴愬姛!";
+                mes.data = data;
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.Message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[MES宸ュ崟宸ュ簭浠诲姟鏌ョ湅SOP,鑾峰彇SOP鏂囦欢涓嬫媺鍒楄〃]
+        public static ToMessage SearchWorkStepSopList(string partcode, string routecode,string stepcode)
+        {
+            string sql = "";
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                //鑾峰彇SOP鏂囦欢淇℃伅
+                sql = @"select id,define_name,file_path   from TK_Sop_Matfile where materiel_code=@partcode and eqptype_code in(
+                        select distinct T.code  from TMateriel_Route A
+                        inner join TFlw_Rtdt B on A.route_code=B.rout_code
+                        inner join TFlw_Rteqp E on B.step_code=E.step_code
+                        inner join TEqpInfo  Q on E.eqp_code=Q.code
+                        inner join TEqpType T on Q.eqptype_code=T.code
+                        where A.materiel_code=@partcode and A.route_code=@routecode and B.step_code=@stepcode) order by file_version desc";
+                dynamicParams.Add("@partcode", partcode);
+                dynamicParams.Add("@routecode", routecode);
+                dynamicParams.Add("@stepcode", stepcode);
                 var data = DapperHelper.selectdata(sql, dynamicParams);
                 mes.code = "200";
                 mes.Message = "鏌ヨ鎴愬姛!";
@@ -2353,102 +2607,102 @@
         #region[鐢熶骇绠$悊,淇敼鎶ュ伐鏁版嵁鏌ヨ鎺ュ彛]
         public static ToMessage MesOrderStepVerifySearch(string verify, string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
         {
-            var dynamicParams = new DynamicParameters();
-            string search = "";
-            try
-            {
-                if (verify != "" && verify != null)
+                var dynamicParams = new DynamicParameters();
+                string search = "";
+                try
                 {
-                    search += "and AA.verify=@verify ";
-                    dynamicParams.Add("@verify", verify);
-                }
-                if (wo_code != "" && wo_code != null)
-                {
-                    search += "and AA.wo_code like '%'+@wo_code+'%' ";
-                    dynamicParams.Add("@wo_code", wo_code);
-                }
-                if (partnumber != "" && partnumber != null)
-                {
-                    search += "and AA.partnumber like '%'+@partnumber+'%' ";
-                    dynamicParams.Add("@partnumber", partnumber);
-                }
-                if (partname != "" && partname != null)
-                {
-                    search += "and AA.partname like '%'+@partname+'%' ";
-                    dynamicParams.Add("@partname", partname);
-                }
-                if (partspec != "" && partspec != null)
-                {
-                    search += "and AA.partspec like '%'+@partspec+'%' ";
-                    dynamicParams.Add("@partspec", partspec);
-                }
-                if (reportuser != "" && reportuser != null)
-                {
-                    search += "and AA.usercode like '%'+@reportuser+'%' ";
-                    dynamicParams.Add("@reportuser", reportuser);
-                }
-                if (reportdateopendate != "" && reportdateopendate != null)
-                {
-                    search += "and AA.report_date between @reportdateopendate and @reportdateclosedate ";
-                    dynamicParams.Add("@reportdateopendate", reportdateopendate + " 00:00:00");
-                    dynamicParams.Add("@reportdateclosedate", reportdateclosedate + " 23:59:59");
-                }
+                    if (verify != "" && verify != null)
+                    {
+                        search += "and AA.verify=@verify ";
+                        dynamicParams.Add("@verify", verify);
+                    }
+                    if (wo_code != "" && wo_code != null)
+                    {
+                        search += "and AA.wo_code like '%'+@wo_code+'%' ";
+                        dynamicParams.Add("@wo_code", wo_code);
+                    }
+                    if (partnumber != "" && partnumber != null)
+                    {
+                        search += "and AA.partnumber like '%'+@partnumber+'%' ";
+                        dynamicParams.Add("@partnumber", partnumber);
+                    }
+                    if (partname != "" && partname != null)
+                    {
+                        search += "and AA.partname like '%'+@partname+'%' ";
+                        dynamicParams.Add("@partname", partname);
+                    }
+                    if (partspec != "" && partspec != null)
+                    {
+                        search += "and AA.partspec like '%'+@partspec+'%' ";
+                        dynamicParams.Add("@partspec", partspec);
+                    }
+                    if (reportuser != "" && reportuser != null)
+                    {
+                        search += "and AA.usercode like '%'+@reportuser+'%' ";
+                        dynamicParams.Add("@reportuser", reportuser);
+                    }
+                    if (reportdateopendate != "" && reportdateopendate != null)
+                    {
+                        search += "and AA.report_date between @reportdateopendate and @reportdateclosedate ";
+                        dynamicParams.Add("@reportdateopendate", reportdateopendate + " 00:00:00");
+                        dynamicParams.Add("@reportdateclosedate", reportdateclosedate + " 23:59:59");
+                    }
 
 
-                if (search == "")
-                {
-                    search = "and 1=1 ";
+                    if (search == "")
+                    {
+                        search = "and 1=1 ";
+                    }
+                    search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+                    // --------------鏌ヨ鎸囧畾鑷埗鎶ュ伐澶栧崗鏀舵枡鏁版嵁--------------
+                    var total = 0; //鎬绘潯鏁�
+                    var sql = @"select *  from(
+                                select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,A.task_qty,M.wkshp_code,G.org_name as wkshp_name,A.eqp_code,E.name as eqp_name,
+                                M.route_code,R.name as route_name,A.step_seq,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,B.report_person as usercode,U.username,
+                                B.report_date,B.report_qty,B.ng_qty,B.bad_qty,B.verify,B.bad_money 
+                                from TK_Wrk_Record A
+                                inner join TK_Wrk_RecordSub B on A.id=B.m_id
+                                left join TK_Wrk_Man M on A.wo_code=M.wo_code
+                                left join TStep S on A.step_code=S.stepcode
+                                left  join TWoPrteEqp_Stad T on A.wo_code=T.wo and A.materiel_code=T.materiel_code and A.eqp_code=T.eqp_code and A.step_code=T.step_code and M.route_code=T.route_code 
+                                left join TMateriel_Info P on A.materiel_code=P.partcode
+                                left join TOrganization G on M.wkshp_code=G.org_code
+                                left join TEqpInfo E on A.eqp_code=E.code
+                                left join TFlw_Rout R on M.route_code=R.code
+                                left join TFlw_Rtdt D on M.route_code=D.rout_code and A.step_code=D.step_code
+                                left join TUser U on B.report_person=U.usercode
+                                where A.style='B' and B.style='B' and M.status<>'CLOSED'
+                                ) as AA where" + search;
+                    //union all
+                    //select A.id,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,M.plan_qty as task_qty,M.wkshp_code,G.org_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
+                    //M.route_code,R.name as route_name,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,'' as usergroup_code,'' as usergroup_name,B.in_person as usercode,U.username,
+                    //B.in_time as report_date,B.sqty as report_qty,B.ng_qty,B.bad_qty
+                    //from TK_Wrk_OutRecord A
+                    //inner join TK_Wrk_OutRecordSub B on A.id = B.m_id
+                    //left join TK_Wrk_Man M on A.wo_code = M.wo_code
+                    //left join TStep S on A.step_code = S.stepcode
+                    //left join TPrteEqp_Stad T on A.materiel_code = T.materiel_code and M.route_code = T.route_code and A.step_code = T.step_code and A.wx_code = T.eqp_code
+                    //left join TMateriel_Info P on A.materiel_code = P.partcode
+                    //left join TOrganization G on M.wkshp_code = G.org_code
+                    //left join TCustomer E on A.wx_code = E.code and E.btype = 'WX'
+                    //left join TFlw_Rout R on M.route_code = R.code
+                    //left join TFlw_Rtdt D on M.route_code = D.rout_code and A.step_code = D.step_code
+                    //left join TUser U on B.in_person = U.usercode
+                    //where A.style = 'S' and B.style = 'S' and M.status<>'CLOSED'
+                    var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+                    mes.code = "200";
+                    mes.Message = "鏌ヨ鎴愬姛!";
+                    mes.count = total;
+                    mes.data = data.ToList();
                 }
-                search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
-                // --------------鏌ヨ鎸囧畾鑷埗鎶ュ伐澶栧崗鏀舵枡鏁版嵁--------------
-                var total = 0; //鎬绘潯鏁�
-                var sql = @"select *  from(
-                            select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,A.task_qty,M.wkshp_code,G.org_name as wkshp_name,A.eqp_code,E.name as eqp_name,
-                            M.route_code,R.name as route_name,A.step_seq,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,B.report_person as usercode,U.username,
-                            B.report_date,B.report_qty,B.ng_qty,B.bad_qty,B.verify,B.bad_money 
-                            from TK_Wrk_Record A
-                            inner join TK_Wrk_RecordSub B on A.id=B.m_id
-                            left join TK_Wrk_Man M on A.wo_code=M.wo_code
-                            left join TStep S on A.step_code=S.stepcode
-                            left join TPrteEqp_Stad T on A.materiel_code=T.materiel_code and M.route_code=T.route_code and A.step_code=T.step_code and A.eqp_code=T.eqp_code
-                            left join TMateriel_Info P on A.materiel_code=P.partcode
-                            left join TOrganization G on M.wkshp_code=G.org_code
-                            left join TEqpInfo E on A.eqp_code=E.code
-                            left join TFlw_Rout R on M.route_code=R.code
-                            left join TFlw_Rtdt D on M.route_code=D.rout_code and A.step_code=D.step_code
-                            left join TUser U on B.report_person=U.usercode
-                            where A.style='B' and B.style='B' and M.status<>'CLOSED'
-                            ) as AA where" + search;
-                //union all
-                //select A.id,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,M.plan_qty as task_qty,M.wkshp_code,G.org_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
-                //M.route_code,R.name as route_name,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,'' as usergroup_code,'' as usergroup_name,B.in_person as usercode,U.username,
-                //B.in_time as report_date,B.sqty as report_qty,B.ng_qty,B.bad_qty
-                //from TK_Wrk_OutRecord A
-                //inner join TK_Wrk_OutRecordSub B on A.id = B.m_id
-                //left join TK_Wrk_Man M on A.wo_code = M.wo_code
-                //left join TStep S on A.step_code = S.stepcode
-                //left join TPrteEqp_Stad T on A.materiel_code = T.materiel_code and M.route_code = T.route_code and A.step_code = T.step_code and A.wx_code = T.eqp_code
-                //left join TMateriel_Info P on A.materiel_code = P.partcode
-                //left join TOrganization G on M.wkshp_code = G.org_code
-                //left join TCustomer E on A.wx_code = E.code and E.btype = 'WX'
-                //left join TFlw_Rout R on M.route_code = R.code
-                //left join TFlw_Rtdt D on M.route_code = D.rout_code and A.step_code = D.step_code
-                //left join TUser U on B.in_person = U.usercode
-                //where A.style = 'S' and B.style = 'S' and M.status<>'CLOSED'
-                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
-                mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
-                mes.count = total;
-                mes.data = data.ToList();
-            }
-            catch (Exception e)
-            {
-                mes.code = "300";
-                mes.count = 0;
-                mes.Message = e.Message;
-                mes.data = null;
-            }
-            return mes;
+                catch (Exception e)
+                {
+                    mes.code = "300";
+                    mes.count = 0;
+                    mes.Message = e.Message;
+                    mes.data = null;
+                }
+                return mes;
         }
         #endregion
 

--
Gitblit v1.9.3