Skip to content

张东亮 / SO1057-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit b0174c0e 由 张东亮
选项

临时出库不影响料串口

1 个父辈 e747d3a2
内嵌 并排
正在显示 6 个修改的文件 包含 58 行增加 和 25 行删除
source/Common/bean/Bean.cs
...@@ -281,5 +281,6 @@ namespace OnlineStore.Common ...@@ -281,5 +281,6 @@ namespace OnlineStore.Common
/// 温湿度列表 /// 温湿度列表
/// </summary> /// </summary>
public static string humiAndtempList = "humiAndtempList"; public static string humiAndtempList = "humiAndtempList";
public static string singleOut = "singleOut";
} }
} }
source/Common/util/AcSerialBean.cs
...@@ -306,7 +306,7 @@ namespace OnlineStore.Common ...@@ -306,7 +306,7 @@ namespace OnlineStore.Common
} }
if (num >= Overtime) if (num >= Overtime)
{ {
LogUtil.error(PortName + " 发送数据" + ByteToString(SendData) + "等待接受数据超时"); //LogUtil.error(PortName + " 发送数据" + ByteToString(SendData) + "等待接受数据超时");
} }
if (_serialPort.BytesToRead >= ReceiveData.Length) if (_serialPort.BytesToRead >= ReceiveData.Length)
{ {
...@@ -390,7 +390,7 @@ namespace OnlineStore.Common ...@@ -390,7 +390,7 @@ namespace OnlineStore.Common
} }
if (num >= Overtime) if (num >= Overtime)
{ {
LogUtil.error(PortName + " 发送数据" + ByteToString(SendData) + "等待接受数据超时"); // LogUtil.error(PortName + " 发送数据" + ByteToString(SendData) + "等待接受数据超时");
} }
if (_serialPort.BytesToRead >= ReceiveData.Length) if (_serialPort.BytesToRead >= ReceiveData.Length)
{ {
......
source/DeviceLibrary/manager/model/InOutParam.cs
...@@ -133,10 +133,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -133,10 +133,13 @@ namespace OnlineStore.DeviceLibrary
public bool singleOut = false; public bool singleOut = false;
public string ToStr() public string ToStr()
{ {
return " [" + barcode + "] [" + PosId + "] [" + PlateW + "x" + PlateH + "]"+ $",hSerial[{hSerial}]" +$",isNg[{IsNG}],NgMsg[{NgMsg}]"+ "，urgentReel [" + urgentReel return " [" + barcode + "] [" + PosId + "] [" + PlateW + "x" + PlateH + "]"+ $",hSerial[{hSerial}]" +$",isNg[{IsNG}],NgMsg[{NgMsg}]"+ ",singleOut[" + singleOut + "]";
}
public string ToStr1()
{
return " [" + barcode + "] [" + PosId + "] [" + PlateW + "x" + PlateH + "]" + $",hSerial[{hSerial}]" + $",isNg[{IsNG}],NgMsg[{NgMsg}]" + "，urgentReel [" + urgentReel
+ "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "],singleOut[" + singleOut + "]"; + "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "],singleOut[" + singleOut + "]";
} }
public bool IsNG { get; set; } = false; public bool IsNG { get; set; } = false;
public string NgMsg { get; set; } = ""; public string NgMsg { get; set; } = "";
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_ConnectServerTimer.cs
...@@ -73,7 +73,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -73,7 +73,7 @@ namespace OnlineStore.DeviceLibrary
isInProcess = false; isInProcess = false;
} }
} }
public bool SendStoreState(string posid,string barcode,DeviceStatus storeStatus) public bool SendStoreState(string posid, string barcode, DeviceStatus storeStatus)
{ {
if (Monitor.TryEnter(serverLoc)) if (Monitor.TryEnter(serverLoc))
{ {
...@@ -98,7 +98,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -98,7 +98,7 @@ namespace OnlineStore.DeviceLibrary
operation.boxStatus[1].status = (int)storeStatus; operation.boxStatus[1].status = (int)storeStatus;
LogUtil.info(JsonHelper.SerializeObject(operation)); LogUtil.info(JsonHelper.SerializeObject(operation));
Operation resultOperation = HttpHelper.Post(SServerManager.GetPostApi(server), operation, false); Operation resultOperation = HttpHelper.Post(SServerManager.GetPostApi(server), operation, false);
if(resultOperation != null) if (resultOperation != null)
{ {
if (operation.seq == resultOperation.seq) if (operation.seq == resultOperation.seq)
{ {
...@@ -140,7 +140,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -140,7 +140,7 @@ namespace OnlineStore.DeviceLibrary
if (WarnMsg != "") if (WarnMsg != "")
{ {
lineOperation.status = (int)DeviceStatus.Warning; lineOperation.status = (int)DeviceStatus.Warning;
lineOperation.msg =$"W={WarnMsg}"; lineOperation.msg = $"W={WarnMsg}";
} }
lineOperation.status = (int)DeviceStatus.StoreOnline; lineOperation.status = (int)DeviceStatus.StoreOnline;
...@@ -362,9 +362,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -362,9 +362,11 @@ namespace OnlineStore.DeviceLibrary
//int taskCount = FormUtil.GetIntData(data, ParamDefine.taskCount, 0); //int taskCount = FormUtil.GetIntData(data, ParamDefine.taskCount, 0);
string hSerials = ""; string hSerials = "";
bool singleOut = false;
if (data.ContainsKey(ParamDefine.hSerial)) if (data.ContainsKey(ParamDefine.hSerial))
hSerials = data[ParamDefine.hSerial]; hSerials = data[ParamDefine.hSerial];
if (data.ContainsKey(ParamDefine.singleOut))
bool.TryParse(data[ParamDefine.singleOut], out singleOut);
//urgentReel: true 表示紧急料,需要出到料串上 //urgentReel: true 表示紧急料,需要出到料串上
//cutReel: true 表示分盘料,需要出到料串上 //cutReel: true 表示分盘料,需要出到料串上
//smallReel: true 小料(7x8),放置到小料架上 //smallReel: true 小料(7x8),放置到小料架上
...@@ -383,6 +385,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -383,6 +385,7 @@ namespace OnlineStore.DeviceLibrary
InOutParam inoutParam = new InOutParam(new InOutPosInfo(barcode, posId, plateW, plateH, urgentReel)); InOutParam inoutParam = new InOutParam(new InOutPosInfo(barcode, posId, plateW, plateH, urgentReel));
inoutParam.PosInfo.hSerial = hSerials; inoutParam.PosInfo.hSerial = hSerials;
inoutParam.PosInfo.singleOut = singleOut;
//根据发送的posId获取位置列表 //根据发送的posId获取位置列表
BoxPosition position = CSVPositionReader<BoxPosition>.GetPositon(posId); BoxPosition position = CSVPositionReader<BoxPosition>.GetPositon(posId);
if (position == null) if (position == null)
...@@ -405,7 +408,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -405,7 +408,7 @@ namespace OnlineStore.DeviceLibrary
//判断排队列表中是否已存在 //判断排队列表中是否已存在
List<InOutParam> reviceList = new List<InOutParam>(); List<InOutParam> reviceList = new List<InOutParam>();
reviceList.AddRange(waitAOutStoreList); reviceList.AddRange(waitAOutStoreList);
// reviceList.AddRange(waitBOutStoreList); // reviceList.AddRange(waitBOutStoreList);
reviceList = (from m in reviceList where m.PosInfo.PosId.Equals(posId) select m).ToList<InOutParam>(); reviceList = (from m in reviceList where m.PosInfo.PosId.Equals(posId) select m).ToList<InOutParam>();
if (reviceList.Count > 0) if (reviceList.Count > 0)
{ {
......
source/DeviceLibrary/storeBean/boxBean/Humiture/HumitureController.cs
...@@ -218,7 +218,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -218,7 +218,7 @@ namespace OnlineStore.DeviceLibrary
sendData[7] = 0x00; sendData[7] = 0x00;
sendData = buildCheckData(sendData, sendData.Length - 2); sendData = buildCheckData(sendData, sendData.Length - 2);
string str = AcSerialBean.byteToHexStr(sendData); string str = AcSerialBean.byteToHexStr(sendData);
LogUtil.debug("温湿度控制器发送数据：" + str); //LogUtil.debug("温湿度控制器发送数据：" + str);
byte[] reviceData = new byte[9]; byte[] reviceData = new byte[9];
bool isOk = false; bool isOk = false;
sb.SendCommand(sendData, ref reviceData, 100, out isOk); sb.SendCommand(sendData, ref reviceData, 100, out isOk);
...@@ -255,7 +255,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -255,7 +255,7 @@ namespace OnlineStore.DeviceLibrary
sendData[7] = 0x00; sendData[7] = 0x00;
sendData = buildCheckData(sendData, sendData.Length - 2); sendData = buildCheckData(sendData, sendData.Length - 2);
string str = AcSerialBean.byteToHexStr(sendData); string str = AcSerialBean.byteToHexStr(sendData);
LogUtil.debug("温湿度控制器发送数据：" + str); // LogUtil.debug("温湿度控制器发送数据：" + str);
byte[] reviceData = new byte[9]; byte[] reviceData = new byte[9];
bool isOk = false; bool isOk = false;
sb.SendCommand(sendData, ref reviceData, 100, out isOk); sb.SendCommand(sendData, ref reviceData, 100, out isOk);
...@@ -279,7 +279,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -279,7 +279,7 @@ namespace OnlineStore.DeviceLibrary
sendData[7] = 0x00; sendData[7] = 0x00;
sendData = buildCheckData(sendData, sendData.Length - 2); sendData = buildCheckData(sendData, sendData.Length - 2);
string str = AcSerialBean.byteToHexStr(sendData); string str = AcSerialBean.byteToHexStr(sendData);
LogUtil.debug("温湿度控制器发送数据：" + str); //LogUtil.debug("温湿度控制器发送数据：" + str);
byte[] reviceData = new byte[9]; byte[] reviceData = new byte[9];
bool isOk = false; bool isOk = false;
sb.SendCommand(sendData, ref reviceData, 100, out isOk); sb.SendCommand(sendData, ref reviceData, 100, out isOk);
...@@ -304,7 +304,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -304,7 +304,7 @@ namespace OnlineStore.DeviceLibrary
sendData[7] = 0x00; sendData[7] = 0x00;
sendData = buildCheckData(sendData, sendData.Length - 2); sendData = buildCheckData(sendData, sendData.Length - 2);
string str = AcSerialBean.byteToHexStr(sendData); string str = AcSerialBean.byteToHexStr(sendData);
LogUtil.debug("温湿度控制器发送数据：" + str); //LogUtil.debug("温湿度控制器发送数据：" + str);
byte[] reviceData = new byte[15]; byte[] reviceData = new byte[15];
bool isOk = false; bool isOk = false;
sb.SendCommand(sendData, ref reviceData, 100, out isOk); sb.SendCommand(sendData, ref reviceData, 100, out isOk);
......
source/DeviceLibrary/storeBean/inputBean/InputEquip.cs
using Asa; using Asa;
using HuichuanLibrary; using HuichuanLibrary;
using log4net.Util;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -582,23 +584,32 @@ namespace OnlineStore.DeviceLibrary ...@@ -582,23 +584,32 @@ namespace OnlineStore.DeviceLibrary
{ {
InOutParam param = new InOutParam(posInfo.ToCopy()); InOutParam param = new InOutParam(posInfo.ToCopy());
LogInfo($"{posType} 紧急物料{param.PosInfo.ToStr()}，准备出库到紧急箱"); LogInfo($"{posType} 紧急物料{param.PosInfo.ToStr()}，准备出库到紧急箱");
StartOutstore(param); return StartOutstore(param);
return true;
} }
else if (posInfo.IsNG) else if (posInfo.IsNG)
{ {
InOutParam param = new InOutParam(posInfo.ToCopy()); InOutParam param = new InOutParam(posInfo.ToCopy());
LogInfo($"{posType}物料{param.PosInfo.ToStr()}，准备出库到NG箱"); LogInfo($"{posType}物料{param.PosInfo.ToStr()}，准备出库到NG箱");
StartOutstore(param); return StartOutstore(param);
return true;
} }
} }
if (!posInfo.IsNG && string.IsNullOrEmpty(posInfo.hSerial))
{
return false;
}
else if(posInfo.IsNG)
{
return false;
}
else if (posInfo.singleOut)
{
return false;
}
foreach (BatchMoveBean moveBean in BatchMoveList) foreach (BatchMoveBean moveBean in BatchMoveList)
{ {
if (moveBean.MoveInfo.MoveType.Equals(MoveType.Reset) || moveBean.MoveInfo.MoveType.Equals(MoveType.RHome)) if (moveBean.MoveInfo.MoveType.Equals(MoveType.Reset) || moveBean.MoveInfo.MoveType.Equals(MoveType.RHome))
continue; continue;
LogUtil.debug($"{moveBean.Name} CheckStartOutPos 处理"); //LogUtil.debug($"{moveBean.Name} CheckStartOutPos 处理");
var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial ?? ""; var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial ?? "";
if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial) if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial)
{ {
...@@ -615,8 +626,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -615,8 +626,10 @@ namespace OnlineStore.DeviceLibrary
{ {
InOutParam param = new InOutParam(posInfo.ToCopy()); InOutParam param = new InOutParam(posInfo.ToCopy());
param.ShelfType = moveBean.ShelfType; param.ShelfType = moveBean.ShelfType;
LogInfo($"{posType}物料{param.PosInfo.ToStr()}，准备出库到料串{param.ShelfType}"); if(StartOutstore(param))
StartOutstore(param); {
LogInfo($"{posType}物料{param.PosInfo.ToStr()}，准备出库到料串{param.ShelfType}");
}
return true; return true;
} }
if (moveBean.MoveInfo.MoveType == MoveType.None) if (moveBean.MoveInfo.MoveType == MoveType.None)
...@@ -659,7 +672,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -659,7 +672,18 @@ namespace OnlineStore.DeviceLibrary
return true; return true;
} }
} }
if (!posInfo.IsNG && string.IsNullOrEmpty(posInfo.hSerial))
{
return false;
}
else if (posInfo.IsNG)
{
return false;
}
else if(posInfo.singleOut)
{
return false;
}
foreach (BatchMoveBean moveBean in BatchMoveList) foreach (BatchMoveBean moveBean in BatchMoveList)
{ {
// LogUtil.debug($"{moveBean.Name} CheckStartOutPos {moveBean.MoveInfo.MoveType}"); // LogUtil.debug($"{moveBean.Name} CheckStartOutPos {moveBean.MoveInfo.MoveType}");
...@@ -682,8 +706,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -682,8 +706,10 @@ namespace OnlineStore.DeviceLibrary
{ {
InOutParam param = new InOutParam(posInfo.ToCopy()); InOutParam param = new InOutParam(posInfo.ToCopy());
param.ShelfType = moveBean.ShelfType; param.ShelfType = moveBean.ShelfType;
LogInfo($"{posType}物料{param.PosInfo.ToStr()}，准备出库到料串{param.ShelfType}"); if(StartOutstore(param))
StartOutstore(param); {
LogInfo($"{posType}物料{param.PosInfo.ToStr()}，准备出库到料串{param.ShelfType}");
}
return true; return true;
} }
if (moveBean.MoveInfo.MoveType == MoveType.None) if (moveBean.MoveInfo.MoveType == MoveType.None)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!