From 515978fab272cec55342103182af68c1dcddbfea Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 13 十一月 2024 11:38:47 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 324 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 304 insertions(+), 20 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 43ca4af..1583573 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1,14 +1,19 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
+using System.Security.Policy;
using System.Text;
+using System.Threading.Tasks;
using Model.InterFaceModel;
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.PdaDto;
+using Model.ModelDto.SysDto;
+using Model.ModelVm;
using Newtonsoft.Json;
using SqlSugar;
using Utility.Tools;
using WMS.BLL.LogServer;
+using WMS.BLL.SysServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
using WMS.Entity.BllCheckEntity;
@@ -826,7 +831,7 @@
{
try
{
- var allotList = Db.Queryable<BllExportNotice>().Where(m => m.IsDel == "0" && m.Status == "2").Select(m => m.SONo).Distinct().ToList();
+ var allotList = Db.Queryable<BllExportNotice>().Where(m => m.IsDel == "0" && (m.Status == "3" || m.Status == "4")).Select(m => m.SONo).Distinct().ToList();
return allotList;
}
catch (Exception ex)
@@ -983,11 +988,11 @@
//淇敼搴撳瓨鏄庣粏淇℃伅
stockDetail.Status = "4";//绉诲簱閿佸畾
- stockDetail.LockQty = stockDetail.Qty;//閿佸畾搴撳瓨鏁伴噺
+ //stockDetail.LockQty = stockDetail.Qty;//閿佸畾搴撳瓨鏁伴噺
Db.Updateable(stockDetail).ExecuteCommand();
//淇敼搴撳瓨淇℃伅
- stock.LockQty += (decimal)stockDetail.Qty;
- Db.Updateable(stock).ExecuteCommand();
+ //stock.LockQty += (decimal)stockDetail.Qty;
+ //Db.Updateable(stock).ExecuteCommand();
//淇敼璧峰鍌ㄤ綅鍦板潃鐘舵��
storageLocat.Status = "5";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
@@ -1069,7 +1074,7 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="userId"></param>
- public void AgvTransport2(string soNo, string palletNo, string areaNo, int userId, string url)
+ public List<string> AgvTransport2(string soNo, string palletNo, string areaNo, int userId, string url)
{
if (string.IsNullOrEmpty(soNo))
{
@@ -1084,7 +1089,7 @@
//寮�鍚簨鍔�
Db.BeginTran();
List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
-
+ var strList = new List<string>();//閿欒淇℃伅闆嗗悎 //0 锛氶儴鍒嗘墭鐩樺凡鏈夊皬杞︾瓑寰呮墽琛屾垨姝ｅ湪鎵ц鐨勪换鍔�
//鍑哄簱鍗曚俊鎭�
var notice = Db.Queryable<BllExportNotice>().First(w => w.IsDel == "0" && w.SONo == soNo);
if (notice == null)
@@ -1104,8 +1109,9 @@
}
else//鏁翠釜鍑哄簱鍗曞彨璐�
{
- 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();
+ // 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();
+ stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SONo == soNo).ToList();
}
if (stockDetailList.Count <= 0)
{
@@ -1117,14 +1123,10 @@
var stock = Db.Queryable<DataStock>().Where(w => w.IsDel == "0");//搴撳瓨鎬昏〃
string EndLocat = string.Empty;//鐩爣浣嶇疆
string hasLocatNoList = string.Empty;//宸插垎閰嶇殑鍌ㄤ綅
+
foreach (var item in stockDetailList)
{
- //浠诲姟淇℃伅
- var logInfo = log.First(w => w.PalletNo == item.PalletNo);
- if (logInfo != null)
- {
- throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}宸叉湁灏忚溅绛夊緟鎵ц鎴栨鍦ㄦ墽琛岀殑浠诲姟!");
- }
+
if (string.IsNullOrEmpty(item.LocatNo))
{
throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}鐨勫偍浣嶄俊鎭笉瀛樺湪,璇锋鏌�!");
@@ -1132,6 +1134,17 @@
if (item.WareHouseNo != "W02")
{
throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}鏈湪骞冲簱鍐�,璇锋鏌�!");
+ }
+ //浠诲姟淇℃伅
+ var logInfo = log.First(w => w.PalletNo == item.PalletNo);
+ if (logInfo != null)
+ {
+ if (!strList.Contains("1"))
+ {
+ strList.Add("1");
+ }
+ continue;
+ //throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}宸叉湁灏忚溅绛夊緟鎵ц鎴栨鍦ㄦ墽琛岀殑浠诲姟!");
}
//璧峰鍌ㄤ綅淇℃伅
var storageLocatBegin = storageLocat.First(w => w.LocatNo == item.LocatNo);
@@ -1171,7 +1184,7 @@
Msg = string.Format("杞繍浠诲姟锛歿0}=>>{1}", item.LocatNo, EndLocat),
StartLocat = item.LocatNo,//璧峰浣嶇疆
EndLocat = EndLocat,//鐩爣浣嶇疆
- PalletNo = palletNo,//鎵樼洏鐮�
+ PalletNo = item.PalletNo,//鎵樼洏鐮�
IsSend = 1,//鏄惁鍙啀娆′笅鍙�
IsCancel = 1,//鏄惁鍙彇娑�
IsFinish = 1,//鏄惁鍙畬鎴�
@@ -1194,7 +1207,7 @@
//淇敼搴撳瓨鏄庣粏淇℃伅
item.Status = "4";//绉诲簱閿佸畾
- item.LockQty = item.Qty;//閿佸畾搴撳瓨鏁伴噺
+ //item.LockQty = item.Qty;//閿佸畾搴撳瓨鏁伴噺
Db.Updateable(item).ExecuteCommand();
//淇敼璧峰鍌ㄤ綅鍦板潃鐘舵��
@@ -1203,11 +1216,16 @@
//淇敼鐩爣鍌ㄤ綅鍦板潃鐘舵��
storageLocatEnd.Status = "4";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑
Db.Updateable(storageLocatEnd).ExecuteCommand();
+
+ if (!strList.Contains("0"))
+ {
+ strList.Add("0");
+ }
- var stockInfo = stock.First(w => w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
- //淇敼搴撳瓨淇℃伅
- stockInfo.LockQty += (decimal)item.Qty;//閿佸畾鏁伴噺
- Db.Updateable(stockInfo).ExecuteCommand();
+ //var stockInfo = stock.First(w => w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
+ ////淇敼搴撳瓨淇℃伅
+ //stockInfo.LockQty += (decimal)item.Qty;//閿佸畾鏁伴噺
+ //Db.Updateable(stockInfo).ExecuteCommand();
}
if (string.IsNullOrEmpty(palletNo))
{
@@ -1264,6 +1282,7 @@
//鎻愪氦浜嬪姟
Db.CommitTran();
+ return strList;
}
catch (Exception ex)
{
@@ -1318,5 +1337,270 @@
}
#endregion
+ #region 浜哄伐杞繍
+
+ //浜哄伐杞繍
+ public void ArtificialTransport(string palletNo, string locatNo, string endLocatNo, string mesTokenUrl, string mesUrl,int userId)
+ {
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("璇锋壂鎻忔墭鐩樻潯鐮侊紒");
+ }
+ if (string.IsNullOrEmpty(locatNo))
+ {
+ throw new Exception("璇烽�夋嫨璧峰鍦板潃锛�");
+ }
+ if (string.IsNullOrEmpty(endLocatNo))
+ {
+ throw new Exception("璇疯緭鍏ョ洰鏍囧湴鍧�锛�");
+ }
+
+ try
+ {
+ #region 鍒ゆ柇淇℃伅
+
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo).ToList();
+ if (stockDetail.Count == 0)
+ {
+ throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樻槑缁嗕俊鎭笉瀛樺湪,璇锋鏌�!");
+ }
+
+ if (string.IsNullOrEmpty(stockDetail.First().LocatNo))
+ {
+ throw new Exception("鎵樼洏鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ if (stockDetail.First().WareHouseNo != "W02")
+ {
+ throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
+ }
+ //璧峰鍌ㄤ綅淇℃伅
+ var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo);
+ if (storageLocat == null)
+ {
+ throw new Exception("璧峰鍦板潃鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+ //鐩爣鍌ㄤ綅淇℃伅
+ var EndLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == endLocatNo);
+ if (EndLocat == null)
+ {
+ throw new Exception("鐩爣鍦板潃鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+ }
+
+ #endregion
+
+ //寮�鍚簨鍔�
+ Db.BeginTran();
+
+ //闇�鍏堝垽鏂洰鏍囧湴鍧�鍓嶆柟鏄惁鏈夌┖鍌ㄤ綅
+
+ storageLocat.Status = "0"; //鏇存敼璧峰鍌ㄤ綅
+ Db.Updateable(storageLocat).ExecuteCommand();
+ EndLocat.Status = "1"; //鏇存敼鐩爣鍌ㄤ綅
+ Db.Updateable(storageLocat).ExecuteCommand();
+
+ var data = new List<RequertBeiliaoInfoModel>();
+
+ //鏇存敼搴撳瓨鏄庣粏
+ foreach (var item in stockDetail)
+ {
+ item.LocatNo = EndLocat.LocatNo;//鍌ㄤ綅鏇存敼
+ item.WareHouseNo = EndLocat.WareHouseNo;//鎵�灞炰粨搴撴洿鏀�
+ item.RoadwayNo = EndLocat.RoadwayNo;//鎵�灞炲贩閬撴洿鏀�
+ item.AreaNo = EndLocat.AreaNo;//鎵�灞炲尯鍩熸洿鏀�
+
+ Db.Updateable(item).ExecuteCommand();
+
+ if (EndLocat != null && EndLocat.AreaNo == "B12") //鏄惁鏄�3妤肩紦瀛樺尯 鏄細鍒犻櫎搴撳瓨
+ {
+ if (string.IsNullOrWhiteSpace(item.SONo))
+ {
+ throw new Exception("褰撳墠鎵樼洏涓嶆槸鎷兼墭鍑哄簱鎵樼洏");
+ }
+ //璁板綍鎵樼洏涓婁俊鎭粰MES
+
+ data.Add(new RequertBeiliaoInfoModel()
+ {
+ materiel_no = item.SkuNo,
+ materiel_name = item.SkuName,
+ qty = item.Qty,
+ batch = item.LotNo,
+ producttime = item.ProductionTime,
+ expiry = item.ExpirationTime
+
+ });
+ //搴撳瓨绠辩爜鏄庣粏鍒犻櫎
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).ToList();
+ Db.Deleteable(boxInfo).ExecuteCommand();
+ //鍒犻櫎搴撳瓨鎵樼洏淇℃伅
+ Db.Deleteable(item).ExecuteCommand();
+ //鏇存敼搴撳瓨鎬昏〃
+ var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
+ stock.LockQty -= (decimal)item.Qty;
+ stock.Qty -= (decimal)item.Qty;
+ Db.Updateable(stock).ExecuteCommand();
+ //鏇存敼鎵樼洏鐘舵��
+ var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+ if (pallet != null)
+ {
+ pallet.Status = "0";
+ Db.Updateable(pallet).ExecuteCommand();
+ }
+ }
+ }
+
+
+ if (EndLocat != null && EndLocat.AreaNo == "B12")
+ {
+ //鑾峰彇浠ょ墝
+ var token = new Token().GetMesToken(mesTokenUrl);
+ Dictionary<string, string> mesDic = new Dictionary<string, string>()
+ {
+ {"Authorization",token }
+ };
+ var mesData = new RequertBeiliaoModel()
+ {
+ morder_no = stockDetail.First().SONo,
+ pallet = stockDetail.First().PalletNo,
+ layer_no = EndLocat.LocatNo,
+ items = data
+ };
+ var jsonData = JsonConvert.SerializeObject(mesData);
+ //璋冪敤鎺ュ彛
+ var response = HttpHelper.DoPost(mesUrl, jsonData, "澶囨枡瀹屾垚杩愯嚦缂撳瓨鍖哄弽棣堣嚦MES", "MES", mesDic);
+
+ var obj = JsonConvert.DeserializeObject<MesModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ if (obj.status != "0")
+ {
+ throw new Exception("澶囨枡鍚屾MES澶辫触锛�" + obj.message);
+ }
+
+ }
+
+
+
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
+
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ Db.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+
+
+
+
+ }
+
+ #endregion
+
+ #region 绠辩爜鏌ヨ
+ /// <summary>
+ /// 绠辩爜鏌ヨ
+ /// </summary>
+ /// <param name="boxNo">绠辩爜</param>
+ /// <returns></returns>
+ public DataBoxDto GetBoxQueryList(string boxNo)
+ {
+ // 瀹炰緥鍖栬繑鍥炵被
+ DataBoxDto boxModel = new DataBoxDto();
+ List<DataBoxInfoDto> list = new List<DataBoxInfoDto>();
+
+ // 鏍规嵁绠辩爜鑾峰彇绠变俊鎭�
+ var boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+
+ if (boxData.Count() == 0)
+ {
+ // 鏍规嵁鐩掔爜鑾峰彇绠变俊鎭�
+ boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo2 == boxNo);
+ if (boxData.Count() == 0)
+ {
+ boxModel = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo3 == boxNo).Select(it => new DataBoxDto() { Qty = it.Qty }, true).First();
+ return boxModel;
+ }
+
+ list = boxData.Select(it => new DataBoxInfoDto()
+ {
+ BoxNo2 = it.BoxNo3,
+ Qty2 = it.Qty
+ }).ToList();
+
+ boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo2 == boxNo);
+ boxModel = boxData.GroupBy(m => new
+ {
+ m.BoxNo,
+ m.SkuName,
+ m.SkuNo,
+ m.LotNo,
+ m.SupplierLot,
+ m.InspectStatus
+ }).Select(it => new DataBoxDto()
+ {
+ BoxNo = it.BoxNo,
+ SkuName = it.SkuName,
+ SkuNo = it.SkuNo,
+ LotNo = it.LotNo,
+ SupplierLot = it.SupplierLot,
+ InspectStatus = it.InspectStatus == "0" ? "寰呮" : it.InspectStatus == "1" ? "鍚堟牸":"涓嶅悎鏍�",
+ Qty = SqlFunc.AggregateSum(it.Qty)
+ }).First();
+
+ boxModel.InfoList = list;
+ return boxModel;
+ }
+ else //绠辩爜鍐呮暟鎹�
+ {
+ // 澶勭悊澶氱骇鐮�
+ var num = boxData.Count(m => !string.IsNullOrWhiteSpace(m.BoxNo2));
+ if (num > 0)
+ {
+ list = boxData.GroupBy(m => new
+ {
+ m.BoxNo2
+ }).Select(it => new DataBoxInfoDto()
+ {
+ BoxNo2 = it.BoxNo2,
+ Qty2 = SqlFunc.AggregateSum(it.Qty)
+ }).ToList();
+ }
+ else
+ {
+ list = boxData.Select(it => new DataBoxInfoDto()
+ {
+ BoxNo2 = SqlFunc.IsNull(it.BoxNo3,""),
+ Qty2 = it.Qty
+ }).ToList();
+ }
+
+ // 绠辩爜淇℃伅璧嬪��
+ boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+ boxModel = boxData.GroupBy(m => new
+ {
+ m.BoxNo,
+ m.SkuName,
+ m.SkuNo,
+ m.LotNo,
+ m.SupplierLot,
+ m.InspectStatus
+ }).Select(it => new DataBoxDto()
+ {
+ BoxNo = it.BoxNo,
+ SkuName = it.SkuName,
+ SkuNo = it.SkuNo,
+ LotNo = it.LotNo,
+ SupplierLot = it.SupplierLot,
+ InspectStatus = it.InspectStatus == "0" ? "寰呮" : it.InspectStatus == "1" ? "鍚堟牸" : "涓嶅悎鏍�",
+ Qty = SqlFunc.AggregateSum(it.Qty)
+ }).First();
+ boxModel.InfoList = list;
+
+ return boxModel;
+ }
+ }
+ #endregion
+
}
}
--
Gitblit v1.8.0