wenjy
/
JYHB.SlnMesnac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-完善2楼小包产出叫料逻辑

Browse Source
dev
liuwf 3 months ago
parent 833bae6d08
commit 64a04dce5f
14 changed files with 441 additions and 171 deletions
Show Stats Download Patch File Download Diff File

228
SlnMesnac.Business/ProdCompletionBusiness.cs
Unescape Escape View File

@ -1,4 +1,4 @@
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using SlnMesnac.Business.@base; using SlnMesnac.Business.@base;
using SlnMesnac.Common; using SlnMesnac.Common;
@ -21,32 +21,32 @@ using System.Threading.Tasks;
using TouchSocket.Core; using TouchSocket.Core;
using static System.Net.Mime.MediaTypeNames; using static System.Net.Mime.MediaTypeNames;
#region << 版 本 注 释 >> #region << 版 本 注 释 >>
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
* 版权所有 (c) 2024 WenJY 保留所有权利。 * 版权所有 (c) 2024 WenJY 保留所有权利。
* CLR版本：4.0.30319.42000 * CLR版本：4.0.30319.42000
* 机器名称：LAPTOP-E0N2L34V * 机器名称：LAPTOP-E0N2L34V
* 命名空间：SlnMesnac.Business * 命名空间：SlnMesnac.Business
* 唯一标识：f79d6d97-d9b0-4b0b-a442-e6bb1c1c79e6 * 唯一标识：f79d6d97-d9b0-4b0b-a442-e6bb1c1c79e6
* *
* 创建者：WenJY * 创建者：WenJY
* 电子邮箱：wenjy@mesnac.com * 电子邮箱：wenjy@mesnac.com
* 创建时间：2024-04-10 16:36:01 * 创建时间：2024-04-10 16:36:01
* 版本：V1.0.0 * 版本：V1.0.0
* 描述： * 描述：
* *
*-------------------------------------------------------------------- *--------------------------------------------------------------------
* 修改人： * 修改人：
* 时间： * 时间：
* 修改说明： * 修改说明：
* *
* 版本：V1.0.0 * 版本：V1.0.0
*--------------------------------------------------------------------*/ *--------------------------------------------------------------------*/
#endregion << 版 本 注 释 >> #endregion << 版 本 注 释 >>
namespace SlnMesnac.Business namespace SlnMesnac.Business
{ {
/// <summary> /// <summary>
/// 设备产出业务逻辑 /// 设备产出业务逻辑
/// </summary> /// </summary>
public class ProdCompletionBusiness : BaseBusiness public class ProdCompletionBusiness : BaseBusiness
{ {
@ -61,7 +61,7 @@ namespace SlnMesnac.Business
private ISqlSugarClient sqlSugarClient; private ISqlSugarClient sqlSugarClient;
public ProdCompletionBusiness(ISqlSugarClient _sqlSugarClient,ILogger<BaseBusiness> logger, AppConfig appConfig, List<PlcAbsractFactory> plcFactories, List<RfidAbsractFactory> rfidFactories, IMesProductPlanService mesProductPlanService, IMesPrdBarCodeService barCodeTaskService, IServiceProvider serviceProvider) : base(logger, appConfig, plcFactories, rfidFactories, serviceProvider) public ProdCompletionBusiness(ISqlSugarClient _sqlSugarClient, ILogger<BaseBusiness> logger, AppConfig appConfig, List<PlcAbsractFactory> plcFactories, List<RfidAbsractFactory> rfidFactories, IMesProductPlanService mesProductPlanService, IMesPrdBarCodeService barCodeTaskService, IServiceProvider serviceProvider) : base(logger, appConfig, plcFactories, rfidFactories, serviceProvider)
{ {
sqlSugarClient = _sqlSugarClient; sqlSugarClient = _sqlSugarClient;
_mesProductPlanService = mesProductPlanService; _mesProductPlanService = mesProductPlanService;
@ -85,12 +85,15 @@ namespace SlnMesnac.Business
} }
private static bool isEmptyPalletHandleRunning = false;
public void Init() public void Init()
{ {
Task.Run(() => Task.Run(async () =>
{ {
EmptyPalletHandle(); await EmptyPalletHandle();
}); });
Task.Run(() => Task.Run(() =>
{ {
@ -100,13 +103,13 @@ namespace SlnMesnac.Business
} }
/// <summary> /// <summary>
/// 设备产出逻辑处理 /// 设备产出逻辑处理
/// </summary> /// </summary>
private async void DeviceOutPutHandle() private async void DeviceOutPutHandle()
{ {
// 读取RFID失败重试次数，超过5次推送报警 // 读取RFID失败重试次数，超过5次推送报警
int readRfidAmount = 0; int readRfidAmount = 0;
while(true) while (true)
{ {
try try
{ {
@ -114,23 +117,31 @@ namespace SlnMesnac.Business
if (plc == null) if (plc == null)
{ {
_logger.LogInformation("读取小包出口信号,PLC连接信息为空......"); _logger.LogInformation("读取小包出口信号,PLC连接信息为空......");
Thread.Sleep(3000); Thread.Sleep(3000);
continue; continue;
} }
if (plc.readByteByAddress(GetPlcAddressByConfigKey("2楼小包出口到位信号"))!=1) if (plc.readByteByAddress(GetPlcAddressByConfigKey("2楼小包出口到位信号")) != 1)
{ {
_logger.LogInformation("等待小包出口信号触发......"); _logger.LogInformation("等待小包出口信号触发......");
Thread.Sleep(5000); Thread.Sleep(5000);
continue; continue;
} }
string rfid = plc.readStringByAddress(GetPlcAddressByConfigKey("2楼码垛出口RFID条码地址"),12).Replace("\0","");
if (!string.IsNullOrWhiteSpace(rfid))
{
_logger.LogInformation("小包出口已经有RFID了，无需再读");
Thread.Sleep(5000);
continue;
}
string epcStr = await ReadEpcStrByRfidKeyAsync("secondFloorOut"); string epcStr = await ReadEpcStrByRfidKeyAsync("secondFloorOut");
if (string.IsNullOrEmpty(epcStr)) if (string.IsNullOrEmpty(epcStr))
{ {
_logger.LogError("小包出口到位信号触发,读取RFID失败......"); _logger.LogError("小包出口到位信号触发,读取RFID失败......");
//判断前一位置是否有托盘缓存 //判断前一位置是否有托盘缓存
RealPalletTask realPalletTask = _realPalletTaskService.Query().FirstOrDefault(); RealPalletTask realPalletTask = _realPalletTaskService.Query().FirstOrDefault();
if (realPalletTask != null) if (realPalletTask != null)
{ {
@ -139,15 +150,15 @@ namespace SlnMesnac.Business
else else
{ {
readRfidAmount++; readRfidAmount++;
if(readRfidAmount == 5) if (readRfidAmount == 5)
{ {
string virtualEpc = NoReadRFIDAlarm(); string virtualEpc = NoReadRFIDAlarm();
_logger.LogError("小包出口到位信号触发,读取RFID失败超过5次......"); _logger.LogError("小包出口到位信号触发,读取RFID失败超过5次......");
if (!string.IsNullOrEmpty(virtualEpc)) if (!string.IsNullOrEmpty(virtualEpc))
{ {
epcStr = virtualEpc; epcStr = virtualEpc;
_logger.LogError("小包出口到位信号触发,读取RFID失败超过5次,生成虚拟托盘号:"+virtualEpc); _logger.LogError("小包出口到位信号触发,读取RFID失败超过5次,生成虚拟托盘号:" + virtualEpc);
} }
} }
else else
@ -158,32 +169,32 @@ namespace SlnMesnac.Business
} }
} }
RefreshMessage($"小包出口读取到RFID条码{epcStr},开始绑定流程:"); RefreshMessage($"小包出口读取到RFID条码{epcStr},开始绑定流程:");
_mesProductPlanService.GetStartedProdPlan(out MesProductPlanDto productPlanDto); _mesProductPlanService.GetStartedProdPlan(out MesProductPlanDto productPlanDto);
if (productPlanDto == null) if (productPlanDto == null)
{ {
//TODO:没有计划的话,处理方式待定 //TODO:没有计划的话,处理方式待定
throw new ArgumentException($"未获取到正在执行的生产计划"); throw new ArgumentException($"未获取到正在执行的生产计划");
} }
#region 开启事务 #region 开启事务
sqlSugarClient.AsTenant().BeginTran(); sqlSugarClient.AsTenant().BeginTran();
//1.生成大条码插入mes_barcode_info； //1.生成大条码插入mes_barcode_info；
string bigCode =GenerateBigBarcode(productPlanDto, epcStr); string bigCode = GenerateBigBarcode(productPlanDto, epcStr);
//2.40个小条码及大条码绑定托盘号，小条码绑定大条码 //2.40个小条码及大条码绑定托盘号，小条码绑定大条码
BindingBarCode(bigCode,epcStr); BindingBarCode(bigCode, epcStr);
//3.更新mes_product_plan及mes_product_order表，更新已生产数量 //3.更新mes_product_plan及mes_product_order表，更新已生产数量
UpdatePlanInfoAndOrder(productPlanDto); UpdatePlanInfoAndOrder(productPlanDto);
// 删除正在使用的数据库托盘号 // 删除正在使用的数据库托盘号
RealPalletTask realPallet = _realPalletTaskService.Query(x => x.PalletCode == epcStr).FirstOrDefault(); RealPalletTask realPallet = _realPalletTaskService.Query(x => x.PalletCode == epcStr).FirstOrDefault();
if (realPallet != null) if (realPallet != null)
{ {
sqlSugarClient.AsTenant().GetConnection("mes").Deleteable(realPallet).ExecuteCommand(); sqlSugarClient.AsTenant().GetConnection("mes").Deleteable(realPallet).ExecuteCommand();
} }
// 写入PLC RFID号供调度使用 // 写入PLC RFID号供调度使用
plc.writeStringByAddress(GetPlcAddressByConfigKey("2楼码垛出口RFID条码地址"), epcStr); plc.writeStringByAddress(GetPlcAddressByConfigKey("2楼码垛出口RFID条码地址"), epcStr);
plc.writeByteByAddress(GetPlcAddressByConfigKey("2楼小包出口到位信号"),2); // plc.writeByteByAddress(GetPlcAddressByConfigKey("2楼小包出口到位信号"), 2);
readRfidAmount = 0; readRfidAmount = 0;
sqlSugarClient.AsTenant().CommitTran(); sqlSugarClient.AsTenant().CommitTran();
#endregion #endregion
@ -192,15 +203,15 @@ namespace SlnMesnac.Business
{ {
sqlSugarClient.AsTenant().RollbackTran(); sqlSugarClient.AsTenant().RollbackTran();
_logger.LogError($"DeviceOutPutHandle异常:{ex.Message}"); _logger.LogError($"DeviceOutPutHandle异常:{ex.Message}");
} }
Thread.Sleep(1000 * 5); Thread.Sleep(1000 * 5);
} }
} }
/// <summary> /// <summary>
/// 推送报警,并生成虚拟托盘号暂时使用，虚拟托盘号储存到报警信息，人工处理可以将虚拟托盘号替换为正常托盘号 /// 推送报警,并生成虚拟托盘号暂时使用，虚拟托盘号储存到报警信息，人工处理可以将虚拟托盘号替换为正常托盘号
/// <return> 返回生产的虚拟托盘号 /// <return> 返回生产的虚拟托盘号
/// </summary> /// </summary>
private string NoReadRFIDAlarm() private string NoReadRFIDAlarm()
{ {
@ -210,8 +221,8 @@ namespace SlnMesnac.Business
epcStr = "TEMP" + DateTime.Now.ToString("MMddHHmm"); epcStr = "TEMP" + DateTime.Now.ToString("MMddHHmm");
sqlSugarClient.AsTenant().BeginTran(); sqlSugarClient.AsTenant().BeginTran();
// 有报警，找出该设备的报警记录，如果没有报警记录或者报警记录已结束，则新增报警记录 // 有报警，找出该设备的报警记录，如果没有报警记录或者报警记录已结束，则新增报警记录
int warnRuleId = int.Parse(WarnStatusEnum.小包出口读取RFID失败5次.GetDescription()); int warnRuleId = int.Parse(WarnStatusEnum.小包出口读取RFID失败5次.GetDescription());
DmsRecordAlarmTime? dmsRecordAlarmTime = sqlSugarClient.AsTenant().GetConnection("mes").Queryable<DmsRecordAlarmTime>().First(x => x.AlarmRuleId == warnRuleId); DmsRecordAlarmTime? dmsRecordAlarmTime = sqlSugarClient.AsTenant().GetConnection("mes").Queryable<DmsRecordAlarmTime>().First(x => x.AlarmRuleId == warnRuleId);
if (dmsRecordAlarmTime == null) if (dmsRecordAlarmTime == null)
{ {
@ -224,8 +235,8 @@ namespace SlnMesnac.Business
dmsRecordAlarmTime.ContinueTime = dmsBaseAlarmRule.ContinueTime; dmsRecordAlarmTime.ContinueTime = dmsBaseAlarmRule.ContinueTime;
dmsRecordAlarmTime.AlarmReason = dmsBaseAlarmRule.AlarmReason; dmsRecordAlarmTime.AlarmReason = dmsBaseAlarmRule.AlarmReason;
dmsRecordAlarmTime.AlarmReason = dmsBaseAlarmRule.AlarmReason; dmsRecordAlarmTime.AlarmReason = dmsBaseAlarmRule.AlarmReason;
dmsRecordAlarmTime.AlarmData = WarnStatusEnum.小包出口读取RFID失败5次.ToString(); dmsRecordAlarmTime.AlarmData = WarnStatusEnum.小包出口读取RFID失败5次.ToString();
dmsRecordAlarmTime.HandleSuggest = dmsBaseAlarmRule.HandleSuggest+";;虚拟托盘号为:"+epcStr; dmsRecordAlarmTime.HandleSuggest = dmsBaseAlarmRule.HandleSuggest + ";;虚拟托盘号为:" + epcStr;
dmsRecordAlarmTime.CreateBy = "SlnMesnac"; dmsRecordAlarmTime.CreateBy = "SlnMesnac";
dmsRecordAlarmTime.CreateTime = DateTime.Now; dmsRecordAlarmTime.CreateTime = DateTime.Now;
@ -238,8 +249,8 @@ namespace SlnMesnac.Business
dmsRecordAlarmInfo.ContinueTime = dmsBaseAlarmRule.ContinueTime; dmsRecordAlarmInfo.ContinueTime = dmsBaseAlarmRule.ContinueTime;
dmsRecordAlarmInfo.AlarmReason = dmsBaseAlarmRule.AlarmReason; dmsRecordAlarmInfo.AlarmReason = dmsBaseAlarmRule.AlarmReason;
dmsRecordAlarmInfo.AlarmReason = dmsBaseAlarmRule.AlarmReason; dmsRecordAlarmInfo.AlarmReason = dmsBaseAlarmRule.AlarmReason;
dmsRecordAlarmInfo.AlarmData = WarnStatusEnum.小包出口读取RFID失败5次.ToString(); dmsRecordAlarmInfo.AlarmData = WarnStatusEnum.小包出口读取RFID失败5次.ToString();
dmsRecordAlarmInfo.HandleSuggest = dmsBaseAlarmRule.HandleSuggest + ";;虚拟托盘号为:" + epcStr; dmsRecordAlarmInfo.HandleSuggest = dmsBaseAlarmRule.HandleSuggest + ";;虚拟托盘号为:" + epcStr;
dmsRecordAlarmInfo.CreateBy = "SlnMesnac"; dmsRecordAlarmInfo.CreateBy = "SlnMesnac";
dmsRecordAlarmInfo.CreateTime = DateTime.Now; dmsRecordAlarmInfo.CreateTime = DateTime.Now;
@ -251,7 +262,7 @@ namespace SlnMesnac.Business
dmsRecordAlarmTime.UpdateTime = DateTime.Now; dmsRecordAlarmTime.UpdateTime = DateTime.Now;
dmsRecordAlarmTime.UpdateBy = "SlnMesnac"; dmsRecordAlarmTime.UpdateBy = "SlnMesnac";
DmsRecordAlarmInfo dmsRecordAlarmInfo = sqlSugarClient.AsTenant().GetConnection("mes").Queryable<DmsRecordAlarmInfo>().First(x=>x.AlarmRuleId==warnRuleId); DmsRecordAlarmInfo dmsRecordAlarmInfo = sqlSugarClient.AsTenant().GetConnection("mes").Queryable<DmsRecordAlarmInfo>().First(x => x.AlarmRuleId == warnRuleId);
if (dmsRecordAlarmInfo != null) if (dmsRecordAlarmInfo != null)
{ {
dmsRecordAlarmInfo.UpdateTime = DateTime.Now; dmsRecordAlarmInfo.UpdateTime = DateTime.Now;
@ -264,10 +275,11 @@ namespace SlnMesnac.Business
sqlSugarClient.AsTenant().CommitTran(); sqlSugarClient.AsTenant().CommitTran();
return epcStr; return epcStr;
}catch(Exception ex) }
catch (Exception ex)
{ {
sqlSugarClient.AsTenant().RollbackTran(); sqlSugarClient.AsTenant().RollbackTran();
_logger.LogError($"NoReadRFIDAlarm异常:{ex.Message}"); _logger.LogError($"NoReadRFIDAlarm异常:{ex.Message}");
return ""; return "";
} }
@ -275,15 +287,15 @@ namespace SlnMesnac.Business
/// <summary> /// <summary>
/// 生成大条码插入mes_barcode_info； /// 生成大条码插入mes_barcode_info；
/// </summary> /// </summary>
/// <param name="productPlanDto"></param> /// <param name="productPlanDto"></param>
/// <param name="epcStr"></param> /// <param name="epcStr"></param>
/// <returns></returns> /// <returns></returns>
private string GenerateBigBarcode(MesProductPlanDto productPlanDto,string epcStr) private string GenerateBigBarcode(MesProductPlanDto productPlanDto, string epcStr)
{ {
string bigBarcode = productPlanDto.PlanCode+DateTime.Now.ToString("_MMddHHmmss"); string bigBarcode = productPlanDto.PlanCode + DateTime.Now.ToString("_MMddHHmmss");
MesBaseBarcodeInfo mesBaseBarcodeInfo = new MesBaseBarcodeInfo(); MesBaseBarcodeInfo mesBaseBarcodeInfo = new MesBaseBarcodeInfo();
mesBaseBarcodeInfo.printTime = DateTime.Now; mesBaseBarcodeInfo.printTime = DateTime.Now;
mesBaseBarcodeInfo.printPerson = "SlnMesnac"; mesBaseBarcodeInfo.printPerson = "SlnMesnac";
@ -299,7 +311,7 @@ namespace SlnMesnac.Business
mesBaseBarcodeInfo.productionDate = DateTime.Now; mesBaseBarcodeInfo.productionDate = DateTime.Now;
mesBaseBarcodeInfo.acceptedDate = DateTime.Now; mesBaseBarcodeInfo.acceptedDate = DateTime.Now;
mesBaseBarcodeInfo.planCode = productPlanDto.PlanCode; mesBaseBarcodeInfo.planCode = productPlanDto.PlanCode;
mesBaseBarcodeInfo.safeFlag = productPlanDto.SaleOrderId ==0 ?"1" : "0"; mesBaseBarcodeInfo.safeFlag = productPlanDto.SaleOrderId == 0 ? "1" : "0";
mesBaseBarcodeInfo.saleOrderId = productPlanDto.SaleOrderId; mesBaseBarcodeInfo.saleOrderId = productPlanDto.SaleOrderId;
mesBaseBarcodeInfo.saleorderCode = productPlanDto.SaleorderCode; mesBaseBarcodeInfo.saleorderCode = productPlanDto.SaleorderCode;
mesBaseBarcodeInfo.bindStatus = "1"; mesBaseBarcodeInfo.bindStatus = "1";
@ -309,7 +321,7 @@ namespace SlnMesnac.Business
mesBaseBarcodeInfo.completeFlag = "1"; mesBaseBarcodeInfo.completeFlag = "1";
mesBaseBarcodeInfo.singleFlag = "0"; mesBaseBarcodeInfo.singleFlag = "0";
var materialInfo = _baseMaterialInfoService.Query(x => x.MaterialId == productPlanDto.MaterialId).FirstOrDefault(); var materialInfo = _baseMaterialInfoService.Query(x => x.MaterialId == productPlanDto.MaterialId).FirstOrDefault();
if(materialInfo != null) if (materialInfo != null)
{ {
mesBaseBarcodeInfo.barcodeSpec = materialInfo.MaterialSpec; mesBaseBarcodeInfo.barcodeSpec = materialInfo.MaterialSpec;
} }
@ -318,21 +330,21 @@ namespace SlnMesnac.Business
} }
/// <summary> /// <summary>
/// 40个小条码及大条码绑定托盘号，小条码绑定大条码 /// 40个小条码及大条码绑定托盘号，小条码绑定大条码
/// </summary> /// </summary>
/// <param name="bigBarcode"></param> /// <param name="bigBarcode"></param>
/// <param name="epcStr"></param> /// <param name="epcStr"></param>
private void BindingBarCode(string bigBarcode,string epcStr) private void BindingBarCode(string bigBarcode, string epcStr)
{ {
List<MesPrdBarcodeInfo> list = _mesPrdBarCodeService.GetUseBarCodeList(); List<MesPrdBarcodeInfo> list = _mesPrdBarCodeService.GetUseBarCodeList();
if(list==null || list.Count == 0) if (list == null || list.Count == 0)
{ {
throw new InvalidOperationException("托盘未找到可以绑定的小条码"); throw new InvalidOperationException("托盘未找到可以绑定的小条码");
} }
if (list.Where(x => x.PrintFlag == "1").ToList().Count < 40) if (list.Where(x => x.PrintFlag == "1").ToList().Count < 40)
{ {
// TODO推送低级别报警 // TODO推送低级别报警
PrintLessThan40Alarm(); PrintLessThan40Alarm();
} }
foreach (var item in list) foreach (var item in list)
@ -348,33 +360,33 @@ namespace SlnMesnac.Business
private void UpdatePlanInfoAndOrder(MesProductPlanDto productPlanDto) private void UpdatePlanInfoAndOrder(MesProductPlanDto productPlanDto)
{ {
MesProductPlan productPlan = _mesProductPlanService.Query(x => x.PlanCode == productPlanDto.PlanCode).FirstOrDefault(); MesProductPlan productPlan = _mesProductPlanService.Query(x => x.PlanCode == productPlanDto.PlanCode).FirstOrDefault();
if(productPlan == null) if (productPlan == null)
{ {
throw new InvalidOperationException("未找到该生产计划!"); throw new InvalidOperationException("未找到该生产计划!");
} }
MesProductOrder productOrder = _mesProductOrderService.Query(x => x.ProductOrderId == productPlan.ProductOrderId).FirstOrDefault(); MesProductOrder productOrder = _mesProductOrderService.Query(x => x.ProductOrderId == productPlan.ProductOrderId).FirstOrDefault();
if (productPlan == null) if (productPlan == null)
{ {
throw new InvalidOperationException("未找到该生产计划对应的生产工单!"); throw new InvalidOperationException("未找到该生产计划对应的生产工单!");
} }
#region 更新生产计划 #region 更新生产计划
if (productPlan.CompleteAmount == 0) if (productPlan.CompleteAmount == 0)
{ {
productPlan.RealBeginTime = DateTime.Now; productPlan.RealBeginTime = DateTime.Now;
} }
productPlan.CompleteAmount++; productPlan.CompleteAmount++;
if(productPlan.CompleteAmount == productPlan.PlanAmount) if (productPlan.CompleteAmount == productPlan.PlanAmount)
{ {
productPlan.RealEndTime = DateTime.Now; productPlan.RealEndTime = DateTime.Now;
productPlan.PlanStatus = Model.enums.PlanStatusEnum.已完成; productPlan.PlanStatus = Model.enums.PlanStatusEnum.已完成;
} }
productPlan.UpdateTime = DateTime.Now; productPlan.UpdateTime = DateTime.Now;
productPlan.UpdateBy = "SlnMesnac"; productPlan.UpdateBy = "SlnMesnac";
sqlSugarClient.AsTenant().GetConnection("mes").Updateable(productPlan).ExecuteCommand(); sqlSugarClient.AsTenant().GetConnection("mes").Updateable(productPlan).ExecuteCommand();
#endregion #endregion
#region 更新生产工单 #region 更新生产工单
if (productOrder.CompleteAmount == 0) if (productOrder.CompleteAmount == 0)
{ {
@ -382,7 +394,7 @@ namespace SlnMesnac.Business
productOrder.RealBeginTime = DateTime.Now; productOrder.RealBeginTime = DateTime.Now;
} }
productOrder.CompleteAmount++; productOrder.CompleteAmount++;
if(productOrder.CompleteAmount== productOrder.PlanAmount) if (productOrder.CompleteAmount == productOrder.PlanAmount)
{ {
productOrder.RealEndTime = DateTime.Now; productOrder.RealEndTime = DateTime.Now;
@ -396,8 +408,8 @@ namespace SlnMesnac.Business
} }
/// <summary> /// <summary>
/// 小包产出绑定托盘，小包喷码数量小于40低级别报警 /// 小包产出绑定托盘，小包喷码数量小于40低级别报警
/// <return> 返回生产的虚拟托盘号 /// <return> 返回生产的虚拟托盘号
/// </summary> /// </summary>
private void PrintLessThan40Alarm() private void PrintLessThan40Alarm()
{ {
@ -405,8 +417,8 @@ namespace SlnMesnac.Business
{ {
sqlSugarClient.AsTenant().BeginTran(); sqlSugarClient.AsTenant().BeginTran();
// 有报警，找出该设备的报警记录，如果没有报警记录或者报警记录已结束，则新增报警记录 // 有报警，找出该设备的报警记录，如果没有报警记录或者报警记录已结束，则新增报警记录
int warnRuleId = int.Parse(WarnStatusEnum.托盘绑定时已喷码数不足40.GetDescription()); int warnRuleId = int.Parse(WarnStatusEnum.托盘绑定时已喷码数不足40.GetDescription());
DmsRecordAlarmTime? dmsRecordAlarmTime = sqlSugarClient.AsTenant().GetConnection("mes").Queryable<DmsRecordAlarmTime>().First(x => x.AlarmRuleId == warnRuleId); DmsRecordAlarmTime? dmsRecordAlarmTime = sqlSugarClient.AsTenant().GetConnection("mes").Queryable<DmsRecordAlarmTime>().First(x => x.AlarmRuleId == warnRuleId);
if (dmsRecordAlarmTime == null) if (dmsRecordAlarmTime == null)
{ {
@ -419,7 +431,7 @@ namespace SlnMesnac.Business
dmsRecordAlarmTime.ContinueTime = dmsBaseAlarmRule.ContinueTime; dmsRecordAlarmTime.ContinueTime = dmsBaseAlarmRule.ContinueTime;
dmsRecordAlarmTime.AlarmReason = dmsBaseAlarmRule.AlarmReason; dmsRecordAlarmTime.AlarmReason = dmsBaseAlarmRule.AlarmReason;
dmsRecordAlarmTime.AlarmReason = dmsBaseAlarmRule.AlarmReason; dmsRecordAlarmTime.AlarmReason = dmsBaseAlarmRule.AlarmReason;
dmsRecordAlarmTime.AlarmData = WarnStatusEnum.托盘绑定时已喷码数不足40.ToString(); dmsRecordAlarmTime.AlarmData = WarnStatusEnum.托盘绑定时已喷码数不足40.ToString();
dmsRecordAlarmTime.HandleSuggest = dmsBaseAlarmRule.HandleSuggest; dmsRecordAlarmTime.HandleSuggest = dmsBaseAlarmRule.HandleSuggest;
dmsRecordAlarmTime.CreateBy = "SlnMesnac"; dmsRecordAlarmTime.CreateBy = "SlnMesnac";
dmsRecordAlarmTime.CreateTime = DateTime.Now; dmsRecordAlarmTime.CreateTime = DateTime.Now;
@ -433,7 +445,7 @@ namespace SlnMesnac.Business
dmsRecordAlarmInfo.ContinueTime = dmsBaseAlarmRule.ContinueTime; dmsRecordAlarmInfo.ContinueTime = dmsBaseAlarmRule.ContinueTime;
dmsRecordAlarmInfo.AlarmReason = dmsBaseAlarmRule.AlarmReason; dmsRecordAlarmInfo.AlarmReason = dmsBaseAlarmRule.AlarmReason;
dmsRecordAlarmInfo.AlarmReason = dmsBaseAlarmRule.AlarmReason; dmsRecordAlarmInfo.AlarmReason = dmsBaseAlarmRule.AlarmReason;
dmsRecordAlarmInfo.AlarmData = WarnStatusEnum.托盘绑定时已喷码数不足40.ToString(); dmsRecordAlarmInfo.AlarmData = WarnStatusEnum.托盘绑定时已喷码数不足40.ToString();
dmsRecordAlarmInfo.HandleSuggest = dmsBaseAlarmRule.HandleSuggest; dmsRecordAlarmInfo.HandleSuggest = dmsBaseAlarmRule.HandleSuggest;
dmsRecordAlarmInfo.CreateBy = "SlnMesnac"; dmsRecordAlarmInfo.CreateBy = "SlnMesnac";
dmsRecordAlarmInfo.CreateTime = DateTime.Now; dmsRecordAlarmInfo.CreateTime = DateTime.Now;
@ -463,18 +475,18 @@ namespace SlnMesnac.Business
catch (Exception ex) catch (Exception ex)
{ {
sqlSugarClient.AsTenant().RollbackTran(); sqlSugarClient.AsTenant().RollbackTran();
_logger.LogError($"PrintLessThan40Alarm异常:{ex.Message}"); _logger.LogError($"PrintLessThan40Alarm异常:{ex.Message}");
} }
} }
/// <summary> /// <summary>
/// 空托盘进入码垛位,读取RFID备用 /// 空托盘进入码垛位,读取RFID备用
/// </summary> /// </summary>
private async void EmptyPalletHandle() private async Task EmptyPalletHandle()
{ {
//读取PLC空托盘流转信号 //读取PLC空托盘流转信号
while (true) while (true)
{ {
try try
@ -482,71 +494,75 @@ namespace SlnMesnac.Business
var plc = base.GetPlcByKey("plc"); var plc = base.GetPlcByKey("plc");
if (plc == null) if (plc == null)
{ {
_logger.LogInformation("读取PLC空托盘码垛到位信号,PLC连接信息为空......"); _logger.LogInformation("读取PLC空托盘码垛到位信号,PLC连接信息为空......");
Thread.Sleep(5000); Thread.Sleep(5000);
continue; continue;
} }
if (!plc.readBoolByAddress(GetPlcAddressByConfigKey("2楼码垛到位信号"))) if (!plc.readBoolByAddress(GetPlcAddressByConfigKey("2楼码垛到位信号")))
{ {
_logger.LogInformation("等待空托盘到位信号触发......"); _logger.LogInformation("等待空托盘到位信号触发......");
Thread.Sleep(5000); Thread.Sleep(5000);
continue; continue;
} }
//读取RFID、获取当前正在执行的计划、将当前计划、工单等信息与托盘绑定 RealPalletTask realPalletTask = _realPalletTaskService.Query().FirstOrDefault();
RefreshMessage("空托盘到位信号触发成功,读取托盘RFID信息"); if (realPalletTask != null)
{
_logger.LogInformation("空托盘到位信号触发,已经有读取托盘，不再读取......");
Thread.Sleep(5000);
continue;
}
//读取RFID、获取当前正在执行的计划、将当前计划、工单等信息与托盘绑定
RefreshMessage("空托盘到位信号触发成功,读取托盘RFID信息");
string epcStr = await ReadEpcStrByRfidKeyAsync("secondFloorPallet"); string epcStr = await ReadEpcStrByRfidKeyAsync("secondFloorPallet");
if (string.IsNullOrEmpty(epcStr)) if (string.IsNullOrEmpty(epcStr))
{ {
_logger.LogError("空托盘到位信号触发,读取RFID失败......"); _logger.LogError("空托盘到位信号触发,读取RFID失败......");
Thread.Sleep(1000*10); Thread.Sleep(1000 * 10);
continue; continue;
} }
RefreshMessage($"空托盘RFID信息读取成功，标签信息：{epcStr}"); RefreshMessage($"空托盘RFID信息读取成功，标签信息：{epcStr}");
// 插入一条托盘记录 // 插入一条托盘记录
RealPalletTask realPalletTask = new RealPalletTask() realPalletTask = new RealPalletTask()
{ {
PalletCode = epcStr, PalletCode = epcStr,
RecordTime = DateTime.Now, RecordTime = DateTime.Now,
}; };
bool result = _realPalletTaskService.Insert(realPalletTask); _realPalletTaskService.Insert(realPalletTask);
if (result)
{
plc.writeBoolByAddress(GetPlcAddressByConfigKey("2楼码垛到位信号"), false);
}
} }
catch (Exception e) catch (Exception e)
{ {
RefreshMessage($"空托盘进入码垛位处理异常：{e.Message}"); RefreshMessage($"空托盘进入码垛位处理异常：{e.Message}");
} }
Thread.Sleep(1000*5); Thread.Sleep(1000 * 10);
} }
} }
/// <summary> /// <summary>
/// 根据条码提取序列 /// 根据条码提取序列
/// </summary> /// </summary>
/// <param name="barCode"></param> /// <param name="barCode"></param>
/// <param name="result"></param> /// <param name="result"></param>
/// <exception cref="InvalidOperationException"></exception> /// <exception cref="InvalidOperationException"></exception>
private void ExtractNumber(string barCode,out int result) private void ExtractNumber(string barCode, out int result)
{ {
string pattern = @"\b0*(\d{1,6})\b$"; string pattern = @"\b0*(\d{1,6})\b$";
Match match = Regex.Match(barCode, pattern); Match match = Regex.Match(barCode, pattern);
if (match.Success) if (match.Success)
{ {
result = Convert.ToInt32(match.Groups[1].Value)+1; result = Convert.ToInt32(match.Groups[1].Value) + 1;
} }
else else
{ {
throw new InvalidOperationException($"通过条码:{barCode}提取当前序列异常:未找到匹配的数字"); throw new InvalidOperationException($"通过条码:{barCode}提取当前序列异常:未找到匹配的数字");
} }
} }

12
SlnMesnac.Business/ProdMgmtBusiness.cs
Unescape Escape View File

@ -84,9 +84,11 @@ namespace SlnMesnac.Business
_mesPrdBarCodeService = serviceProvider.GetRequiredService<IMesPrdBarCodeService>(); _mesPrdBarCodeService = serviceProvider.GetRequiredService<IMesPrdBarCodeService>();
_configInfoBusiness = configInfoBusiness; _configInfoBusiness = configInfoBusiness;
//testRFID();
} }
public void TestTran() public void TestTran()
{ {
try try
@ -127,7 +129,6 @@ namespace SlnMesnac.Business
Console.WriteLine(aaa); Console.WriteLine(aaa);
//RefreshMessage($"投料校验RFID标签读取成功，标签信息：{epcStr}"); //RefreshMessage($"投料校验RFID标签读取成功，标签信息：{epcStr}");
} }
#region 委托事件 #region 委托事件
@ -392,13 +393,16 @@ namespace SlnMesnac.Business
//2.生成小包条码 //2.生成小包条码
GenerateBarcode(40); GenerateBarcode(40);
//BaseConfigInfo configInfo = _configInfoBusiness.GetConfigInfos().Where(x => x.ConfigKey == "系统运行时长").FirstOrDefault();
//configInfo.ConfigValue = "0";
//sqlSugarClient.AsTenant().GetConnection("local").Updateable(configInfo).ExecuteCommand();
//_configInfoBusiness.RefreshConfigInfo();
sqlSugarClient.AsTenant().CommitTran();
//3.清空投料系统运行时间 //3.清空投料系统运行时间
BaseConfigInfo configInfo = _configInfoBusiness.GetConfigInfos().Where(x => x.ConfigKey == "系统运行时长").FirstOrDefault(); BaseConfigInfo configInfo = _configInfoBusiness.GetConfigInfos().Where(x => x.ConfigKey == "系统运行时长").FirstOrDefault();
configInfo.ConfigValue = "0"; configInfo.ConfigValue = "0";
sqlSugarClient.AsTenant().GetConnection("local").Updateable(configInfo).ExecuteCommand(); _configInfoBusiness.UpdateConfigInfo(configInfo);
_configInfoBusiness.RefreshConfigInfo();
sqlSugarClient.AsTenant().CommitTran();
} }
} }

57
SlnMesnac.Model/domain/DmsRealtimeStatus.cs
Unescape Escape View File

@ -0,0 +1,57 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Security.Principal;
using System.Text;
namespace SlnMesnac.Model.domain
{
/// <summary>
/// 设备状态信息
/// </summary>
[SugarTable("dms_realtime_status")]
public class DmsRealtimeStatus
{
/// <summary>
/// 状态ID
/// </summary>
[SugarColumn(ColumnName = "status_id", IsPrimaryKey = true, IsIdentity = true)]
public long StatusId { get; set; }
/// <summary>
/// 设备状态编号
/// </summary>
[SugarColumn(ColumnName = "status_code")]
public string StatusCode { get; set; }
/// <summary>
/// 设备状态名称
/// </summary>
[SugarColumn(ColumnName = "status_name")]
public string StatusName { get; set; }
/// <summary>
/// 设备状态值
/// </summary>
[SugarColumn(ColumnName = "status_value")]
public string StatusValue { get; set; }
/// <summary>
/// 所属设备id
/// </summary>
[SugarColumn(ColumnName = "device_id")]
public long? DeviceId { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "creat_time")]
public DateTime? CreatTime { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(ColumnName = "update_time")]
public DateTime? UpdateTime { get; set; }
}
}

69
SlnMesnac.Model/domain/DmsRealtimeStatusHistory.cs
Unescape Escape View File

@ -0,0 +1,69 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Security.Principal;
using System.Text;
namespace SlnMesnac.Model.domain
{
/// <summary>
/// 设备状态历史记录
/// </summary>
[SugarTable("dms_realtime_status_history")]
public class DmsRealtimeStatusHistory
{
/// <summary>
/// 历史记录ID
/// </summary>
[SugarColumn(ColumnName = "history_id", IsPrimaryKey = true, IsIdentity = true)]
public long HistoryId { get; set; }
/// <summary>
/// 状态ID
/// </summary>
[SugarColumn(ColumnName = "status_id")]
public long StatusId { get; set; }
/// <summary>
/// 设备状态编号
/// </summary>
[SugarColumn(ColumnName = "status_code")]
public string StatusCode { get; set; }
/// <summary>
/// 设备状态名称
/// </summary>
[SugarColumn(ColumnName = "status_name")]
public string StatusName { get; set; }
/// <summary>
/// 设备状态值
/// </summary>
[SugarColumn(ColumnName = "status_value")]
public string StatusValue { get; set; }
/// <summary>
/// 所属设备id
/// </summary>
[SugarColumn(ColumnName = "device_id")]
public long? DeviceId { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "creat_time")]
public DateTime? CreatTime { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(ColumnName = "update_time")]
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 同步时间
/// </summary>
[SugarColumn(ColumnName = "sync_time")]
public DateTime SyncTime { get; set; }
}
}

34
SlnMesnac.Model/dto/DmsRealTimeDto.cs
Unescape Escape View File

@ -0,0 +1,34 @@
using System;
#region << 版 本 注 释 >>
/*--------------------------------------------------------------------
* 版权所有 (c) 2024 WenJY 保留所有权利。
* CLR版本：4.0.30319.42000
* 机器名称：LAPTOP-E0N2L34V
* 命名空间：SlnMesnac.Model.dto
* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82
*
* 创建者：WenJY
* 电子邮箱：wenjy@mesnac.com
* 创建时间：2024-03-27 21:58:35
* 版本：V1.0.0
* 描述：
*
*--------------------------------------------------------------------
* 修改人：
* 时间：
* 修改说明：
*
* 版本：V1.0.0
*--------------------------------------------------------------------*/
#endregion << 版 本 注 释 >>
namespace SlnMesnac.Model.dto
{
/// <summary>
/// 采集设备状态
/// </summary>
public class DmsRealTimeDto
{
}
}

4
SlnMesnac.Repository/service/Impl/MesProductPlanServiceImpl.cs
Unescape Escape View File

@ -121,7 +121,9 @@ namespace SlnMesnac.Repository.service.Impl
} }
catch (Exception e) catch (Exception e)
{ {
throw new InvalidOperationException($"获取已开始的第一条生产计划异常：{e.Message}"); productPlanDto = null;
return null;
//throw new InvalidOperationException($"获取已开始的第一条生产计划异常：{e.Message}");
} }
} }

4
SlnMesnac.WPF/Dto/MachineStatusDto.cs
Unescape Escape View File

@ -17,9 +17,11 @@ namespace SlnMesnac.WPF.Dto
//设备运行状态 //设备运行状态
public bool status { get; set; } public bool status { get; set; }
//报警类型 //报警类型
public WarnStatusEnum warnStatus { get; set; } = WarnStatusEnum.无报警; public WarnStatusEnum warnStatus { get; set; } = WarnStatusEnum.无报警;
//设备实时状态采集点
// public List<> realTimeList { get; set; }
} }

11
SlnMesnac.WPF/Page/DevMonitorPage.xaml
Unescape Escape View File

@ -18,12 +18,17 @@
<Grid > <Grid >
<StackPanel VerticalAlignment="Center" Orientation="Horizontal" > <StackPanel VerticalAlignment="Center" Orientation="Horizontal" >
<TextBlock Text="包装袋余量:" FontSize="25" VerticalAlignment="Center" Width="140" Margin="0,0,20,0" Foreground="White" HorizontalAlignment="Left"/> <TextBlock Text="缓存区重量:" FontSize="25" VerticalAlignment="Center" Width="140" Margin="0,0,20,0" Foreground="White" HorizontalAlignment="Left"/>
<TextBlock x:Name="BagsAmountTxt" Text="0" Width="80" FontSize="25" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/> <TextBlock x:Name="BufferWeightTxt" Text="0" Width="80" FontSize="25" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
<Button x:Name="AmountChangeButton" Style="{StaticResource BUTTON_AGREE}" Content="数量调整" FontSize="30" Background="Blue" Width="180" Height="60" Margin="0 0 20 0" HorizontalAlignment="Left" Click="AmountChangeButton_Click"/> <Button x:Name="SetStopWeightButton" Style="{StaticResource BUTTON_AGREE}" Content="设置重量阈值" FontSize="30" Background="CadetBlue" Width="200" Height="60" Margin="0 0 20 0" HorizontalAlignment="Left" Click="SetStopWeightButton_Click" />
<Button x:Name="StartButton" Style="{StaticResource BUTTON_AGREE}" Content="一键启动" FontSize="30" Background="LimeGreen" Width="180" Height="60" Margin="180 0 20 0" Click="StartButton_Click"/> <Button x:Name="StartButton" Style="{StaticResource BUTTON_AGREE}" Content="一键启动" FontSize="30" Background="LimeGreen" Width="180" Height="60" Margin="180 0 20 0" Click="StartButton_Click"/>
<Button x:Name="StopButton" Style="{StaticResource BUTTON_AGREE}" Content="一键停止" FontSize="30" Background="OrangeRed" Width="180" Height="60" Margin="0,0,20,0" Click="StopButton_Click"/> <Button x:Name="StopButton" Style="{StaticResource BUTTON_AGREE}" Content="一键停止" FontSize="30" Background="OrangeRed" Width="180" Height="60" Margin="0,0,20,0" Click="StopButton_Click"/>
<Button x:Name="StopUrgentButton" Style="{StaticResource BUTTON_AGREE}" Content="急停" FontSize="30" Background="#E4B74C" Width="150" Height="60" Margin="0,0,0,0" Click="StopUrgentButton_Click"/> <Button x:Name="StopUrgentButton" Style="{StaticResource BUTTON_AGREE}" Content="急停" FontSize="30" Background="#E4B74C" Width="150" Height="60" Margin="0,0,0,0" Click="StopUrgentButton_Click"/>
<TextBlock Text="包装袋余量:" FontSize="25" VerticalAlignment="Center" Width="140" Margin="200,0,20,0" Foreground="White" HorizontalAlignment="Left"/>
<TextBlock x:Name="BagsAmountTxt" Text="0" Width="80" FontSize="25" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
<Button x:Name="AmountChangeButton" Style="{StaticResource BUTTON_AGREE}" Content="数量调整" FontSize="30" Background="CadetBlue" Width="180" Height="60" Margin="0 0 20 0" HorizontalAlignment="Left" Click="AmountChangeButton_Click"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>

42
SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
Unescape Escape View File

@ -151,6 +151,13 @@ namespace SlnMesnac.WPF.Page
RefreshHot(machineStatusDtos); RefreshHot(machineStatusDtos);
RefreshUnPack(machineStatusDtos); RefreshUnPack(machineStatusDtos);
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
BagsAmountTxt.Text = _configInfoBusiness.GetConfigInfos().FirstOrDefault(x => x.ConfigKey == "包装袋余量").ConfigValue;
BufferWeightTxt.Text = recipeManageCache.BufferWeight.ToString("F2");
}));
//开关机时间采集 //开关机时间采集
machineStatusDtos.ForEach(x => OeeCollection(x)); machineStatusDtos.ForEach(x => OeeCollection(x));
//报警采集 //报警采集
@ -164,10 +171,7 @@ namespace SlnMesnac.WPF.Page
Thread.Sleep(1000 * 30); Thread.Sleep(1000 * 30);
} }
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
BagsAmountTxt.Text = _configInfoBusiness.GetConfigInfos().FirstOrDefault(x => x.ConfigKey == "包装袋余量").ConfigValue;
}));
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -370,6 +374,9 @@ namespace SlnMesnac.WPF.Page
if (warnStatusEnum == WarnStatusEnum.拆包机堵料停螺旋) if (warnStatusEnum == WarnStatusEnum.拆包机堵料停螺旋)
{ {
return 0; return 0;
}else if(warnStatusEnum == WarnStatusEnum.烘干机烘干温度超温 || warnStatusEnum == WarnStatusEnum.烘干机温控模块通讯超时)
{ // 不停
return -1;
} }
else if (warnStatusEnum.ToString().Contains("烘干机")) else if (warnStatusEnum.ToString().Contains("烘干机"))
{ {
@ -615,15 +622,14 @@ namespace SlnMesnac.WPF.Page
} }
else else
{ {
return false; recipeManageCache.useRecipeManage.RecipeName = targetRecipet.RecipeName;
recipeManageCache.RecipeMode = "手动模式";
return true;
} }
} }
#endregion #endregion
#region 设备启动、停止 #region 设备启动、停止
/// <summary> /// <summary>
@ -792,13 +798,14 @@ namespace SlnMesnac.WPF.Page
} }
#region 烘干机 #region 烘干机
SendPulseSignal("烘干机螺旋停止");
if(stopLevel < 2) return result;
Thread.Sleep(MachineSleep);
SendPulseSignal("烘干机燃烧停止"); SendPulseSignal("烘干机燃烧停止");
if (stopLevel < 3) return result; if (stopLevel < 3) return result;
Thread.Sleep(MachineSleep);
SendPulseSignal("烘干机螺旋停止");
if (stopLevel < 2) return result;
Thread.Sleep(MachineSleep); Thread.Sleep(MachineSleep);
SendPulseSignal("烘干机风机停止"); SendPulseSignal("烘干机风机停止");
#endregion #endregion
@ -1560,6 +1567,8 @@ namespace SlnMesnac.WPF.Page
})); }));
//数据采集部分
MachineStatusDto machineStatusDto = new MachineStatusDto(); MachineStatusDto machineStatusDto = new MachineStatusDto();
machineStatusDto.deviceId = 1016; machineStatusDto.deviceId = 1016;
machineStatusDto.status = unPackStatus1; machineStatusDto.status = unPackStatus1;
@ -1875,6 +1884,8 @@ namespace SlnMesnac.WPF.Page
#region 设备管理界面螺旋频率设定--暂未启用 #region 设备管理界面螺旋频率设定--暂未启用
///// <summary> ///// <summary>
@ -2067,7 +2078,10 @@ namespace SlnMesnac.WPF.Page
//} //}
#endregion #endregion
private void SetStopWeightButton_Click(object sender, RoutedEventArgs e)
{
InputDialogWindow window = new InputDialogWindow();
window.ShowDialog();
}
} }
} }

26
SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml
Unescape Escape View File

@ -0,0 +1,26 @@
<Window x:Class="SlnMesnac.WPF.Page.InputDialogWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SlnMesnac.WPF.Page"
mc:Ignorable="d"
Title="重量设置" Height="300" Width="700" WindowStartupLocation="CenterScreen" Topmost="True" Background="Transparent">
<Border Margin="5" Background="Transparent" CornerRadius="10">
<Border.Effect>
<DropShadowEffect Color="LightGoldenrodYellow" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect>
<Grid>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
<TextBlock Text="最大重量阈值:" FontSize="25" VerticalAlignment="Center" Width="200" Margin="0,0,20,0" Foreground="White" HorizontalAlignment="Left"/>
<TextBlock x:Name="BagsAmountTxt" Text="1222" Width="80" FontSize="25" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
<Button x:Name="AmountChangeButton" Style="{StaticResource BUTTON_AGREE}" Content="数量调整" FontSize="30" Background="CadetBlue" Width="180" Height="60" Margin="0 0 20 0" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Margin="80 150 0 0" VerticalAlignment="Center" >
<TextBlock Text="提示信息: 缓存区重量超过该值，设备将会停止！" FontSize="25" Width="600" Margin="0,0,20,0" Foreground="White" HorizontalAlignment="Left"/>
</StackPanel>
</Grid>
</Border>
</Window>

38
SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml.cs
Unescape Escape View File

@ -0,0 +1,38 @@
using Microsoft.Extensions.DependencyInjection;
using Quartz.Util;
using SlnMesnac.Business;
using SlnMesnac.Model.domain;
using SlnMesnac.WPF.Model;
using SlnMesnac.WPF.ViewModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace SlnMesnac.WPF.Page
{
/// <summary>
///
/// </summary>
public partial class InputDialogWindow : Window
{
private RecipeManageCache recipeManageCache = RecipeManageCache.Instance;
public InputDialogWindow()
{
InitializeComponent();
}
}
}

3
SlnMesnac.WPF/SlnMesnac.WPF.csproj
Unescape Escape View File

@ -48,6 +48,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Page\Window\InputDialogWindow.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="Page\Window\RecipeModeSetWindow.xaml.cs"> <Compile Update="Page\Window\RecipeModeSetWindow.xaml.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

2
SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs
Unescape Escape View File

@ -192,7 +192,7 @@ namespace SlnMesnac.WPF.ViewModel
Task.Run(() => Task.Run(() =>
{ {
_prodCompletionBusiness.PrintMessageToListBoxEvent += PrintMessageToListBox; _prodCompletionBusiness.PrintMessageToListBoxEvent += PrintMessageToListBox;
_prodCompletionBusiness.Init(); // _prodCompletionBusiness.Init();
}); });
} }

10
SlnMesnac.WPF/appsettings.json
Unescape Escape View File

@ -38,9 +38,9 @@
{ {
"configId": 1, "configId": 1,
"plcType": "SiemensPlc", "plcType": "SiemensPlc",
// "plcIp": "192.168.2.220", "plcIp": "192.168.2.220",
"plcIp": "127.0.0.1", // "plcIp": "127.0.0.1",
"plcPort": 103, "plcPort": 102,
"plcKey": "plc", "plcKey": "plc",
"isFlage": true "isFlage": true
}, },
@ -60,7 +60,7 @@
"equipIp": "192.168.2.27", "equipIp": "192.168.2.27",
"equipPort": 20108, "equipPort": 20108,
"equipKey": "secondFloorPallet", "equipKey": "secondFloorPallet",
"isFlage": false "isFlage": true
}, },
{ {
// 小包出口位RFID // 小包出口位RFID
@ -68,7 +68,7 @@
"equipIp": "192.168.2.28", "equipIp": "192.168.2.28",
"equipPort": 20108, "equipPort": 20108,
"equipKey": "secondFloorOut", "equipKey": "secondFloorOut",
"isFlage": false "isFlage": true
} }
] ]
//"redisConfig": "175.27.215.92:6379,password=redis@2023" //"redisConfig": "175.27.215.92:6379,password=redis@2023"

Write Preview
Loading…
Cancel
Save