yl
2022-06-23 ece3372b4f7500483092a90f2a1e40f3586f6f1b
存货档案、工艺路线(新增、编辑、删除、关联工艺路线)
已添加3个文件
已修改22个文件
1243 ■■■■■ 文件已修改
.vs/VueWebApi/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/BasicSettingController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/DeviceManagerController.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/ProductModelController.cs 206 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/BLL/BasicSettingBLL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/BLL/DeviceManagerBLL.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/BLL/ProductModelBLL.cs 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/BasicSettingDAL.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/DeviceManagerDAL.cs 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/ProductModelDAL.cs 687 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Logs/2022-06-23.TXT 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Models/RoutEdit.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Models/StepEqp.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/VueWebApi.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/VueWebApi.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.xml 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Debug/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
.vs/VueWebApi/v16/.suo
Binary files differ
VueWebApi/Controllers/BasicSettingController.cs
@@ -563,13 +563,13 @@
        /// <summary>
        /// å¾€æ¥å•位删除
        /// </summary>
        /// <param name="unitid">往来单位ID</param>
        /// <param name="unitcode">往来单位编码</param>
        /// <returns></returns>
        [Route(template: "DeleteCurrentUnit")]
        [HttpPost]
        public HttpResponseMessage DeleteCurrentUnit(string unitid)
        public HttpResponseMessage DeleteCurrentUnit(string unitcode)
        {
            mes = BasicSettingBLL.DeleteCurrentUnit(unitid);
            mes = BasicSettingBLL.DeleteCurrentUnit(unitcode);
            return TJson.toJson(mes);
        }
        #endregion
VueWebApi/Controllers/DeviceManagerController.cs
@@ -184,6 +184,21 @@
        }
        #endregion
        #region[所属车间查找所属产线接口]
        /// <summary>
        /// æ‰€å±žè½¦é—´æŸ¥æ‰¾æ‰€å±žäº§çº¿æŽ¥å£
        /// </summary>
        /// <param name="workshopcode">车间编码</param>
        /// <returns></returns>
        [Route(template: "WorkShopSelectLine")]
        [HttpGet]
        public HttpResponseMessage WorkShopSelectLine(string workshopcode)
        {
            mes = DeviceManagerBLL.WorkShopSelectLine(workshopcode);
            return TJson.toJson(mes);
        }
        #endregion
        #region[设备清单查询]
        /// <summary>
        /// è®¾å¤‡æ¸…单查询
VueWebApi/Controllers/ProductModelController.cs
@@ -184,16 +184,16 @@
        /// <summary>
        /// å­˜è´§æ¡£æ¡ˆæŸ¥è¯¢
        /// </summary>
        /// <param name="partcode"></param>
        /// <param name="partname"></param>
        /// <param name="partspec"></param>
        /// <param name="stocktypecode"></param>
        /// <param name="materialtypecode"></param>
        /// <param name="storehousecode"></param>
        /// <param name="page"></param>
        /// <param name="rows"></param>
        /// <param name="prop"></param>
        /// <param name="order"></param>
        /// <param name="partcode">物料编码</param>
        /// <param name="partname">物料名称</param>
        /// <param name="partspec">物料规格</param>
        /// <param name="stocktypecode">存货类型编码</param>
        /// <param name="materialtypecode">物料类型编码</param>
        /// <param name="storehousecode">所属仓库编码</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "InventoryFileSelect")]
        [HttpGet]
@@ -264,8 +264,192 @@
        #endregion
        #region[存货档案关联工艺路线提交]
        /// <summary>
        /// å­˜è´§æ¡£æ¡ˆå…³è”工艺路线提交
        /// </summary>
        /// <param name="partcode">物料编码</param>
        /// <param name="json">提交数据对象</param>
        /// <returns></returns>
        [Route(template: "SaveInventoryFile")]
        [HttpPost]
        public HttpResponseMessage SaveInventoryFile(string partcode, List<ObjectData> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductModelBLL.SaveInventoryFile(partcode, username,json);
            return TJson.toJson(mes);
        }
        #endregion
        #region[工艺路线查询]
        /// <summary>
        /// å·¥è‰ºè·¯çº¿æŸ¥è¯¢
        /// </summary>
        /// <param name="routecode">工艺路线编码</param>
        /// <param name="routename">工艺路线名称</param>
        /// <param name="description">工艺路线描述</param>
        /// <param name="createuser">创建人员</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "RouteSearch")]
        [HttpGet]
        public HttpResponseMessage RouteSearch(string routecode = null, string routename = null, string description = null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductModelBLL.RouteSearch(routecode, routename, description, createuser, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
        #region[工艺路线预览]
        /// <summary>
        /// å·¥è‰ºè·¯çº¿é¢„览
        /// </summary>
        /// <param name="routecode">工艺路线编码</param>
        /// <returns></returns>
        [Route(template: "ViewRoute")]
        [HttpGet]
        public HttpResponseMessage ViewRoute(string routecode)
        {
            mes = ProductModelBLL.ViewRoute(routecode);
            return TJson.toJson(mes);
        }
        #endregion
        #region[工艺路线新增]
        /// <summary>
        /// å·¥è‰ºè·¯çº¿æ–°å¢žç¼–辑
        /// </summary>
        /// <param name="id">工艺路线id</param>
        /// <param name="opertype">操作类型(新增)</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "AddUpdateRoute")]
        [HttpPost]
        public HttpResponseMessage AddUpdateRoute(string id,string opertype, RoutEdit json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductModelBLL.AddUpdateRoute(id, opertype, username, json);
            return TJson.toJson(mes);
        }
        #endregion
        #region[工艺路线删除]
        /// <summary>
        /// å·¥è‰ºè·¯çº¿åˆ é™¤
        /// </summary>
        /// <param name="routecode">工艺路线编码</param>
        /// <returns></returns>
        [Route(template: "DeleteRoute")]
        [HttpPost]
        public HttpResponseMessage DeleteRoute(string routecode)
        {
            mes = ProductModelBLL.DeleteRoute(routecode);
            return TJson.toJson(mes);
        }
        #endregion
        #region[工序查询]
        /// <summary>
        /// å·¥åºæŸ¥è¯¢
        /// </summary>
        /// <param name="stepcode">工序编码</param>
        /// <param name="stepname">工序名称</param>
        /// <param name="enable">启用状态</param>
        /// <param name="steptypecode">工序类型编码</param>
        /// <param name="createuser">创建人员</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "StepSearch")]
        [HttpGet]
        public HttpResponseMessage StepSearch(string stepcode = null, string stepname = null, string enable = null,string steptypecode=null, string createuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductModelBLL.StepSearch(stepcode, stepname, enable, steptypecode,createuser, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
        #region[工序新增编辑]
        /// <summary>
        /// å·¥åºæ–°å¢žç¼–辑
        /// </summary>
        /// <param name="obj">提交数据对象</param>
        /// <returns></returns>
        [Route(template: "AddUpdateStep")]
        [HttpPost]
        public HttpResponseMessage AddUpdateStep([FromBody] JObject obj)
        {
            string stepid = obj["id"].ToString();    //工序id(主键)
            string stepcode = obj["stepcode"].ToString(); //工序编码
            string stepname = obj["stepname"].ToString(); //工序名称
            string steptypecode = obj["steptypecode"].ToString(); //工序类型编码
            string enable = obj["enable"].ToString();           //启用状态
            string description = obj["description"].ToString(); //工序描述
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            string OperType = obj["OperType"].ToString();  //操作类型
            mes = ProductModelBLL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, username, OperType);
            return TJson.toJson(mes);
        }
        #endregion
        #region[工序删除]
        /// <summary>
        /// å·¥åºåˆ é™¤
        /// </summary>
        /// <param name="stepcode">工序编码</param>
        /// <returns></returns>
        [Route(template: "DeleteStep")]
        [HttpPost]
        public HttpResponseMessage DeleteStep(string stepcode)
        {
            mes = ProductModelBLL.DeleteStep(stepcode);
            return TJson.toJson(mes);
        }
        #endregion
        #region[工序定义关联工作站查询]
        /// <summary>
        /// å·¥åºå®šä¹‰å…³è”工作站查询
        /// </summary>
        /// <param name="stepcode">工序编码</param>
        /// <returns></returns>
        [Route(template: "StepAssociationEqp")]
        [HttpGet]
        public HttpResponseMessage StepAssociationEqp(string stepcode)
        {
            mes = ProductModelBLL.StepAssociationEqp(stepcode);
            return TJson.toJson(mes);
        }
        #endregion
        #region [工序定义关联工作站提交]
        /// <summary>
        /// å·¥åºå®šä¹‰å…³è”工作站提交
        /// </summary>
        /// <param name="stepcode">工序编码</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "SaveStepAssociationEqp")]
        [HttpPost]
        public HttpResponseMessage SaveStepAssociationEqp(string stepcode, List<ObjectData> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductModelBLL.SaveStepAssociationEqp(stepcode, username, json);
            return TJson.toJson(mes);
        }
        #endregion
    }
}
VueWebApi/DLL/BLL/BasicSettingBLL.cs
@@ -193,9 +193,9 @@
        #endregion
        #region[往来单位删除]
        public static ToMessage DeleteCurrentUnit(string unitid)
        public static ToMessage DeleteCurrentUnit(string unitcode)
        {
            return BasicSettingDAL.DeleteCurrentUnit(unitid);
            return BasicSettingDAL.DeleteCurrentUnit(unitcode);
        }
        #endregion
    }
VueWebApi/DLL/BLL/DeviceManagerBLL.cs
@@ -75,6 +75,13 @@
        }
        #endregion
        #region[所属车间查找所属产线接口]
        public static ToMessage WorkShopSelectLine(string workshopcode)
        {
            return DeviceManagerDAL.WorkShopSelectLine(workshopcode);
        }
        #endregion
        #region [设备清单查询]
        public static ToMessage DeviceMangerSearch(string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
        {
VueWebApi/DLL/BLL/ProductModelBLL.cs
@@ -96,5 +96,81 @@
            return ProductModelDAL.InventoryFileAssociationRoute(partcode);
        }
        #endregion
        #region[存货档案关联工艺路线提交]
        public static ToMessage SaveInventoryFile(string partcode,string username, List<ObjectData> json)
        {
            return ProductModelDAL.SaveInventoryFile(partcode, username, json);
        }
        #endregion
        #region[工艺路线查询]
        public static ToMessage RouteSearch(string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
        {
            return ProductModelDAL.RouteSearch(routecode, routename, description, createuser, startNum, endNum, prop, order);
        }
        #endregion
        #region[工艺路线预览]
        public static ToMessage ViewRoute(string routecode)
        {
            return ProductModelDAL.ViewRoute(routecode);
        }
        #endregion
        #region[工艺路线新增]
        public static ToMessage AddUpdateRoute(string id,string opertype, string username, RoutEdit json)
        {
            return ProductModelDAL.AddUpdateRoute(id,opertype,username, json);
        }
        #endregion
        #region[工艺路线删除]
        public static ToMessage DeleteRoute(string routecode)
        {
            return ProductModelDAL.DeleteRoute(routecode);
        }
        #endregion
        #region[工序查询]
        public static ToMessage StepSearch(string stepcode, string stepname, string enable,string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
        {
            return ProductModelDAL.StepSearch(stepcode, stepname, enable, steptypecode, createuser, startNum, endNum, prop, order);
        }
        #endregion
        #region[工序新增编辑]
        public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
        {
            return ProductModelDAL.AddUpdateStep(stepid, stepcode, stepname, steptypecode, enable, description, username, operType);
        }
        #endregion
        #region[工序删除]
        public static ToMessage DeleteStep(string stepcode)
        {
            return ProductModelDAL.DeleteStep(stepcode);
        }
        #endregion
        #region[工序定义关联工作站查询]
        public static ToMessage StepAssociationEqp(string stepcode)
        {
            return ProductModelDAL.StepAssociationEqp(stepcode);
        }
        #endregion
        #region [工序定义关联工作站提交]
        public static ToMessage SaveStepAssociationEqp(string stepcode, string username, List<ObjectData> json)
        {
            return ProductModelDAL.SaveStepAssociationEqp(stepcode,username,json);
        }
        #endregion
    }
}
VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -1396,28 +1396,41 @@
        #endregion
        #region[往来单位删除]
        public static ToMessage DeleteCurrentUnit(string unitid)
        public static ToMessage DeleteCurrentUnit(string unitcode)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                sql = @"select *  from TFlw_Rteqp where eqp_code=@unitcode";
                dynamicParams.Add("@unitcode", unitcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "外协供方已关联外协工序,不允许删除!";
                    mes.data = null;
                    return mes;
                }
                //删除(更新状态)往来单位表
                sql = @"update TCustomer set is_delete='1'  where id=@unitid";
                list.Add(new { str = sql, parm = new { unitid = unitid } });
                sql = @"update TCustomer set is_delete='1'  where code=@unitcode";
                list.Add(new { str = sql, parm = new { unitcode = unitcode } });
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "删除用户成功!";
                    mes.Message = "删除成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "删除用户失败!";
                    mes.Message = "删除失败!";
                    mes.data = null;
                }
            }
VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -59,7 +59,7 @@
                //循环写入设备类型表
                for (int i = 0; i < json.Count; i++)
                {
                    sql = @"insert into TRoleType(code,name,lm_user,lm_date,remark) values(@code,@name,@username,@createdate,@description)";
                    sql = @"insert into TEqpType(code,name,lm_user,lm_date,remark) values(@code,@name,@username,@createdate,@description)";
                    list.Add(new
                    {
                        str = sql,
@@ -112,8 +112,8 @@
                //判断设备类型下是否关联设备组
                sql = @"select *  from TEqpGroup where eqptype_code=@devicetypecode and is_delete<>'1'";
                dynamicParams.Add("@devicetypecode", devicetypecode);
                var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
                if (data.Count > 0)
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
@@ -125,8 +125,8 @@
                    //判断设备有无关联设备类型
                    sql = @"select *  from TEqpInfo where eqptype_code=@devicetypecode and is_delete<>'1'";
                    dynamicParams.Add("@devicetypecode", devicetypecode);
                    var data0 = DapperHelper.select<TreeObejct>(sql, dynamicParams);
                    if (data0.Count > 0)
                    var data0 = DapperHelper.selectdata(sql, dynamicParams);
                    if (data0.Rows.Count > 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
@@ -288,8 +288,8 @@
                //判断设备组下是否关联设备
                sql = @"select *  from TEqpInfo where eqpgroup_code=@devicegroupcode and is_delete<>'1'";
                dynamicParams.Add("@devicegroupcode", devicegroupcode);
                var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
                if (data.Count > 0)
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
@@ -382,6 +382,33 @@
        }
        #endregion
        #region[所属车间查找所属产线接口]
        public static ToMessage WorkShopSelectLine(string workshopcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            List<TreeObejct> list = new List<TreeObejct>();
            try
            {
                //获取角色类型集合(包含绑定标识)
                dynamicParams.Add("@workshop_code", workshopcode);
                var data = DapperHelper.selectProcedure("h_p_T_WorkShopSelectLine", 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 DeviceMangerSearch(string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
        {
@@ -401,7 +428,7 @@
                }
                if (status != "" && status != null)
                {
                    search += "and A.status=@status ";
                    search += "and A.enable=@status ";
                    dynamicParams.Add("@status", status);
                }
                if (workShop != "" && workShop != null)
VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -265,10 +265,10 @@
                        {
                            code = json[i].code,
                            name = json[i].name,
                            digdect=json[i].digdect,
                            r_ule=json[i].r_ule,
                            username= username,
                            CreateDate= DateTime.Now.ToString()
                            digdect = json[i].digdect,
                            r_ule = json[i].r_ule,
                            username = username,
                            CreateDate = DateTime.Now.ToString()
                        }
                    });
                }
@@ -638,7 +638,7 @@
                    rout.code = data.Rows[i]["CODE"].ToString();
                    rout.name = data.Rows[i]["NAME"].ToString();
                    rout.flag = data.Rows[i]["FLAG"].ToString();
                    //根据工艺路线编码获取关联的工序信息
                    sql = @"select A.seq,B.stepcode,B.stepname,B.enable from TFlw_Rtdt A
                            inner join TStep B on A.step_code=B.stepcode
@@ -664,5 +664,682 @@
        }
        #endregion
        #region[存货档案关联工艺路线提交]
        public static ToMessage SaveInventoryFile(string partcode, string username, List<ObjectData> json)
        {
            var sql = "";
            List<object> list = new List<object>();
            try
            {
                list.Clear();
                if (json == null || json.Count <= 0)
                {
                    //清除物料关联工艺路线表数据
                    sql = @"delete TMateriel_Route where materiel_code=@partcode";
                    list.Add(new { str = sql, parm = new { partcode = partcode } });
                    //标记物料表关联工艺路线标识
                    sql = @"update TMateriel_Info set proute_id='N' where partcode=@partcode";
                    list.Add(new { str = sql, parm = new { partcode = partcode } });
                }
                else
                {
                    //清除用户关联角色表数据
                    sql = @"delete TMateriel_Route where materiel_code=@partcode";
                    list.Add(new { str = sql, parm = new { partcode = partcode } });
                    //循环写入用户关联角色表
                    for (int i = 0; i < json.Count; i++)
                    {
                        sql = @"insert into TMateriel_Route(materiel_code,route_code,lm_user,lm_date) values(@materiel_code,@route_code,@lm_user,@lm_date)";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                materiel_code = partcode,
                                route_code = json[i].code,
                                lm_user = username,
                                lm_date = DateTime.Now.ToString()
                            }
                        });
                    }
                    //标记物料表关联工艺路线标识
                    sql = @"update TMateriel_Info set proute_id='Y' where partcode=@partcode";
                    list.Add(new { str = sql, parm = new { partcode = partcode } });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "操作成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "操作失败!";
                    mes.data = null;
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[工艺路线查询]
        public static ToMessage RouteSearch(string routecode, string routename, string description, string createuser, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (routecode != "" && routecode != null)
                {
                    search += "and code like '%'+@partcode+'%' ";
                    dynamicParams.Add("@routecode", routecode);
                }
                if (routename != "" && routename != null)
                {
                    search += "and name like '%'+@routename+'%' ";
                    dynamicParams.Add("@routename", routename);
                }
                if (description != "" && description != null)
                {
                    search += "and description=@description ";
                    dynamicParams.Add("@description", description);
                }
                if (createuser != "" && createuser != null)
                {
                    search += "and lm_user=@createuser ";
                    dynamicParams.Add("@createuser", createuser);
                }
                if (search == "")
                {
                    search = "and 1=1 ";
                }
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select code,name,description,enable,lm_user,lm_date
                            from TFlw_Rout
                            where is_delete<>'1' " + 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 ViewRoute(string routecode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            List<RoutEdit> list = new List<RoutEdit>();
            try
            {
                //获取工艺路线信息
                sql = @"select code,name,description,enable
                        from TFlw_Rout
                        where code=@routecode and is_delete<>'1'";
                dynamicParams.Add("@routecode", routecode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                for (int i = 0; i < data.Rows.Count; i++)
                {
                    RoutEdit rout = new RoutEdit();
                    rout.code = data.Rows[i]["CODE"].ToString();
                    rout.name = data.Rows[i]["NAME"].ToString();
                    rout.enable = data.Rows[i]["ENABLE"].ToString();
                    rout.description = data.Rows[i]["DESCRIPTION"].ToString();
                    //根据工艺路线编码获取关联的工序信息
                    sql = @"select A.seq,B.stepcode,B.stepname,B.enable from TFlw_Rtdt A
                            inner join TStep B on A.step_code=B.stepcode
                            where A.rout_code=@route_code and B.is_delete<>'1' order by A.seq asc";
                    dynamicParams.Add("@route_code", rout.code);
                    var data0 = DapperHelper.selectdata(sql, dynamicParams);
                    rout.Data = data0;
                    list.Add(rout);
                }
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = list;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[工艺路线新增]
        public static ToMessage AddUpdateRoute(string id, string opertype, string username, RoutEdit json)
        {
            var sql = "";
            var dynamicParams = new DynamicParameters();
            List<object> list = new List<object>();
            try
            {
                if (opertype == "Add")
                {
                    //新增工艺路线表
                    sql = @"insert into TFlw_Rout(code,name,description,enable,lm_user,lm_date) values(@code,@name,@description,@enable,@lm_user,@lm_date)";
                    list.Add(new { str = sql, parm = new { code = json.code, name = json.name, description = json.description, enable = json.enable, lm_user = username, lm_date = DateTime.Now.ToString() } });
                    string is_firststep = "N"; //是否首道工序
                    string is_laststep = "N"; //是否末道工序
                    for (int i = 0; i < json.Data.Rows.Count; i++)
                    {
                        if (json.Data.Rows[i]["SEQ"].ToString() == "1")  //是否首道工序
                        {
                            is_firststep = "Y";
                        }
                        if (Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()) == json.Data.Rows.Count) //是否末道工序
                        {
                            is_laststep = "Y";
                        }
                        //新增工艺路线关联工序表
                        sql = @"insert TFlw_Rtdt (rout_code,seq,step_code,first_choke,last_choke,lm_user,lm_date) values()";
                        list.Add(new { str = sql, parm = new { rout_code = json.code, seq = Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()), step_code = json.Data.Rows[i]["STEPCODE"].ToString(), first_choke = is_firststep, last_choke = is_laststep, lm_user = username, lm_date = DateTime.Now.ToString() } });
                    }
                    bool aa = DapperHelper.DoTransaction(list);
                    if (aa)
                    {
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "新增操作成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "新增操作失败!";
                        mes.data = null;
                    }
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[工艺路线删除]
        public static ToMessage DeleteRoute(string routecode)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                //判断工艺路线是否被工单引用(被引用则不能删除)
                sql = @"select *   from TK_Wrk_Man where route_code=@routecode";
                dynamicParams.Add("@routecode", routecode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "工艺路线已被工单引用,不允许删除!";
                    mes.data = null;
                }
                else
                {
                    //判断当前工艺路线是否有设置节拍工价(有设置,提示先删除节拍工价设置)
                    sql = @"select *   from TPrteEqp_Stad where route_code=@routecode";
                    dynamicParams.Add("@routecode", routecode);
                    var data0 = DapperHelper.selectdata(sql, dynamicParams);
                    if (data0.Rows.Count > 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "工艺路线已设置节拍工价,请先删除设置!";
                        mes.data = null;
                    }
                    else
                    {
                        //删除工艺路线关联工序表
                        sql = @"delete TFlw_Rtdt  where rout_code=@routecode";
                        list.Add(new { str = sql, parm = new { routecode = routecode } });
                        //删除工艺路线表
                        sql = @"delete TFlw_Rout  where code=@routecode";
                        list.Add(new { str = sql, parm = new { routecode = routecode } });
                        //删除物料关联工艺路线表
                        sql = @"delete TMateriel_Route  where route_code=@routecode";
                        list.Add(new { str = sql, parm = new { routecode = routecode } });
                    }
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "删除成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "删除失败!";
                    mes.data = null;
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[工序查询]
        public static ToMessage StepSearch(string stepcode, string stepname, string enable, string steptypecode, string createuser, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (stepcode != "" && stepcode != null)
                {
                    search += "and stepcode like '%'+@stepcode+'%' ";
                    dynamicParams.Add("@stepcode", stepcode);
                }
                if (stepname != "" && stepname != null)
                {
                    search += "and stepname like '%'+@stepname+'%' ";
                    dynamicParams.Add("@stepname", stepname);
                }
                if (enable != "" && enable != null)
                {
                    search += "and enable=@enable ";
                    dynamicParams.Add("@enable", enable);
                }
                if (steptypecode != "" && steptypecode != null)
                {
                    search += "and flwtype=@steptypecode ";
                    dynamicParams.Add("@steptypecode", steptypecode);
                }
                if (createuser != "" && createuser != null)
                {
                    search += "and lm_user=@createuser ";
                    dynamicParams.Add("@createuser", createuser);
                }
                if (search == "")
                {
                    search = "and 1=1 ";
                }
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select stepcode,stepname,flwtype,enable,descr,lm_user,lm_date,is_eqp,is_defect
                            from TStep
                            where is_delete<>'1' " + 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 AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
        {
            var dynamicParams = new DynamicParameters();
            try
            {
                if (operType == "Add")
                {
                    var sql = @"insert into TStep(stepcode,stepname,flwtype,enable,descr,lm_user,lm_date)
                            values(@stepcode,@stepname,@steptypecode,@enable,@description,@username,@CreateDate)";
                    dynamicParams.Add("@stepcode", stepcode);
                    dynamicParams.Add("@stepname", stepname);
                    dynamicParams.Add("@steptypecode", steptypecode);
                    dynamicParams.Add("@enable", enable);
                    dynamicParams.Add("@description", description);
                    dynamicParams.Add("@username", username);
                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
                    int cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
                    {
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "新增操作成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "新增操作失败!";
                        mes.data = null;
                    }
                }
                if (operType == "Update")
                {
                    //如果当前工序使用状态位N(未启用),需判断当前工序对应工艺路线被引用的工单是否关闭
                    if (enable == "N")
                    {
                        var sql0 = @"select *  from TFlw_Rtdt A
                                 inner join TK_Wrk_Man B on A.rout_code=B.route_code
                                 where A.step_code=@stepcode and B.status<>'CLOSED'";
                        dynamicParams.Add("@stepcode", stepcode);
                        var data = DapperHelper.selectdata(sql0, dynamicParams);
                        if (data.Rows.Count > 0)
                        {
                            mes.code = "300";
                            mes.count = 0;
                            mes.Message = "工序有为执行完的工单,工序状态不能为未启用!";
                            mes.data = null;
                            return mes;
                        }
                    }
                    var sql = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
                                lm_user=@username,lm_date=@CreateDate where id=@stepid";
                    dynamicParams.Add("@stepid", stepid);
                    dynamicParams.Add("@stepname", stepname);
                    dynamicParams.Add("@steptypecode", steptypecode);
                    dynamicParams.Add("@enable", enable);
                    dynamicParams.Add("@description", description);
                    dynamicParams.Add("@username", username);
                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
                    int cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
                    {
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "修改操作成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "修改操作失败!";
                        mes.data = null;
                    }
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[工序删除]
        public static ToMessage DeleteStep(string stepcode)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                //当前工序是否关联工艺路线
                sql = @"select *  from TFlw_Rtdt
                        where step_code=@stepcode";
                dynamicParams.Add("@stepcode", stepcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "工序已关联工艺路线,不允许删除!";
                    mes.data = null;
                    return mes;
                }
                //删除设备节拍工价表
                sql = @"delete TPrteEqp_Stad  where stepcode=@stepcode";
                list.Add(new { str = sql, parm = new { stepcode = stepcode } });
                //删除工序关联工作站表
                sql = @"delete TFlw_Rteqp   where step_code=@stepcode";
                list.Add(new { str = sql, parm = new { stepcode = stepcode } });
                //删除缺陷关联工序表
                sql = @"update TDefect_Step  where step_code=@stepcode";
                list.Add(new { str = sql, parm = new { stepcode = stepcode } });
                //删除工序
                sql = @"update TStep set is_delete='1' where partcode=@stepcode";
                list.Add(new { str = sql, parm = new { stepcode = stepcode } });
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "删除成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "删除失败!";
                    mes.data = null;
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[工序定义关联工作站查询]
        public static ToMessage StepAssociationEqp(string stepcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            List<StepEqp> list = new List<StepEqp>();
            try
            {
                //获取工作站集合(车间、外协供应商,包含已绑定工作站标识)
                sql = @"select distinct T.org_code as wksp_code,T.org_name as wksp_name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag from TOrganization T
                        left join(
                        select distinct A.eqp_code,B.wksp_code  from TFlw_Rteqp A
                        inner join TEqpInfo B on A.eqp_code=B.code
                        where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
                        ) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'
                        UNION ALL
                        select distinct T.btype as wksp_code,(case T.btype  when 'WX' then '外协供方' end ) as wksp_name,'W' as type,(case when B.btype is null then 'N' else 'Y' end) flag
                        from TCustomer T
                        left join(
                        select distinct A.eqp_code,B.btype  from TFlw_Rteqp A
                        inner join TCustomer B on A.eqp_code=B.code
                        where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
                        ) B on T.code=B.eqp_code where T.btype='WX' and T.is_delete<>'1'";
                dynamicParams.Add("@stepcode", stepcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                for (int i = 0; i < data.Rows.Count; i++)
                {
                    StepEqp rout = new StepEqp();
                    rout.code = data.Rows[i]["WKSP_CODE"].ToString();
                    rout.name = data.Rows[i]["WKSP_NAME"].ToString();
                    rout.type = data.Rows[i]["TYPE"].ToString();
                    rout.flag = data.Rows[i]["FLAG"].ToString();
                    rout.children = new List<StepEqpCn>();
                    if (rout.code == "WX") //外协供方
                    {
                        //根据外协供方标识编码查找外协供方信息(包含已关联标识)
                        sql = @"select A.code,A.name,'W' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
                                from TCustomer A
                                left join(
                                select distinct A.eqp_code  from TFlw_Rteqp A
                                inner join TCustomer B on A.eqp_code=B.code
                                where B.btype=@wxcode and A.is_delete<>'1' and B.is_delete<>'1'
                                ) B on A.code=B.eqp_code where A.btype=@wxcode and A.is_delete<>'1'";
                        dynamicParams.Add("@wxcode", rout.code);
                        var data0 = DapperHelper.selectdata(sql, dynamicParams);
                        for (int k = 0; k < data0.Rows.Count; k++)
                        {
                            StepEqpCn cn = new StepEqpCn();
                            cn.code = data0.Rows[k]["CODE"].ToString();//外协供方编码
                            cn.name = data0.Rows[k]["NAME"].ToString();//外协供方名称
                            cn.type = data0.Rows[k]["TYPE"].ToString();//工作站类型(E:设备 W:外协供方)
                            cn.flag = data0.Rows[k]["FLAG"].ToString();//关联标识
                            rout.children.Add(cn);
                        }
                        list.Add(rout);
                    }
                    else
                    {
                        //根据车间编码查找设备(包含已关联标识)
                        sql = @"select A.code,A.name,'E' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
                              from TEqpInfo A
                              left join(
                              select distinct A.eqp_code  from TFlw_Rteqp A
                              inner join TEqpInfo B on A.eqp_code=B.code
                              where B.wksp_code='W001' and A.is_delete<>'1' and B.is_delete<>'1'
                              ) B on A.code=B.eqp_code and A.is_delete<>'1'";
                        dynamicParams.Add("@stepcode", stepcode);
                        var data0 = DapperHelper.selectdata(sql, dynamicParams);
                        for (int j = 0; j < data0.Rows.Count; j++)
                        {
                            StepEqpCn cn = new StepEqpCn();
                            cn.code= data0.Rows[j]["CODE"].ToString();//设备编码
                            cn.name = data0.Rows[j]["NAME"].ToString();//设备名称
                            cn.type = data0.Rows[j]["TYPE"].ToString();//工作站类型(E:设备 W:外协供方)
                            cn.flag = data0.Rows[j]["FLAG"].ToString();//关联标识
                            rout.children.Add(cn);
                        }
                        list.Add(rout);
                    }
                }
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = list;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region [工序定义关联工作站提交]
        public static ToMessage SaveStepAssociationEqp(string stepcode, string username, List<ObjectData> json)
        {
            var sql = "";
            List<object> list = new List<object>();
            try
            {
                list.Clear();
                if (json == null || json.Count <= 0)
                {
                    //清除工序关联工作站表数据
                    sql = @"delete TFlw_Rteqp where step_code=@stepcode";
                    list.Add(new { str = sql, parm = new { stepcode = stepcode } });
                    //标记工序表关联工作站标识
                    sql = @"update TStep is_eqp='N' where stepcode=@stepcode";
                    list.Add(new { str = sql, parm = new { stepcode = stepcode } });
                }
                else
                {
                    //清除工序关联工作站表数据
                    sql = @"delete TFlw_Rteqp where step_code=@stepcode";
                    list.Add(new { str = sql, parm = new { stepcode = stepcode } });
                    //循环写入用户关联角色表
                    for (int i = 0; i < json.Count; i++)
                    {
                        sql = @"insert into TFlw_Rteqp(eqp_code,step_code,style,lm_user,lm_date) values(@eqp_code,@stepcode,@style,@lm_user,@lm_date)";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                eqp_code = json[i].code,
                                stepcode = stepcode,
                                style = json[i].name,
                                lm_user = username,
                                lm_date = DateTime.Now.ToString()
                            }
                        });
                    }
                    //标记物料表关联工艺路线标识
                    sql = @"update TStep set is_eqp='Y' where stepcode=@stepcode";
                    list.Add(new { str = sql, parm = new { stepcode = stepcode } });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "操作成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "操作失败!";
                    mes.data = null;
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
    }
}
VueWebApi/Logs/2022-06-23.TXT
VueWebApi/Models/RoutEdit.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
namespace VueWebApi.Models
{
    public class RoutEdit
    {
        public string code { get; set; }
        public string name { get; set; }
        public string enable { get; set; }
        public string description { get; set; }
        public DataTable Data { get; set; }
    }
}
VueWebApi/Models/StepEqp.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace VueWebApi.Models
{
    public class StepEqp
    {
        public string code { get; set; }
        public string name { get; set; }
        public string type { get; set; }
        public string flag { get; set; }
        public List<StepEqpCn> children { get; set; }//子节点
    }
    public class StepEqpCn
    {
        public string code { get; set; }
        public string name { get; set; }
        public string type { get; set; }
        public string flag { get; set; }
    }
}
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -372,13 +372,13 @@
      <publishTime>11/28/2018 13:04:24</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>06/22/2022 18:15:29</publishTime>
      <publishTime>06/23/2022 17:26:46</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll.config">
      <publishTime>06/15/2022 15:31:43</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>06/22/2022 18:15:29</publishTime>
      <publishTime>06/23/2022 17:26:46</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>06/16/2022 14:26:01</publishTime>
VueWebApi/VueWebApi.csproj
@@ -283,6 +283,8 @@
    <Compile Include="Models\ObjectData.cs" />
    <Compile Include="Models\ObjectDataCont.cs" />
    <Compile Include="Models\RoleUserSubmit.cs" />
    <Compile Include="Models\RoutEdit.cs" />
    <Compile Include="Models\StepEqp.cs" />
    <Compile Include="Models\TreeDG.cs" />
    <Compile Include="Models\TreeDM.cs" />
    <Compile Include="Models\TreeObejct.cs" />
VueWebApi/VueWebApi.csproj.user
@@ -8,7 +8,7 @@
    <IISExpressWindowsAuthentication />
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\新凯迪MES\VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
VueWebApi/bin/VueWebApi.pdb
Binary files differ
VueWebApi/bin/VueWebApi.xml
@@ -728,7 +728,7 @@
            <summary>
            å¾€æ¥å•位删除
            </summary>
            <param name="unitid">往来单位ID</param>
            <param name="unitcode">往来单位编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceTypeSearch(System.Int32,System.Int32,System.String,System.String)">
@@ -796,6 +796,13 @@
            <summary>
            æ‰€å±žè½¦é—´ä¸‹æ‹‰æŽ¥å£
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.DeviceManagerController.WorkShopSelectLine(System.String)">
            <summary>
            æ‰€å±žè½¦é—´æŸ¥æ‰¾æ‰€å±žäº§çº¿æŽ¥å£
            </summary>
            <param name="workshopcode">车间编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceMangerSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
@@ -1048,16 +1055,16 @@
            <summary>
            å­˜è´§æ¡£æ¡ˆæŸ¥è¯¢
            </summary>
            <param name="partcode"></param>
            <param name="partname"></param>
            <param name="partspec"></param>
            <param name="stocktypecode"></param>
            <param name="materialtypecode"></param>
            <param name="storehousecode"></param>
            <param name="page"></param>
            <param name="rows"></param>
            <param name="prop"></param>
            <param name="order"></param>
            <param name="partcode">物料编码</param>
            <param name="partname">物料名称</param>
            <param name="partspec">物料规格</param>
            <param name="stocktypecode">存货类型编码</param>
            <param name="materialtypecode">物料类型编码</param>
            <param name="storehousecode">所属仓库编码</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.AddUpdateInventoryFile(Newtonsoft.Json.Linq.JObject)">
@@ -1081,6 +1088,95 @@
            <param name="partcode">物料编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
            <summary>
            å­˜è´§æ¡£æ¡ˆå…³è”工艺路线提交
            </summary>
            <param name="partcode">物料编码</param>
            <param name="json">提交数据对象</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.RouteSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            å·¥è‰ºè·¯çº¿æŸ¥è¯¢
            </summary>
            <param name="routecode">工艺路线编码</param>
            <param name="routename">工艺路线名称</param>
            <param name="description">工艺路线描述</param>
            <param name="createuser">创建人员</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.ViewRoute(System.String)">
            <summary>
            å·¥è‰ºè·¯çº¿é¢„览
            </summary>
            <param name="routecode">工艺路线编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.AddUpdateRoute(System.String,System.String,VueWebApi.Models.RoutEdit)">
            <summary>
            å·¥è‰ºè·¯çº¿æ–°å¢žç¼–辑
            </summary>
            <param name="id">工艺路线id</param>
            <param name="opertype">操作类型(新增)</param>
            <param name="json">提交数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.DeleteRoute(System.String)">
            <summary>
            å·¥è‰ºè·¯çº¿åˆ é™¤
            </summary>
            <param name="routecode">工艺路线编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepSearch(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            å·¥åºæŸ¥è¯¢
            </summary>
            <param name="stepcode">工序编码</param>
            <param name="stepname">工序名称</param>
            <param name="enable">启用状态</param>
            <param name="steptypecode">工序类型编码</param>
            <param name="createuser">创建人员</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.AddUpdateStep(Newtonsoft.Json.Linq.JObject)">
            <summary>
            å·¥åºæ–°å¢žç¼–辑
            </summary>
            <param name="obj">提交数据对象</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.DeleteStep(System.String)">
            <summary>
            å·¥åºåˆ é™¤
            </summary>
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.StepAssociationEqp(System.String)">
            <summary>
            å·¥åºå®šä¹‰å…³è”工作站查询
            </summary>
            <param name="stepcode">工序编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductModelController.SaveStepAssociationEqp(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
            <summary>
            å·¥åºå®šä¹‰å…³è”工作站提交
            </summary>
            <param name="stepcode">工序编码</param>
            <param name="json"></param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.SystemSettingController.EncodingRules(System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            ç¼–码规则查询
VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
35bd76ae72fd355c9137f72fe96aec389f85212c
4c18228ccc6ec1b0f1e055955b46344b14f533de
VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt
@@ -1,6 +1,3 @@
D:\新凯迪MES\VueWebApi\VueWebApi\bin\NPOI.OOXML.xml
D:\新凯迪MES\VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.pdb
D:\新凯迪MES\VueWebApi\VueWebApi\bin\NPOI.OpenXmlFormats.pdb
D:\新凯迪MES\VueWebApi\VueWebApi\bin\VueWebApi.dll.config
D:\新凯迪MES\VueWebApi\VueWebApi\bin\VueWebApi.xml
D:\新凯迪MES\VueWebApi\VueWebApi\bin\VueWebApi.dll
@@ -111,7 +108,10 @@
D:\新凯迪MES\VueWebApi\VueWebApi\bin\NPOI.pdb
D:\新凯迪MES\VueWebApi\VueWebApi\bin\NPOI.xml
D:\新凯迪MES\VueWebApi\VueWebApi\bin\NPOI.OOXML.pdb
D:\新凯迪MES\VueWebApi\VueWebApi\bin\NPOI.OOXML.xml
D:\新凯迪MES\VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.pdb
D:\新凯迪MES\VueWebApi\VueWebApi\bin\NPOI.OpenXml4Net.xml
D:\新凯迪MES\VueWebApi\VueWebApi\bin\NPOI.OpenXmlFormats.pdb
D:\新凯迪MES\VueWebApi\VueWebApi\bin\Pipelines.Sockets.Unofficial.xml
D:\新凯迪MES\VueWebApi\VueWebApi\bin\ServiceStack.Common.xml
D:\新凯迪MES\VueWebApi\VueWebApi\bin\ServiceStack.Interfaces.xml
VueWebApi/obj/Debug/VueWebApi.pdb
Binary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
facf67c0e99c52b4a568e4dc312c32889b04f076
8846817bef2faf361bb1dae0ba7c58c4d14cfba8
VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ