From 2ef8eda1ea4ef302d86dff34d722da0cce950eff Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 09 12月 2024 16:34:02 +0800
Subject: [PATCH] 1
---
SDA/iWareSda/Devices/4-Station/StationService/StationService.cs | 142 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 129 insertions(+), 13 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs b/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
index dc11237..743998f 100644
--- a/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
@@ -1,5 +1,6 @@
锘縰sing iWareCommon.Utils;
using iWareModel;
+using iWareSda.Model;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -188,6 +189,22 @@
}
var Station = (StationResult.resData as StationEntity).View;
return Station;
+ }
+
+ /// <summary>
+ /// 鑾峰彇褰撳墠姝ｅ湪鎶ヨ鐨勬姤璀﹀垪琛�
+ /// </summary>
+ /// <param name="deviceId"></param>
+ /// <returns></returns>
+ public List<DeviceWarningInfo> GetWaringInfoList(int deviceId, List<WmsConfigDeviceWarning> configDeviceWarningList)
+ {
+ var StationResult = Station_CacheEntity.GetDeviceObj(deviceId);
+ if (!StationResult.result)
+ {
+ return null;
+ }
+ var waringList = (StationResult.resData as StationEntity).GetStationAlertDatas(configDeviceWarningList);
+ return waringList;
}
@@ -405,9 +422,41 @@
}
}
+ /// <summary>
+ /// 鍐橮LC bool
+ /// </summary>
+ /// <param name="deviceId"></param>
+ /// <param name="dbAddress"></param>
+ /// <param name="value"></param>
+ /// <returns></returns>
+ public SdaResEntity WriteBoolPlcData(int deviceId, string dbAddress, bool value)
+ {
+ SdaResEntity _SdaResEntity = new SdaResEntity();
+ try
+ {
+ var StationResult = Station_CacheEntity.GetDeviceObj(deviceId);
+ if (!StationResult.result)
+ {
+ return StationResult;
+ }
+ var Station = StationResult.resData as StationEntity;
+
+ string msg = "";
+ var result = Station.WriteBoolPlcData(dbAddress, value, out msg);
+ _SdaResEntity.result = result;
+ _SdaResEntity.resMsg = msg;
+ return _SdaResEntity;
+ }
+ catch (Exception ex)
+ {
+ _SdaResEntity.result = false;
+ _SdaResEntity.resMsg = ex.Message;
+ return _SdaResEntity;
+ }
+ }
/// <summary>
- /// 鍐欏叆榻愬缁撴灉
+ /// 鍐欏叆榻愬缁撴灉銆佽В鏋愮粨鏋�
/// </summary>
/// <param name="deviceId"></param>
/// <param name="value"></param>
@@ -476,7 +525,7 @@
/// <param name="deviceId"></param>
/// <param name="value"></param>
/// <returns></returns>
- public SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode)
+ public SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode, bool isClearData)
{
SdaResEntity _SdaResEntity = new SdaResEntity();
try
@@ -489,7 +538,7 @@
var Station = StationResult.resData as StationEntity;
string msg = "";
- var result = Station.OutboundFinishConfirm(stationCode, value, out msg);
+ var result = Station.OutboundFinishConfirm(stationCode, value, out msg, isClearData);
_SdaResEntity.result = result;
_SdaResEntity.resMsg = msg;
return _SdaResEntity;
@@ -572,7 +621,7 @@
/// <param name="deviceId"></param>
/// <param name="value"></param>
/// <returns></returns>
- public SdaResEntity WritePalletizingTaskInfo(int deviceId, string stationCode,int taskID, short length, short width, short height,short rotate,short toplace,short placeX,short placeY, short placeZ,short lastnum)
+ public SdaResEntity WritePalletizingTaskInfo(int deviceId, string stationCode, int taskID, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ, short lastnum)
{
SdaResEntity _SdaResEntity = new SdaResEntity();
try
@@ -585,7 +634,7 @@
var Station = StationResult.resData as StationEntity;
string msg = "";
- var result = Station.WritePalletizingTaskInfo(stationCode, taskID, length, width, height,rotate,toplace,placeX,placeY,placeZ,lastnum ,out msg);
+ var result = Station.WritePalletizingTaskInfo(stationCode, taskID, length, width, height, rotate, toplace, placeX, placeY, placeZ, lastnum, out msg);
_SdaResEntity.result = result;
_SdaResEntity.resMsg = msg;
return _SdaResEntity;
@@ -628,14 +677,14 @@
return _SdaResEntity;
}
}
-
+
/// <summary>
/// 鍐欏叆鍚堝寘浠诲姟淇℃伅
/// </summary>
/// <param name="deviceId"></param>
/// <param name="value"></param>
/// <returns></returns>
- public SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, int taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey)
+ public SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey)
{
SdaResEntity _SdaResEntity = new SdaResEntity();
try
@@ -648,7 +697,7 @@
var Station = StationResult.resData as StationEntity;
string msg = "";
- var result = Station.WriteSurroundTaskInfo(stationCode, taskID, length, width, cartonhigh, cartonwidth, placex, placey, out msg);
+ var result = Station.WriteSurroundTaskInfo(stationCode, taskID, length, width, cartonhigh, cartonwidth, placex, placey, out msg);
_SdaResEntity.result = result;
_SdaResEntity.resMsg = msg;
return _SdaResEntity;
@@ -716,15 +765,15 @@
return _SdaResEntity;
}
}
+
/// <summary>
- /// 鍐欏叆鍑哄簱浠诲姟淇℃伅
+ /// 鍐欏叆 琛ユ澘宸ヤ綅鍏佽杩涙澘
/// </summary>
/// <param name="deviceId"></param>
+ /// <param name="value"></param>
/// <param name="stationCode"></param>
- /// <param name="sourcePlaceNo"></param>
- /// <param name="outbound_TaskID"></param>
/// <returns></returns>
- public SdaResEntity WriteOutStoreTaskInfo(int deviceId, string stationCode, string sourcePlaceNo, int outbound_TaskID)
+ public SdaResEntity WriteStation_AllowIn(int deviceId, bool value, string stationCode)
{
SdaResEntity _SdaResEntity = new SdaResEntity();
try
@@ -737,7 +786,74 @@
var Station = StationResult.resData as StationEntity;
string msg = "";
- var result = Station.WriteOutStoreTaskInfo(stationCode, sourcePlaceNo, out msg, outbound_TaskID);
+ var result = Station.WriteStation_AllowIn(stationCode, value, out msg);
+ _SdaResEntity.result = result;
+ _SdaResEntity.resMsg = msg;
+ return _SdaResEntity;
+ }
+ catch (Exception ex)
+ {
+ _SdaResEntity.result = false;
+ _SdaResEntity.resMsg = ex.Message;
+ return _SdaResEntity;
+ }
+ }
+
+ /// <summary>
+ /// 鍐欏叆 浜哄伐鏀捐
+ /// </summary>
+ /// <param name="deviceId"></param>
+ /// <param name="value"></param>
+ /// <param name="stationCode"></param>
+ /// <returns></returns>
+ public SdaResEntity WriteStation_PersonAllow(int deviceId, bool value, string stationCode)
+ {
+ SdaResEntity _SdaResEntity = new SdaResEntity();
+ try
+ {
+ var StationResult = Station_CacheEntity.GetDeviceObj(deviceId);
+ if (!StationResult.result)
+ {
+ return StationResult;
+ }
+ var Station = StationResult.resData as StationEntity;
+
+ string msg = "";
+ var result = Station.WriteStation_PersonAllow(stationCode, value, out msg);
+ _SdaResEntity.result = result;
+ _SdaResEntity.resMsg = msg;
+ return _SdaResEntity;
+ }
+ catch (Exception ex)
+ {
+ _SdaResEntity.result = false;
+ _SdaResEntity.resMsg = ex.Message;
+ return _SdaResEntity;
+ }
+ }
+
+ /// <summary>
+ /// 鍐欏叆鍑哄簱浠诲姟淇℃伅
+ /// </summary>
+ /// <param name="deviceId"></param>
+ /// <param name="stationCode"></param>
+ /// <param name="sourcePlaceNo"></param>
+ /// <param name="outbound_TaskID"></param>
+ /// <returns></returns>
+ public SdaResEntity WriteOutStoreTaskInfo(bool isResetData, int deviceId, string stationCode, string sourcePlaceNo, int outbound_TaskID)
+ {
+ SdaResEntity _SdaResEntity = new SdaResEntity();
+ try
+ {
+ var StationResult = Station_CacheEntity.GetDeviceObj(deviceId);
+ if (!StationResult.result)
+ {
+ return StationResult;
+ }
+ var Station = StationResult.resData as StationEntity;
+
+ string msg = "";
+ var result = Station.WriteOutStoreTaskInfo(isResetData, stationCode, sourcePlaceNo, out msg, outbound_TaskID);
_SdaResEntity.result = result;
_SdaResEntity.resMsg = msg;
return _SdaResEntity;
--
Gitblit v1.9.3