Luy
/
NWeiWMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

no message

master
陆晔 2 years ago
parent
4c66beec6b
commit
293f23e225
2 changed files with 23 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
  2. 42
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs

4
ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
View File

@ -7441,7 +7441,7 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
else
{
//呼叫AGV开始搬运任务
PostionCode = ICSWareHouseLotInfoService.GetAGVTaskPosition(item.ContainerCode, item.User, item.WorkPoint, cmd, language);
PostionCode = ICSWareHouseLotInfoService.GetAGVTaskPosition(item.ContainerCode, item.IsOverLoad, item.User, item.WorkPoint, cmd, language);
}
}
res.Success = true;
@ -8686,7 +8686,7 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
}
else
{
ICSWareHouseLotInfoService.ActionMaterialBack(GUID,JsonData.OutPosition, JsonData.WorkPoint, cmd, language);
ICSWareHouseLotInfoService.ActionMaterialBack(GUID, JsonData.OutPosition, JsonData.WorkPoint, cmd, language);
}
res.Ret = 1;
res.RetMsg = "success";// "接口调用成功！";

42
ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
View File

@ -3188,30 +3188,30 @@ namespace ICSSoft.DataProject
/// <param name="WorkPoint"></param>
/// <param name="cmd"></param>
/// <param name="language"></param>
public static string GetAGVTaskPosition(string LocationCode, string User, string WorkPoint, SqlCommand cmd, Dictionary<string, string> language)
public static string GetAGVTaskPosition(string ContainerCode, bool isOverLoad, string User, string WorkPoint, SqlCommand cmd, Dictionary<string, string> language)
{
try
{
//string sql = @" select TOP 1 B.LotNo from ICSContainer A
// INNER JOIN ICSContainerLot B ON B.ContainerID=A.ID AND B.WorkPoint=A.WorkPoint
// ORDER BY B.MTIME DESC";
//sql = string.Format(sql, LocationCode, WorkPoint);
//DataTable dt = DBHelper.SQlReturnData(sql, cmd);
//if (dt.Rows.Count == 0)
//{
// return "";
//}
//else
//{
// sql = @"SELECT A.WHCode,C.LocationCode FROM ICSDeliveryNotice A
// INNER JOIN ICSInventoryLotDetail B ON B.TransCode=A.DNCode AND B.TransSequence=A.Sequence AND B.WorkPoint=A.WorkPoint
// INNER JOIN ICSInventoryDetail C ON C.INVCode=A.InvCode AND C.WHCode=A.WHCode AND C.WorkPoint=A.WorkPoint
// WHERE B.LotNo='{0}' AND B.WorkPoint='{1}'";
// sql = string.Format(sql, dt.Rows[0]["LotNo"].ToString(), WorkPoint);
// return dt.Rows[0]["Define1"].ToString();
//}
return "S02";
string sql = @" select TOP 1 B.LotNo from ICSContainer A
INNER JOIN ICSContainerLot B ON B.ContainerID=A.ID AND B.WorkPoint=A.WorkPoint
Where A.ContainerCode='{0}' AND A.WorkPoint='{1}'
ORDER BY B.MTIME DESC";
sql = string.Format(sql, ContainerCode, WorkPoint);
DataTable dt = DBHelper.SQlReturnData(sql, cmd);
if (dt.Rows.Count == 0)
{
return "";
}
else
{
sql = @"SELECT A.WHCode,C.LocationCode FROM ICSDeliveryNotice A
INNER JOIN ICSInventoryLotDetail B ON B.TransCode=A.DNCode AND B.TransSequence=A.Sequence AND B.WorkPoint=A.WorkPoint
INNER JOIN ICSInventoryDetail C ON C.INVCode=A.InvCode AND C.WHCode=A.WHCode AND C.WorkPoint=A.WorkPoint
WHERE B.LotNo='{0}' AND B.WorkPoint='{1}'";
sql = string.Format(sql, dt.Rows[0]["LotNo"].ToString(), WorkPoint);
dt = DBHelper.SQlReturnData(sql, cmd);
return dt.Rows[0]["Define1"].ToString();
}
}
catch (Exception)
{

Write Preview
Loading…
Cancel
Save