From ec991a5bf47647cc496e047258e253d0690365a9 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 20 五月 2024 11:18:57 +0800
Subject: [PATCH] 修改增加或修改时计算折件数量，增加JC23、JC24数据库，降库存信息代码增加到JC23。
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 141 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 121 insertions(+), 20 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index f2b8b13..43ca4af 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -2,9 +2,12 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
+using Model.InterFaceModel;
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.PdaDto;
+using Newtonsoft.Json;
using SqlSugar;
+using Utility.Tools;
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
@@ -776,7 +779,7 @@
var storageArea = new List<SysStorageArea>();
if (string.IsNullOrEmpty(palletNo))
{
- storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.WareHouseNo == "W02").OrderBy(o=>o.AreaNo).ToList();
+ storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
}
else
{
@@ -798,7 +801,7 @@
{
throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
}
-
+
if (storageLocat.AreaNo.Contains("B0"))
{
storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo.Contains("B0") && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
@@ -807,7 +810,7 @@
{
storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo.Contains("B1") && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
}
- }
+ }
return storageArea;
}
catch (Exception ex)
@@ -880,7 +883,7 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="ruku"></param>
- public void AgvTransport(string palletNo, string areaNo, string ruku, int userId)
+ public void AgvTransport(string palletNo, string areaNo, string ruku, int userId, string url)
{
if (string.IsNullOrEmpty(palletNo))
{
@@ -893,7 +896,7 @@
if (!string.IsNullOrEmpty(areaNo) && !string.IsNullOrEmpty(ruku))
{
throw new Exception("鐩爣鍖哄煙鍜屽叆搴撳彛涓嶈兘鍚屾椂閫夋嫨锛�");
- }
+ }
try
{
string EndLocat = string.Empty;//鐩爣浣嶇疆
@@ -902,7 +905,7 @@
if (log != null)
{
throw new Exception("璇ユ墭鐩樺凡鏈夊皬杞︾瓑寰呮墽琛屾垨姝ｅ湪鎵ц鐨勪换鍔�!");
- }
+ }
var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
if (stockDetail == null)
{
@@ -915,7 +918,7 @@
{
throw new Exception("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
}
- EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo,palletNo);
+ EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo, palletNo);
}
else
{
@@ -950,7 +953,7 @@
throw new Exception("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
}
}
-
+
//寮�鍚簨鍔�
Db.BeginTran();
@@ -995,15 +998,63 @@
{
storageLocatEnd.Status = "4";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
Db.Updateable(storageLocatEnd).ExecuteCommand();
- }
+ }
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
- //鎻愪氦浜嬪姟
- Db.CommitTran();
#region 鍛煎彨灏忚溅浠ｇ爜
+
+ List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
+
+ AgvSchedulingTask agvTask = new AgvSchedulingTask();
+ agvTask.ReqCode = taskNo;
+ agvTask.TaskTyp = "F01";
+ agvTask.WbCode = "";
+ agvTask.PositionCodePath = null;
+ agvTask.PodCode = "-1";
+
+ agvTaskList.Add(agvTask);
+
+ var IsTrue = false;
+ while (IsTrue == true)
+ {
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ string str = "";
+ var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
+ var jsonData = JsonConvert.SerializeObject(agvTaskList);
+ string response = "";
+
+ try
+ {
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+ var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+ if (agvModel.Code == "0")
+ {
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list2, time1, time2);
+ str += "涓嬪彂鎴愬姛";
+ IsTrue = true;
+ }
+ if (agvModel.Code == "1")
+ {
+ new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
+ throw new Exception(agvModel.Message);
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
#endregion
+
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
}
catch (Exception ex)
{
@@ -1018,7 +1069,7 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="userId"></param>
- public void AgvTransport2(string soNo,string palletNo, string areaNo, int userId)
+ public void AgvTransport2(string soNo, string palletNo, string areaNo, int userId, string url)
{
if (string.IsNullOrEmpty(soNo))
{
@@ -1032,6 +1083,8 @@
{
//寮�鍚簨鍔�
Db.BeginTran();
+ List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
+
//鍑哄簱鍗曚俊鎭�
var notice = Db.Queryable<BllExportNotice>().First(w => w.IsDel == "0" && w.SONo == soNo);
if (notice == null)
@@ -1054,7 +1107,7 @@
string sqlStr = $"select * from DataStockDetail where PalletNo in (select PalletNo from BllExportAllot where IsDel='0' and SONo='{soNo}')";
stockDetailList = Db.Ado.SqlQuery<DataStockDetail>(sqlStr).ToList();
}
- if (stockDetailList.Count<=0)
+ if (stockDetailList.Count <= 0)
{
throw new Exception("鎵樼洏鏄庣粏涓嶅瓨鍦�,璇锋鏌�!");
}
@@ -1067,7 +1120,7 @@
foreach (var item in stockDetailList)
{
//浠诲姟淇℃伅
- var logInfo = log.First(w =>w.PalletNo == item.PalletNo);
+ var logInfo = log.First(w => w.PalletNo == item.PalletNo);
if (logInfo != null)
{
throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}宸叉湁灏忚溅绛夊緟鎵ц鎴栨鍦ㄦ墽琛岀殑浠诲姟!");
@@ -1130,6 +1183,15 @@
};
Db.Insertable(exTask).ExecuteCommand();
+ AgvSchedulingTask agvTask = new AgvSchedulingTask();
+ agvTask.ReqCode = taskNo;
+ agvTask.TaskTyp = "F01";
+ agvTask.WbCode = "";
+ agvTask.PositionCodePath = null;
+ agvTask.PodCode = "-1";
+
+ agvTaskList.Add(agvTask);
+
//淇敼搴撳瓨鏄庣粏淇℃伅
item.Status = "4";//绉诲簱閿佸畾
item.LockQty = item.Qty;//閿佸畾搴撳瓨鏁伴噺
@@ -1157,12 +1219,51 @@
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
}
- //鎻愪氦浜嬪姟
- Db.CommitTran();
#region 鍛煎彨灏忚溅浠ｇ爜
+
+
+ var IsTrue = false;
+ while (IsTrue == true)
+ {
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ string str = "";
+ var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
+ var jsonData = JsonConvert.SerializeObject(agvTaskList);
+ string response = "";
+
+ try
+ {
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍙栬揣鍛戒护", "AGV");
+ var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+ if (agvModel.Code == "0")
+ {
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list2, time1, time2);
+ str += "涓嬪彂鎴愬姛";
+ IsTrue = true;
+ }
+ if (agvModel.Code == "1")
+ {
+ new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
+ throw new Exception(agvModel.Message);
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+
#endregion
+
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
}
catch (Exception ex)
{
@@ -1177,16 +1278,16 @@
/// <param name="skuNo"></param>
/// <param name="lotNo"></param>
/// <returns></returns>
- private string GetLocat(string areaNo,string skuNo,string lotNo,string palletNo,string hasLocatNoList="")
+ private string GetLocat(string areaNo, string skuNo, string lotNo, string palletNo, string hasLocatNoList = "")
{
try
{
string endLocat = string.Empty;//鐩爣鍌ㄤ綅
- //褰撶劧鍖哄煙鎵�鏈夊偍浣嶄俊鎭�
+ //褰撶劧鍖哄煙鎵�鏈夊偍浣嶄俊鎭�
var storageLocatList = Db.Queryable<SysStorageLocat>().Where(w => w.WareHouseNo == "W02" && w.AreaNo == areaNo).ToList();
//鍚屽尯鍩熷悓鎵规鐗╂枡鐨勫偍浣嶄俊鎭�
List<string> locatList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SkuNo == skuNo && w.LotNo == lotNo && w.WareHouseNo == "W02" && w.AreaNo == areaNo && w.PalletNo != palletNo)
- .OrderByDescending(o=>o.LocatNo).Select(s=>s.LocatNo).Distinct().ToList();
+ .OrderByDescending(o => o.LocatNo).Select(s => s.LocatNo).Distinct().ToList();
foreach (var item in locatList)
{
var locatInfo = storageLocatList.Where(w => w.LocatNo == item).First();
@@ -1201,7 +1302,7 @@
if (string.IsNullOrEmpty(endLocat))
{
var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0" && !hasLocatNoList.Contains(w.LocatNo))
- .OrderByDescending(m => m.Layer).OrderByDescending(m=>m.Column).OrderByDescending(m=> m.Row).First();
+ .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
if (locatInfo3 != null)
{
--
Gitblit v1.8.0