Core版本,MES/WMS 版本
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yl
2024-09-05 c43a4dfbc7a80d6be6e9823cdd0e182898fc2562 
 VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs


@@ -626,7 +626,8 @@


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


                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.route_code,R.name as route_name,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,


                            A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,A.data_sources,A.isstep,A.clerkuser


                            A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,


                            A.data_sources,A.isstep,A.clerkuser,A.bom_id,M.version


                            from TK_Wrk_Man A


                            left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code and A.sbid=W.sbid


                            left join TMateriel_Info B on A.materiel_code=B.partcode


@@ -635,6 +636,7 @@


                            left join TUser U on A.lm_user=U.usercode 


                            left join TOrganization L on  C.parent_id=L.id


                            left join TFlw_Rout R on A.route_code=R.code


                            left join TBom_Main M on A.bom_id=M.id


                            where A.is_delete<>'1' " + search;


                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);


                mes.code = "200";


@@ -919,8 +921,8 @@


                        {


                            // 假设你已经有了插入主表和子表的SQL语句  


                            //写入工单表


                            string workSql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,lm_user,lm_date,materiel_code,route_code,sourceid,m_po,saleOrderDeliveryDate,plan_startdate,plan_enddate,piroque,isaps,data_sources,isstep)


                                values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@lm_user,@lm_date,@materiel_code,@route_code,@sourceid,@m_po,@saleOrderDeliveryDate,@plan_startdate,@plan_enddate,@orderlev,@isaps,@data_sources,@isstep)";


                            string workSql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,lm_user,lm_date,materiel_code,route_code,sourceid,m_po,saleOrderDeliveryDate,plan_startdate,plan_enddate,piroque,isaps,data_sources,isstep,bom_id)


                                values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@lm_user,@lm_date,@materiel_code,@route_code,@sourceid,@m_po,@saleOrderDeliveryDate,@plan_startdate,@plan_enddate,@orderlev,@isaps,@data_sources,@isstep,@bom_id)";


                            //写入工单工序表


                            string masterInsertSql = @"insert into TK_Wrk_Step(wo_code,seq,step_code,route_code,stepprice,plan_qty,status,isbott,isend,lm_user,lm_date)


                                values(@wo_code,@seq,@step_code,@route_code,@stepprice,@plan_qty,@status,@isbott,@isend,@lm_user,@lm_date); SELECT CAST(SCOPE_IDENTITY() AS INT)";


@@ -956,6 +958,7 @@


                            workParam.Add("@isaps", "N");//是否排产,默认N  Y=是   N=否


                            workParam.Add("@data_sources", json.data_sources);


                            workParam.Add("@isstep", json.isstep);//是否关联工序


                            workParam.Add("@bom_id", string.IsNullOrEmpty(json.bomid) ? null : json.bomid);// 物料请单Bomid


                            conn.Execute(workSql, workParam, transaction);




                            //写入工单工序表


@@ -988,7 +991,7 @@


                                }


                            }


                            //写入工单用料表(子件)


                            if (json.bomid != "" && json != null) 


                            if (json.bomid != "" && json != null)


                            {


                                var workallParam = new DynamicParameters();


                                workallParam.Add("@wocode", json.wocode);


@@ -1012,11 +1015,11 @@


                            sql = @"select *  from TK_Wrk_Step where wo_code=@wo_code";


                            dynamicParams.Add("@wo_code", json.wocode);


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


                           




                            // 假设你已经有了插入主表和子表的SQL语句  


                            //修改工单表


                            string workSql = @"update TK_Wrk_Man set wotype=@wotype,wkshp_code=@wkshp_code,plan_qty=@plan_qty,lm_user=@lm_user,lm_date=@lm_date,


                            materiel_code=@materiel_code,route_code=@route_code,sourceid=@sourceid,m_po=@m_po,saleOrderDeliveryDate=@saleOrderDeliveryDate,plan_startdate=@plan_startdate,plan_enddate=@plan_enddate,isstep=@isstep


                            materiel_code=@materiel_code,route_code=@route_code,sourceid=@sourceid,m_po=@m_po,saleOrderDeliveryDate=@saleOrderDeliveryDate,plan_startdate=@plan_startdate,plan_enddate=@plan_enddate,isstep=@isstep,bom_id=@bom_id


                            where wo_code=@wo_code";


                            //删除工单工序设备表


                            string deleteWrkStepEqp = @"delete TK_Wrk_StepEqp where m_id=@m_id";


@@ -1040,7 +1043,7 @@


                            where A.m_id=@bom_id";


                            //修改生产订单表状态、已下达数量


                            string EwoStatusSql = @"update TKimp_Ewo set status=@status,relse_qty=@relse_qty where id=@sourceid and wo=@sourcewo";


                            






                            // 修改工单表


                            var workParam = new DynamicParameters();


@@ -1058,6 +1061,7 @@


                            workParam.Add("@plan_startdate", json.paystartdate);


                            workParam.Add("@plan_enddate", json.payenddate);


                            workParam.Add("@isstep", json.isstep);//是否关联工序


                            workParam.Add("@bom_id", string.IsNullOrEmpty(json.bomid) ? null : json.bomid);//物料清单BOMid


                            conn.Execute(workSql, workParam, transaction);




                            //删除工单工序设备表


@@ -1109,7 +1113,7 @@


                                }


                            }


                            //写入工单用料表


                            if (json.bomid != "" && json.bomid != null) 


                            if (json.bomid != "" && json.bomid != null)


                            {


                                var InsertWorkALLParam = new DynamicParameters();


                                InsertWorkALLParam.Add("@wocode", json.wocode);


@@ -2133,6 +2137,51 @@


        }


        #endregion




        #region [生产开报工：报工/外协(发料/收料)时获取设备/外协供应商数据返回接口]


        public static ToMessage MesOrderStepDeviceCusstomer(string operType, string wocode, string stepcode, User us)


        {


            var sql = "";


            var dynamicParams = new DynamicParameters();


            try


            {


                if (operType == "ZZ")


                {


                    sql = @"select E.eqp_code as code,D.name,E.eqpprice   from TK_Wrk_Step S


                            inner join TK_Wrk_StepEqp E on S.id=E.m_id


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


                            where S.wo_code=@wocode and S.step_code=@stepcode and D.enable='Y'";


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


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


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


                    mes.code = "200";


                    mes.message = "查询成功!";


                    mes.data = data;


                }


                if (operType == "WX")


                {


                    sql = @"select E.eqp_code as code,C.name,E.eqpprice   from TK_Wrk_Step S


                            inner join TK_Wrk_StepEqp E on S.id=E.m_id


                            inner  join TCustomer C on E.eqp_code=C.code


                            where S.wo_code=@wocode and S.step_code=@stepcode ";


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


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


                    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[生产开报工,报工提交]


        public static ToMessage SavaMesOrderStepReport(string mesordercode, string partcode, string stepseq, string stepcode, string stepprice, string eqpcode, string inbarcode, string reckway, string usergroupcode, string reportuser, string taskqty, string startqty, string reportqty, List<ReportDefectList> defectobjs, string remarks, User us)


        {


@@ -2308,8 +2357,6 @@


                        }


                    }


                }






                //回写工单工序表合格数量、不良数量


                sql = @"update TK_Wrk_Step set good_qty=good_qty+@reportqty,ng_qty=ng_qty+@ngqty  where wo_code=@mesordercode and step_code=@stepcode";


                list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepcode = stepcode, reportqty = reportqty, ngqty = ngqty } });


@@ -2431,7 +2478,7 @@


        #endregion




        #region[生产开报工,收料提交]


        public static ToMessage SavaMesOrderStepIn(string mesordercode, string partcode, string stepseq, string stepcode, string wxcode, string inbarcode, string inuser, string taskqty, string sqty, List<ReportDefectList> defectobjs, string remarks, User us)


        public static ToMessage SavaMesOrderStepIn(string mesordercode, string partcode, string stepseq, string stepcode,string stepprice, string wxcode, string inbarcode, string inuser, string taskqty, string sqty, List<ReportDefectList> defectobjs, string remarks, User us)


        {


            var sql = "";


            string[] arra1 = new string[] { };


@@ -2519,9 +2566,9 @@


                    sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_OutRecord')+1,1) as id";


                    var dt = DapperHelper.selecttable(sql);


                    //写入外协记录主表


                    sql = @"insert into  TK_Wrk_OutRecord(wo_code,step_seq,step_code,wx_code,materiel_code,style,sqty,ng_qty,lm_user,lm_date,inbarcode) 


                                values(@mesordercode,@stepseq,@stepcode,@wx_code,@partcode,@style,@sqty,@ngqty,@lm_user,@lm_date,@inbarcode)";


                    list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepseq = stepseq, stepcode = stepcode, wx_code = wxcode, partcode = partcode, style = 'S', sqty = sqty, ngqty = ngqty, lm_user = us.usercode, lm_date = date, inbarcode = inbarcode } });


                    sql = @"insert into  TK_Wrk_OutRecord(wo_code,step_seq,step_code,step_price,wx_code,materiel_code,style,sqty,ng_qty,lm_user,lm_date,inbarcode) 


                                values(@mesordercode,@stepseq,@stepcode,@step_price,@wx_code,@partcode,@style,@sqty,@ngqty,@lm_user,@lm_date,@inbarcode)";


                    list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepseq = stepseq, stepcode = stepcode,step_price=stepprice, wx_code = wxcode, partcode = partcode, style = 'S', sqty = sqty, ngqty = ngqty, lm_user = us.usercode, lm_date = date, inbarcode = inbarcode } });




                    //写入外协记录子表


                    sql = @"insert into  TK_Wrk_OutRecordSub(m_id,wx_code,in_person,in_time,sqty,ng_qty,style,lm_user,lm_date) 


@@ -2546,9 +2593,9 @@


                    sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_OutRecord')+1,1) as id";


                    var dt = DapperHelper.selecttable(sql);


                    //写入外协记录主表


                    sql = @"insert into  TK_Wrk_OutRecord(wo_code,step_seq,step_code,wx_code,materiel_code,style,sqty,ng_qty,lm_user,lm_date,inbarcode) 


                                values(@mesordercode,@stepseq,@stepcode,@wx_code,@partcode,@style,@sqty,@ngqty,@lm_user,@lm_date,@inbarcode)";


                    list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepseq = stepseq, stepcode = stepcode, wx_code = wxcode, partcode = partcode, style = 'S', sqty = sqty, ngqty = ngqty, lm_user = us.usercode, lm_date = date, inbarcode = inbarcode } });


                    sql = @"insert into  TK_Wrk_OutRecord(wo_code,step_seq,step_code,step_price,wx_code,materiel_code,style,sqty,ng_qty,lm_user,lm_date,inbarcode) 


                                values(@mesordercode,@stepseq,@stepcode,@step_price,@wx_code,@partcode,@style,@sqty,@ngqty,@lm_user,@lm_date,@inbarcode)";


                    list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepseq = stepseq, stepcode = stepcode, step_price=stepprice, wx_code = wxcode, partcode = partcode, style = 'S', sqty = sqty, ngqty = ngqty, lm_user = us.usercode, lm_date = date, inbarcode = inbarcode } });




                    //写入外协记录子表


                    sql = @"insert into  TK_Wrk_OutRecordSub(m_id,wx_code,in_person,in_time,sqty,ng_qty,style,lm_user,lm_date)