From 02771e1f094f82f5de81e28ad26ecf68e73549f7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 23 11月 2024 16:36:24 +0800
Subject: [PATCH] 修复查询库位bug
---
CC/iWareUnitTest/Task_UnitTest.cs | 10 +++++++---
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/1、DataProcess_BZ39.cs | 8 +++++++-
CC/iWareSql/DataAccess/StationHandlerV2.cs | 8 ++++----
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/2、DataProcess_RobotBuffer_FinishTask.cs | 1 +
CC/iWareUnitTest/App.config | 3 +--
5 files changed, 20 insertions(+), 10 deletions(-)
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 6287326..9aad677 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"
@@ -54,6 +54,8 @@
var qitaoReault = false;
using (WmsDBModel wmsDB = new WmsDBModel())
{
+ //涓嶅啀鎷︽埅
+ /*
//瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB);
if (!isValidate)
@@ -61,6 +63,7 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
continue;
}
+ //*/
var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
if (upiObj == null)
{
@@ -110,6 +113,8 @@
using (StationServiceClient client = new StationServiceClient())
{
+ //涓嶅啀鎷︽埅
+ /*
//棣栧厛鍏堟竻鐞�
var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation);
if (!res.result)
@@ -121,8 +126,9 @@
{
Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 鎴愬姛,InboundFinishConfirmAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
}
+ //*/
- res = await client.WriteInStoreTaskInfoAsync((int)EDevice.Station, rgvLocation, place.PlaceCode,
+ var res = await client.WriteInStoreTaskInfoAsync((int)EDevice.Station, rgvLocation, place.PlaceCode,
(short)upiObj.Length,
(short)upiObj.Width, (short)upiObj.Thk, Convert.ToInt32(task.TaskNo));
if (!res.result)
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 8158e17..c61372e 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"
@@ -89,6 +89,7 @@
InTime = DateTime.Now,
OperReason = "鍏ュ簱",
PackageCode = task.PackageCode,
+ Length = task.Length,
Width = task.Width,
Thk = task.Thk,
PlaceCode = task.PlaceCode,
diff --git a/CC/iWareSql/DataAccess/StationHandlerV2.cs b/CC/iWareSql/DataAccess/StationHandlerV2.cs
index 9c33aa9..717e298 100644
--- a/CC/iWareSql/DataAccess/StationHandlerV2.cs
+++ b/CC/iWareSql/DataAccess/StationHandlerV2.cs
@@ -181,18 +181,18 @@
var emptyStationList = edm.V_EmptyStation.ToList();
//涓嶉殢鏈烘帓搴�
- emptyStationList = emptyStationList.OrderByDescending(x => x.LaneNo).ThenByDescending(x => x.ColumnNo).ThenBy(x => x.LayerNo).ToList();
+ emptyStationList = emptyStationList.OrderBy(x => x.LaneNo).ThenBy(x => x.LayerNo).ThenBy(x => x.ColumnNo).ToList();
//澧炲姞璇ュ簱浣嶆槸鍚﹁浠诲姟鍗犵敤鐨勭瓫閫� [EditBy shaocx,2022-06-02]
//emptyStationList = FilterStationForDoingTask(edm, emptyStationList);
List<int> usePlaceTypeList = new List<int>();
- int placeType = TCSCommon.GetPlaceTypeByWidthLength(upiObj, upiObj.Length, upiObj.Width,ref usePlaceTypeList);
+ int placeType = TCSCommon.GetPlaceTypeByWidthLength(upiObj, upiObj.Length, upiObj.Width, ref usePlaceTypeList);
//浼樺厛鏌ヨ
- var my_emptyStationList = emptyStationList.Where(x => usePlaceTypeList.Contains( x.PlaceType)).OrderBy(x=>x.PlaceType).ToList();
+ var my_emptyStationList = emptyStationList.Where(x => usePlaceTypeList.Contains(x.PlaceType)).OrderBy(x => x.PlaceType).ToList();
if (my_emptyStationList?.Count() > 0)
{
- wms_base_place toPlace = StationHandler.GetPlaceByPlaceId(emptyStationList.First().Id, edm);
+ wms_base_place toPlace = StationHandler.GetPlaceByPlaceId(my_emptyStationList.First().Id, edm);
return toPlace;
}
else
diff --git a/CC/iWareUnitTest/App.config b/CC/iWareUnitTest/App.config
index 92abca4..0d0d06c 100644
--- a/CC/iWareUnitTest/App.config
+++ b/CC/iWareUnitTest/App.config
@@ -5,8 +5,7 @@
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
</configSections>
<connectionStrings>
- <!--鏈満-->
- <add name="DbModel" connectionString="data source=192.168.10.5;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
+ <add name="WmsDBModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
</connectionStrings>
<appSettings>
<!-- 鏄惁妯℃嫙PLC锛屽彂甯冧竴瀹氭槸 FALSE -->
diff --git a/CC/iWareUnitTest/Task_UnitTest.cs b/CC/iWareUnitTest/Task_UnitTest.cs
index 6e90b46..6b589be 100644
--- a/CC/iWareUnitTest/Task_UnitTest.cs
+++ b/CC/iWareUnitTest/Task_UnitTest.cs
@@ -6,6 +6,8 @@
using iWareModel;
using iWareCC.Common.Helper;
using iWareSql.DBModel;
+using iWareSql.WmsDBModel;
+using System.Linq;
namespace iWareUnitTest
{
@@ -17,9 +19,11 @@
public void Test()
{
var errMsg = "";
- using (DbModel context = new DbModel())
+ using (WmsDBModel context = new WmsDBModel())
{
- var srmStore = MyExtendHelper.FindStoreForEmptySalverTo1014(context, ref errMsg);
+ var obj = context.mes_batchOrderUPI_new.Where(x => x.UPI == "LS101000901100090000").FirstOrDefault();
+
+ var place = StationHandlerV2.FindBestEmptyPlace(context, obj);
}
}
@@ -27,7 +31,7 @@
[TestMethod]
public void TestAddInStoreTask()
{
- SysUser user = new SysUser();
+
AddMainTaskPostParam param = new AddMainTaskPostParam();
param.CargoNo = "鎴戞槸璐х墿鍙峰晩2swfsaf";
param.SalverCode = "鎴戞槸鎵樼洏鍙峰晩2swfsaf";
--
Gitblit v1.9.3