1.组织架构增加是否末道工序报工字段：islastreport 2.报工调整增加工序编码查询字段：stepcode 3.报工调整增加批量改价接口 4....

yl

10 小时以前 5a7936034ead831cdf69cdae3e46f8170516efc6

 VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs

@@ -267,7 +267,7 @@
                    dynamicParams.Add("@storg_name", storg_name);
                }
                var sql = @"select T.id,T.parent_id,T.torg_code,T.torg_name,T.status,T.leve,T.torg_seq,
                            T.lm_user  as usercode,U.username,T.lm_date  
                            T.lm_user  as usercode,U.username,T.lm_date,T.islastreport 
                            from TOrganization T
                            left join  TUser U on T.lm_user=U.usercode
                            where 1=1" + search + " order by T.lm_date desc";
@@ -289,7 +289,7 @@
        #endregion

        #region[新增编辑组织架构]
        public static ToMessage AddUpdateOrganization(string OrganCode, string OrganName, string leve, string parent_id, string storgcode, string torg_seq, string status, string OperType, User us)
        public static ToMessage AddUpdateOrganization(string OrganCode, string OrganName, string leve, string parent_id, string storgcode, string torg_seq, string status,string islastreport, string OperType, User us)
        {
            string sql = "";
            List<object> list = new List<object>();
@@ -310,8 +310,8 @@
                        return mes;
                    }

                    sql = @"insert into TOrganization(parent_id,torg_code,torg_name,status,leve,torg_seq,lm_user,lm_date) 
                            values(@parent_id,@torg_code,@torg_name,@status,@leve,@torg_seq,@lm_user,@lm_date)";
                    sql = @"insert into TOrganization(parent_id,torg_code,torg_name,status,leve,torg_seq,lm_user,lm_date,islastreport) 
                            values(@parent_id,@torg_code,@torg_name,@status,@leve,@torg_seq,@lm_user,@lm_date,@islastreport)";
                    list.Add(new
                    {
                        str = sql,
@@ -324,7 +324,8 @@
                            leve = leve,
                            torg_seq = torg_seq,
                            lm_user = us.usercode,
                            lm_date = DateTime.Now.ToString()
                            lm_date = DateTime.Now.ToString(),
                            islastreport= islastreport
                        }
                    });

@@ -388,7 +389,7 @@
                    }

                    //修改当前组织数据
                    sql = @"update TOrganization set parent_id=@parent_id,torg_name=@torg_name,leve=@leve,torg_seq=@torg_seq,lm_user=@lm_user,lm_date=@lm_date 
                    sql = @"update TOrganization set parent_id=@parent_id,torg_name=@torg_name,leve=@leve,torg_seq=@torg_seq,lm_user=@lm_user,lm_date=@lm_date,islastreport=@islastreport
                            where torg_code=@torg_code";
                    list.Add(new
                    {
@@ -401,7 +402,8 @@
                            leve = leve,
                            torg_seq = torg_seq,
                            lm_user = us.usercode,
                            lm_date = DateTime.Now.ToString()
                            lm_date = DateTime.Now.ToString(),
                            islastreport= islastreport
                        }
                    });
                    //递归更新状态,当前选中数据及子级
@@ -414,7 +416,7 @@
                            from TOrganization AS t
                            inner join CTE AS c ON t.parent_id = c.torg_code
                            )
                            update TOrganization set status=@status 
                            update TOrganization set status=@status,islastreport=@islastreport 
                            where torg_code in (select torg_code from CTE)";
                    list.Add(new
                    {
@@ -422,7 +424,8 @@
                        parm = new
                        {
                            OrganCode = OrganCode,
                            status = status
                            status = status,
                            islastreport= islastreport
                        }
                    });