From 5ce969ed34e91c931cce38e2feb5d2c208633a96 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 03 十一月 2024 18:34:53 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 304 insertions(+), 35 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 386e71a..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;
@@ -868,8 +873,7 @@
{
throw new Exception("璇烽�夋嫨鍑哄簱鍗曞彿锛�");
}
- //var palletNoList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo).Select(m => m.PalletNo).Distinct().ToList();
- var palletNoList = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SONo == soNo).Select(m => m.PalletNo).Distinct().ToList();
+ var palletNoList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo).Select(m => m.PalletNo).Distinct().ToList();
return palletNoList;
}
catch (Exception ex)
@@ -1238,41 +1242,41 @@
- //var IsTrue = false;
- //while (IsTrue == true)
- //{
- // // 姝ｅ紡杩愯绋嬪簭鏀惧紑
- // string str = "";
- // var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
- // var jsonData = JsonConvert.SerializeObject(agvTaskList);
- // string response = "";
+ 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")
+ 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);
- // }
- //}
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ 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
@@ -1333,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