正清河MesApi
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yl
2023-11-10 15c6d7dec741a03bd7a84c3948fdc2a89e036395 
 VueWebApi/Tools/ScanStartReport.cs


@@ -18,10 +18,11 @@


        /// 扫码信息为工单+工序条码


        /// </summary>


        /// <param name="stu_torgcode">所属组织编码</param>


        /// <param name="SelectType">设备编码</param>


        /// <param name="ordercode">工单编号</param>


        /// <param name="stepcode">工序编码</param>


        /// <returns></returns>


        public static ToMessage ZZEncodingSeach(string stu_torgcode, string ordercode, string stepcode)


        public static ToMessage ZZEncodingSeach(string stu_torgcode, string SelectType, string ordercode, string stepcode)


        {


            var sql = "";


            string flwtype = ""; //工序属性


@@ -62,10 +63,12 @@


                }




                //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.status,A.plan_qty,A.isbott,A.isend,L.org_code,L.org_name,


                        M.m_po,W.saleOrderCode


                        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 TKimp_Ewo W on M.m_po=W.wo and M.materiel_code=W.materiel_code


                        left join  TMateriel_Info P on M.materiel_code=P.partcode


                        left join  TOrganization L on M.wkshp_code=L.org_code


                        where A.wo_code=@ordercode and A.step_code=@stepcode";


@@ -76,6 +79,8 @@


                {


                    rt.wkshopcode= data.Rows[0]["org_code"].ToString(); //车间编码


                    rt.wkshopname = data.Rows[0]["org_name"].ToString(); //车间名称


                    rt.saleOrderCode = data.Rows[0]["saleOrderCode"].ToString();//销售订单号


                    rt.m_po= data.Rows[0]["m_po"].ToString();//订单号


                    rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //工单号


                    rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //产品编码


                    rt.partname = data.Rows[0]["PARTNAME"].ToString(); //产品名称


@@ -116,6 +121,7 @@


                    mes.data = null;


                    return mes;


                }




                switch (flwtype)


                {


                    case "Z":  //自制工序


@@ -124,9 +130,10 @@


                            //1.首道工序时，判断是否有开工记录


                            sql = @"select *   from TK_Wrk_Record R


                                    left join TEqpInfo E on R.eqp_code=E.code


                                    where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";


                                    where R.wo_code=@ordercode and R.step_code=@stepcode and eqp_code=@eqp_code and R.style='S'";


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


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


                            dynamicParams.Add("@eqp_code", SelectType);


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


                            if (data0.Rows.Count > 0)  //有开工记录


                            {


@@ -205,9 +212,10 @@


                                //1.非首道工序时，判断本道是否有开工记录


                                sql = @"select *   from TK_Wrk_Record R


                                        left join TEqpInfo E on R.eqp_code=E.code


                                        where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";


                                        where R.wo_code=@ordercode and R.step_code=@stepcode and eqp_code=@eqp_code  and R.style='S'";


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


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


                                dynamicParams.Add("@eqp_code", SelectType);


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


                                if (data1.Rows.Count > 0)//本道有开工记录


                                {


@@ -545,7 +553,7 @@


            try


            {


                //判断当前工单是否关闭


                sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode and wkshop_code=@stu_torgcode and status='CLOSED'";


                sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode and wkshp_code=@stu_torgcode and status='CLOSED'";


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


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


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


@@ -559,7 +567,7 @@


                }




                //0.判断当前工单所属车间是否为当前登录人员车间


                sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode and wkshop_code=@stu_torgcode";


                sql = @"select *   from TK_Wrk_Man where wo_code=@ordercode and wkshp_code=@stu_torgcode";


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


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


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


@@ -573,10 +581,12 @@


                }




                //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.status,A.plan_qty,A.isbott,A.isend,L.org_code,L.org_name,


                        M.m_po,W.saleOrderCode


                        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 TKimp_Ewo W on M.m_po=W.wo and M.materiel_code=W.materiel_code


                        left join  TMateriel_Info P on M.materiel_code=P.partcode


                        left join  TOrganization L on M.wkshp_code=L.org_code


                        where A.wo_code=@ordercode and A.step_code=@stepcode";


@@ -588,6 +598,8 @@


                    rt.wkshopcode = data.Rows[0]["org_code"].ToString(); //车间编码


                    rt.wkshopname = data.Rows[0]["org_name"].ToString(); //车间名称


                    rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //工单号


                    rt.saleOrderCode = data.Rows[0]["saleOrderCode"].ToString();//销售订单号


                    rt.m_po = data.Rows[0]["m_po"].ToString();//订单号


                    rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //产品编码


                    rt.partname = data.Rows[0]["PARTNAME"].ToString(); //产品名称


                    rt.partspec = data.Rows[0]["PARTSPEC"].ToString(); //产品规格