From 157abc191c34e57c1b958ae74fc3de6518ca8a30 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 28 二月 2025 11:06:36 +0800
Subject: [PATCH] 修改客户需求
---
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 316 insertions(+), 35 deletions(-)
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index 2d8c259..2e8dd5f 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -11,8 +11,10 @@
using Model.ModelVm.BllCheckVm;
using Newtonsoft.Json;
using SqlSugar;
+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;
@@ -199,7 +201,7 @@
LotNo = m.LotNo,
LotText = m.LotText,
SupplierLot = m.SupplierLot,
- Qty = (int)m.Qty,
+ Qty = m.Qty,
PalletNo = m.PalletNo
}).ToList();
@@ -543,53 +545,90 @@
//寰幆鐩樼偣璁板綍
foreach (var l in demo)
{
+ var sku = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.SkuNo == l.SkuNo);
if (l.CheckResult == 0)//姝ｅ父
{
- var de3 = stockBox.First(m => m.BoxNo == l.BoxNo && m.BoxNo3 == l.BoxNo3);
- if (de3 == null)
+ if (sku.Type != "4")
{
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨绠辩爜鐨勪俊鎭�");
+ var de3 = stockBox.First(m => m.BoxNo == l.BoxNo && m.BoxNo3 == l.BoxNo3);
+ if (de3 == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨绠辩爜鐨勪俊鎭�");
+ }
+ var de2 = stockDetail.First(m => m.Id == de3.StockDetailId);
+ if (de2 == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鏄庣粏鐨勪俊鎭�");
+ }
+ de2.Status = "0";//灏嗗簱瀛樻槑缁嗙姸鎬佹敼涓哄緟鍒嗛厤
+ Db.Updateable(de2).ExecuteCommand();
}
- var de2 = stockDetail.First(m => m.Id == de3.StockDetailId);
- if (de2 == null)
+ else
{
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鏄庣粏鐨勪俊鎭�");
+ var de2 = stockDetail.First(m => m.PalletNo == l.PalletNo && m.SkuNo == l.SkuNo);
+ if (de2 == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{l.PalletNo}鐨勫簱瀛樻槑缁嗙殑淇℃伅");
+ }
+ de2.Status = "0";//灏嗗簱瀛樻槑缁嗙姸鎬佹敼涓哄緟鍒嗛厤
+ Db.Updateable(de2).ExecuteCommand();
}
- de2.Status = "0";//灏嗗簱瀛樻槑缁嗙姸鎬佹敼涓哄緟鍒嗛厤
- Db.Updateable(de2).ExecuteCommand();
+
}
else if (l.CheckResult == 1)//鐩樹簭
{
- var de3 = stockBox.First(m => m.BoxNo == l.BoxNo && m.BoxNo3 == l.BoxNo3);
- if (de3 == null)
+ if (sku.Type != "4")
{
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨绠辩爜鐨勪俊鎭�");
- }
+ var de3 = stockBox.First(m => m.BoxNo == l.BoxNo && m.BoxNo3 == l.BoxNo3);
+ if (de3 == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨绠辩爜鐨勪俊鎭�");
+ }
- var de2 = stockDetail.First(m => m.Id == de3.StockDetailId);
- if (de2 == null)
- {
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鏄庣粏鐨勪俊鎭�");
- }
- de2.Status = "0";
- de2.Qty -= de3.Qty;
- var de = stock.First(m => m.SkuNo == l.SkuNo && m.LotNo == l.LotNo);
- if (de == null)
- {
- throw new Exception($"鏈煡璇㈠埌鐗╂枡{l.SkuNo}鎵规{l.LotNo}鐨勬�诲簱瀛樼殑淇℃伅");
- }
- de.Qty -= de3.Qty;
+ var de2 = stockDetail.First(m => m.Id == de3.StockDetailId);
+ if (de2 == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鏄庣粏鐨勪俊鎭�");
+ }
+ de2.Status = "0";
+ de2.Qty -= de3.Qty;
+ var de = stock.First(m => m.SkuNo == l.SkuNo && m.LotNo == l.LotNo);
+ if (de == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌鐗╂枡{l.SkuNo}鎵规{l.LotNo}鐨勬�诲簱瀛樼殑淇℃伅");
+ }
+ de.Qty -= de3.Qty;
- Db.Updateable(de).ExecuteCommand();
- Db.Updateable(de2).ExecuteCommand();
- Db.Deleteable(de3).ExecuteCommand();
+ Db.Updateable(de).ExecuteCommand();
+ Db.Updateable(de2).ExecuteCommand();
+ Db.Deleteable(de3).ExecuteCommand();
+ }
+ else
+ {
+ var de2 = stockDetail.First(m => m.PalletNo == l.PalletNo && m.SkuNo == l.SkuNo);
+ if (de2 == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{l.PalletNo}鐨勫簱瀛樻槑缁嗙殑淇℃伅");
+ }
+ de2.Status = "0";
+ de2.Qty = l.RealQty;
+ var de = stock.First(m => m.SkuNo == l.SkuNo && m.LotNo == l.LotNo);
+ if (de == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌鐗╂枡{l.SkuNo}鎵规{l.LotNo}鐨勬�诲簱瀛樼殑淇℃伅");
+ }
+ de.Qty -= Convert.ToDecimal(l.Qty - l.RealQty);
+
+ Db.Updateable(de).ExecuteCommand();
+ Db.Updateable(de2).ExecuteCommand();
+ }
}
else if (l.CheckResult == 2)//鐩樼泩
{
- var sku = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.SkuNo == l.SkuNo);
+
var stockDetailInfo = stockDetail.First(m => m.PalletNo == d.PalletNo && m.SkuNo == d.SkuNo && m.LotNo == d.LotNo);//搴撳瓨鏄庣粏
-
+
if (sku.Type != "4")
{
var stockBoxInfo = stockBox.First(m => m.StockDetailId == stockDetailInfo.Id);//搴撳瓨绠辨敮鏄庣粏
@@ -603,7 +642,7 @@
BoxNo2 = l.BoxNo2,
BoxNo3 = l.BoxNo3,
PalletNo = l.PalletNo,
- Qty = (int)l.RealQty,
+ Qty = (decimal)l.RealQty,
FullQty = stockBoxInfo.FullQty,//婊＄鏁伴噺
Status = "2",
SkuNo = l.SkuNo,
@@ -644,7 +683,7 @@
{
de.Qty += (int)(l.RealQty - l.Qty);
}
-
+
Db.Updateable(de).ExecuteCommand();
}
}
@@ -956,7 +995,7 @@
}
}
- //鐢熸垚鐩樼偣璁板綍
+ //鐢熸垚鐩樼偣璁板綍
Db.Insertable(logList).ExecuteCommand();
}
// 鍌ㄤ綅鍙�
@@ -1256,6 +1295,180 @@
}
}
+ //AGV绉诲簱瀹屾垚
+ public void MoveSuccess(string taskNo,string mesTokenUrl, string mesUrl, int userId)
+ {
+ try
+ {
+ //褰撳墠浠诲姟淇℃伅
+ var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
+ if (task == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌浠诲姟鍙蜂负锛氣�榹taskNo}鈥欑殑浠诲姟淇℃伅");
+ }
+ if (task.Status == "2")
+ {
+ throw new Exception("褰撳墠浠诲姟宸插畬鎴�");
+ }
+ Db.BeginTran();
+ //搴撳瓨涓綋鍓嶆墭鐩樼殑淇℃伅
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
+ var locateNo = stockDetail.Select(m => m.LocatNo).Distinct().FirstOrDefault();
+
+ //褰撳墠浠诲姟涓殑鍌ㄤ綅淇℃伅
+ var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == locateNo);
+
+ //鏇存敼浠诲姟
+ task.Status = "2";//浠诲姟鐘舵��
+ task.IsSend = 0;
+ task.IsCancel = 0;
+ task.IsFinish = 0;
+ task.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
+ Db.Updateable(task).ExecuteCommand();
+ // 鏇存敼褰撳墠浠诲姟涓殑鍌ㄤ綅鐘舵�侊紙鏀逛负0绌哄偍浣嶏級
+ locate.Status = "0";
+ Db.Updateable(locate).ExecuteCommand();
+
+ //鐩爣鍌ㄤ綅淇℃伅
+ var endLocate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
+ if (endLocate != null)
+ {
+ if (endLocate.Status != "4")
+ {
+ throw new Exception("鐩爣鍌ㄤ綅鐘舵�侀潪绉诲叆涓�");
+ }
+ }
+ var data = new List<RequertBeiliaoInfoModel>();
+ //鏇存敼搴撳瓨鏄庣粏
+ foreach (var item in stockDetail)
+ {
+ //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;//鎵�灞炲尯鍩熸洿鏀�
+
+ }
+ else//娌℃湁鐩爣鍌ㄤ綅璇存槑绉诲埌鍏ュ簱鍙�
+ {
+ item.LocatNo = "";//鍌ㄤ綅鏇存敼锛堟敼涓虹┖锛�
+ 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();
+
+
+
+
+ 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)
+ {
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�", userId);
+ }
+ Db.CommitTran();
+
+ }
+ catch (Exception ex)
+ {
+ Db.RollbackTran();
+ throw new Exception("瀹屾垚鍙嶉澶辫触锛�" + ex.Message);
+ }
+ }
+
//閲嶆柊涓嬪彂鐩樼偣鍑哄簱浠诲姟
public OutCommandDto AgainSendCheckTask(string taskNo, int userId, string url)
{
@@ -1379,7 +1592,7 @@
checkLog.IsDel = "1";
Db.Updateable(checkLog).ExecuteCommand();
//淇敼鍌ㄤ綅淇℃伅
- var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
+ var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
if (locat == null)
{
throw new Exception("鏈煡璇㈠埌鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");
@@ -1403,6 +1616,74 @@
}
}
+ //鍙栨秷AGV绉诲簱浠诲姟
+ public void CancelMoveTask(string taskNo, int userId)
+ {
+ try
+ {
+ Db.BeginTran();
+
+ var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
+ if (task == null)
+ {
+ throw new Exception("鏈煡璇㈠埌浠诲姟淇℃伅");
+ }
+ //淇敼浠诲姟
+ task.IsSuccess = 0;
+ task.IsSend = 0;
+ task.IsCancel = 0;
+ task.IsFinish = 0;
+ task.Status = "4";
+ task.CancelDate = DateTime.Now;
+ Db.Updateable(task).ExecuteCommand();
+
+ //淇敼璧峰鍌ㄤ綅淇℃伅
+ var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
+ if (locat == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");
+ }
+ locat.Status = "1"; //鏈夌墿鍝�
+ Db.Updateable(locat).ExecuteCommand();
+
+ //淇敼鐩爣鍌ㄤ綅淇℃伅
+ var locatEnd = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.EndLocat);
+ if (locatEnd != null)
+ {
+ locatEnd.Status = "0"; //绌哄偍浣�
+ Db.Updateable(locatEnd).ExecuteCommand();
+ }
+
+ //淇敼搴撳瓨鏄庣粏
+ var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == task.PalletNo);
+ if (stockDetail == null)
+ {
+ throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樻槑缁嗕俊鎭笉瀛樺湪,璇锋鏌�!");
+ }
+ stockDetail.Status = "0";//寰呭垎閰�
+ stockDetail.LockQty = 0;//閿佸畾鏁伴噺
+ Db.Updateable(stockDetail).ExecuteCommand();
+
+ //淇敼搴撳瓨
+ var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == stockDetail.SkuNo && w.LotNo == stockDetail.LotNo);
+ if (stock == null)
+ {
+ throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樹俊鎭笉瀛樺湪,璇锋鏌�!");
+ }
+ stock.LockQty -= (decimal)stockDetail.Qty;
+ Db.Updateable(stock).ExecuteCommand();
+
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "鍙栨秷", $"鐐瑰嚮鍙栨秷鎸夐挳銆佸彇娑堜簡浠诲姟鍙蜂负锛歿taskNo}鐨勪换鍔�", userId);
+ Db.CommitTran();
+ }
+ catch (Exception e)
+ {
+ Db.RollbackTran();
+ throw new Exception(e.Message);
+ }
+ }
+
#region 涓婃父绯荤粺鎺ュ彛
//鐩樼偣缁撴灉杩斿洖erp
--
Gitblit v1.8.0