From 7cb93a547ec132591aedc4add0200bb0b712c84b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 28 11月 2024 11:24:24 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareModel/EnumType/WMS/UpiStatusEnum.cs | 68 +++++++++++++++++++---------------
SDA/iWareSda/Devices/4-Station/StationService/StationService.cs | 2
SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs | 2
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/DataProcess_BZ12.cs | 4 +-
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs | 2
SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs | 14 +++---
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs | 2
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/DataProcess_BZ21.cs | 17 +++++---
8 files changed, 61 insertions(+), 50 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/DataProcess_BZ12.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/DataProcess_BZ12.cs"
index 49bcc6a..1b1d699 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/DataProcess_BZ12.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/DataProcess_BZ12.cs"
@@ -87,11 +87,11 @@
placeX = (short)upiObj.MachineXCenter;
placeY = (short)upiObj.MachineYCenter;
placeZ = (short)upiObj.MachineZCenter;
- if (upiObj.UpiStatus == 3||upiObj.UpiStatus==5)
+ if (upiObj.UpiStatus == (int)UpiStatusEnum.宸茬爜鍨泑|upiObj.UpiStatus== (int)UpiStatusEnum.鐮佸灈涓�)
{
continue;
}
- upiObj.UpiStatus = 5;
+ upiObj.UpiStatus = (int)UpiStatusEnum.鐮佸灈涓�;
//鏌ュ杩欏寘鎵�鏈夌殑鏁伴噺
var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
//鏌ヨ鏄惁鏈澘骞朵笖鍒ゆ柇鏈夋病鏈夋贩鎵�
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
index 9f681ac..a02976f 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
@@ -67,7 +67,7 @@
short placeX = 0;
short placeY = 0;
short placeZ = 0;
- string place = "";
+ string place = "22";
using (WmsDBModel wmsDB = new WmsDBModel())
{
//瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
@@ -83,10 +83,11 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
continue;
}
+
placeX = (short)upiObj.MachineXCenter;
placeY = (short)upiObj.MachineYCenter;
placeZ = (short)upiObj.MachineZCenter;
- cartonhigh = (short)upiObj.Info1;
+ cartonhigh = (short)upiObj.Info3;
cartonwidth = (short)upiObj.Info2;
//璁板綍浠诲姟
@@ -98,10 +99,12 @@
PackageCode=upiObj.PackageCode,
PushStatus=0,
PushNum=0,
+ ApiMessage="11",
CreateTime = DateTime.Now,
CreateUserName = "CC",
UpdateTime = DateTime.Now,
UpdateUserName = "CC",
+ CreateOrgName="11"
};
var task = new wms_rbline_task()
{
@@ -116,10 +119,10 @@
OrderId = upiObj.OrderId,
PackageCode = upiObj.PackageCode,
RbTaskType = (int)RbTaskTypeEnum.澶规澘浠诲姟,
- RbTaskTypeEnumName = RbTaskTypeEnum.鐮佹澘浠诲姟.ToString(),
+ RbTaskTypeEnumName = RbTaskTypeEnum.澶规澘浠诲姟.ToString(),
TaskStatus = (int)TaskStatusEnum.宸蹭笅鍙�,
TaskStatusName = TaskStatusEnum.宸蹭笅鍙�.ToString(),
- TaskMsg = "鐮佹澘",
+ TaskMsg = "澶规澘",
CreateTime = DateTime.Now,
CreateUserName = "CC",
UpdateTime = DateTime.Now,
@@ -128,12 +131,12 @@
};
wmsDB.wms_rbline_task.Add(task);
- wmsDB.mes_push_packagecode.Add(putpakegecode);
+ // wmsDB.mes_push_packagecode.Add(putpakegecode);
using (StationServiceClient client = new StationServiceClient())
{
- var res = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, Convert.ToInt32(task.TaskNo),
- (short)upiObj.Info1, (short)upiObj.Info2,cartonhigh,cartonwidth,placeX,placeY);
+ var res = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo),
+ (short)upiObj.Length, (short)upiObj.Width,cartonhigh,cartonwidth,placeX,placeY);
if (!res.result)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,WriteInStoreTaskInfoAsync 杩斿洖:{res.resMsg}";
diff --git a/CC/iWareModel/EnumType/WMS/UpiStatusEnum.cs b/CC/iWareModel/EnumType/WMS/UpiStatusEnum.cs
index c1a71cd..85cd12a 100644
--- a/CC/iWareModel/EnumType/WMS/UpiStatusEnum.cs
+++ b/CC/iWareModel/EnumType/WMS/UpiStatusEnum.cs
@@ -10,39 +10,47 @@
[Description("鏉挎枡鐘舵�佹灇涓�")]
public enum UpiStatusEnum
{
- /// <summary>
- /// 鍒濆
- /// </summary>
- [Description("鍒濆")]
- 鍒濆 = 0,
+ /// <summary>
+ /// 鍒濆
+ /// </summary>
+ [Description("鍒濆")]
+ 鍒濆 = 0,
- /// <summary>
- /// 涓嶉綈鍖�
- /// </summary>
- [Description("涓嶉綈鍖�")]
- 涓嶉綈鍖� = 1,
+ /// <summary>
+ /// 涓嶉綈鍖�
+ /// </summary>
+ [Description("涓嶉綈鍖�")]
+ 涓嶉綈鍖� = 1,
- /// <summary>
- /// 宸查綈鍖�
- /// </summary>
- [Description("宸查綈鍖�")]
- 宸查綈鍖� = 2,
+ /// <summary>
+ /// 宸查綈鍖�
+ /// </summary>
+ [Description("宸查綈鍖�")]
+ 宸查綈鍖� = 2,
- /// <summary>
- /// 宸茬爜鍨�
- /// </summary>
- [Description("宸茬爜鍨�")]
- 宸茬爜鍨� = 3,
+ /// <summary>
+ /// 鐮佸灈涓�
+ /// </summary>
+ [Description("鐮佸灈涓�")]
+ 鐮佸灈涓� = 3,
- /// <summary>
- /// 宸插悎鍖�
- /// </summary>
- [Description("宸插悎鍖�")]
- 宸插悎鍖� = 4,
- /// <summary>
- /// 鐮佸灈涓�
- /// </summary>
- [Description("鐮佸灈涓�")]
- 鐮佸灈涓� = 5,
+
+ /// <summary>
+ /// 宸茬爜鍨�
+ /// </summary>
+ [Description("宸茬爜鍨�")]
+ 宸茬爜鍨� = 4,
+
+ /// <summary>
+ /// 宸插悎鍖�
+ /// </summary>
+ [Description("宸插悎鍖�")]
+ 宸插悎鍖� = 5,
+
+ /// <summary>
+ /// 宸蹭笅绾�
+ /// </summary>
+ [Description("宸蹭笅绾�")]
+ 宸蹭笅绾� = 6
}
}
\ No newline at end of file
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
index 4fdab05..8fd7f32 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -91,38 +91,38 @@
/// 鍖呬欢闀�
/// </summary>
[Description("鍖呬欢闀�")]
- public string W_PackageLength { get; set; }
+ public short W_PackageLength { get; set; }
/// <summary>
/// 鍖呬欢瀹�
/// </summary>
[Description("鍖呬欢瀹�")]
- public string W_PackageWidth { get; set; }
+ public short W_PackageWidth { get; set; }
/// <summary>
/// 绾哥楂�
/// </summary>
[Description("绾哥楂�")]
- public string W_CartonHeight { get; set; }
+ public short W_CartonHeight { get; set; }
/// <summary>
/// 绾哥瀹�
/// </summary>
[Description("绾哥瀹�")]
- public string W_CartonWidth { get; set; }
+ public short W_CartonWidth { get; set; }
/// <summary>
/// 鏀炬枡X鍋忕Щ
/// </summary>
[Description("鏀炬枡X鍋忕Щ")]
- public string W_X_Offset { get; set; }
+ public short W_X_Offset { get; set; }
/// <summary>
/// 鏀炬枡Y鍋忕Щ
/// </summary>
[Description("鏀炬枡Y鍋忕Щ")]
- public string W_Y_Offset { get; set; }
+ public short W_Y_Offset { get; set; }
/// <summary>
/// 鍏ュ簱瀹屾垚宸茬‘璁�
@@ -197,7 +197,7 @@
/// 鍚堝寘浠诲姟鍙�
/// </summary>
[Description("鍚堝寘浠诲姟鍙�")]
- public int W_SurroundTaskNo { get; set; }
+ public short W_SurroundTaskNo { get; set; }
/// <summary>
/// 鐮佸灈棣栨湯鏉�
/// </summary>
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
index 0aaa888..99a3dab 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -547,7 +547,7 @@
/// <param name="placey"></param>
/// <param name="msg"></param>
/// <returns></returns>
- public bool WriteSurroundTaskInfo(string stationCode, int taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey, out string msg)
+ public bool WriteSurroundTaskInfo(string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey, out string msg)
{
try
{
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index 437d385..03589a6 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -288,7 +288,7 @@
_dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
{
StationCode = StationLocationEnum.BZ21.ToString(),
- R_PalletizingAck = W_DBHeaderWithSeparate_BZ12 + "50.2",
+ R_PalletizingAck = W_DBHeaderWithSeparate_BZ21 + "50.2",
R_ReqParseData = W_DBHeaderWithSeparate_BZ21 + "50.0",
R_SurrouondTaskFinish = W_DBHeaderWithSeparate_BZ21 + "50.1",
diff --git a/SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs b/SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs
index af267f7..864796b 100644
--- a/SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs
@@ -160,7 +160,7 @@
SdaResEntity SetPalletizingTaskFinishAck(int deviceId, bool value, string stationCode);
[OperationContract]
- SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, int taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey);
+ SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey);
[OperationContract]
SdaResEntity SetSurroundTaskFinishAck(int deviceId, bool value, string stationCode);
diff --git a/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs b/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
index dc11237..ccbba8c 100644
--- a/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
@@ -635,7 +635,7 @@
/// <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
--
Gitblit v1.9.3