From 19e95f4acc328bbf62a0427fe658d00268019e66 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 10:14:34 +0800
Subject: [PATCH] 修改IIS配置
---
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 156 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 124 insertions(+), 32 deletions(-)
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index 28b7459..ed8af5e 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -14,6 +14,7 @@
using SqlSugar.Extensions;
using Utility.Tools;
using WMS.BLL.LogServer;
+using WMS.BLL.SysServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
using WMS.Entity.BllCheckEntity;
@@ -994,7 +995,7 @@
}
}
- //鐢熸垚鐩樼偣璁板綍
+ //鐢熸垚鐩樼偣璁板綍
Db.Insertable(logList).ExecuteCommand();
}
// 鍌ㄤ綅鍙�
@@ -1195,22 +1196,22 @@
try
{
var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- //response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS"); //姝ｅ紡鐗堟湰鏀惧紑
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS"); //姝ｅ紡鐗堟湰鏀惧紑
var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
- ////瑙ｆ瀽杩斿洖鏁版嵁
- //var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- //if (wcsModel.StatusCode == 0)
- //{
- // //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
- // new TaskServer().EditTaskIssueOk(list2, time1, time2);
- //str += "涓嬪彂鎴愬姛";
- //}
- //if (wcsModel.StatusCode == -1)
- //{
- // new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
- // throw new Exception(wcsModel.Msg);
- //}
+ //瑙ｆ瀽杩斿洖鏁版嵁
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ if (wcsModel.StatusCode == 0)
+ {
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list2, time1, time2);
+ str += "涓嬪彂鎴愬姛";
+ }
+ if (wcsModel.StatusCode == -1)
+ {
+ new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
+ throw new Exception(wcsModel.Msg);
+ }
}
catch (Exception ex)
{
@@ -1237,11 +1238,19 @@
{
try
{
+ //鍑哄簱浠诲姟鍙锋洿鏀癸紝濡傛灉鐢盤LC鍑哄簱锛屽垯PLC鍥炰紶浠诲姟鍙蜂负锛氫换鍔″彿+瀹為檯鍑哄簱鍙�
+ var TtaskNo = taskNo;
+ var outLine = "";
+ if (taskNo.Length == 18)
+ {
+ TtaskNo = taskNo.Substring(0, taskNo.Length - 3);
+ outLine = taskNo.Substring(taskNo.Length - 3, 3);
+ }
//褰撳墠浠诲姟淇℃伅
- var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
+ var task = Db.Queryable<LogTask>().First(m => m.TaskNo == TtaskNo && m.IsDel == "0");
if (task == null)
{
- throw new Exception($"鏈煡璇㈠埌浠诲姟鍙蜂负锛氣�榹taskNo}鈥欑殑浠诲姟淇℃伅");
+ throw new Exception($"鏈煡璇㈠埌浠诲姟鍙蜂负锛氣�榹TtaskNo}鈥欑殑浠诲姟淇℃伅");
}
if (task.Status == "2")
{
@@ -1271,7 +1280,7 @@
Db.Updateable(item).ExecuteCommand();
}
//鐩樼偣鏄庣粏锛堟洿鏀圭姸鎬侊級
- var checkDetails = Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && (m.TaskNo == taskNo || (m.Status == 1 && m.PalletNo == task.PalletNo))).ToList();
+ var checkDetails = Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && (m.TaskNo == TtaskNo || (m.Status == 1 && m.PalletNo == task.PalletNo))).ToList();
foreach (var item in checkDetails)
{
@@ -1282,7 +1291,7 @@
if (userId != 0)
{
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�", userId);
+ var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", TtaskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{TtaskNo}鐨勪换鍔�", userId);
}
Db.CommitTran();
@@ -1295,7 +1304,7 @@
}
//AGV绉诲簱瀹屾垚
- public void MoveSuccess(string taskNo, int userId)
+ public void MoveSuccess(string taskNo,string mesTokenUrl, string mesUrl, int userId)
{
try
{
@@ -1332,22 +1341,24 @@
var endLocate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
if (endLocate != null)
{
- if (endLocate.Status != "0")
+ if (endLocate.Status != "4")
{
- throw new Exception("鐩爣鍌ㄤ綅鐘舵�侀潪绌哄偍浣�");
+ throw new Exception("鐩爣鍌ㄤ綅鐘舵�侀潪绉诲叆涓�");
}
}
+ var data = new List<RequertBeiliaoInfoModel>();
//鏇存敼搴撳瓨鏄庣粏
foreach (var item in stockDetail)
{
- item.Status = "0";//寰呭垎閰�
- item.LockQty = 0;//閿佸畾鏁伴噺鏀逛负0
+ //item.Status = "0";//寰呭垎閰�
+ //item.LockQty = 0;//閿佸畾鏁伴噺鏀逛负0
if (endLocate != null)//鏈夌洰鏍囧偍浣嶈鏄庣Щ鍒板叾浠栧尯鍩熷偍浣�
{
item.LocatNo = endLocate.LocatNo;//鍌ㄤ綅鏇存敼
item.WareHouseNo = endLocate.WareHouseNo;//鎵�灞炰粨搴撴洿鏀�
item.RoadwayNo = endLocate.RoadwayNo;//鎵�灞炲贩閬撴洿鏀�
- item.AreaNo = endLocate.AreaNo;//鎵�灞炲尯鍩熸洿鏀�
+ item.AreaNo = endLocate.AreaNo;//鎵�灞炲尯鍩熸洿鏀�
+
}
else//娌℃湁鐩爣鍌ㄤ綅璇存槑绉诲埌鍏ュ簱鍙�
{
@@ -1355,21 +1366,102 @@
item.WareHouseNo = "";//鎵�灞炰粨搴撴洿鏀癸紙鏀逛负绌猴級
item.RoadwayNo = "";//鎵�灞炲贩閬撴洿鏀癸紙鏀逛负绌猴級
item.AreaNo = "";//鎵�灞炲尯鍩熸洿鏀癸紙鏀逛负绌猴級
- }
+ }
+ if (item.Qty == item.LockQty && item.LockQty>0)
+ {
+ item.Status = "2";
+ }
+ else if (item.Qty > item.LockQty && item.LockQty > 0)
+ {
+ item.Status = "1";
+ }
+ else if (item.Qty > item.LockQty && item.LockQty == 0)
+ {
+ item.Status = "0";
+ }
Db.Updateable(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;
- Db.Updateable(stock).ExecuteCommand();
+
+
+
+ if (endLocate != null && endLocate.AreaNo == "B12") //鏄惁鏄�3妤肩紦瀛樺尯 鏄細鍒犻櫎搴撳瓨
+ {
+ if (string.IsNullOrWhiteSpace(item.SONo))
+ {
+ throw new Exception("褰撳墠鎵樼洏涓嶆槸鎷兼墭鍑哄簱鎵樼洏");
+ }
+ //璁板綍鎵樼洏涓婁俊鎭粰MES
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).ToList();
+ if (boxInfo.Count == 0)
+ {
+ throw new Exception("鎵樼洏涓婄墿鏂欑鐮佷俊鎭笉瀛樺湪,璇锋鏌�!");
+ }
+ foreach (var item2 in boxInfo)
+ {
+ data.Add(new RequertBeiliaoInfoModel()
+ {
+ no = item2.BoxNo,
+ materiel_no = item.SkuNo,
+ materiel_name = item.SkuName,
+ qty = item.Qty,
+ batch = item.LotNo,
+ producttime = item2.ProductionTime.ToString().Substring(1, 8),
+ expiry = item2.ExpirationTime.ToString().Substring(1, 8)
+
+ });
+ }
+ //搴撳瓨绠辩爜鏄庣粏鍒犻櫎
+ 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 == task.PalletNo);
+ if (pallet != null)
+ {
+ pallet.Status = "0";
+ Db.Updateable(pallet).ExecuteCommand();
+ }
+ }
}
if (endLocate != null)
{
//鏇存敼鐩爣鍌ㄤ綅鐘舵��
endLocate.Status = "1";//鏈夌墿鍝�
Db.Updateable(endLocate).ExecuteCommand();
- }
+ }
+ //姝ｅ紡杩愯绋嬪簭鏀惧紑
+ if (endLocate != null && endLocate.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 = endLocate.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);
+ }
+
+ }
if (userId != 0)
{
//娣诲姞鎿嶄綔鏃ュ織璁板綍
@@ -1420,7 +1512,7 @@
PalletNo = task.PalletNo,//鎵樼洏鍙�
StartLocate = locateNo, // 璧峰浣嶇疆
StartRoadway = locate.RoadwayNo,
- EndLocate = "", // 鐩爣浣嶇疆
+ EndLocate = task.EndLocat, // 鐩爣浣嶇疆
TaskNo = task.TaskNo, // 浠诲姟鍙�
TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)
OutMode = "", //鐩爣鍦板潃
--
Gitblit v1.8.0