正清河MesApi
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yl
2023-08-07 48aa43a04f8d8a0964d9d8a206e329f400fd5b89 
 VueWebApi/DLL/DAL/ProductionManagementDAL.cs


@@ -22,7 +22,7 @@






        #region[ERP订单查询]


        public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode,string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)


        public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode,string erporderstus, string erpordercode,string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)


        {


            var dynamicParams = new DynamicParameters();


            string search = "";


@@ -52,6 +52,11 @@


                {


                    search += "and A.wo like '%'+@erpordercode+'%' ";


                    dynamicParams.Add("@erpordercode", erpordercode);


                }


                if (saleordercode != "" && saleordercode != null)


                {


                    search += "and A.saleOrderCode like '%'+@saleordercode+'%' ";


                    dynamicParams.Add("@saleordercode", saleordercode);


                }


                if (partcode != "" && partcode != null)


                {


@@ -93,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,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 


                            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


@@ -119,7 +124,7 @@


        #endregion




        #region[ERP订单下达]


        public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, string username)


        public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode,string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, string username)


        {


            var sql = "";


            List<object> list = new List<object>();


@@ -157,7 +162,7 @@


                    }


                    if (i == Convert.ToInt32(ordernum))  //最后一单时


                    {


                        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,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";


                        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,saleOrderCode,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate)";


                        list.Add(new


                        {


                            str = sql,


@@ -174,6 +179,7 @@


                                m_po = erpordercode,


                                username = username,


                                CreateDate = DateTime.Now.ToString(),


                                saleOrderCode=saleordercode,


                                saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)


                            }


                        });


@@ -182,7 +188,7 @@


                    else


                    {




                        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,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";


                        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,saleOrderCode,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate)";


                        list.Add(new


                        {


                            str = sql,


@@ -199,6 +205,7 @@


                                m_po = erpordercode,


                                username = username,


                                CreateDate = DateTime.Now.ToString(),


                                saleOrderCode=saleordercode,


                                saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)


                            }


                        });


@@ -323,7 +330,7 @@






        #region[MES工单查询]


        public static ToMessage MesOrderSearch(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 MesOrderSearch(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 = "";


@@ -358,6 +365,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)


                {


@@ -397,8 +409,9 @@


                // --------------查询指定数据--------------


                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


                            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 


@@ -425,7 +438,7 @@


        #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)


        public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder,string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)


        {


            var dynamicParams = new DynamicParameters();


            string search = "";


@@ -440,6 +453,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 (partcode != "" && partcode != null)


                {


@@ -474,8 +492,9 @@


                // --------------查询指定数据--------------


                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


                            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,S.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 (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


@@ -1848,7 +1867,7 @@


                    switch (OperType)


                    {


                        case "ZZ":


                            mes = ScanStartReport.ZZEncodingSeach(stu_torgcode,ordercode, stepcode);


                            mes = ScanStartReport.ZZEncodingSeach(stu_torgcode, SelectType,ordercode, stepcode);


                            break;


                        case "WX":


                            mes = ScanStartReport.WXEncodingSeach(stu_torgcode,SelectType, ordercode, stepcode);


@@ -1988,7 +2007,11 @@


            try


            {


                //班组获取人员列表


                sql = @"select usercode,username  from TUser where stu_torgcode=@stu_torgcode and usergroup_code=@usergroupcode and is_delete<>'1'";


                sql = @"select U.username,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


                        where G.torg_code=@stu_torgcode and G.group_code=@usergroupcode";


                dynamicParams.Add("@stu_torgcode", stu_torgcode);


                dynamicParams.Add("@usergroupcode", usergroupcode);


                var data = DapperHelper.selectdata(sql, dynamicParams);


@@ -2152,15 +2175,16 @@


                string date = DateTime.Now.ToString(); //获取系统时间


                list.Clear();


                //判断是否有开工记录


                sql = @"select *  from TK_Wrk_Record where wo_code=@wo_code and step_code=@step_code  and style='S'";


                sql = @"select *  from TK_Wrk_Record where wo_code=@wo_code and step_code=@step_code  and eqp_code=@eqpcode and style='S'";


                dynamicParams.Add("@wo_code", mesordercode);


                dynamicParams.Add("@step_code", stepcode);


                dynamicParams.Add("@eqpcode", eqpcode);


                var data = DapperHelper.selectdata(sql, dynamicParams);


                if (data.Rows.Count > 0)


                {


                    mes.code = "300";


                    mes.count = 0;


                    mes.Message = "当前工序任务已开工!";


                    mes.Message = "当前工序任务设备已开工!";


                    mes.data = null;


                    return mes;


                }


@@ -2235,9 +2259,10 @@


                //获取开工记录的默认选中的设备(产线)与报工时的设备产线做对比判断


                sql = @"select A.eqp_code,B.name  from TK_Wrk_Record A


                        inner join TEqpInfo B on A.eqp_code=B.code


                        where A.wo_code=@wo_code and A.step_code=@step_code and A.style='S'";


                        where A.wo_code=@wo_code and A.step_code=@step_code and eqp_code=@eqpcode  and A.style='S'";


                dynamicParams.Add("@wo_code", mesordercode);


                dynamicParams.Add("@step_code", stepcode);


                dynamicParams.Add("@eqpcode", eqpcode);


                var da = DapperHelper.selectdata(sql, dynamicParams);


                if (da.Rows[0]["EQP_CODE"].ToString() != eqpcode)


                {