分支自 SuZhouGuanHong/TaiYuanTaiZhong

dengjunjie
2024-06-07 3450443ee68b49e539f066bd7cea23fb7fcd81c3
桁架模式1/2切换
已修改2个文件
45 ■■■■■ 文件已修改
代码管理/PCS/WCS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_headService.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_WCS/Services/WCS/Partial/dt_patternService.cs 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_headService.cs
@@ -42,6 +42,11 @@
            //多租户会用到这init代码,其他情况可以不用
            //base.Init(dbRepository);
        }
        /// <summary>
        /// å–消工单出库外协
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        public WebResponseContent CancelsorcingWorkOrder(SaveModel saveModel)
        {
            WebResponseContent content = new WebResponseContent();
@@ -60,7 +65,7 @@
                    }
                }
                content.OK();
                WriteDBLog.Success("指定工单出库外协", $"工单编号:{list}", "PCS", compeletor);
                WriteDBLog.Success("取消工单出库外协", $"工单编号:{list}", "PCS", compeletor);
            }
            catch (Exception ex)
            {
@@ -68,6 +73,11 @@
            }
            return content;
        }
        /// <summary>
        /// å·¥å•出库外协
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public WebResponseContent OutsorcingWorkOrder(SaveModel model)
        {
            WebResponseContent content = new WebResponseContent();
@@ -94,6 +104,11 @@
            }
            return content;
        }
        /// <summary>
        /// å®Œæˆå·¥å•
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public WebResponseContent FinishWorkOrder(SaveModel model)
        {
            WebResponseContent content = new WebResponseContent();
´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Services/WCS/Partial/dt_patternService.cs
@@ -22,6 +22,7 @@
using WIDESEA_Core.EFDbContext;
using WIDESEA_WCS.Repositories;
using WIDESEA_Comm;
using WIDESEA_WCS.WCSClient;
namespace WIDESEA_WCS.Services
{
@@ -50,11 +51,19 @@
        public WebResponseContent UpdateAuto(string v)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var Gantry_client = PLCClient.Clients.FirstOrDefault(t => t.PLCName == "桁架");
                if (Gantry_client == null) throw new Exception("桁架调度服务未开启!");
                if (!Gantry_client.IsConnected) throw new Exception("与桁架连接超时!");
            VOLContext context = new VOLContext();
            Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context);
            var stations = stationinfoRepository.Find(x => x.stationCode == "X01001001" || x.stationCode == "X01001002" || x.stationCode == "X02001001" || x.stationCode == "X02001002").ToList();
            if (stations.Where(x => x.tray_status == TrayStateEnum.StrogeTray.ToString()).Any())
                return content.Error("设置为模式1失败!下料位存在车轮!");
                    throw new Exception("设置为模式1失败!下料位存在车轮!");
                #region å†™å…¥ä¿¡å·å‘Šè¯‰æ¡æž¶åˆ‡æ¢æ¨¡å¼
                #endregion
            var model = JsonConvert.DeserializeObject<dt_pattern>(v);
            model.pattern_state = 1;
@@ -63,6 +72,11 @@
                content.OK(model.pattern_name + "设置为模式1成功!");
            else
                content.Error(model.pattern_name + "设置为模式1失败!");
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
        /// <summary>
@@ -73,11 +87,16 @@
        public WebResponseContent UpdateManual(string v)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var Gantry_client = PLCClient.Clients.FirstOrDefault(t => t.PLCName == "桁架");
                if (Gantry_client == null) throw new Exception("桁架调度服务未开启!");
                if (!Gantry_client.IsConnected) throw new Exception("与桁架连接超时!");
            VOLContext context = new VOLContext();
            Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context);
            var stations = stationinfoRepository.Find(x => x.stationCode == "X01001001" || x.stationCode == "X01001002" || x.stationCode == "X02001001" || x.stationCode == "X02001002").ToList();
            if (stations.Where(x => x.tray_status == TrayStateEnum.StrogeTray.ToString()).Any())
                return content.Error("设置为模式2失败!下料位存在车轮!");
                    throw new Exception("设置为模式2失败!下料位存在车轮!");
            var model = JsonConvert.DeserializeObject<dt_pattern>(v);
            model.pattern_state = 0;
            var cont = _repository.Update(model, true);
@@ -85,6 +104,11 @@
                content.OK(model.pattern_name + "设置为模式2成功!");
            else
                content.Error(model.pattern_name + "设置为模式2失败!");
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
    }