From 607fa9a9dec5ff4fe780231d635bbd62e1740f37 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 12月 2024 18:37:27 +0800
Subject: [PATCH] 1
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 22 +++++
SDA/iWareSda/Devices/4-Station/StationService/StationService.cs | 2
CC/iWareCC_ASRS/ThreadService/01_BZ01工位（清灰，洗板后工位）/DataProcess_BZ01.cs | 4
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/2、DataProcess_RobotBuffer_FinishTask.cs | 2
CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | 4
/dev/null | 30 -------
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/1、DataProcess_BZ39.cs | 6 +
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/DataProcess_BZ12.cs | 31 ++++---
CC/iWareSql/iWareSql.csproj | 1
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs | 35 +++++---
CC/iWareCC_ASRS/ThreadService/00_269工位/DataProcess_269.cs | 19 ++++
CC/iWareCC_ASRS/Handler/WmsRecordUpiProcessHandler.cs | 71 +++++++++++++++++
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Outbound/3、DataProcess_RobotBuffer_FinishTaskForOutbound.cs | 2
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/DataProcess_BZ21.cs | 4 +
CC/iWareCC_ASRS/iWareCC.csproj | 1
15 files changed, 168 insertions(+), 66 deletions(-)
diff --git a/CC/iWareCC_ASRS/Handler/WmsRecordUpiProcessHandler.cs b/CC/iWareCC_ASRS/Handler/WmsRecordUpiProcessHandler.cs
new file mode 100644
index 0000000..e2a79c9
--- /dev/null
+++ b/CC/iWareCC_ASRS/Handler/WmsRecordUpiProcessHandler.cs
@@ -0,0 +1,71 @@
+锘縰sing iWareCommon.Utils;
+using iWareSql.WmsDBModel;
+using System;
+
+namespace iWareCC
+{
+ public class WmsRecordUpiProcessHandler
+ {
+ /// <summary>
+ /// 淇濆瓨 鏉夸欢灞ュ巻琛�
+ /// </summary>
+ /// <param name="wmsDB"></param>
+ /// <param name="orderUPI_New"></param>
+ /// <param name="location"></param>
+ public static void SaveWmsRecordUpiProcess(WmsDBModel wmsDB, mes_batchOrderUPI_new orderUPI_New, string location, string operRemark)
+ {
+ wms_record_upi_process upi_Process = ClassHelper.RotationMapping<wms_record_upi_process, mes_batchOrderUPI_new>(orderUPI_New);
+
+ upi_Process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ upi_Process.CreateTime = DateTime.Now;
+ upi_Process.CreateUserName = "WCS";
+ upi_Process.Location = location;
+ upi_Process.OperRemark = operRemark;
+
+ wmsDB.wms_record_upi_process.Add(upi_Process);
+
+ }
+
+ /// <summary>
+ /// 淇濆瓨 鏉夸欢灞ュ巻琛�
+ /// </summary>
+ /// <param name="wmsDB"></param>
+ /// <param name="orderUPI_New"></param>
+ /// <param name="location"></param>
+ public static void SaveWmsRecordPackageProcess(WmsDBModel wmsDB, mes_batchOrderUPI_new orderUPI_New, string location, string operRemark)
+ {
+ wms_record_package_process upi_Process = ClassHelper.RotationMapping<wms_record_package_process, mes_batchOrderUPI_new>(orderUPI_New);
+
+ upi_Process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ upi_Process.CreateTime = DateTime.Now;
+ upi_Process.CreateUserName = "WCS";
+ upi_Process.Location = location;
+ upi_Process.OperRemark = operRemark;
+
+ wmsDB.wms_record_package_process.Add(upi_Process);
+
+ }
+
+ /// <summary>
+ /// 淇濆瓨 鏉夸欢灞ュ巻琛�
+ /// </summary>
+ /// <param name="wmsDB"></param>
+ /// <param name="orderUPI_New"></param>
+ /// <param name="location"></param>
+ public static void SaveWmsRecordPackageProcess(WmsDBModel wmsDB, mes_package_gather package_Gather, string location, string operRemark)
+ {
+ wms_record_package_process upi_Process = ClassHelper.RotationMapping<wms_record_package_process, mes_package_gather>(package_Gather);
+
+ upi_Process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ upi_Process.CreateTime = DateTime.Now;
+ upi_Process.CreateUserName = "WCS";
+ upi_Process.Location = location;
+ upi_Process.OperRemark = operRemark;
+
+ wmsDB.wms_record_package_process.Add(upi_Process);
+
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git "a/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs" "b/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs"
index 3bb1907..d98ea9e 100644
--- "a/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs"
@@ -59,11 +59,30 @@
{
SystemWarningMsg._lbl_alert_DataProcess_269 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
continue;
+ //*/
+ }
+
+ //鎺ㄩ�乸lc瑙ｆ瀽瀹屾垚
+ using (StationServiceClient client = new StationServiceClient())
+ {
+ var res = await client.WriteQiTaoInfoAsync((int)EDevice.Station, rgvLocation, true);
+ if (!res.result)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}- 鎺ㄩ�乸lc瑙ｆ瀽瀹屾垚 澶辫触,WriteQiTaoInfoAsync杩斿洖:{res.resMsg}";
+ continue;
+ }
+ else
+ {
+ Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-鎺ㄩ�乸lc瑙ｆ瀽瀹屾垚 鎴愬姛,WriteQiTaoInfoAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
+ }
}
upiObj.AreaCode = (int)AreaCodeEnum.寰呯紦瀛樺垎鎷ｅ尯;
+ WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "269", "棣栨鎵爜");
+
wmsDB.SaveChanges();
+ //*/
}
}
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs" "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
index 20eec66..6b24faa 100644
--- "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
@@ -37,7 +37,7 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ01 = string.Empty;
try
{
- if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ01 &&
+ if (SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ01 &&
{
if (FormCC.IsAllowRunOutMode == true)
{
@@ -131,6 +131,8 @@
rbRunMode.OrderId = upiObj.OrderId;
rbRunMode.PackageCode = upiObj.PackageCode;
+ WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ01", "榻愬寘楠岃瘉");
+
wmsDB.SaveChanges();
}
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
index ebe49de..9b89928 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
@@ -34,7 +34,7 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ39 = string.Empty;
try
{
- if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ39 &&
+ if (SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ39 &&
{
var rgvLocation = StationLocationEnum.BZ39.ToString();
/*
@@ -57,7 +57,7 @@
//涓嶅啀鎷︽埅
//瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
- var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB,upiCode);
+ var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB, upiCode);
if (!isValidate)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
@@ -131,6 +131,8 @@
place.PlaceStatus = (int)PlaceStatusEnum.閿佸畾;
+ WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ39", "缂撳瓨鍏ュ簱");
+
wmsDB.SaveChanges();
}
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
index 206c13d..5ab0229 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
@@ -134,6 +134,8 @@
}
}
+ WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, task.PlaceCode, "缂撳瓨鍏ュ簱瀹屾垚");
+
wmsDB.SaveChanges();
}
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.cs"
index 9121899..c84697e 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/3\343\200\201DataProcess_RobotBuffer_FinishTaskForOutbound.cs"
@@ -105,6 +105,8 @@
}
}
+ WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, task.PlaceCode, "鍑虹紦瀛樺簱锛�"+task.TaskMsg);
+
wmsDB.SaveChanges();
}
}
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 16f7a44..fe7c0f2 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"
@@ -36,21 +36,21 @@
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_PalletizingAck)
{
- //缁橮LC鎺ㄩ�佷换鍔″畬鎺ユ敹瀹屾垚澶嶄綅淇″彿
- using (StationServiceClient client = new StationServiceClient())
+ //缁橮LC鎺ㄩ�佷换鍔″畬鎺ユ敹瀹屾垚澶嶄綅淇″彿
+ using (StationServiceClient client = new StationServiceClient())
+ {
+ var res = client.WriteStation_ACK((int)EDevice.Station, false, rgvLocation);
+ if (!res.result)
{
- var res = client.WriteStation_ACK((int)EDevice.Station, false, rgvLocation);
- if (!res.result)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
- continue;
- }
- else
- {
- Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 鎴愬姛,SetPalletizingTaskFinishAck锛屽弬鏁�: 绔欑偣{rgvLocation}");
- }
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
+ continue;
}
-
+ else
+ {
+ Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 鎴愬姛,SetPalletizingTaskFinishAck锛屽弬鏁�: 绔欑偣{rgvLocation}");
+ }
+ }
+
}
if (obj.R_ReqParseData)
@@ -87,7 +87,7 @@
placeX = (short)upiObj.MachineXCenter;
placeY = (short)upiObj.MachineYCenter;
placeZ = (short)upiObj.MachineZCenter;
- if (upiObj.UpiStatus == (int)UpiStatusEnum.宸茬爜鍨泑|upiObj.UpiStatus== (int)UpiStatusEnum.鐮佸灈涓�)
+ if (upiObj.UpiStatus == (int)UpiStatusEnum.宸茬爜鍨� || upiObj.UpiStatus == (int)UpiStatusEnum.鐮佸灈涓�)
{
continue;
}
@@ -195,6 +195,9 @@
}
}
+
+ WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ12绔欑偣", "鐮佸寘");
+
wmsDB.SaveChanges();
}
}
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 77a06ef..b48aa38 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"
@@ -253,6 +253,10 @@
}
}
+
+ WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ21", "鍚堝寘");
+ WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, upiObj, "BZ21", "鍚堝寘");
+
wmsDB.SaveChanges();
}
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs" "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
index a88ad98..f811232 100644
--- "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
@@ -122,6 +122,8 @@
record.OpRemark = "涓嬬嚎";
wmsDB.mes_package_unline_record.Add(record);
+ WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, package, "BZ30", "榻愬楠岃瘉");
+
wmsDB.SaveChanges();
}
@@ -136,6 +138,6 @@
}
}
-
+
}
}
diff --git a/CC/iWareCC_ASRS/iWareCC.csproj b/CC/iWareCC_ASRS/iWareCC.csproj
index 4f7ae2e..13158d4 100644
--- a/CC/iWareCC_ASRS/iWareCC.csproj
+++ b/CC/iWareCC_ASRS/iWareCC.csproj
@@ -153,6 +153,7 @@
<Compile Include="Forms\SystemCheckForm.Designer.cs">
<DependentUpon>SystemCheckForm.cs</DependentUpon>
</Compile>
+ <Compile Include="Handler\WmsRecordUpiProcessHandler.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="DeviceThreadFactory\DeviceThreadService\RgvThreadService\RgvTaskThreadService.cs" />
diff --git a/CC/iWareSql/DataAccess/WmsRecordUpiProcessHandler.cs b/CC/iWareSql/DataAccess/WmsRecordUpiProcessHandler.cs
deleted file mode 100644
index a95831f..0000000
--- a/CC/iWareSql/DataAccess/WmsRecordUpiProcessHandler.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-锘�
-
-using iWareCommon.Utils;
-using iWareModel.Entity.AGV;
-using iWareModel.EnumType.EDevice.AGV;
-using iWareSql.DBModel;
-using iWareSql.WmsDBModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace iWareSql.DataAccess
-{
- public class WmsRecordUpiProcessHandler
- {
- /// <summary>
- /// 淇濆瓨AGV瀹炴椂鏁版嵁
- /// </summary>
- /// <param name="vehicles"></param>
- public static void SaveAgvData(mes_batchOrderUPI_new orderUPI_New )
- {
- wms_record_upi_process upi_Process = new wms_record_upi_process()
- {
-
- };
- }
-
-
- }
-}
\ No newline at end of file
diff --git a/CC/iWareSql/iWareSql.csproj b/CC/iWareSql/iWareSql.csproj
index ec058e4..c38477f 100644
--- a/CC/iWareSql/iWareSql.csproj
+++ b/CC/iWareSql/iWareSql.csproj
@@ -55,7 +55,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="DataAccess\WmsRecordUpiProcessHandler.cs" />
<Compile Include="DataAccess\TaskHandler.cs" />
<Compile Include="DataAccess\AgvHandler.cs" />
<Compile Include="DataAccess\Base_CodeItemsHandler.cs" />
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
index 0de0c10..ad0330a 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -22,13 +22,16 @@
private readonly SqlSugarRepository<SysConfig> _sysConfigRep;
private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _mesBatchOrderUpiRep;
private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
-
+ private readonly SqlSugarRepository<WmsRecordUpiProcess> _wmsRecordUpiProcessRep;
+ private readonly SqlSugarRepository<WmsRecordPackageProcess> _wmsRecordPackageProcessRep;
public WmsOperationTaskService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
, SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
, SqlSugarRepository<SysConfig> sysConfigRep
, SqlSugarRepository<Mes_BatchOrderUPI_New> mesBatchOrderUpiRep
, SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
+ , SqlSugarRepository<WmsRecordUpiProcess> wmsRecordUpiProcessRep
+ , SqlSugarRepository<WmsRecordPackageProcess> wmsRecordPackageProcessRep
)
{
_sysConfigRep = sysConfigRep;
@@ -37,6 +40,8 @@
_wmsStockQuanRep = wmsStockQuanRep;
_mesBatchOrderUpiRep = mesBatchOrderUpiRep;
_mesOrderGatherRep = mesOrderGatherRep;
+ _wmsRecordUpiProcessRep = wmsRecordUpiProcessRep;
+ _wmsRecordPackageProcessRep = wmsRecordPackageProcessRep;
}
@@ -195,6 +200,21 @@
{
throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{input.PackageCode}鐨勬眹鎬绘暟鎹�");
}
+
+ WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
+ wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>();
+ wmsRecordPackage.CreateTime = DateTime.Now;
+ wmsRecordPackage.Location = "BZ29";
+ wmsRecordPackage.OperRemark = "鏍稿鏍囩";
+ await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);
+
+ WmsRecordUpiProcess wmsRecordUpi = new WmsRecordUpiProcess();
+ wmsRecordUpi = singleUpi.Adapt<WmsRecordUpiProcess>();
+ wmsRecordUpi.CreateTime = DateTime.Now;
+ wmsRecordUpi.Location = "BZ29";
+ wmsRecordUpi.OperRemark = "鏍稿鏍囩";
+ await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);
+
return singlePackage;
}
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
index ebd3081..73f687c 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -180,8 +180,9 @@
}
+
/// <summary>
- /// 鍐欏叆榻愬缁撴灉
+ /// 鍐欏叆榻愬缁撴灉銆佽В鏋愮粨鏋�
/// </summary>
/// <param name="deviceId"></param>
/// <param name="value">true:琛ㄧず 榻愬銆俧alse锛氫笉榻愬</param>
@@ -196,21 +197,25 @@
var view_stationObj = this.View.W_StationForWriteCommList.Where(x => x.StationCode == stationCode).FirstOrDefault();
- int i_result = 0;
- if (value)
+ MessageModel b2 = null;
+ if (stationCode == StationLocationEnum.BZ01.ToString())
{
- i_result = 998;
- }
- else
- {
- i_result = 999;
- }
- MessageModel b2 = this.plcService.WriteValuePoint(stationObj.W_KittingInfo, i_result, view_stationObj.W_KittingInfo);
- if (!b2.result)
- {
- msg = string.Format("鍚慡tation鍦板潃{0} 鍐� " + value + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
- stationObj.W_DataFinish);
- return false;
+ int i_result = 0;
+ if (value)
+ {
+ i_result = 998;
+ }
+ else
+ {
+ i_result = 999;
+ }
+ b2 = this.plcService.WriteValuePoint(stationObj.W_KittingInfo, i_result, view_stationObj.W_KittingInfo);
+ if (!b2.result)
+ {
+ msg = string.Format("鍚慡tation鍦板潃{0} 鍐� " + value + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
+ stationObj.W_DataFinish);
+ return false;
+ }
}
b2 = this.plcService.WriteValuePoint(stationObj.W_DataFinish, true, view_stationObj.W_DataFinish);
diff --git a/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs b/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
index 3ada592..3267b36 100644
--- a/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
@@ -407,7 +407,7 @@
/// <summary>
- /// 鍐欏叆榻愬缁撴灉
+ /// 鍐欏叆榻愬缁撴灉銆佽В鏋愮粨鏋�
/// </summary>
/// <param name="deviceId"></param>
/// <param name="value"></param>
--
Gitblit v1.9.3