From 0464969366317154fdbb51e106ca778b855bdd08 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 17 八月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 1974 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 1,196 insertions(+), 778 deletions(-)
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index 24196ca..22739af 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -3,15 +3,21 @@
using System.ComponentModel.Design;
using System.Linq;
using System.Linq.Expressions;
+using System.Net;
using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
using Model.InterFaceModel;
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.DataDto;
+using Model.ModelDto.SysDto;
using Model.ModelVm;
using Model.ModelVm.BllCheckVm;
+using Model.ModelVm.LogVm;
using Newtonsoft.Json;
using SqlSugar;
using SqlSugar.Extensions;
+using Utility;
using Utility.Tools;
using WMS.BLL.LogServer;
using WMS.DAL;
@@ -23,238 +29,276 @@
using WMS.Entity.LogEntity;
using WMS.Entity.SysEntity;
using WMS.IBLL.IBllCheckServer;
+using WMS.IBLL.ILogServer;
namespace WMS.BLL.BllCheckServer
{
public class StockCheckServer : DbHelper<BllStockCheck>, IStockCheckServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
- public StockCheckServer() : base(Db)
+ private readonly UserManager _userManager;
+ private readonly IOperationCRServer _operation;
+ public StockCheckServer(UserManager userManager, IOperationCRServer operation) : base(Db)
{
+ _userManager = userManager;
+ _operation = operation;
}
//鑾峰彇鐩樼偣鍗曟嵁
- public List<StockCheckDto> GetStockCheckList(string crNo, string status, string palletNo, string skuNo, string skuName,
- string lotNo, string startTime, string endTime, int page, int limit, out int count)
+ public async Task<List<StockCheckDto>> GetStockCheckList(string crNo, string status, string palletNo, string skuNo, string skuName,
+ string lotNo, string startTime, string endTime, int page, int limit, RefAsync<int> count)
{
- try
+ var strList = new List<string>();
+
+ if (!string.IsNullOrWhiteSpace(palletNo) || !string.IsNullOrWhiteSpace(skuNo) || !string.IsNullOrWhiteSpace(skuName) || !string.IsNullOrWhiteSpace(lotNo))
{
- var strList = new List<string>();
-
- if (!string.IsNullOrWhiteSpace(palletNo) || !string.IsNullOrWhiteSpace(skuNo) || !string.IsNullOrWhiteSpace(skuName) || !string.IsNullOrWhiteSpace(lotNo))
- {
- Expression<Func<BllStockCheckDetail, bool>> demo = Expressionable.Create<BllStockCheckDetail>()
- .AndIF(!string.IsNullOrWhiteSpace(palletNo), m => m.PalletNo.Contains(palletNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(skuNo), m => m.SkuNo.Contains(skuNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(skuName), m => m.SkuName.Contains(skuName.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(lotNo), m => m.LotNo.Contains(lotNo.Trim()))
- .And(m => m.IsDel == "0")
- .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
-
- var detailList = Db.Queryable<BllStockCheckDetail>().Where(demo).Select(m => m.CRNo).Distinct().ToList();
- strList = detailList;
- }
-
- Expression<Func<BllStockCheck, bool>> item = Expressionable.Create<BllStockCheck>()
- .AndIF(!string.IsNullOrWhiteSpace(crNo), m => m.CRNo.Contains(crNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(status), m => m.Status == int.Parse(status))
- .AndIF(!string.IsNullOrWhiteSpace(startTime), m => m.CheckDate >= Convert.ToDateTime(startTime))
- .AndIF(!string.IsNullOrWhiteSpace(endTime), m => m.CheckDate <= Convert.ToDateTime(endTime).AddDays(1))
- .AndIF(!string.IsNullOrWhiteSpace(palletNo), m => strList.Contains(m.CRNo))
- .AndIF(!string.IsNullOrWhiteSpace(skuNo), m => strList.Contains(m.CRNo))
- .AndIF(!string.IsNullOrWhiteSpace(skuName), m => strList.Contains(m.CRNo))
- .AndIF(!string.IsNullOrWhiteSpace(lotNo), m => strList.Contains(m.CRNo))
+ Expression<Func<BllStockCheckDetail, bool>> demo = Expressionable.Create<BllStockCheckDetail>()
+ .AndIF(!string.IsNullOrWhiteSpace(palletNo), m => m.PalletNo.Contains(palletNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(skuNo), m => m.SkuNo.Contains(skuNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(skuName), m => m.SkuName.Contains(skuName.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(lotNo), m => m.LotNo.Contains(lotNo.Trim()))
.And(m => m.IsDel == "0")
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var total = 0;
- var list = Db.Queryable<BllStockCheck>().Where(item)
- .LeftJoin<SysUserInfor>((a, b) => a.AuditUser == b.Id)
- .LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
- .LeftJoin<SysUserInfor>((a, b, c, d) => a.CreateUser == d.Id)
- .Select((a, b, c, d) => new StockCheckDto()
- {
- Id = a.Id,
- CrNo = a.CRNo,
- CheckDate = a.CheckDate,
- CompleteDate = a.CompleteDate,
- Status = a.Status,
- Origin = a.Origin,
- AuditStatusNo = a.AuditStatusNo,
- IsDoubleCheck = a.IsDoubleCheck,
- AuditUserName = b.RealName,
- AuditTime = a.AuditTime,
- Demo = a.Demo,
- CreateUserName = c.RealName,
- UpdateUserName = d.RealName,
- CreateTime = a.CreateTime,
- UpdateTime = a.UpdateTime,
-
- }).OrderByDescending(a => a.CreateTime).ToOffsetPage(page, limit, ref total);
- count = total;
-
- return list;
-
+ var detailList = await Db.Queryable<BllStockCheckDetail>().Where(demo).Select(m => m.CRNo).Distinct().ToListAsync();
+ strList = detailList;
}
- catch (Exception e)
- {
- throw new Exception(e.Message);
- }
+
+ Expression<Func<BllStockCheck, bool>> item = Expressionable.Create<BllStockCheck>()
+ .AndIF(!string.IsNullOrWhiteSpace(crNo), m => m.CRNo.Contains(crNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(status), m => m.Status == int.Parse(status))
+ .AndIF(!string.IsNullOrWhiteSpace(startTime), m => m.CheckDate >= Convert.ToDateTime(startTime))
+ .AndIF(!string.IsNullOrWhiteSpace(endTime), m => m.CheckDate <= Convert.ToDateTime(endTime).AddDays(1))
+ .AndIF(!string.IsNullOrWhiteSpace(palletNo), m => strList.Contains(m.CRNo))
+ .AndIF(!string.IsNullOrWhiteSpace(skuNo), m => strList.Contains(m.CRNo))
+ .AndIF(!string.IsNullOrWhiteSpace(skuName), m => strList.Contains(m.CRNo))
+ .AndIF(!string.IsNullOrWhiteSpace(lotNo), m => strList.Contains(m.CRNo))
+ .And(m => m.IsDel == "0")
+ .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+ var list = await Db.Queryable<BllStockCheck>().Where(item)
+ .LeftJoin<SysUserInfor>((a, b) => a.AuditUser == b.Id)
+ .LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
+ .LeftJoin<SysUserInfor>((a, b, c, d) => a.CreateUser == d.Id)
+ .Select((a, b, c, d) => new StockCheckDto()
+ {
+ Id = a.Id,
+ CrNo = a.CRNo,
+ CheckDate = a.CheckDate,
+ CompleteDate = a.CompleteDate,
+ Status = a.Status,
+ Origin = a.Origin,
+ AuditStatusNo = a.AuditStatusNo,
+ IsDoubleCheck = a.IsDoubleCheck,
+ AuditUserName = b.RealName,
+ AuditTime = a.AuditTime,
+ Demo = a.Demo,
+ CreateUserName = c.RealName,
+ UpdateUserName = d.RealName,
+ CreateTime = a.CreateTime,
+ UpdateTime = a.UpdateTime,
+ }).OrderByDescending(a => a.CreateTime).ToPageListAsync(page, limit, count);
+
+ return list;
}
//鑾峰彇鐩樼偣鍗曟嵁鏄庣粏
- public List<StockCheckDetailDto> GetStockCheckDetailList(string crNo, int page, int limit, out int count)
+ public async Task<List<StockCheckDetailDto>> GetStockCheckDetailList(string crNo, int page, int limit, RefAsync<int> count)
{
- try
- {
- var total = 0;
- var list = Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && m.CRNo == crNo)
- .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
- .LeftJoin<SysUserInfor>((a, b, c) => a.UpdateUser == c.Id)
- .Select((a, b, c) => new StockCheckDetailDto()
- {
- Id = a.Id,
- CrNo = a.CRNo,
- PalletNo = a.PalletNo,
- Qty = a.Qty,
- RealQty = a.RealQty,
- CheckResult = a.CheckResult,
- Status = a.Status,
- SkuNo = a.SkuNo,
- SkuName = a.SkuName,
- Standard = a.Standard,
- LotNo = a.LotNo,
- LotText = a.LotText,
- SupplierLot = a.SupplierLot,
+ return await Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && m.CRNo == crNo)
+ .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
+ .LeftJoin<SysUserInfor>((a, b, c) => a.UpdateUser == c.Id)
+ .Select((a, b, c) => new StockCheckDetailDto()
+ {
+ Id = a.Id,
+ CrNo = a.CRNo,
+ PalletNo = a.PalletNo,
+ Qty = a.Qty,
+ RealQty = a.RealQty,
+ CheckResult = a.CheckResult,
+ Status = a.Status,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ Standard = a.Standard,
+ LotNo = a.LotNo,
+ LotText = a.LotText,
+ SupplierLot = a.SupplierLot,
- CreateUserName = b.RealName,
- UpdateUserName = c.RealName,
- CreateTime = a.CreateTime,
- UpdateTime = a.UpdateTime,
+ CreateUserName = b.RealName,
+ UpdateUserName = c.RealName,
+ CreateTime = a.CreateTime,
+ UpdateTime = a.UpdateTime,
- }).ToOffsetPage(page, limit, ref total);
- count = total;
-
- return list;
- }
- catch (Exception e)
- {
- throw new Exception(e.Message);
- }
+ }).ToPageListAsync(page, limit, count);
}
//鑾峰彇搴撳瓨鏄庣粏淇℃伅锛堢洏鐐归�夋嫨鏄庣粏鏁版嵁婧愶級
- public List<StockDetailDto> GetCheckStockDetailList(string houseNo, string roadwayNo, string locateNo, string msg, int page, int limit, out int count)
+ public async Task<List<StockDetailDto>> GetCheckStockDetailList(string houseNo, string roadwayNo, string locateNo, string msg, int page, int limit, RefAsync<int> count)
{
- try
- {
- Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
- .AndIF(!string.IsNullOrWhiteSpace(houseNo), m => m.WareHouseNo == houseNo)
- .AndIF(!string.IsNullOrWhiteSpace(roadwayNo), m => m.RoadwayNo == roadwayNo)
- .AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo == locateNo)
- .AndIF(!string.IsNullOrWhiteSpace(msg),
- m => m.SkuNo.Contains(msg.Trim())
- || m.SkuName.Contains(msg.Trim())
- || m.LotNo.Contains(msg.Trim()))
- .And(m => m.IsDel == "0" && m.SkuNo != "100099" && m.Status == "0")
- .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
-
- var total = 0;
- var list = Db.Queryable<DataStockDetail>().Where(item).GroupBy(m => new { m.SkuNo, m.SkuName, m.Standard, m.LotNo, m.LotText, m.SupplierLot, m.LocatNo, m.PalletNo })
- .Select(a => new StockDetailDto()
- {
- SkuNo = a.SkuNo,
- SkuName = a.SkuName,
- Standard = a.Standard,
- LotNo = a.LotNo,
- LotText = a.LotText,
- SupplierLot = a.SupplierLot,
- Qty = SqlFunc.AggregateSum(a.Qty),
- LocatNo = a.LocatNo,
- PalletNo = a.PalletNo
- }).ToOffsetPage(page, limit, ref total);
- count = total;
-
- return list;
- }
- catch (Exception e)
- {
- throw new Exception(e.Message);
- }
+ Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
+ .AndIF(!string.IsNullOrWhiteSpace(houseNo), m => m.WareHouseNo == houseNo)
+ .AndIF(!string.IsNullOrWhiteSpace(roadwayNo), m => m.RoadwayNo == roadwayNo)
+ .AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo == locateNo)
+ .AndIF(!string.IsNullOrWhiteSpace(msg),
+ m => m.SkuNo.Contains(msg.Trim())
+ || m.SkuName.Contains(msg.Trim())
+ || m.LotNo.Contains(msg.Trim()))
+ .And(m => m.IsDel == "0" && m.SkuNo != "100099" && m.Status == "0")
+ .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+ return await Db.Queryable<DataStockDetail>().Where(item).GroupBy(m => new { m.SkuNo, m.SkuName, m.Standard, m.LotNo, m.LotText, m.SupplierLot, m.LocatNo, m.PalletNo })
+ .Select(a => new StockDetailDto()
+ {
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ Standard = a.Standard,
+ LotNo = a.LotNo,
+ LotText = a.LotText,
+ SupplierLot = a.SupplierLot,
+ Qty = SqlFunc.AggregateSum(a.Qty),
+ LocatNo = a.LocatNo,
+ PalletNo = a.PalletNo
+ }).ToPageListAsync(page, limit, count);
}
- public EditStockCheckDto GetStockCheckDetailById(string crNo)
+ public async Task<EditStockCheckDto> GetStockCheckDetailById(string crNo)
{
- try
+ var notify = await Db.Queryable<BllStockCheck>().FirstAsync(m => m.CRNo == crNo && m.IsDel == "0");
+ if (notify == null)
{
- var notify = Db.Queryable<BllStockCheck>().First(m => m.CRNo == crNo && m.IsDel == "0");
- if (notify == null)
- {
- throw new Exception($"鏈煡璇㈠埌{crNo}鐨勭洏鐐瑰崟鎹俊鎭�");
- }
- var detail = Db.Queryable<BllStockCheckDetail>().Where(m => m.CRNo == crNo && m.IsDel == "0").Select(m => new EditStockCheckDetailDto()
- {
- SkuNo = m.SkuNo,
- SkuName = m.SkuName,
- Standard = m.Standard,
- LotNo = m.LotNo,
- LotText = m.LotText,
- SupplierLot = m.SupplierLot,
- Qty = m.Qty,
-
- PalletNo = m.PalletNo
- }).ToList();
- var data = new EditStockCheckDto()
- {
- CrNo = crNo,
- Detail = detail
- };
-
- return data;
+ throw new Exception($"鏈煡璇㈠埌{crNo}鐨勭洏鐐瑰崟鎹俊鎭�");
}
- catch (Exception e)
+ var detail = await Db.Queryable<BllStockCheckDetail>().Where(m => m.CRNo == crNo && m.IsDel == "0").Select(m => new EditStockCheckDetailDto()
{
- throw new Exception(e.Message);
- }
+ SkuNo = m.SkuNo,
+ SkuName = m.SkuName,
+ Standard = m.Standard,
+ LotNo = m.LotNo,
+ LotText = m.LotText,
+ SupplierLot = m.SupplierLot,
+ Qty = m.Qty,
+
+ PalletNo = m.PalletNo
+ }).ToListAsync();
+ var data = new EditStockCheckDto()
+ {
+ CrNo = crNo,
+ Detail = detail
+ };
+
+ return data;
}
//娣诲姞鐩樼偣鍗曘�佺紪杈戠洏鐐瑰崟
- public void AddEditStockCheck(AddEditStockCheckVm model, int userId)
+ public async Task AddEditStockCheck(AddEditStockCheckVm model)
{
- try
+ if (model.Detail.Count == 0)
{
- if (model.Detail.Count == 0)
- {
- throw new Exception("鐩樼偣鏄庣粏涓嶈兘涓虹┖");
- }
- Db.BeginTran();
- var time = DateTime.Now;
+ throw Oops.Bah("鐩樼偣鏄庣粏涓嶈兘涓虹┖");
+ }
+ var time = DateTime.Now;
- //娣诲姞
- if (string.IsNullOrWhiteSpace(model.CrNo))
+ //娣诲姞
+ if (string.IsNullOrWhiteSpace(model.CrNo))
+ {
+ var num = await Db.Queryable<BllStockCheck>().CountAsync(m => m.IsDel == "0" && (m.Status == 0 || m.Status == 1));
+ if (num > 0)
{
- var num = Db.Queryable<BllStockCheck>().Count(m => m.IsDel == "0" && (m.Status == 0 || m.Status == 1));
- if (num > 0)
- {
- throw new Exception("宸叉湁绛夊緟鎵ц鐨勭洏鐐瑰崟鎹鍏堝畬鎴愭垨鍒犻櫎");
- }
- var crNo = new Common().GetMaxNo("CR");
- var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0");
- var check = new BllStockCheck()
+ throw Oops.Bah("宸叉湁绛夊緟鎵ц鐨勭洏鐐瑰崟鎹鍏堝畬鎴愭垨鍒犻櫎");
+ }
+ var crNo = new Common().GetMaxNo("CR");
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0");
+ var check = new BllStockCheck()
+ {
+ CRNo = crNo,
+ Origin = "0",
+ Status = 0,
+ CreateUser = _userManager.UserId,
+ CreateTime = time
+ };
+ var list = new List<BllStockCheckDetail>();
+ foreach (var item in model.Detail)
+ {
+ var detail = new BllStockCheckDetail()
{
CRNo = crNo,
- Origin = "0",
- Status = 0,
- CreateUser = userId,
+ PalletNo = item.PalletNo,
+ Qty = item.Qty,
+ Status = 0, //0锛氭湭鐩� 1锛氬凡鐩� 2锛氬凡璋冩暣
+ SkuNo = item.SkuNo,
+ SkuName = item.SkuName,
+ Standard = item.Standard,
+ LotNo = item.LotNo,
+ LotText = item.LotText,
+ SupplierLot = item.SupplierLot,
+ CreateUser = _userManager.UserId,
CreateTime = time
};
- var list = new List<BllStockCheckDetail>();
- foreach (var item in model.Detail)
+ list.Add(detail);
+ var sd = await stockDetail.FirstAsync(m => m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo && m.Status == "0");
+ sd.Status = "3";
+ Db.Updateable(sd).ExecuteCommand();
+ }
+ Db.Insertable(check).ExecuteCommand();
+ Db.Insertable(list).ExecuteCommand();
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "鐩樼偣鍗曟嵁",
+ FkNo = crNo,
+ TypeName = "娣诲姞",
+ Msg = $"娣诲姞浜嗗崟鎹彿涓簕crNo}鐨勭洏鐐瑰崟淇℃伅"
+ });
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", crNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕crNo}鐨勭洏鐐瑰崟淇℃伅", _userManager.UserId);
+ }
+ else //缂栬緫
+ {
+ var check = await Db.Queryable<BllStockCheck>().FirstAsync(m => m.IsDel == "0" && m.CRNo == model.CrNo);
+ if (check == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌鐩樼偣鍗曟嵁鐨勪俊鎭�");
+ }
+ check.UpdateUser = _userManager.UserId;
+ check.UpdateTime = time;
+ await Db.Updateable(check).ExecuteCommandAsync();
+
+ //鐩樼偣鏄庣粏淇℃伅
+ var checkDetail = Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && m.CRNo == model.CrNo).ToList();
+
+ //鍒犻櫎鏃х殑
+ foreach (var d in checkDetail)
+ {
+ var mq = model.Detail.Where(o => o.SkuNo == d.SkuNo && o.LotNo == d.LotNo && o.PalletNo == d.PalletNo).ToList();
+ if (mq.Any()) //濡傛灉鏈夎繖涓墿鏂欏強鎵规鍒欒烦杩�
+ {
+ continue;
+ }
+
+ var sd = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SkuNo == d.SkuNo && m.LotNo == d.LotNo && m.PalletNo == d.PalletNo && m.Status == "3").ToList();
+ foreach (var s in sd)
+ {
+ s.Status = "0";
+
+ }
+ d.IsDel = "1";
+ d.UpdateUser = _userManager.UserId;
+ d.UpdateTime = time;
+ //淇敼搴撳瓨鏄庣粏鐨勭姸鎬侊紙瑙ｉ櫎鐩樼偣閿佸畾锛�
+ await Db.Updateable(sd).ExecuteCommandAsync();
+ await Db.Updateable(d).ExecuteCommandAsync();
+ }
+
+ //娣诲姞涓庝慨鏀�
+ var list = new List<BllStockCheckDetail>();
+ foreach (var item in model.Detail)
+ {
+ var de = checkDetail.FirstOrDefault(m => m.PalletNo == item.PalletNo && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo);
+ //鏂板姞椤�
+ if (de == null)
{
var detail = new BllStockCheckDetail()
{
- CRNo = crNo,
+ CRNo = model.CrNo,
PalletNo = item.PalletNo,
Qty = item.Qty,
Status = 0, //0锛氭湭鐩� 1锛氬凡鐩� 2锛氬凡璋冩暣
@@ -265,163 +309,90 @@
LotText = item.LotText,
SupplierLot = item.SupplierLot,
- CreateUser = userId,
+ CreateUser = _userManager.UserId,
CreateTime = time
};
list.Add(detail);
- var sd = stockDetail.First(m => m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo && m.Status == "0");
- sd.Status = "3";
- Db.Updateable(sd).ExecuteCommand();
- }
- Db.Insertable(check).ExecuteCommand();
- Db.Insertable(list).ExecuteCommand();
- //娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", crNo, "娣诲姞", $"娣诲姞浜嗗崟鎹彿涓簕crNo}鐨勭洏鐐瑰崟淇℃伅", userId);
- }
- else //缂栬緫
- {
- var check = Db.Queryable<BllStockCheck>().First(m => m.IsDel == "0" && m.CRNo == model.CrNo);
- if (check == null)
- {
- throw new Exception("鏈煡璇㈠埌鐩樼偣鍗曟嵁鐨勪俊鎭�");
- }
- check.UpdateUser = userId;
- check.UpdateTime = time;
- Db.Updateable(check).ExecuteCommand();
-
- //鐩樼偣鏄庣粏淇℃伅
- var checkDetail = Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && m.CRNo == model.CrNo).ToList();
-
- //鍒犻櫎鏃х殑
- foreach (var d in checkDetail)
- {
- var mq = model.Detail.Where(o => o.SkuNo == d.SkuNo && o.LotNo == d.LotNo && o.PalletNo == d.PalletNo).ToList();
- if (mq.Any()) //濡傛灉鏈夎繖涓墿鏂欏強鎵规鍒欒烦杩�
- {
- continue;
- }
-
- var sd = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SkuNo == d.SkuNo && m.LotNo == d.LotNo && m.PalletNo == d.PalletNo && m.Status == "3").ToList();
+ var sd = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo && m.Status == "0").ToList();
foreach (var s in sd)
{
- s.Status = "0";
-
+ s.Status = "3";
}
- d.IsDel = "1";
- d.UpdateUser = userId;
- d.UpdateTime = time;
- //淇敼搴撳瓨鏄庣粏鐨勭姸鎬侊紙瑙ｉ櫎鐩樼偣閿佸畾锛�
- Db.Updateable(sd).ExecuteCommand();
- Db.Updateable(d).ExecuteCommand();
+ await Db.Updateable(sd).ExecuteCommandAsync();
}
-
- //娣诲姞涓庝慨鏀�
- var list = new List<BllStockCheckDetail>();
- foreach (var item in model.Detail)
+ else if (de.Qty != item.Qty)
{
- var de = checkDetail.FirstOrDefault(m => m.PalletNo == item.PalletNo && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo);
- //鏂板姞椤�
- if (de == null)
- {
- var detail = new BllStockCheckDetail()
- {
- CRNo = model.CrNo,
- PalletNo = item.PalletNo,
- Qty = item.Qty,
- Status = 0, //0锛氭湭鐩� 1锛氬凡鐩� 2锛氬凡璋冩暣
- SkuNo = item.SkuNo,
- SkuName = item.SkuName,
- Standard = item.Standard,
- LotNo = item.LotNo,
- LotText = item.LotText,
- SupplierLot = item.SupplierLot,
-
- CreateUser = userId,
- CreateTime = time
- };
- list.Add(detail);
- var sd = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo && m.Status == "0").ToList();
- foreach (var s in sd)
- {
- s.Status = "3";
- }
- Db.Updateable(sd).ExecuteCommand();
- }
- else if (de.Qty != item.Qty)
- {
- de.Qty = item.Qty;
- de.UpdateUser = userId;
- de.UpdateTime = time;
- Db.Updateable(de).ExecuteCommand();
- }
-
+ de.Qty = item.Qty;
+ de.UpdateUser = _userManager.UserId;
+ de.UpdateTime = time;
+ await Db.Updateable(de).ExecuteCommandAsync();
}
- if (list.Count > 0)
- {
- Db.Insertable(list).ExecuteCommand();
- }
-
- //娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", model.CrNo, "缂栬緫", $"缂栬緫浜嗗崟鎹彿涓簕model.CrNo}鐨勭洏鐐瑰崟淇℃伅", userId);
}
- Db.CommitTran();
- }
- catch (Exception e)
- {
- Db.RollbackTran();
- throw new Exception(e.Message);
+ if (list.Count > 0)
+ {
+ await Db.Insertable(list).ExecuteCommandAsync();
+ }
+
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "鐩樼偣鍗曟嵁",
+ FkNo = model.CrNo,
+ TypeName = "缂栬緫",
+ Msg = $"缂栬緫浜嗗崟鎹彿涓簕model.CrNo}鐨勭洏鐐瑰崟淇℃伅"
+ });
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", model.CrNo, "缂栬緫", $"缂栬緫浜嗗崟鎹彿涓簕model.CrNo}鐨勭洏鐐瑰崟淇℃伅", _userManager.UserId);
}
}
//鍒犻櫎鐩樼偣鍗�
- public void DelStockCheck(int id, int userId)
+ public async Task DelStockCheck(int id)
{
- try
+ var notice = await Db.Queryable<BllStockCheck>().FirstAsync(m => m.IsDel == "0" && m.Id == id);
+ if (notice == null || notice.Status != 0)
{
- var notice = Db.Queryable<BllStockCheck>().First(m => m.IsDel == "0" && m.Id == id);
- if (notice == null || notice.Status != 0)
- {
- throw new Exception("鏈煡璇㈠埌鐘舵�佷负绛夊緟鎵ц鐨勭洏鐐瑰崟淇℃伅");
- }
-
- var detail = Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && m.CRNo == notice.CRNo).ToList();
- if (detail.Count == 0)
- {
- throw new Exception("鏈煡璇㈠埌鐩樼偣鍗曟嵁鏄庣粏淇℃伅");
- }
- Db.BeginTran();
- var time = DateTime.Now;
- foreach (var d in detail)
- {
- d.IsDel = "1";
- d.UpdateTime = time;
- d.UpdateUser = userId;
- var item = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == d.PalletNo && m.SkuNo == d.SkuNo && m.LotNo == d.LotNo && m.Status == "3").ToList();
- foreach (var i in item)
- {
- i.Status = "0";
- }
- Db.Updateable(item).ExecuteCommand();
- }
-
- notice.IsDel = "1";
- notice.UpdateTime = time;
- notice.UpdateUser = userId;
-
- Db.Updateable(notice).ExecuteCommand();
- Db.Updateable(detail).ExecuteCommand();
- //娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", notice.CRNo, "鍒犻櫎", $"鍒犻櫎浜嗗崟鎹彿涓簕notice.CRNo}鐨勭洏鐐瑰崟淇℃伅", userId);
- Db.CommitTran();
-
+ throw Oops.Bah("鏈煡璇㈠埌鐘舵�佷负绛夊緟鎵ц鐨勭洏鐐瑰崟淇℃伅");
}
- catch (Exception e)
+
+ var detail = await Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && m.CRNo == notice.CRNo).ToListAsync();
+ if (detail.Count == 0)
{
- Db.RollbackTran();
- throw new Exception(e.Message);
+ throw Oops.Bah("鏈煡璇㈠埌鐩樼偣鍗曟嵁鏄庣粏淇℃伅");
}
+ var time = DateTime.Now;
+ foreach (var d in detail)
+ {
+ d.IsDel = "1";
+ d.UpdateTime = time;
+ d.UpdateUser = _userManager.UserId;
+ var item = await Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == d.PalletNo && m.SkuNo == d.SkuNo && m.LotNo == d.LotNo && m.Status == "3").ToListAsync();
+ foreach (var i in item)
+ {
+ i.Status = "0";
+ }
+ await Db.Updateable(item).ExecuteCommandAsync();
+ }
+
+ notice.IsDel = "1";
+ notice.UpdateTime = time;
+ notice.UpdateUser = _userManager.UserId;
+
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ await Db.Updateable(detail).ExecuteCommandAsync();
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "鐩樼偣鍗曟嵁",
+ FkNo = notice.CRNo,
+ TypeName = "鍒犻櫎",
+ Msg = $"鍒犻櫎浜嗗崟鎹彿涓簕notice.CRNo}鐨勭洏鐐瑰崟淇℃伅"
+ });
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", notice.CRNo, "鍒犻櫎", $"鍒犻櫎浜嗗崟鎹彿涓簕notice.CRNo}鐨勭洏鐐瑰崟淇℃伅", userId);
+
}
/// <summary>
@@ -430,24 +401,32 @@
/// <param name="id"></param>
/// <param name="demo"></param>
/// <param name="userId"></param>
- public void EditNoticeDemo(int id, string demo, int userId)
+ public async Task EditNoticeDemo(int id, string demo)
{
try
{
- var notice = Db.Queryable<BllStockCheck>().First(m => m.IsDel == "0" && m.Id == id);
+ var notice = await Db.Queryable<BllStockCheck>().FirstAsync(m => m.IsDel == "0" && m.Id == id);
if (notice == null)
{
throw new Exception("鏈煡璇㈠埌鐩樼偣鍗曟嵁淇℃伅");
}
notice.Demo = demo + "".Trim();
- notice.UpdateUser = userId;
+ notice.UpdateUser = _userManager.UserId;
notice.UpdateTime = DateTime.Now;
int i = Db.Updateable(notice).ExecuteCommand();
if (i > 0)
{
//娣诲姞鎿嶄綔鏃ュ織
- new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", notice.CRNo, "缂栬緫", $"缂栬緫浜嗗崟鎹彿涓簕notice.CRNo}鐨勫娉ㄤ俊鎭�", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "鐩樼偣鍗曟嵁",
+ FkNo = notice.CRNo,
+ TypeName = "缂栬緫",
+ Msg = $"缂栬緫浜嗗崟鎹彿涓簕notice.CRNo}鐨勫娉ㄤ俊鎭�"
+ });
+ //new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", notice.CRNo, "缂栬緫", $"缂栬緫浜嗗崟鎹彿涓簕notice.CRNo}鐨勫娉ㄤ俊鎭�", userId);
}
}
catch (Exception ex)
@@ -457,39 +436,39 @@
}
//璋冩暣搴撳瓨
- public bool StockAdjust(int id, int userId)
+ public async Task StockAdjust(int id)
{
try
{
//鐩樼偣淇℃伅
- var notice = Db.Queryable<BllStockCheck>().First(m => m.IsDel == "0" && m.Id == id);
+ var notice = await Db.Queryable<BllStockCheck>().FirstAsync(m => m.IsDel == "0" && m.Id == id);
if (notice == null || notice.Status != 2)
{
- throw new Exception("鏈煡璇㈠埌鐘舵�佷负鐩樼偣瀹屾垚鐨勭洏鐐瑰崟淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌鐘舵�佷负鐩樼偣瀹屾垚鐨勭洏鐐瑰崟淇℃伅");
}
if (notice == null || notice.Status != 2)
{
- throw new Exception("鏈煡璇㈠埌鐘舵�佷负鐩樼偣瀹屾垚鐨勭洏鐐瑰崟淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌鐘舵�佷负鐩樼偣瀹屾垚鐨勭洏鐐瑰崟淇℃伅");
}
//鐩樼偣鏄庣粏
- var detail = Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && m.CRNo == notice.CRNo).ToList();
+ var detail = await Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && m.CRNo == notice.CRNo).ToListAsync();
if (detail.Count == 0)
{
- throw new Exception("鏈煡璇㈠埌鐩樼偣鍗曟嵁鏄庣粏淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌鐩樼偣鍗曟嵁鏄庣粏淇℃伅");
}
//寮�鍚簨鍔�
Db.BeginTran();
- var stock = Db.Queryable<DataStock>().Where(m => m.IsDel == "0").ToList();//搴撳瓨琛�
- var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0").ToList();//搴撳瓨鏄庣粏
- var stockBox = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0").ToList();//搴撳瓨绠辨敮鏄庣粏
- var materialList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();//鐗╂枡淇℃伅
- var packagList = Db.Queryable<SysPackag>().Where(m => m.IsDel == "0").ToList();//鍖呰淇℃伅
+ var stock = await Db.Queryable<DataStock>().Where(m => m.IsDel == "0").ToListAsync();//搴撳瓨琛�
+ var stockDetail = await Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0").ToListAsync();//搴撳瓨鏄庣粏
+ var stockBox = await Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0").ToListAsync();//搴撳瓨绠辨敮鏄庣粏
+ var materialList = await Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToListAsync();//鐗╂枡淇℃伅
+ var packagList = await Db.Queryable<SysPackag>().Where(m => m.IsDel == "0").ToListAsync();//鍖呰淇℃伅
var time = DateTime.Now;
//鐩樼偣璁板綍
- var checkLog = Db.Queryable<BllStockCheckLog>().Where(m => m.IsDel == "0" && m.CRNo == notice.CRNo).ToList();
+ var checkLog = await Db.Queryable<BllStockCheckLog>().Where(m => m.IsDel == "0" && m.CRNo == notice.CRNo).ToListAsync();
if (checkLog.Count(m => m.CheckResult == null) > 0)
{
- throw new Exception($"{notice.CRNo}鍗曟嵁涓惈鏈夋湭鐩樼偣鐨勪俊鎭紝璇锋牳瀹�!");
+ throw Oops.Bah($"{notice.CRNo}鍗曟嵁涓惈鏈夋湭鐩樼偣鐨勪俊鎭紝璇锋牳瀹�!");
}
List<BoxQtyInfo> boxQtyList = new List<BoxQtyInfo>();
@@ -541,10 +520,10 @@
foreach (var d in detail)
{
var demo = checkLog.Where(m => m.PalletNo == d.PalletNo).ToList();//鐩樼偣璁板綍
- //寰幆鐩樼偣璁板綍
+ //寰幆鐩樼偣璁板綍
foreach (var l in demo)
{
- var sku = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.SkuNo == l.SkuNo);
+ var sku = await Db.Queryable<SysMaterials>().FirstAsync(a => a.IsDel == "0" && a.SkuNo == l.SkuNo);
if (l.CheckResult == 0)//姝ｅ父
{
if (sku.Type != "4")
@@ -552,25 +531,25 @@
var de3 = stockBox.First(m => m.BoxNo == l.BoxNo && m.BoxNo3 == l.BoxNo3);
if (de3 == null)
{
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨绠辩爜鐨勪俊鎭�");
+ throw Oops.Bah($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨绠辩爜鐨勪俊鎭�");
}
var de2 = stockDetail.First(m => m.Id == de3.StockDetailId);
if (de2 == null)
{
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鏄庣粏鐨勪俊鎭�");
+ throw Oops.Bah($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鏄庣粏鐨勪俊鎭�");
}
de2.Status = "0";//灏嗗簱瀛樻槑缁嗙姸鎬佹敼涓哄緟鍒嗛厤
- Db.Updateable(de2).ExecuteCommand();
+ await Db.Updateable(de2).ExecuteCommandAsync();
}
else
{
var de2 = stockDetail.First(m => m.PalletNo == l.PalletNo && m.SkuNo == l.SkuNo);
if (de2 == null)
{
- throw new Exception($"鏈煡璇㈠埌{l.PalletNo}鐨勫簱瀛樻槑缁嗙殑淇℃伅");
+ throw Oops.Bah($"鏈煡璇㈠埌{l.PalletNo}鐨勫簱瀛樻槑缁嗙殑淇℃伅");
}
de2.Status = "0";//灏嗗簱瀛樻槑缁嗙姸鎬佹敼涓哄緟鍒嗛厤
- Db.Updateable(de2).ExecuteCommand();
+ await Db.Updateable(de2).ExecuteCommandAsync();
}
}
@@ -581,13 +560,13 @@
var de3 = stockBox.First(m => m.BoxNo == l.BoxNo && m.BoxNo3 == l.BoxNo3);
if (de3 == null)
{
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨绠辩爜鐨勪俊鎭�");
+ throw Oops.Bah($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨绠辩爜鐨勪俊鎭�");
}
var de2 = stockDetail.First(m => m.Id == de3.StockDetailId);
if (de2 == null)
{
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鏄庣粏鐨勪俊鎭�");
+ throw Oops.Bah($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鏄庣粏鐨勪俊鎭�");
}
de2.Status = "0";
de2.Qty -= de3.Qty;
@@ -598,30 +577,29 @@
}
de.Qty -= de3.Qty;
- Db.Updateable(de).ExecuteCommand();
- Db.Updateable(de2).ExecuteCommand();
- Db.Deleteable(de3).ExecuteCommand();
+ await Db.Updateable(de).ExecuteCommandAsync();
+ await Db.Updateable(de2).ExecuteCommandAsync();
+ await Db.Deleteable(de3).ExecuteCommandAsync();
}
else
{
var de2 = stockDetail.First(m => m.PalletNo == l.PalletNo && m.SkuNo == l.SkuNo);
if (de2 == null)
{
- throw new Exception($"鏈煡璇㈠埌{l.PalletNo}鐨勫簱瀛樻槑缁嗙殑淇℃伅");
+ throw Oops.Bah($"鏈煡璇㈠埌{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}鐨勬�诲簱瀛樼殑淇℃伅");
+ throw Oops.Bah($"鏈煡璇㈠埌鐗╂枡{l.SkuNo}鎵规{l.LotNo}鐨勬�诲簱瀛樼殑淇℃伅");
}
de.Qty -= Convert.ToDecimal(l.Qty - l.RealQty);
- Db.Updateable(de).ExecuteCommand();
- Db.Updateable(de2).ExecuteCommand();
+ await Db.Updateable(de).ExecuteCommandAsync();
+ await Db.Updateable(de2).ExecuteCommandAsync();
}
-
}
else if (l.CheckResult == 2)//鐩樼泩
{
@@ -656,7 +634,7 @@
ProductionTime = stockBoxInfo.ProductionTime,
BitBoxMark = boxInfo.bitBoxMark,
};
- Db.Insertable<DataBoxInfo>(databox).ExecuteCommand();
+ await Db.Insertable<DataBoxInfo>(databox).ExecuteCommandAsync();
//搴撳瓨鏄庣粏澧炲姞鏁伴噺
stockDetailInfo.Qty += (int)l.RealQty;
}
@@ -667,12 +645,12 @@
}
stockDetailInfo.Status = "0";
- Db.Updateable(stockDetailInfo).ExecuteCommand();
+ await Db.Updateable(stockDetailInfo).ExecuteCommandAsync();
//搴撳瓨澧炲姞鏁伴噺
var de = stock.First(m => m.SkuNo == l.SkuNo && m.LotNo == l.LotNo);
if (de == null)
{
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鐨勪俊鎭�");
+ throw Oops.Bah($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鐨勪俊鎭�");
}
if (sku.Type != "4")
{
@@ -683,13 +661,13 @@
de.Qty += (int)(l.RealQty - l.Qty);
}
- Db.Updateable(de).ExecuteCommand();
+ await Db.Updateable(de).ExecuteCommandAsync();
}
}
//淇敼鐩樼偣鏄庣粏
d.Status = 4;//鐘舵��
d.UpdateTime = time;
- d.UpdateUser = userId;
+ d.UpdateUser = _userManager.UserId;
//鐩樼偣缁撴灉
if (d.Qty == d.RealQty)
{
@@ -707,18 +685,18 @@
{
d.CheckResult = 1;
}
- Db.Updateable(d).ExecuteCommand();
+ await Db.Updateable(d).ExecuteCommandAsync();
#region 娣诲姞鍒ゆ柇鐩樼偣瀹屾墭鐩樻槸鍚︽槸闆舵墭
var material = materialList.FirstOrDefault(m => m.SkuNo == d.SkuNo);
if (material == null)
{
- throw new Exception($"鏈煡璇㈠埌{d.SkuNo}鐨勭墿鏂欎俊鎭紱");
+ throw Oops.Bah($"鏈煡璇㈠埌{d.SkuNo}鐨勭墿鏂欎俊鎭紱");
}
var pack = packagList.FirstOrDefault(m => m.PackagNo == material.PackagNo);
if (pack == null)
{
- throw new Exception($"鏈煡璇㈠埌{d.SkuNo}鐨勫寘瑁呬俊鎭紱");
+ throw Oops.Bah($"鏈煡璇㈠埌{d.SkuNo}鐨勫寘瑁呬俊鎭紱");
}
var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
var bNum = 0;//绠辩墿鍝佹暟閲�
@@ -744,7 +722,7 @@
}
if (pNum == 0)
{
- throw new Exception("鏈煡璇㈠埌鐗╂枡鍖呰鎵樼鍏崇郴淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌鐗╂枡鍖呰鎵樼鍏崇郴淇℃伅");
}
var stockDetailInfo2 = stockDetail.First(m => m.PalletNo == d.PalletNo && m.SkuNo == d.SkuNo && m.LotNo == d.LotNo);//搴撳瓨鏄庣粏
if (stockDetailInfo2.Qty >= pNum)
@@ -756,20 +734,27 @@
stockDetailInfo2.BitPalletMark = "1";
}
- Db.Updateable(stockDetailInfo2).ExecuteCommand();
+ await Db.Updateable(stockDetailInfo2).ExecuteCommandAsync();
#endregion
}
//淇鐩樼偣淇℃伅
notice.Status = 3;//鐘舵��
notice.UpdateTime = time;
- notice.UpdateUser = userId;
- Db.Updateable(notice).ExecuteCommand();
+ notice.UpdateUser = _userManager.UserId;
+ await Db.Updateable(notice).ExecuteCommandAsync();
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", notice.CRNo, "璋冩暣鍗曟嵁", $"璋冩暣浜嗗崟鎹彿涓簕notice.CRNo}鐨勭洏鐐瑰崟淇℃伅", userId);
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", notice.CRNo, "璋冩暣鍗曟嵁", $"璋冩暣浜嗗崟鎹彿涓簕notice.CRNo}鐨勭洏鐐瑰崟淇℃伅", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "鐩樼偣鍗曟嵁",
+ FkNo = notice.CRNo,
+ TypeName = "璋冩暣鍗曟嵁",
+ Msg = $"璋冩暣浜嗗崟鎹彿涓簕notice.CRNo}鐨勭洏鐐瑰崟淇℃伅"
+ });
//鎻愪氦浜嬪姟
Db.CommitTran();
- return true;
}
catch (Exception e)
{
@@ -780,7 +765,7 @@
}
//璋冩暣搴撳瓨-閽堝寮傚父鐢熸垚鐨�
- public bool StockAdjustAuto(int id, int userId)
+ public async Task StockAdjustAuto(int id)
{
try
{
@@ -788,55 +773,54 @@
var notice = Db.Queryable<BllStockCheck>().First(m => m.IsDel == "0" && m.Id == id);
if (notice == null || notice.Status != 2)
{
- throw new Exception("鏈煡璇㈠埌鐘舵�佷负鐩樼偣瀹屾垚鐨勭洏鐐瑰崟淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌鐘舵�佷负鐩樼偣瀹屾垚鐨勭洏鐐瑰崟淇℃伅");
}
//鐩樼偣鏄庣粏
var detail = Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && m.CRNo == notice.CRNo).ToList();
if (detail.Count == 0)
{
- throw new Exception("鏈煡璇㈠埌鐩樼偣鍗曟嵁鏄庣粏淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌鐩樼偣鍗曟嵁鏄庣粏淇℃伅");
}
//寮�鍚簨鍔�
Db.BeginTran();
-
var stock = Db.Queryable<DataStock>().Where(m => m.IsDel == "0");//搴撳瓨
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0");//搴撳瓨鏄庣粏
var stockBox = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0");//搴撳瓨绠辨敮淇℃伅
var time = DateTime.Now;
//鐩樼偣璁板綍
var checkLog = Db.Queryable<BllStockCheckLog>().Where(m => m.IsDel == "0" && m.CRNo == notice.CRNo);
- if (checkLog.Count(m => m.CheckResult == null) > 0)
+ if (await checkLog.CountAsync(m => m.CheckResult == null) > 0)
{
throw new Exception($"{notice.CRNo}鍗曟嵁涓惈鏈夋湭鐩樼偣鐨勪俊鎭紝璇锋牳瀹�!");
}
foreach (var d in detail)
{
//鎵樼洏缁戝畾琛�
- var palletBind = Db.Queryable<BllPalletBind>().First(m => m.PalletNo == d.PalletNo);
+ var palletBind = await Db.Queryable<BllPalletBind>().FirstAsync(m => m.PalletNo == d.PalletNo);
//鍌ㄤ綅琛�
- var storageLocat = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == palletBind.LocatNo);
+ var storageLocat = await Db.Queryable<SysStorageLocat>().FirstAsync(m => m.LocatNo == palletBind.LocatNo);
if (storageLocat != null && storageLocat.Flag == "1")
{
//灏嗗偍浣嶆爣蹇桭lag淇敼涓猴細0锛氭甯�
storageLocat.Flag = "0";
- storageLocat.UpdateUser = userId;
+ storageLocat.UpdateUser = _userManager.UserId;
storageLocat.UpdateTime = time;
- Db.Updateable(storageLocat).ExecuteCommand();
+ await Db.Updateable(storageLocat).ExecuteCommandAsync();
}
//鏉＄爜绠＄悊(鎵樼洏)
- var pallets = Db.Queryable<SysPallets>().First(m => m.PalletNo == d.PalletNo);
+ var pallets = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == d.PalletNo);
if (pallets != null && pallets.Status == "1")
{
//灏嗘墭鐩樺彿鐘舵�佸彉鏇翠负 0 鏈娇鐢�
pallets.Status = "0";
- pallets.UpdateUser = userId;
+ pallets.UpdateUser = _userManager.UserId;
pallets.UpdateTime = time;
- Db.Updateable(pallets).ExecuteCommand();
+ await Db.Updateable(pallets).ExecuteCommandAsync();
}
//鐩樼偣璁板綍
- var demo = checkLog.Where(m => m.PalletNo == d.PalletNo).ToList();
+ var demo = await checkLog.Where(m => m.PalletNo == d.PalletNo).ToListAsync();
foreach (var l in demo)
{
if (l.CheckResult == 0)//姝ｅ父
@@ -846,48 +830,55 @@
else if (l.CheckResult == 1)//鐩樹簭
{
//鐗╃悊鍒犻櫎搴撳瓨绠辨敮淇℃伅
- var de3 = stockBox.First(m => m.BoxNo == l.BoxNo && m.BoxNo3 == l.BoxNo3);
+ var de3 = await stockBox.FirstAsync(m => m.BoxNo == l.BoxNo && m.BoxNo3 == l.BoxNo3);
if (de3 == null)
{
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨绠辩爜鐨勪俊鎭�");
+ throw Oops.Bah($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨绠辩爜鐨勪俊鎭�");
}
- Db.Deleteable(de3).ExecuteCommand();
+ await Db.Deleteable(de3).ExecuteCommandAsync();
//鐗╃悊鍒犻櫎搴撳瓨鏄庣粏
- var de2 = stockDetail.First(m => m.Id == de3.StockDetailId);
+ var de2 = await stockDetail.FirstAsync(m => m.Id == de3.StockDetailId);
if (de2 == null)
{
- throw new Exception($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鏄庣粏鐨勪俊鎭�");
+ throw Oops.Bah($"鏈煡璇㈠埌{l.BoxNo}绠变腑{l.BoxNo3}搴撳瓨鏄庣粏鐨勪俊鎭�");
}
- Db.Deleteable(de2).ExecuteCommand();
+ await Db.Deleteable(de2).ExecuteCommandAsync();
//鏇存敼搴撳瓨鏁伴噺鍜岄攣瀹氭暟閲�
- var de = stock.First(m => m.SkuNo == l.SkuNo && m.LotNo == l.LotNo);
+ var de = await stock.FirstAsync(m => m.SkuNo == l.SkuNo && m.LotNo == l.LotNo);
if (de == null)
{
- throw new Exception($"鏈煡璇㈠埌鐗╂枡{l.SkuNo}鎵规{l.LotNo}鐨勬�诲簱瀛樼殑淇℃伅");
+ throw Oops.Bah($"鏈煡璇㈠埌鐗╂枡{l.SkuNo}鎵规{l.LotNo}鐨勬�诲簱瀛樼殑淇℃伅");
}
de.Qty -= de3.Qty;
de.LockQty -= de3.Qty;
- Db.Updateable(de).ExecuteCommand();
+ await Db.Updateable(de).ExecuteCommandAsync();
}
}
//灏嗙洏鐐规槑缁嗙姸鎬佹敼涓� 宸茶皟鏁�
d.Status = 4;
d.UpdateTime = time;
- d.UpdateUser = userId;
+ d.UpdateUser = _userManager.UserId;
- Db.Updateable(d).ExecuteCommand();
+ await Db.Updateable(d).ExecuteCommandAsync();
}
//灏嗙洏鐐规�昏〃鐘舵�佹敼涓� 鐢熸垚璋冩暣
notice.Status = 3;
notice.UpdateTime = time;
- notice.UpdateUser = userId;
- Db.Updateable(notice).ExecuteCommand();
+ notice.UpdateUser = _userManager.UserId;
+ await Db.Updateable(notice).ExecuteCommandAsync();
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", notice.CRNo, "璋冩暣鍗曟嵁", $"璋冩暣浜嗗崟鎹彿涓簕notice.CRNo}鐨勭洏鐐瑰崟淇℃伅", userId);
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", notice.CRNo, "璋冩暣鍗曟嵁", $"璋冩暣浜嗗崟鎹彿涓簕notice.CRNo}鐨勭洏鐐瑰崟淇℃伅", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "鐩樼偣鍗曟嵁",
+ FkNo = notice.CRNo,
+ TypeName = "璋冩暣鍗曟嵁",
+ Msg = $"璋冩暣浜嗗崟鎹彿涓簕notice.CRNo}鐨勭洏鐐瑰崟淇℃伅"
+ });
//鎻愪氦浜嬪姟
Db.CommitTran();
- return true;
}
catch (Exception e)
{
@@ -897,343 +888,727 @@
}
//鐩樼偣涓嬪彂鍑哄簱
- public List<OutCommandDto> CheckOutHouse(string crNo, string outMode, int userId, string url, out string str)
+ public async Task<List<OutCommandDto>> CheckOutHouse(string crNo, string outMode, string url, string str)
{
- try
+ #region 闆嗗悎
+ var outDtoList = new List<OutCommandDto>(); //鍑哄簱鏁版嵁鐨勯泦鍚�
+ //璁板綍閿欒淇℃伅鐨勯泦鍚�
+ var flagList = new List<int>();//1:褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭銆�2 鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�3鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�4 瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱
+
+ #endregion
+ var com = new Common();
+ //assign.IsHavePyTask();
+ var notice = await Db.Queryable<BllStockCheck>().FirstAsync(m => m.CRNo == crNo && m.IsDel == "0");
+ if (notice == null)
{
- #region 闆嗗悎
- var outDtoList = new List<OutCommandDto>(); //鍑哄簱鏁版嵁鐨勯泦鍚�
- //璁板綍閿欒淇℃伅鐨勯泦鍚�
- var flagList = new List<int>();//1:褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭銆�2 鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�3鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�4 瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱
-
- #endregion
- var com = new Common();
- //assign.IsHavePyTask();
- var notice = Db.Queryable<BllStockCheck>().First(m => m.CRNo == crNo && m.IsDel == "0");
- if (notice == null)
+ throw Oops.Bah($"鏈壘鍒皗crNo}鐩樼偣鍗曚俊鎭�");
+ }
+ //鎵�鏈夎鍑哄簱鐨勭洏鐐规槑缁嗕俊鎭�(绛夊緟鐨勪俊鎭拰寰呮嫞璐х殑淇℃伅)
+ var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "InventoryCheckMethod");
+ if (funSetting == null || funSetting.IsEnable == "OFF")
+ {
+ throw Oops.Bah("闇�閰嶇疆鐩樼偣鏂瑰紡");
+ }
+ var list = await Db.Queryable<BllStockCheckDetail>().Where(a => a.IsDel == "0" && a.CRNo == crNo && (a.Status == 0 || a.Status == 1 || a.Status == 2)).ToListAsync();
+ if (list.Count == 0) //鍒ゆ柇鏄惁鏈夐渶瑕佷笅鍙戠殑鐩樼偣鏄庣粏
+ {
+ throw Oops.Bah("褰撳墠鐩樼偣鍗曟嵁鏃犻渶瑕佷笅鍙戠殑鎵樼洏");
+ }
+ if (funSetting.SetValue == "once")
+ {
+ if (list.Any(s => s.Status == 1 || s.Status == 2))
{
- throw new Exception($"鏈壘鍒皗crNo}鐩樼偣鍗曚俊鎭�");
+ throw Oops.Bah("宸叉湁姝ｅ湪鍑哄簱鎴栧緟鐩樼偣鐨勬暟鎹紝璇峰畬鎴愮洏鐐瑰悗鍐嶅嚭搴�");
}
- //鎵�鏈夎鍑哄簱鐨勭洏鐐规槑缁嗕俊鎭�(绛夊緟鐨勪俊鎭拰寰呮嫞璐х殑淇℃伅)
- var list = Db.Queryable<BllStockCheckDetail>().Where(a => a.IsDel == "0" && a.CRNo == crNo && a.Status == 0).ToList();
- if (list.Count == 0) //鍒ゆ柇鏄惁鏈夐渶瑕佷笅鍙戠殑鐩樼偣鏄庣粏
+ list = new List<BllStockCheckDetail>() { list.FirstOrDefault() };
+ }
+ else
+ {
+ list = list.Where(s => s.Status == 0).ToList();
+ }
+ #region
+ //瑕佸嚭搴撶殑鎵樼洏闆嗗悎
+ var outLpnList = list.Select(m => m.PalletNo).Distinct().ToList();
+ //瑕佸嚭搴撶殑鏄庣粏闆嗗悎
+ var outStockDetail = await Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && outLpnList.Contains(m.PalletNo)).ToListAsync();
+ var outStockBox = await Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && outLpnList.Contains(m.PalletNo)).ToListAsync();
+ //鑾峰彇鐗╂枡淇℃伅
+ var skuNo = await Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.Type == "4").Select(a => a.SkuNo).ToListAsync();
+ var time = DateTime.Now;
+ //Db.BeginTran();
+ //寰幆鐩樼偣鏄庣粏鐨勪俊鎭敓鎴愬嚭搴撲换鍔�
+ foreach (var item in list)
+ {
+ if (item.Status == 0)
{
- throw new Exception("褰撳墠鐩樼偣鍗曟嵁鏃犻渶瑕佷笅鍙戠殑鎵樼洏");
- }
- #region
- //瑕佸嚭搴撶殑鎵樼洏闆嗗悎
- var outLpnList = list.Select(m => m.PalletNo).Distinct().ToList();
- //瑕佸嚭搴撶殑鏄庣粏闆嗗悎
- var outStockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && outLpnList.Contains(m.PalletNo)).ToList();
- var outStockBox = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && outLpnList.Contains(m.PalletNo)).ToList();
- //鑾峰彇鐗╂枡淇℃伅
- var skuNo = Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.Type == "4").Select(a => a.SkuNo).ToList();
- var time = DateTime.Now;
- Db.BeginTran();
- try
- {
- //寰幆鐩樼偣鏄庣粏鐨勪俊鎭敓鎴愬嚭搴撲换鍔�
- foreach (var item in list)
+ var logList = new List<BllStockCheckLog>();
+ //鍒ゆ柇鏄惁涓烘棤鐮佺墿鏂�
+ if (skuNo.Contains(item.SkuNo))
{
- if (item.Status == 0)
+ var de = outStockDetail.First(m => m.IsDel == "0" &&
+ m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo);
+
+ var checkLog = new BllStockCheckLog()
{
- var logList = new List<BllStockCheckLog>();
- //鍒ゆ柇鏄惁涓烘棤鐮佺墿鏂�
- if (skuNo.Contains(item.SkuNo))
- {
- var de = outStockDetail.First(m => m.IsDel == "0" &&
- m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo);
+ CRNo = item.CRNo,
+ PalletNo = item.PalletNo,
+ BoxNo = "",
+ BoxNo2 = "",
+ BoxNo3 = "",
+ Qty = (int?)de.Qty,
+ SkuNo = de.SkuNo,
+ SkuName = de.SkuName,
+ Standard = de.Standard,
+ LotNo = de.LotNo,
+ LotText = de.LotText,
+ SupplierLot = de.SupplierLot,
- var checkLog = new BllStockCheckLog()
- {
- CRNo = item.CRNo,
- PalletNo = item.PalletNo,
- BoxNo = "",
- BoxNo2 = "",
- BoxNo3 = "",
- Qty = (int?)de.Qty,
- SkuNo = de.SkuNo,
- SkuName = de.SkuName,
- Standard = de.Standard,
- LotNo = de.LotNo,
- LotText = de.LotText,
- SupplierLot = de.SupplierLot,
+ CreateUser = _userManager.UserId,
+ CreateTime = time
+ };
+ logList.Add(checkLog);
- CreateUser = userId,
- CreateTime = time
- };
- logList.Add(checkLog);
-
- }
- else
- {
- var de = outStockDetail.Where(m =>
- m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo).Select(m => m.Id).ToList();
- var bo = outStockBox.Where(m => de.Contains(m.StockDetailId)).ToList();
- foreach (var b in bo)
- {
- var checkLog = new BllStockCheckLog()
- {
- CRNo = item.CRNo,
- PalletNo = item.PalletNo,
- BoxNo = b.BoxNo,
- BoxNo2 = b.BoxNo2,
- BoxNo3 = b.BoxNo3,
- Qty = b.Qty,
- SkuNo = b.SkuNo,
- SkuName = b.SkuName,
- Standard = b.Standard,
- LotNo = b.LotNo,
- LotText = b.LotText,
- SupplierLot = b.SupplierLot,
-
- CreateUser = userId,
- CreateTime = time
- };
- logList.Add(checkLog);
- }
- }
-
- //鐢熸垚鐩樼偣璁板綍
- Db.Insertable(logList).ExecuteCommand();
- }
- // 鍌ㄤ綅鍙�
- var locateNo = outStockDetail.First(m => m.PalletNo == item.PalletNo && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo).LocatNo;
-
- #region 鍒ゆ柇
- //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱鍐�
- if (string.IsNullOrWhiteSpace(locateNo))
+ }
+ else
+ {
+ var de = outStockDetail.Where(m =>
+ m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo).Select(m => m.Id).ToList();
+ var bo = outStockBox.Where(m => de.Contains(m.StockDetailId)).ToList();
+ foreach (var b in bo)
{
- var de = outStockDetail.First(m => m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo);
- //鍒ゆ柇鏄惁鏄浂绠卞簱锛屽綋鍓嶆槑缁嗕俊鎭洿鎺ユ洿鏂板嚭搴撳畬鎴�
- if (de != null && de.WareHouseNo == "W02")
+ var checkLog = new BllStockCheckLog()
{
- //鐩樼偣鏄庣粏鐘舵�佹敼涓哄緟鐩樼偣
- item.Status = 2;
- Db.Updateable(item).ExecuteCommand();
- //鐩樼偣淇℃伅淇敼
- if (notice.Status == 0)
- {
- notice.CheckDate = DateTime.Now;
- notice.Status = 1;
- notice.UpdateUser = userId;
- notice.UpdateTime = time;
- Db.Updateable(notice).ExecuteCommand();
- }
- //搴撳瓨涓綋鍓嶆墭鐩樼殑淇℃伅
- var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == item.PalletNo).ToList();
- foreach (var s in stockDetail)
- {
- s.LocatNo = "";//鍌ㄤ綅鏇存敼锛堟敼涓虹┖锛�
- s.WareHouseNo = "";//鎵�灞炰粨搴撴洿鏀癸紙鏀逛负绌猴級
- s.RoadwayNo = "";//鎵�灞炲贩閬撴洿鏀癸紙鏀逛负绌猴級
- s.AreaNo = "";//鎵�灞炲尯鍩熸洿鏀癸紙鏀逛负绌猴級
- Db.Updateable(s).ExecuteCommand();
- }
- flagList.Add(5);
- continue;
- }
- //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ叆搴撲腑
- var imBl = com.GetImTask(item.PalletNo);
- if (imBl != null)
- {
- flagList.Add(4);
- continue;
- }
- //鍒ゆ柇鏄惁鏄凡缁忓嚭杩囧簱鍙堝洖搴擄紙鐘舵�佷负寰呮嫞璐х殑 1锛�
- if (item.Status == 0)
- {
- //濡傛灉涓嶅湪浠撳簱鍐咃紝褰撳墠鏄庣粏淇℃伅鐩存帴鏇存柊鍑哄簱瀹屾垚
- item.Status = 2;//鐘舵��
- Db.Updateable(item).ExecuteCommand();
- if (notice.Status == 0)
- {
- notice.CheckDate = DateTime.Now;
- notice.Status = 1;
- notice.UpdateUser = userId;
- notice.UpdateTime = time;
- Db.Updateable(notice).ExecuteCommand();
- }
- }
- continue;
- }
- //褰撳墠鍑哄簱鐨勫偍浣嶄俊鎭�
- var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == locateNo && m.IsDel == "0");
- if (locate == null)
- {
- flagList.Add(2);
- continue;
- }
- //鍒ゆ柇鍌ㄤ綅鏍囧織鏄惁涓烘崯鍧�
- if (locate.Flag == "2")
- {
- flagList.Add(3);
- continue;
- }
- #endregion
- if (locate.Status == "1") //鏈夌墿鍝�
- {
- #region 娣诲姞鍑哄簱浠诲姟
- var taskNo = new Common().GetMaxNo("TK");
- //娣诲姞鍑哄簱浠诲姟
- var exTask = new LogTask
- {
- TaskNo = taskNo,
- Sender = "WMS",
- Receiver = "WCS",
- IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ CRNo = item.CRNo,
+ PalletNo = item.PalletNo,
+ BoxNo = b.BoxNo,
+ BoxNo2 = b.BoxNo2,
+ BoxNo3 = b.BoxNo3,
+ Qty = b.Qty,
+ SkuNo = b.SkuNo,
+ SkuName = b.SkuName,
+ Standard = b.Standard,
+ LotNo = b.LotNo,
+ LotText = b.LotText,
+ SupplierLot = b.SupplierLot,
- StartLocat = locate.LocatNo,//璧峰浣嶇疆
- EndLocat = outMode,//鐩爣浣嶇疆
- PalletNo = item.PalletNo,//鎵樼洏鐮�
- IsSend = 1,//鏄惁鍙啀娆′笅鍙�
- IsCancel = 1,//鏄惁鍙彇娑�
- IsFinish = 1,//鏄惁鍙畬鎴�
- Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
- OrderType = "2",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
-
+ CreateUser = _userManager.UserId,
CreateTime = time
};
- Db.Insertable(exTask).ExecuteCommand();
-
- outDtoList.Add(new OutCommandDto()
- {
- PalletNo = item.PalletNo,//鎵樼洏鍙�
- StartLocate = locate.LocatNo, // 璧峰浣嶇疆
- StartRoadway = locate.RoadwayNo,
- EndLocate = "", // 鐩爣浣嶇疆
- TaskNo = exTask.TaskNo, // 浠诲姟鍙�
- TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)
- OutMode = "", //鐩爣鍦板潃
- Order = 1
- });
- #endregion
-
- #region 鏀瑰彉鏁版嵁
- if (item.Status == 0)//鍒ゆ柇鎵樼洏鏄惁涓嬪彂杩�
- {
- if (notice.Status == 0)
- {
- notice.CheckDate = DateTime.Now;
- notice.Status = 1;
- notice.UpdateUser = userId;
- notice.UpdateTime = time;
- Db.Updateable(notice).ExecuteCommand();
- }
- }
- locate.Status = "3"; //瑕佸嚭搴撶殑鍌ㄤ綅鏀瑰彉鐘舵�� 姝ｅ湪鍑哄簱
- Db.Updateable(locate).ExecuteCommand();
-
- item.TaskNo = exTask.TaskNo; // 鍑哄簱鍒嗛厤淇℃伅涓洿鏂颁换鍔″彿
- item.Status = 1; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛�
- Db.Updateable(item).ExecuteCommand();
- #endregion
-
- flagList.Add(0);
- }
- else if (locate.Status == "3") //鍑哄簱涓�
- {
- #region 鏀瑰彉鏁版嵁
- //鍒ゆ柇鏄惁鏄凡缁忓嚭杩囧簱鍙堝洖搴擄紙鐘舵�佷负寰呮嫞璐х殑 1锛�
- if (item.Status == 0)
- {
- if (notice.Status == 0)
- {
- notice.CheckDate = DateTime.Now;
- notice.Status = 1;
- notice.UpdateUser = userId;
- notice.UpdateTime = time;
- Db.Updateable(notice).ExecuteCommand();
-
- }
- }
- var taskNo = Db.Queryable<LogTask>().First(m => m.OrderType == "2" && m.TaskNo != item.TaskNo && m.Status == "1" && m.PalletNo == item.PalletNo);
- item.TaskNo = taskNo.TaskNo;
- item.Status = 1; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛�
- Db.Updateable(item).ExecuteCommand();
-
- #endregion
- }
- else if (locate.Status == "5") //绉诲嚭涓�
- {
- flagList.Add(1);
+ logList.Add(checkLog);
}
}
- //娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", crNo, "鍑哄簱", $"鐐瑰嚮鍑哄簱鎸夐挳鐩樼偣鍗曞彿涓猴細{crNo}鐨勭洏鐐瑰崟", userId);
- Db.CommitTran();
- str = string.Empty;
- if (flagList.Count(m => m == 1) > 0)
- {
- str += "1.褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭銆�";
- }
- if (flagList.Count(m => m == 2) > 0)
- {
- str += "2.鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�";
- }
- if (flagList.Count(m => m == 3) > 0)
- {
- str += "4.鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�";
- }
- if (flagList.Count(m => m == 4) > 0)
- {
- str += "3.瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱銆�";
- }
- if (flagList.Count(m => m == 5) > 0)
- {
- str += "5.瑕佸嚭搴撶殑鎵樼洏鍦ㄩ浂绠卞簱銆�";
- }
- if (outDtoList.Count > 0)
- {
- // 姝ｅ紡杩愯绋嬪簭鏀惧紑
- var list2 = outDtoList.Select(m => m.TaskNo).ToList();
- var jsonData = JsonConvert.SerializeObject(outDtoList);
- string response = "";
-
- try
- {
- var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- //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);
- //}
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
- }
- return outDtoList;
+ //鐢熸垚鐩樼偣璁板綍
+ await Db.Insertable(logList).ExecuteCommandAsync();
}
- catch (Exception e)
+ // 鍌ㄤ綅鍙�
+ var locateNo = outStockDetail.First(m => m.PalletNo == item.PalletNo && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo).LocatNo;
+
+ #region 鍒ゆ柇
+ //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱鍐�
+ if (string.IsNullOrWhiteSpace(locateNo))
{
- Db.RollbackTran();
- throw new Exception(e.Message);
+ var de = outStockDetail.First(m => m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo);
+ //鍒ゆ柇鏄惁鏄浂绠卞簱锛屽綋鍓嶆槑缁嗕俊鎭洿鎺ユ洿鏂板嚭搴撳畬鎴�
+ if (de != null && de.WareHouseNo == "W02")
+ {
+ //鐩樼偣鏄庣粏鐘舵�佹敼涓哄緟鐩樼偣
+ item.Status = 2;
+ await Db.Updateable(item).ExecuteCommandAsync();
+ //鐩樼偣淇℃伅淇敼
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ }
+ //搴撳瓨涓綋鍓嶆墭鐩樼殑淇℃伅
+ var stockDetail = await Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == item.PalletNo).ToListAsync();
+ foreach (var s in stockDetail)
+ {
+ s.LocatNo = "";//鍌ㄤ綅鏇存敼锛堟敼涓虹┖锛�
+ s.WareHouseNo = "";//鎵�灞炰粨搴撴洿鏀癸紙鏀逛负绌猴級
+ s.RoadwayNo = "";//鎵�灞炲贩閬撴洿鏀癸紙鏀逛负绌猴級
+ s.AreaNo = "";//鎵�灞炲尯鍩熸洿鏀癸紙鏀逛负绌猴級
+ await Db.Updateable(s).ExecuteCommandAsync();
+ }
+ flagList.Add(5);
+ continue;
+ }
+ //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ叆搴撲腑
+ var imBl = com.GetImTask(item.PalletNo);
+ if (imBl != null)
+ {
+ flagList.Add(4);
+ continue;
+ }
+ //鍒ゆ柇鏄惁鏄凡缁忓嚭杩囧簱鍙堝洖搴擄紙鐘舵�佷负寰呮嫞璐х殑 1锛�
+ if (item.Status == 0)
+ {
+ //濡傛灉涓嶅湪浠撳簱鍐咃紝褰撳墠鏄庣粏淇℃伅鐩存帴鏇存柊鍑哄簱瀹屾垚
+ item.Status = 2;//鐘舵��
+ await Db.Updateable(item).ExecuteCommandAsync();
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ }
+ }
+ continue;
+ }
+ //褰撳墠鍑哄簱鐨勫偍浣嶄俊鎭�
+ var locate = await Db.Queryable<SysStorageLocat>().FirstAsync(m => m.LocatNo == locateNo && m.IsDel == "0");
+ if (locate == null)
+ {
+ flagList.Add(2);
+ continue;
+ }
+ //鍒ゆ柇鍌ㄤ綅鏍囧織鏄惁涓烘崯鍧�
+ if (locate.Flag == "2")
+ {
+ flagList.Add(3);
+ continue;
}
#endregion
+ if (locate.Status == "1") //鏈夌墿鍝�
+ {
+ #region 娣诲姞鍑哄簱浠诲姟
+ var taskNo = new Common().GetMaxNo("TK");
+ //娣诲姞鍑哄簱浠诲姟
+ var exTask = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ StartLocat = locate.LocatNo,//璧峰浣嶇疆
+ EndLocat = outMode,//鐩爣浣嶇疆
+ PalletNo = item.PalletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "2",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+
+ CreateTime = time
+ };
+ await Db.Insertable(exTask).ExecuteCommandAsync();
+
+ outDtoList.Add(new OutCommandDto()
+ {
+ PalletNo = item.PalletNo,//鎵樼洏鍙�
+ StartLocate = locate.LocatNo, // 璧峰浣嶇疆
+ StartRoadway = locate.RoadwayNo,
+ EndLocate = "", // 鐩爣浣嶇疆
+ TaskNo = exTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ });
+ #endregion
+
+ #region 鏀瑰彉鏁版嵁
+ if (item.Status == 0)//鍒ゆ柇鎵樼洏鏄惁涓嬪彂杩�
+ {
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ }
+ }
+ locate.Status = "3"; //瑕佸嚭搴撶殑鍌ㄤ綅鏀瑰彉鐘舵�� 姝ｅ湪鍑哄簱
+ await Db.Updateable(locate).ExecuteCommandAsync();
+
+ item.TaskNo = exTask.TaskNo; // 鍑哄簱鍒嗛厤淇℃伅涓洿鏂颁换鍔″彿
+ item.Status = 1; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛�
+ await Db.Updateable(item).ExecuteCommandAsync();
+ #endregion
+
+ flagList.Add(0);
+ }
+ else if (locate.Status == "3") //鍑哄簱涓�
+ {
+ #region 鏀瑰彉鏁版嵁
+ //鍒ゆ柇鏄惁鏄凡缁忓嚭杩囧簱鍙堝洖搴擄紙鐘舵�佷负寰呮嫞璐х殑 1锛�
+ if (item.Status == 0)
+ {
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+
+ }
+ }
+ var taskNo = Db.Queryable<LogTask>().First(m => m.OrderType == "2" && m.TaskNo != item.TaskNo && m.Status == "1" && m.PalletNo == item.PalletNo);
+ item.TaskNo = taskNo.TaskNo;
+ item.Status = 1; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛�
+ await Db.Updateable(item).ExecuteCommandAsync();
+
+ #endregion
+ }
+ else if (locate.Status == "5") //绉诲嚭涓�
+ {
+ flagList.Add(1);
+ }
}
- catch (Exception e)
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", crNo, "鍑哄簱", $"鐐瑰嚮鍑哄簱鎸夐挳鐩樼偣鍗曞彿涓猴細{crNo}鐨勭洏鐐瑰崟", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
{
- throw new Exception(e.Message);
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "鐩樼偣鍗曟嵁",
+ FkNo = crNo,
+ TypeName = "鍑哄簱",
+ Msg = $"鐐瑰嚮鍑哄簱鎸夐挳鐩樼偣鍗曞彿涓猴細{crNo}鐨勭洏鐐瑰崟"
+ });
+ //Db.CommitTran();
+
+ str = string.Empty;
+ if (flagList.Count(m => m == 1) > 0)
+ {
+ str += "1.褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭銆�";
}
+ if (flagList.Count(m => m == 2) > 0)
+ {
+ str += "2.鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�";
+ }
+ if (flagList.Count(m => m == 3) > 0)
+ {
+ str += "3.鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�";
+ }
+ if (flagList.Count(m => m == 4) > 0)
+ {
+ str += "4.瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱銆�";
+ }
+ if (flagList.Count(m => m == 5) > 0)
+ {
+ str += "5.瑕佸嚭搴撶殑鎵樼洏鍦ㄩ浂绠卞簱銆�";
+ }
+ if (!string.IsNullOrEmpty(str))
+ throw Oops.Bah(str);
+ if (outDtoList.Count > 0)
+ {
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ var list2 = outDtoList.Select(m => m.TaskNo).ToList();
+ var jsonData = JsonConvert.SerializeObject(outDtoList);
+ string response = "";
+
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ //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 Oops.Bah(wcsModel.Msg);
+ //}
+ }
+ return outDtoList;
+ #endregion
}
+ /// <summary>
+ /// 瑙嗚鐩樼偣
+ /// </summary>
+ /// <param name="crNo"></param>
+ /// <param name="url"></param>
+ /// <param name="str"></param>
+ /// <returns></returns>
+ public async Task<List<OutCommandDto>> CheckVision(string crNo, string url, string str)
+ {
+ #region 闆嗗悎
+ var outDtoList = new List<OutCommandDto>(); //鍑哄簱鏁版嵁鐨勯泦鍚�
+ //璁板綍閿欒淇℃伅鐨勯泦鍚�
+ var flagList = new List<int>();//1:褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭銆�2 鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�3鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�4 瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱
+
+ #endregion
+ var com = new Common();
+ //assign.IsHavePyTask();
+ var notice = await Db.Queryable<BllStockCheck>().FirstAsync(m => m.CRNo == crNo && m.IsDel == "0");
+ if (notice == null)
+ {
+ throw Oops.Bah($"鏈壘鍒皗crNo}鐩樼偣鍗曚俊鎭�");
+ }
+ //鎵�鏈夎鍑哄簱鐨勭洏鐐规槑缁嗕俊鎭�(绛夊緟鐨勪俊鎭拰寰呮嫞璐х殑淇℃伅)
+ var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "InventoryCheckMethod");
+ if (funSetting == null || funSetting.IsEnable == "OFF")
+ {
+ throw Oops.Bah("闇�閰嶇疆鐩樼偣鏂瑰紡");
+ }
+ var list = await Db.Queryable<BllStockCheckDetail>().Where(a => a.IsDel == "0" && a.CRNo == crNo && (a.Status == 0 || a.Status == 1 || a.Status == 2)).ToListAsync();
+ if (list.Count == 0) //鍒ゆ柇鏄惁鏈夐渶瑕佷笅鍙戠殑鐩樼偣鏄庣粏
+ {
+ throw Oops.Bah("褰撳墠鐩樼偣鍗曟嵁鏃犻渶瑕佷笅鍙戠殑鎵樼洏");
+ }
+ if (funSetting.SetValue == "once")
+ {
+ if (list.Any(s => s.Status == 1 || s.Status == 2))
+ {
+ throw Oops.Bah("宸叉湁姝ｅ湪鍑哄簱鎴栧緟鐩樼偣鐨勬暟鎹紝璇峰畬鎴愮洏鐐瑰悗鍐嶅嚭搴�");
+ }
+ list = new List<BllStockCheckDetail>() { list.FirstOrDefault() };
+ }
+ else
+ {
+ list = list.Where(s => s.Status == 0).ToList();
+ }
+ #region
+ //瑕佸嚭搴撶殑鎵樼洏闆嗗悎
+ var outLpnList = list.Select(m => m.PalletNo).Distinct().ToList();
+ //瑕佸嚭搴撶殑鏄庣粏闆嗗悎
+ var outStockDetail = await Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && outLpnList.Contains(m.PalletNo)).ToListAsync();
+ var outStockBox = await Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && outLpnList.Contains(m.PalletNo)).ToListAsync();
+ //鑾峰彇鐗╂枡淇℃伅
+ var skuNo = await Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.Type == "4").Select(a => a.SkuNo).ToListAsync();
+ var time = DateTime.Now;
+ //Db.BeginTran();
+ //寰幆鐩樼偣鏄庣粏鐨勪俊鎭敓鎴愬嚭搴撲换鍔�
+ foreach (var item in list)
+ {
+ if (item.Status == 0)
+ {
+ var logList = new List<BllStockCheckLog>();
+ //鍒ゆ柇鏄惁涓烘棤鐮佺墿鏂�
+ if (skuNo.Contains(item.SkuNo))
+ {
+ var de = outStockDetail.First(m => m.IsDel == "0" &&
+ m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo);
+
+ var checkLog = new BllStockCheckLog()
+ {
+ CRNo = item.CRNo,
+ PalletNo = item.PalletNo,
+ BoxNo = "",
+ BoxNo2 = "",
+ BoxNo3 = "",
+ Qty = (int?)de.Qty,
+ SkuNo = de.SkuNo,
+ SkuName = de.SkuName,
+ Standard = de.Standard,
+ LotNo = de.LotNo,
+ LotText = de.LotText,
+ SupplierLot = de.SupplierLot,
+
+ CreateUser = _userManager.UserId,
+ CreateTime = time
+ };
+ logList.Add(checkLog);
+
+ }
+ else
+ {
+ var de = outStockDetail.Where(m =>
+ m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo).Select(m => m.Id).ToList();
+ var bo = outStockBox.Where(m => de.Contains(m.StockDetailId)).ToList();
+ foreach (var b in bo)
+ {
+ var checkLog = new BllStockCheckLog()
+ {
+ CRNo = item.CRNo,
+ PalletNo = item.PalletNo,
+ BoxNo = b.BoxNo,
+ BoxNo2 = b.BoxNo2,
+ BoxNo3 = b.BoxNo3,
+ Qty = b.Qty,
+ SkuNo = b.SkuNo,
+ SkuName = b.SkuName,
+ Standard = b.Standard,
+ LotNo = b.LotNo,
+ LotText = b.LotText,
+ SupplierLot = b.SupplierLot,
+
+ CreateUser = _userManager.UserId,
+ CreateTime = time
+ };
+ logList.Add(checkLog);
+ }
+ }
+
+ //鐢熸垚鐩樼偣璁板綍
+ await Db.Insertable(logList).ExecuteCommandAsync();
+ }
+ // 鍌ㄤ綅鍙�
+ var locateNo = outStockDetail.First(m => m.PalletNo == item.PalletNo && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo).LocatNo;
+
+ #region 鍒ゆ柇
+ //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱鍐�
+ if (string.IsNullOrWhiteSpace(locateNo))
+ {
+ var de = outStockDetail.First(m => m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.PalletNo == item.PalletNo);
+ //鍒ゆ柇鏄惁鏄浂绠卞簱锛屽綋鍓嶆槑缁嗕俊鎭洿鎺ユ洿鏂板嚭搴撳畬鎴�
+ if (de != null && de.WareHouseNo == "W02")
+ {
+ //鐩樼偣鏄庣粏鐘舵�佹敼涓哄緟鐩樼偣
+ item.Status = 2;
+ await Db.Updateable(item).ExecuteCommandAsync();
+ //鐩樼偣淇℃伅淇敼
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ }
+ //搴撳瓨涓綋鍓嶆墭鐩樼殑淇℃伅
+ var stockDetail = await Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == item.PalletNo).ToListAsync();
+ foreach (var s in stockDetail)
+ {
+ s.LocatNo = "";//鍌ㄤ綅鏇存敼锛堟敼涓虹┖锛�
+ s.WareHouseNo = "";//鎵�灞炰粨搴撴洿鏀癸紙鏀逛负绌猴級
+ s.RoadwayNo = "";//鎵�灞炲贩閬撴洿鏀癸紙鏀逛负绌猴級
+ s.AreaNo = "";//鎵�灞炲尯鍩熸洿鏀癸紙鏀逛负绌猴級
+ await Db.Updateable(s).ExecuteCommandAsync();
+ }
+ flagList.Add(5);
+ continue;
+ }
+ //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ叆搴撲腑
+ var imBl = com.GetImTask(item.PalletNo);
+ if (imBl != null)
+ {
+ flagList.Add(4);
+ continue;
+ }
+ //鍒ゆ柇鏄惁鏄凡缁忓嚭杩囧簱鍙堝洖搴擄紙鐘舵�佷负寰呮嫞璐х殑 1锛�
+ if (item.Status == 0)
+ {
+ //濡傛灉涓嶅湪浠撳簱鍐咃紝褰撳墠鏄庣粏淇℃伅鐩存帴鏇存柊鍑哄簱瀹屾垚
+ item.Status = 2;//鐘舵��
+ await Db.Updateable(item).ExecuteCommandAsync();
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ }
+ }
+ continue;
+ }
+ //褰撳墠鍑哄簱鐨勫偍浣嶄俊鎭�
+ var locate = await Db.Queryable<SysStorageLocat>().FirstAsync(m => m.LocatNo == locateNo && m.IsDel == "0");
+ if (locate == null)
+ {
+ flagList.Add(2);
+ continue;
+ }
+ //鍒ゆ柇鍌ㄤ綅鏍囧織鏄惁涓烘崯鍧�
+ if (locate.Flag == "2")
+ {
+ flagList.Add(3);
+ continue;
+ }
+ #endregion
+ if (locate.Status == "1") //鏈夌墿鍝�
+ {
+ #region 娣诲姞瑙嗚鐩樼偣浠诲姟
+ var taskNo = new Common().GetMaxNo("TK");
+ var exTask = new LogTask
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ StartLocat = locate.LocatNo,//璧峰浣嶇疆
+ //EndLocat = outMode,//鐩爣浣嶇疆
+ PalletNo = item.PalletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "6",////0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗� 4 鍙栨牱鍑哄簱鍗� 6瑙嗚鐩樼偣
+ Msg = $"{locateNo}鐨勮瑙夌洏鐐逛换鍔�",
+ CreateTime = time
+ };
+ await Db.Insertable(exTask).ExecuteCommandAsync();
+
+ outDtoList.Add(new OutCommandDto()
+ {
+ PalletNo = item.PalletNo,//鎵樼洏鍙�
+ StartLocate = locate.LocatNo, // 璧峰浣嶇疆
+ StartRoadway = locate.RoadwayNo,
+ EndLocate = "", // 鐩爣浣嶇疆
+ TaskNo = exTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ });
+ #endregion
+
+ #region 鏀瑰彉鏁版嵁
+ if (item.Status == 0)//鍒ゆ柇鎵樼洏鏄惁涓嬪彂杩�
+ {
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ }
+ }
+ //locate.Status = "3"; //瑕佸嚭搴撶殑鍌ㄤ綅鏀瑰彉鐘舵�� 姝ｅ湪鍑哄簱
+ await Db.Updateable(locate).ExecuteCommandAsync();
+
+ item.TaskNo = exTask.TaskNo; // 鍑哄簱鍒嗛厤淇℃伅涓洿鏂颁换鍔″彿
+ item.Status = 1; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛�
+ await Db.Updateable(item).ExecuteCommandAsync();
+ #endregion
+
+ flagList.Add(0);
+ }
+ else if (locate.Status == "3") //鍑哄簱涓�
+ {
+ #region 鏀瑰彉鏁版嵁
+ //鍒ゆ柇鏄惁鏄凡缁忓嚭杩囧簱鍙堝洖搴擄紙鐘舵�佷负寰呮嫞璐х殑 1锛�
+ if (item.Status == 0)
+ {
+ if (notice.Status == 0)
+ {
+ notice.CheckDate = DateTime.Now;
+ notice.Status = 1;
+ notice.UpdateUser = _userManager.UserId;
+ notice.UpdateTime = time;
+ await Db.Updateable(notice).ExecuteCommandAsync();
+
+ }
+ }
+ var taskNo = Db.Queryable<LogTask>().First(m => m.OrderType == "2" && m.TaskNo != item.TaskNo && m.Status == "1" && m.PalletNo == item.PalletNo);
+ item.TaskNo = taskNo.TaskNo;
+ item.Status = 1; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛�
+ await Db.Updateable(item).ExecuteCommandAsync();
+
+ #endregion
+ }
+ else if (locate.Status == "5") //绉诲嚭涓�
+ {
+ flagList.Add(1);
+ }
+ }
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "鐩樼偣鍗曟嵁", crNo, "鍑哄簱", $"鐐瑰嚮鍑哄簱鎸夐挳鐩樼偣鍗曞彿涓猴細{crNo}鐨勭洏鐐瑰崟", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "鐩樼偣鍗曟嵁",
+ FkNo = crNo,
+ TypeName = "鍑哄簱",
+ Msg = $"鐐瑰嚮鍑哄簱鎸夐挳鐩樼偣鍗曞彿涓猴細{crNo}鐨勭洏鐐瑰崟"
+ });
+ //Db.CommitTran();
+
+ str = string.Empty;
+ if (flagList.Count(m => m == 1) > 0)
+ {
+ str += "1.褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝ｅ湪绉诲嚭銆�";
+ }
+ if (flagList.Count(m => m == 2) > 0)
+ {
+ str += "2.鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�";
+ }
+ if (flagList.Count(m => m == 3) > 0)
+ {
+ str += "3.鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�";
+ }
+ if (flagList.Count(m => m == 4) > 0)
+ {
+ str += "4.瑕佸嚭搴撶殑鎵樼洏姝ｅ湪鍏ュ簱銆�";
+ }
+ if (flagList.Count(m => m == 5) > 0)
+ {
+ str += "5.瑕佸嚭搴撶殑鎵樼洏鍦ㄩ浂绠卞簱銆�";
+ }
+ if (!string.IsNullOrEmpty(str))
+ throw Oops.Bah(str);
+ if (outDtoList.Count > 0)
+ {
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ var list2 = outDtoList.Select(m => m.TaskNo).ToList();
+ var jsonData = JsonConvert.SerializeObject(outDtoList);
+ string response = "";
+
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ //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 Oops.Bah(wcsModel.Msg);
+ //}
+ }
+ return outDtoList;
+ #endregion
+ }
+
+ /// <summary>
+ /// 瑙嗚鐩樼偣浼犵粨鏋�
+ /// </summary>
+ /// <param name="crNo"></param>
+ /// <param name="url"></param>
+ /// <param name="str"></param>
+ /// <returns></returns>
+ public async Task CheckVision(CheckVm model)
+ {
+ if (string.IsNullOrWhiteSpace(model.CrNo))
+ {
+ throw Oops.Bah("鐩樼偣鍗曟嵁涓嶈兘涓虹┖");
+ }
+ if (string.IsNullOrWhiteSpace(model.SkuNo))
+ {
+ throw Oops.Bah("鐗╂枡涓嶈兘涓虹┖");
+ }
+ if (string.IsNullOrWhiteSpace(model.LotNo))
+ {
+ throw Oops.Bah("鐗╂枡鎵规涓嶈兘涓虹┖");
+ }
+ if (string.IsNullOrWhiteSpace(model.PalletNo))
+ {
+ throw Oops.Bah("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ //鐩樼偣鏄庣粏
+ var checkDetail = await Db.Queryable<BllStockCheckDetail>().FirstAsync(m =>
+ m.IsDel == "0" && m.CRNo == model.CrNo && m.PalletNo == model.PalletNo && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
+ if (checkDetail == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌鏈洏鐐圭殑鐩樼偣鏄庣粏淇℃伅");
+ }
+ var modSku = await Db.Queryable<SysMaterials>().Where(s => s.SkuNo == model.SkuNo).FirstAsync();
+
+ }
//鐩樼偣鍑哄簱瀹屾垚
- public void CheckSuccess(string taskNo, int userId)
+ public async Task CheckSuccess(string taskNo, int userId)
{
try
{
@@ -1241,48 +1616,59 @@
var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
if (task == null)
{
- throw new Exception($"鏈煡璇㈠埌浠诲姟鍙蜂负锛氣�榹taskNo}鈥欑殑浠诲姟淇℃伅");
+ throw Oops.Bah($"鏈煡璇㈠埌浠诲姟鍙蜂负锛氣�榹taskNo}鈥欑殑浠诲姟淇℃伅");
}
if (task.Status == "2")
{
- throw new Exception("褰撳墠浠诲姟宸插畬鎴�");
+ throw Oops.Bah("褰撳墠浠诲姟宸插畬鎴�");
}
Db.BeginTran();
//搴撳瓨涓綋鍓嶆墭鐩樼殑淇℃伅
- var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
+ var stockDetail = await Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToListAsync();
var locateNo = stockDetail.Select(m => m.LocatNo).Distinct().FirstOrDefault();
//褰撳墠浠诲姟涓殑鍌ㄤ綅淇℃伅
- var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == locateNo);
+ var locate = await Db.Queryable<SysStorageLocat>().FirstAsync(m => m.LocatNo == locateNo);
task.Status = "2";//浠诲姟鐘舵��
task.IsSend = 0;
task.IsCancel = 0;
task.IsFinish = 0;
task.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
- Db.Updateable(task).ExecuteCommand();
- locate.Status = "0"; // 鏇存敼褰撳墠浠诲姟涓殑鍌ㄤ綅鐘舵�侊紙鏀逛负0绌哄偍浣嶏級
- Db.Updateable(locate).ExecuteCommand();
- foreach (var item in stockDetail)
+ await Db.Updateable(task).ExecuteCommandAsync();
+ if(task.OrderType != "6")//瑙嗚鐩樼偣涓嶆洿鏀圭姸鎬�
{
- item.LocatNo = "";//鍌ㄤ綅鏇存敼锛堟敼涓虹┖锛�
- item.WareHouseNo = "";//鎵�灞炰粨搴撴洿鏀癸紙鏀逛负绌猴級
- item.RoadwayNo = "";//鎵�灞炲贩閬撴洿鏀癸紙鏀逛负绌猴級
- item.AreaNo = "";//鎵�灞炲尯鍩熸洿鏀癸紙鏀逛负绌猴級
- Db.Updateable(item).ExecuteCommand();
+ locate.Status = "0"; // 鏇存敼褰撳墠浠诲姟涓殑鍌ㄤ綅鐘舵�侊紙鏀逛负0绌哄偍浣嶏級
+ await Db.Updateable(locate).ExecuteCommandAsync();
+ foreach (var item in stockDetail)
+ {
+ item.LocatNo = "";//鍌ㄤ綅鏇存敼锛堟敼涓虹┖锛�
+ item.WareHouseNo = "";//鎵�灞炰粨搴撴洿鏀癸紙鏀逛负绌猴級
+ item.RoadwayNo = "";//鎵�灞炲贩閬撴洿鏀癸紙鏀逛负绌猴級
+ item.AreaNo = "";//鎵�灞炲尯鍩熸洿鏀癸紙鏀逛负绌猴級
+ await Db.Updateable(item).ExecuteCommandAsync();
+ }
}
//鐩樼偣鏄庣粏锛堟洿鏀圭姸鎬侊級
- var checkDetails = Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && (m.TaskNo == taskNo || (m.Status == 1 && m.PalletNo == task.PalletNo))).ToList();
+ var checkDetails = await Db.Queryable<BllStockCheckDetail>().Where(m => m.IsDel == "0" && (m.TaskNo == taskNo || (m.Status == 1 && m.PalletNo == task.PalletNo))).ToListAsync();
foreach (var item in checkDetails)
{
item.Status = 2;
- Db.Updateable(item).ExecuteCommand();
+ await Db.Updateable(item).ExecuteCommandAsync();
}
- if (userId != 0)
+ if (_userManager.UserId != 0)
{
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�", userId);
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "搴撳唴鏃ュ織",
+ FkNo = taskNo,
+ TypeName = "瀹屾垚",
+ Msg = $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�"
+ });
}
Db.CommitTran();
@@ -1295,27 +1681,27 @@
}
//AGV绉诲簱瀹屾垚
- public void MoveSuccess(string taskNo, int userId)
+ public async Task MoveSuccess(string taskNo)
{
try
{
//褰撳墠浠诲姟淇℃伅
- var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
+ var task = await Db.Queryable<LogTask>().FirstAsync(m => m.TaskNo == taskNo && m.IsDel == "0");
if (task == null)
{
- throw new Exception($"鏈煡璇㈠埌浠诲姟鍙蜂负锛氣�榹taskNo}鈥欑殑浠诲姟淇℃伅");
+ throw Oops.Bah($"鏈煡璇㈠埌浠诲姟鍙蜂负锛氣�榹taskNo}鈥欑殑浠诲姟淇℃伅");
}
if (task.Status == "2")
{
- throw new Exception("褰撳墠浠诲姟宸插畬鎴�");
+ throw Oops.Bah("褰撳墠浠诲姟宸插畬鎴�");
}
Db.BeginTran();
//搴撳瓨涓綋鍓嶆墭鐩樼殑淇℃伅
- var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
+ var stockDetail = await Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToListAsync();
var locateNo = stockDetail.Select(m => m.LocatNo).Distinct().FirstOrDefault();
-
+
//褰撳墠浠诲姟涓殑鍌ㄤ綅淇℃伅
- var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == locateNo);
+ var locate = await Db.Queryable<SysStorageLocat>().FirstAsync(m => m.LocatNo == locateNo);
//鏇存敼浠诲姟
task.Status = "2";//浠诲姟鐘舵��
@@ -1325,16 +1711,16 @@
task.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
Db.Updateable(task).ExecuteCommand();
// 鏇存敼褰撳墠浠诲姟涓殑鍌ㄤ綅鐘舵�侊紙鏀逛负0绌哄偍浣嶏級
- locate.Status = "0";
+ locate.Status = "0";
Db.Updateable(locate).ExecuteCommand();
//鐩爣鍌ㄤ綅淇℃伅
- var endLocate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
+ var endLocate = await Db.Queryable<SysStorageLocat>().FirstAsync(m => m.LocatNo == task.EndLocat);
if (endLocate != null)
{
if (endLocate.Status != "0")
{
- throw new Exception("鐩爣鍌ㄤ綅鐘舵�侀潪绌哄偍浣�");
+ throw Oops.Bah("鐩爣鍌ㄤ綅鐘舵�侀潪绌哄偍浣�");
}
}
//鏇存敼搴撳瓨鏄庣粏
@@ -1355,25 +1741,33 @@
item.WareHouseNo = "";//鎵�灞炰粨搴撴洿鏀癸紙鏀逛负绌猴級
item.RoadwayNo = "";//鎵�灞炲贩閬撴洿鏀癸紙鏀逛负绌猴級
item.AreaNo = "";//鎵�灞炲尯鍩熸洿鏀癸紙鏀逛负绌猴級
- }
- Db.Updateable(item).ExecuteCommand();
+ }
+ await Db.Updateable(item).ExecuteCommandAsync();
//鏇存敼搴撳瓨鎬昏〃
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();
+ await Db.Updateable(stock).ExecuteCommandAsync();
}
if (endLocate != null)
{
//鏇存敼鐩爣鍌ㄤ綅鐘舵��
endLocate.Status = "1";//鏈夌墿鍝�
- Db.Updateable(endLocate).ExecuteCommand();
+ await Db.Updateable(endLocate).ExecuteCommandAsync();
}
- if (userId != 0)
+ if (_userManager.UserId != 0)
{
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�", userId);
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "搴撳唴鏃ュ織",
+ FkNo = taskNo,
+ TypeName = "瀹屾垚",
+ Msg = $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�"
+ });
}
Db.CommitTran();
@@ -1386,19 +1780,19 @@
}
//閲嶆柊涓嬪彂鐩樼偣鍑哄簱浠诲姟
- public OutCommandDto AgainSendCheckTask(string taskNo, int userId, string url)
+ public async Task<OutCommandDto> AgainSendCheckTask(string taskNo, string url)
{
try
{
- var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
+ var task = await Db.Queryable<LogTask>().FirstAsync(m => m.TaskNo == taskNo && m.IsDel == "0");
if (task == null)
{
- throw new Exception("鏈煡璇㈠埌浠诲姟淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌浠诲姟淇℃伅");
}
- var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.PalletNo == task.PalletNo);
+ var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.PalletNo == task.PalletNo);
if (stockDetail == null)
{
- throw new Exception(task.PalletNo + " 褰撳墠鎵樼洏鏈湪搴撳唴锛岃鏍稿疄淇℃伅");
+ throw Oops.Bah(task.PalletNo + " 褰撳墠鎵樼洏鏈湪搴撳唴锛岃鏍稿疄淇℃伅");
}
Db.BeginTran();
var locateNo = task.StartLocat;
@@ -1407,13 +1801,13 @@
{
locateNo = stockDetail.LocatNo;
task.StartLocat = locateNo;
- Db.Updateable(task).ExecuteCommand();
+ await Db.Updateable(task).ExecuteCommandAsync();
}
var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == locateNo);
if (locate != null && locate.Status != "3")
{
locate.Status = "3";
- Db.Updateable(locate).ExecuteCommand();
+ await Db.Updateable(locate).ExecuteCommandAsync();
}
var outDto = new OutCommandDto()
{
@@ -1427,7 +1821,15 @@
Order = 1
}; //鍑哄簱鏁版嵁
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "涓嬪彂", $"鐐瑰嚮涓嬪彂鎸夐挳銆侀噸鏂颁笅鍙戜簡浠诲姟鍙蜂负锛歿taskNo}鐨勪换鍔�", userId);
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "涓嬪彂", $"鐐瑰嚮涓嬪彂鎸夐挳銆侀噸鏂颁笅鍙戜簡浠诲姟鍙蜂负锛歿taskNo}鐨勪换鍔�", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "搴撳唴鏃ュ織",
+ FkNo = taskNo,
+ TypeName = "涓嬪彂",
+ Msg = $"鐐瑰嚮涓嬪彂鎸夐挳銆侀噸鏂颁笅鍙戜簡浠诲姟鍙蜂负锛歿taskNo}鐨勪换鍔�"
+ });
Db.CommitTran();
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
var list = new List<string> { outDto.TaskNo };
@@ -1468,17 +1870,17 @@
}
//鍙栨秷鐩樼偣鍑哄簱浠诲姟
- public void CancelCheckTask(string taskNo, int userId)
+ public async Task CancelCheckTask(string taskNo)
{
try
{
Db.BeginTran();
try
{
- var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
+ var task = await Db.Queryable<LogTask>().FirstAsync(m => m.TaskNo == taskNo && m.IsDel == "0");
if (task == null)
{
- throw new Exception("鏈煡璇㈠埌浠诲姟淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌浠诲姟淇℃伅");
}
//淇敼浠诲姟
task.IsSuccess = 0;
@@ -1487,37 +1889,45 @@
task.IsFinish = 0;
task.Status = "4";
task.CancelDate = DateTime.Now;
- Db.Updateable(task).ExecuteCommand();
+ await Db.Updateable(task).ExecuteCommandAsync();
//淇敼鐩樼偣鏄庣粏
- var checkDetail = Db.Queryable<BllStockCheckDetail>().First(w => w.TaskNo == task.TaskNo);
+ var checkDetail = await Db.Queryable<BllStockCheckDetail>().FirstAsync(w => w.TaskNo == task.TaskNo);
if (checkDetail == null)
{
- throw new Exception("鏈煡璇㈠埌鐩樼偣鏄庣粏淇℃伅锛岃鏍稿疄锛�");
+ throw Oops.Bah("鏈煡璇㈠埌鐩樼偣鏄庣粏淇℃伅锛岃鏍稿疄锛�");
}
checkDetail.Status = 0;
checkDetail.TaskNo = "";
- Db.Updateable(checkDetail).ExecuteCommand();
+ await Db.Updateable(checkDetail).ExecuteCommandAsync();
//淇敼鐩樼偣璁板綍
- var checkLog = Db.Queryable<BllStockCheckLog>().First(w => w.CRNo == checkDetail.CRNo && w.PalletNo == checkDetail.PalletNo && w.IsDel == "0");
+ var checkLog = await Db.Queryable<BllStockCheckLog>().FirstAsync(w => w.CRNo == checkDetail.CRNo && w.PalletNo == checkDetail.PalletNo && w.IsDel == "0");
if (checkLog == null)
{
- throw new Exception("鏈煡璇㈠埌鐩樼偣璁板綍淇℃伅锛岃鏍稿疄锛�");
+ throw Oops.Bah("鏈煡璇㈠埌鐩樼偣璁板綍淇℃伅锛岃鏍稿疄锛�");
}
checkLog.IsDel = "1";
- Db.Updateable(checkLog).ExecuteCommand();
+ await Db.Updateable(checkLog).ExecuteCommandAsync();
//淇敼鍌ㄤ綅淇℃伅
- var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
+ var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
if (locat == null)
{
- throw new Exception("鏈煡璇㈠埌鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");
+ throw Oops.Bah("鏈煡璇㈠埌鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");
}
locat.Status = "1"; //鏈夌墿鍝�
- Db.Updateable(locat).ExecuteCommand();
+ await Db.Updateable(locat).ExecuteCommandAsync();
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "鍙栨秷", $"鐐瑰嚮鍙栨秷鎸夐挳銆佸彇娑堜簡浠诲姟鍙蜂负锛歿taskNo}鐨勪换鍔�", userId);
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "鍙栨秷", $"鐐瑰嚮鍙栨秷鎸夐挳銆佸彇娑堜簡浠诲姟鍙蜂负锛歿taskNo}鐨勪换鍔�", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "搴撳唴鏃ュ織",
+ FkNo = taskNo,
+ TypeName = "鍙栨秷",
+ Msg = $"鐐瑰嚮鍙栨秷鎸夐挳銆佸彇娑堜簡浠诲姟鍙蜂负锛歿taskNo}鐨勪换鍔�"
+ });
Db.CommitTran();
}
catch (Exception e)
@@ -1533,16 +1943,16 @@
}
//鍙栨秷AGV绉诲簱浠诲姟
- public void CancelMoveTask(string taskNo, int userId)
+ public async Task CancelMoveTask(string taskNo)
{
try
{
Db.BeginTran();
- var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
+ var task = await Db.Queryable<LogTask>().FirstAsync(m => m.TaskNo == taskNo && m.IsDel == "0");
if (task == null)
{
- throw new Exception("鏈煡璇㈠埌浠诲姟淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌浠诲姟淇℃伅");
}
//淇敼浠诲姟
task.IsSuccess = 0;
@@ -1551,46 +1961,54 @@
task.IsFinish = 0;
task.Status = "4";
task.CancelDate = DateTime.Now;
- Db.Updateable(task).ExecuteCommand();
+ await Db.Updateable(task).ExecuteCommandAsync();
//淇敼璧峰鍌ㄤ綅淇℃伅
- var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
+ var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
if (locat == null)
{
- throw new Exception("鏈煡璇㈠埌鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");
+ throw Oops.Bah("鏈煡璇㈠埌鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");
}
locat.Status = "1"; //鏈夌墿鍝�
Db.Updateable(locat).ExecuteCommand();
//淇敼鐩爣鍌ㄤ綅淇℃伅
- var locatEnd = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.EndLocat);
+ var locatEnd = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.EndLocat);
if (locatEnd != null)
{
locatEnd.Status = "0"; //绌哄偍浣�
- Db.Updateable(locatEnd).ExecuteCommand();
- }
+ await Db.Updateable(locatEnd).ExecuteCommandAsync();
+ }
//淇敼搴撳瓨鏄庣粏
- var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == task.PalletNo);
+ var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(w => w.IsDel == "0" && w.PalletNo == task.PalletNo);
if (stockDetail == null)
{
- throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樻槑缁嗕俊鎭笉瀛樺湪,璇锋鏌�!");
+ throw Oops.Bah("鎵樼洏涓婄墿鏂欏簱瀛樻槑缁嗕俊鎭笉瀛樺湪,璇锋鏌�!");
}
stockDetail.Status = "0";//寰呭垎閰�
stockDetail.LockQty = 0;//閿佸畾鏁伴噺
- Db.Updateable(stockDetail).ExecuteCommand();
+ await Db.Updateable(stockDetail).ExecuteCommandAsync();
//淇敼搴撳瓨
- var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == stockDetail.SkuNo && w.LotNo == stockDetail.LotNo);
+ var stock = await Db.Queryable<DataStock>().FirstAsync(w => w.IsDel == "0" && w.SkuNo == stockDetail.SkuNo && w.LotNo == stockDetail.LotNo);
if (stock == null)
{
- throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樹俊鎭笉瀛樺湪,璇锋鏌�!");
+ throw Oops.Bah("鎵樼洏涓婄墿鏂欏簱瀛樹俊鎭笉瀛樺湪,璇锋鏌�!");
}
stock.LockQty -= (decimal)stockDetail.Qty;
- Db.Updateable(stock).ExecuteCommand();
+ await Db.Updateable(stock).ExecuteCommandAsync();
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "鍙栨秷", $"鐐瑰嚮鍙栨秷鎸夐挳銆佸彇娑堜簡浠诲姟鍙蜂负锛歿taskNo}鐨勪换鍔�", userId);
+ //var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "鍙栨秷", $"鐐瑰嚮鍙栨秷鎸夐挳銆佸彇娑堜簡浠诲姟鍙蜂负锛歿taskNo}鐨勪换鍔�", userId);
+ await _operation.AddLogOperationCr(new OperationInputVm()
+ {
+ ParentName = "搴撳唴浣滀笟",
+ MenuName = "搴撳唴鏃ュ織",
+ FkNo = taskNo,
+ TypeName = "鍙栨秷",
+ Msg = $"鐐瑰嚮鍙栨秷鎸夐挳銆佸彇娑堜簡浠诲姟鍙蜂负锛歿taskNo}鐨勪换鍔�"
+ });
Db.CommitTran();
}
catch (Exception e)
--
Gitblit v1.8.0