From 24eaa29a52b8c050fc391eafd0b0cc370733cf91 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期三, 26 十一月 2025 15:22:16 +0800
Subject: [PATCH] 修改拣货拼托判断有误
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 848 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 709 insertions(+), 139 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index d0ca543..a95d6f3 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -23,6 +23,7 @@
using System.Threading.Tasks;
using Utility;
using WMS.BLL.Logic;
+using System.Web;
namespace WMS.BLL.BllPdaServer
{
@@ -41,7 +42,7 @@
/// <param name="boxNo"></param>
/// <param name="palletNoNew"></param>
/// <param name="userId"></param>
- public async Task SoSetPinPick34(string soNo, string soDetailId, string palletNo, string boxNo , string palletNoNew, int userId)
+ public async Task SoSetPinPick34(string soNo, string soDetailId, string palletNo, string boxNo, string palletNoNew, int userId)
{
Db.BeginTran();
try
@@ -84,16 +85,13 @@
throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
}
//鍑哄簱鍗曟槑缁�
- var noticeDetail = await Db.Queryable<BllExportNoticeDetail>()
- .FirstAsync(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
+ var noticeDetail = await Db.Queryable<BllExportNoticeDetail>().FirstAsync(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
if (noticeDetail == null)
{
throw Oops.Bah("鏈煡璇㈠埌璇ュ嚭搴撳崟鏄庣粏鐨勪俊鎭�");
}
//鍑哄簱鍒嗛厤淇℃伅
- var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
- m.IsDel == "0" && (m.Status == "2" || m.Status == "3" || m.Status == "5") && m.SONo == soNo &&
- m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
+ var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m => m.IsDel == "0" && (m.Status == "2" || m.Status == "3" || m.Status == "5") && m.SONo == soNo && m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
if (allot == null)
{
throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樼殑鍒嗛厤淇℃伅");
@@ -120,32 +118,45 @@
var sdId = 0;
bool isNew = false;
- var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
-
- if (pinStockDetail != null)
+ //var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
+ var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
+
+ if (pinStockDetail != null)
{
+ //淇敼鎵樼洏琛ㄧ姸鎬佽鎵樼洏琛ㄥ拰搴撳瓨鏄庣粏琛ㄤ繚鎸佷竴鑷�
+ string uptPalletStatusSql = $@"update SysPallets set Status='1' where PalletNo='{palletNoNew}'";
+ int uptPalletStatus = Db.Ado.ExecuteCommand(uptPalletStatusSql);
+ Db.CommitTran();
+
if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�
{
- var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id!= pinStockDetail.Id).ToList();
- if (pinStockDetails.Count(m=>m.SONo != notice.SONo) > 0)
+ //var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
+ var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew).ToList();
+ //鍙厑璁哥粦瀹氬悓涓�涓嚭搴撳崟涓嬬殑鐗╂枡
+ if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
throw Oops.Bah("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
}
}
-
+
sdId = pinStockDetail.Id;
}
else
{
isNew = true;
- var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
+ var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);//&& m.Status == "0"
if (newPalletInfo == null)
{
- var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew &&(m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
+ throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪锛�");
+ }
+ if (newPalletInfo.Status == "0")
+ {
+ var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
+ //鍙厑璁哥粦瀹氬悓涓�涓嚭搴撳崟涓嬬殑鐗╂枡
if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
- throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
+ throw Oops.Bah("涓�涓墭鐩樺彧鑳芥帴鍙椾竴涓嚭搴撳崟鎷兼墭锛�");
}
}
else
@@ -154,9 +165,9 @@
newPalletInfo.Status = "1";
await Db.Updateable(newPalletInfo).ExecuteCommandAsync();
}
-
+
}
-
+
var sd = new DataStockDetail();
if (isNew)
{
@@ -202,6 +213,10 @@
sd.UDF5 = "1";
//鏂板鎷兼墭搴撳瓨鏄庣粏淇℃伅
sdId = await Db.Insertable(sd).ExecuteReturnIdentityAsync();
+
+ //淇敼鎵樼洏琛ㄧ姸鎬佽鎵樼洏琛ㄥ拰搴撳瓨鏄庣粏琛ㄤ繚鎸佷竴鑷�
+ string uptPalletStatusSql = $@"update SysPallets set Status='1' where PalletNo='{palletNoNew}'";
+ int uptPalletStatus = Db.Ado.ExecuteCommand(uptPalletStatusSql);
}
#endregion
@@ -229,10 +244,10 @@
{
throw Oops.Bah($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
}
- if (item.SkuNo != allot.SkuNo || item.LotNo != allot.LotNo)
- {
- throw Oops.Bah("褰撳墠鎵樼洏涓婃湁鍏朵粬涓嶅悓鐗╂枡鎵规锛屾嫞璐уけ璐�");
- }
+ //if (item.SkuNo != allot.SkuNo || item.LotNo != allot.LotNo)
+ //{
+ // throw Oops.Bah("褰撳墠鎵樼洏涓婃湁鍏朵粬涓嶅悓鐗╂枡鎵规锛屾嫞璐уけ璐�");
+ //}
//娣诲姞鎷ｈ揣鏄庣粏
var completeDetail = new BllCompleteDetail()
{
@@ -302,6 +317,19 @@
}
else
{
+ var locateStr = stockDetail.LocatNo;
+ //鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
+ var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
+ if (locate != null)
+ {
+ locate.Status = "0";
+ Db.Updateable(locate).ExecuteCommand();
+ }
+ stockDetail.WareHouseNo = "";
+ stockDetail.RoadwayNo = "";
+ stockDetail.AreaNo = "";
+ stockDetail.LocatNo = "";
+
stockDetail.SONo = soNo;
stockDetail.UDF5 = "1";
await Db.Updateable(stockDetail).ExecuteCommandAsync();
@@ -329,9 +357,9 @@
}
boxInfos = boxInfo.ToList();
var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
-
+
//鏁寸鎷ｈ揣
-
+
if (boxInfo.Any(m => m.PalletNo != palletNo))
{
throw Oops.Bah("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
@@ -341,7 +369,7 @@
//{
// throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
//}
-
+
foreach (var item in boxInfos)
{
if (comDetailList.Any(m => m.BoxNo == item.BoxNo))
@@ -349,7 +377,7 @@
throw Oops.Bah($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
}
}
-
+
var comList = new List<BllCompleteDetail>();
foreach (var item in boxInfos)
@@ -385,20 +413,20 @@
item.BindNo = null;//鎵樼洏缁戝畾鍙�
item.PalletNo = palletNoNew;
}
-
+
item.Status = "5";//绠辨敮鐘舵�侊紝0锛氭湭缁勬墭 1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷ｈ揣
await Db.Updateable(item).ExecuteCommandAsync();
pickQty += item.Qty;
-
+
}
-
+
await Db.Insertable(comList).ExecuteCommandAsync();
//淇敼鍑哄簱鍒嗛厤淇℃伅
allot.CompleteQty += pickQty;
allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
allot.UpdateTime = DateTime.Now;
-
+
await Db.Updateable(allot).ExecuteCommandAsync();
//鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
@@ -428,28 +456,32 @@
var locateStr = stockDetail.LocatNo;
await Db.Deleteable(stockDetail).ExecuteCommandAsync();
- //鏀瑰彉鎵樼洏鐘舵��
- var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
- if (pallet == null)
+ var detailOther = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == stockDetail.PalletNo && w.Id != stockDetail.Id).ToList();
+ if (detailOther.Count <= 0)
{
- throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
- }
- pallet.Status = "0";
- await Db.Updateable(pallet).ExecuteCommandAsync();
+ //鏀瑰彉鎵樼洏鐘舵��
+ var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
+ if (pallet == null)
+ {
+ throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+ }
+ pallet.Status = "0";
+ await Db.Updateable(pallet).ExecuteCommandAsync();
- //鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
- var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
- if (locate != null)
- {
- locate.Status = "0";
- Db.Updateable(locate).ExecuteCommand();
+ //鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
+ var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
+ if (locate != null)
+ {
+ locate.Status = "0";
+ Db.Updateable(locate).ExecuteCommand();
+ }
}
}
else
{
await Db.Updateable(stockDetail).ExecuteCommandAsync();
}
-
+
//淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
noticeDetail.CompleteQty += pickQty;
await Db.Updateable(noticeDetail).ExecuteCommandAsync();
@@ -534,16 +566,13 @@
throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
}
//鍑哄簱鍗曟槑缁�
- var noticeDetail = await Db.Queryable<BllExportNoticeDetail>()
- .FirstAsync(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
+ var noticeDetail = await Db.Queryable<BllExportNoticeDetail>().FirstAsync(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
if (noticeDetail == null)
{
throw Oops.Bah("鏈煡璇㈠埌璇ュ嚭搴撳崟鏄庣粏鐨勪俊鎭�");
}
//鍑哄簱鍒嗛厤淇℃伅
- var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
- m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.SONo == soNo &&
- m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
+ var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m => m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.SONo == soNo && m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
if (allot == null)
{
throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樼殑鍒嗛厤淇℃伅");
@@ -578,12 +607,19 @@
#region 鎷兼墭淇℃伅
bool isNew = false;
- var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo== stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
+ //var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
+ var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
if (pinStockDetail != null)
{
+ //淇敼鎵樼洏琛ㄧ姸鎬佽鎵樼洏琛ㄥ拰搴撳瓨鏄庣粏琛ㄤ繚鎸佷竴鑷�
+ string uptPalletStatusSql = $@"update SysPallets set Status='1' where PalletNo='{palletNoNew}'";
+ int uptPalletStatus = Db.Ado.ExecuteCommand(uptPalletStatusSql);
+ Db.CommitTran();
+
if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�
{
- var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
+ //var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
+ var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew).ToList();
if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
throw Oops.Bah("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
@@ -594,8 +630,13 @@
{
isNew = true;
- var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
+ //var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
+ var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
if (newPalletInfo == null)
+ {
+ throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪锛�");
+ }
+ if (newPalletInfo.Status == "0")
{
var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo && m.LotNo != stockDetail.LotNo)).ToList();
if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
@@ -613,54 +654,58 @@
if (isNew)
{
- var sd = new DataStockDetail();
+ var sd = new DataStockDetail
+ {
+ LotNo = stockDetail.LotNo,
+ LotText = stockDetail.LotText,
+ SupplierLot = stockDetail.SupplierLot,
+ SkuNo = stockDetail.SkuNo,
+ SkuName = stockDetail.SkuName,
+ Standard = stockDetail.Standard,
- sd.LotNo = stockDetail.LotNo;
- sd.LotText = stockDetail.LotText;
- sd.SupplierLot = stockDetail.SupplierLot;
- sd.SkuNo = stockDetail.SkuNo;
- sd.SkuName = stockDetail.SkuName;
- sd.Standard = stockDetail.Standard;
+ Qty = int.Parse(PickQty),
+ LockQty = int.Parse(PickQty),
- sd.Qty = int.Parse(PickQty);
- sd.LockQty = int.Parse(PickQty);
+ FrozenQty = 0,
+ InspectQty = 0,
+ ASNNo = "",
+ ASNDetailNo = null,
+ SONo = soNo,//鍑哄簱鍗曞彿
+ WareHouseNo = "",
+ RoadwayNo = "",
+ AreaNo = "",
+ LocatNo = "",
+ PalletNo = palletNoNew,
+ PalletNo2 = "",
+ PalletNo3 = "",
+ //PalletType = item.PalletType,
+ CompleteTime = nowDate,
+ ProductionTime = stockDetail.ProductionTime,
+ ExpirationTime = stockDetail.ExpirationTime,
+ Status = "2",//鐘舵�侊紝宸插垎閰�
+ InspectMark = stockDetail.InspectMark,
+ InspectStatus = stockDetail.InspectStatus,
+ BitPalletMark = "0",
+ PackagNo = noticeDetail.PackagNo,
+ IsBale = stockDetail.IsBale,
+ IsBelt = stockDetail.IsBelt,
+ Demo = stockDetail.Demo,
+ OwnerName = stockDetail.OwnerName,
+ OwnerNo = stockDetail.OwnerNo,
+ SupplierName = stockDetail.SupplierName,
+ SupplierNo = stockDetail.SupplierNo,
- sd.FrozenQty = 0;
- sd.InspectQty = 0;
- sd.ASNNo = "";
- sd.ASNDetailNo = null;
- sd.SONo = soNo;//鍑哄簱鍗曞彿
- sd.WareHouseNo = "";
- sd.RoadwayNo = "";
- sd.AreaNo = "";
- sd.LocatNo = "";
- sd.PalletNo = palletNoNew;
- sd.PalletNo2 = "";
- sd.PalletNo3 = "";
- //PalletType = item.PalletType,
- sd.CompleteTime = nowDate;
- sd.ProductionTime = stockDetail.ProductionTime;
- sd.ExpirationTime = stockDetail.ExpirationTime;
- sd.Status = "2";//鐘舵�侊紝宸插垎閰�
- sd.InspectMark = stockDetail.InspectMark;
- sd.InspectStatus = stockDetail.InspectStatus;
- sd.BitPalletMark = "0";
- sd.PackagNo = noticeDetail.PackagNo;
- sd.IsBale = stockDetail.IsBale;
- sd.IsBelt = stockDetail.IsBelt;
- sd.Demo = stockDetail.Demo;
- sd.OwnerName = stockDetail.OwnerName;
- sd.OwnerNo = stockDetail.OwnerNo;
- sd.SupplierName = stockDetail.SupplierName;
- sd.SupplierNo = stockDetail.SupplierNo;
-
- sd.IsDel = "0";
- sd.CreateUser = userId;
- sd.CreateTime = nowDate;
- sd.UDF5 = "1";
-
+ IsDel = "0",
+ CreateUser = userId,
+ CreateTime = nowDate,
+ UDF5 = "1"
+ };
//鏂板鎷兼墭搴撳瓨鏄庣粏淇℃伅
await Db.Insertable(sd).ExecuteReturnIdentityAsync();
+
+ //淇敼鎵樼洏琛ㄧ姸鎬佽鎵樼洏琛ㄥ拰搴撳瓨鏄庣粏琛ㄤ繚鎸佷竴鑷�
+ string uptPalletStatusSql = $@"update SysPallets set Status='1' where PalletNo='{palletNoNew}'";
+ int uptPalletStatus = Db.Ado.ExecuteCommand(uptPalletStatusSql);
}
else
{
@@ -787,8 +832,8 @@
await Db.Updateable(pallet).ExecuteCommandAsync();
//鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
- var locate = Db.Queryable<SysStorageLocat>().First(m=>m.IsDel == "0" && m.LocatNo == locateStr);
- if (locate!=null)
+ var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
+ if (locate != null)
{
locate.Status = "0";
Db.Updateable(locate).ExecuteCommand();
@@ -800,8 +845,7 @@
noticeDetail.CompleteQty += int.Parse(PickQty);
await Db.Updateable(noticeDetail).ExecuteCommandAsync();
- var num = await Db.Queryable<BllExportNoticeDetail>()
- .CountAsync(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
+ var num = await Db.Queryable<BllExportNoticeDetail>().CountAsync(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
if (num <= 0)
{
notice.Status = "4"; //鏇存敼涓烘墽琛屽畬鎴�
@@ -1507,7 +1551,7 @@
//搴撳瓨鏄庣粏
var stockDetail = await Db.Queryable<DataStockDetail>()
- .FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo
+ .FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo
&& m.SkuNo == boxInfos.First().SkuNo && m.LotNo == boxInfos.First().LotNo);
if (stockDetail == null)
{
@@ -1518,7 +1562,7 @@
string skuName = boxInfos.First().SkuName;
// 楠岃瘉鏄惁杞﹂棿绾胯竟浠撳簱
- var areaList = new List<string>() { "B06", "B07", "B09" };
+ var areaList = new List<string>() { "B06", "B07", "B09", "B24" };
if (!areaList.Contains(stockDetail.AreaNo))
{
throw Oops.Bah("鎵樼洏涓嶆槸杞﹂棿鎵樼洏锛�");
@@ -1562,9 +1606,9 @@
else
{
await Db.Updateable(stockDetail).ExecuteCommandAsync();
- }
+ }
stock.Qty -= pickQty;
- //stock.LockQty -= pickQty;
+ stock.LockQty -= pickQty;
if (stock.Qty <= 0)
{
await Db.Deleteable(stock).ExecuteCommandAsync();
@@ -1605,7 +1649,7 @@
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "杞﹂棿鍑哄簱",
+ var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "杞﹂棿鍑哄簱",
boxNo, "鍑哄簱", $"鍦≒DA涓婂绠卞彿涓猴細{boxNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
Db.CommitTran();
}
@@ -1621,7 +1665,7 @@
}
// 杞﹂棿Pda鎷ｈ揣-鏁伴噺
- public async Task ChejianPickNum(PdaSoVm model, int userId)
+ public async Task ChejianPickNum(PdaSoVm model, int userId)
{
Db.BeginTran();
try
@@ -1642,10 +1686,10 @@
{
throw Oops.Bah("鐗╂枡鏁伴噺涓嶅彲涓簄ull");
}
- else
+ else
{
skuNum = decimal.Parse(model.PickQty);
- if (skuNum <= 0)
+ if (skuNum <= 0)
{
throw Oops.Bah("鐗╂枡鏁伴噺搴斿ぇ浜�0锛�");
}
@@ -1657,9 +1701,9 @@
{
throw Oops.Bah("鐗╂枡涓嶅瓨鍦紝璇锋鏌ョ墿鏂欑紪鐮佹槸鍚︽嫰鍗达紒");
}
- else
+ else
{
- if (skuModel.IsPasteCode != "0")
+ if (skuModel.IsPasteCode != "0")
{
throw Oops.Bah("璇ョ墿鏂欎负璐存爣鐗╂枡锛岃鍒版爣绛鹃〉闈㈡嫞璐э紒");
}
@@ -1669,14 +1713,14 @@
//搴撳瓨鏄庣粏
var stockDetail = await Db.Queryable<DataStockDetail>()
.FirstAsync(m => m.IsDel == "0" && m.PalletNo == model.PalletNo
- && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
+ && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
if (stockDetail == null)
{
throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樹笂璐х墿鐨勫簱瀛樻槑缁嗕俊鎭紒");
}
// 楠岃瘉鏄惁杞﹂棿绾胯竟浠撳簱
- var areaList = new List<string>() { "B06", "B07", "B09" };
+ var areaList = new List<string>() { "B06", "B07", "B09", "B24" };
if (!areaList.Contains(stockDetail.AreaNo))
{
throw Oops.Bah("鎵樼洏涓嶆槸杞﹂棿鎵樼洏锛�");
@@ -1757,14 +1801,13 @@
#endregion
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "杞﹂棿鍑哄簱",
- skuModel.SkuName, "鎷ｈ揣", $"鍦≒DA杞﹂棿鍑哄簱椤典笂瀵癸細锛歿skuModel.SkuName}鐨勭墿鏂欒繘琛屾嫞璐ф搷浣�", userId);
+ var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "杞﹂棿鍑哄簱", skuModel.SkuName, "鎷ｈ揣", $"鍦≒DA杞﹂棿鍑哄簱椤典笂瀵癸細{skuModel.SkuName}鐨勭墿鏂欒繘琛屾嫞璐ф搷浣�", userId);
Db.CommitTran();
}
- catch (AppFriendlyException e)
- {
- Db.RollbackTran();
- }
+ //catch (AppFriendlyException e)
+ //{
+ // Db.RollbackTran();
+ //}
catch (Exception e)
{
Db.RollbackTran();
@@ -1848,11 +1891,12 @@
//}
if (type == "1")//骞冲簱鍑哄簱鑾峰彇鍗曟嵁
{
- var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo).OrderByDescending(m => m.SONo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
return allotList;
}
+ var noticeList = Db.Queryable<BllExportNotice>().Where(w => w.IsDel == "0" && (w.Status == "3" || w.Status == "4")).Select(s => s.SONo).ToList();
//鑾峰彇鐘舵�佷负寰呮嫞璐ф垨鑰呴儴鍒嗘嫞璐х殑鍑哄簱鍗�
- var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" || m.Status == "3" || m.Status == "5") && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" || m.Status == "3" || m.Status == "5") && m.PalletNo == palletNo && noticeList.Contains(m.SONo)).OrderByDescending(m => m.SONo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
//var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
//鑾峰彇鍑哄簱鍗曟嵁涓嶄负寰呮嫞璐� 鎵ц瀹屾瘯 璁㈠崟鍏抽棴 绛夊緟鎵ц鐨勫崟鎹�
@@ -1868,18 +1912,18 @@
if (string.IsNullOrWhiteSpace(soNo))//鍒ゆ柇鎵樼洏鏄惁涓虹┖
{
throw Oops.Bah("鍑哄簱鍗曚负绌猴紝璇烽�夋嫨鍑哄簱鍗�");
- }
+ }
if (string.IsNullOrWhiteSpace(soDetailId))
{
throw Oops.Bah("鍑哄簱鏄庣粏涓虹┖锛岃閫夋嫨鐗╂枡-鎵规");
}
-
+
var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "0" && m.SONo == soNo && m.SODetailNo == int.Parse(soDetailId)).Select(m => m.PalletNo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
return allotList;
-
+
}
-
+
//鑾峰彇鎵樼洏涓惈鏈夌殑鎵ц涓殑鍗曟嵁
@@ -1887,7 +1931,7 @@
{
if (type == "1")//骞冲簱鍑哄簱鑾峰彇鍗曟嵁
{
- var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "1" || m.Status =="0")).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "1" || m.Status == "0")).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
return allotList;
}
//鑾峰彇鐘舵�佷负寰呮嫞璐ф垨鑰呴儴鍒嗘嫞璐х殑鍑哄簱鍗�
@@ -1909,7 +1953,7 @@
}
//鑾峰彇鐘舵�佷负寰呮嫞璐ф垨鑰呴儴鍒嗘嫞璐х殑鍑哄簱鍗�
var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo && (m.Status == "0" || m.Status == "1"));
-
+
var list = await allotList.GroupBy(m => new { m.SODetailNo, m.SkuNo, m.SkuName, m.LotNo }).Select(m => new DetailIdSkuLotNo()
{
SoDetailId = m.SODetailNo,
@@ -1963,7 +2007,7 @@
{
OutModel = data.OutMode,
Standard = data.Standard,
- PickQty = data.Qty,
+ PickQty = data.Qty - data.CompleteQty,
PickedQty = data.CompleteQty
};
return data2;
@@ -1977,10 +2021,16 @@
{
throw Oops.Bah("鏈煡璇㈠埌鍑哄簱鍗曠殑鏄庣粏");
}
+ var notice = await Db.Queryable<BllExportNotice>().FirstAsync(m => m.SONo == detail.SONo && m.IsDel == "0");
+ if (notice == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌鍑哄簱鍗曚俊鎭�");
+ }
var data = new OutPdaInfo()
{
PlanQty = detail.Qty,
- FinishQty = detail.CompleteQty
+ FinishQty = detail.CompleteQty,
+ OrderCode = notice.OrderCode,
};
return data;
}
@@ -2091,6 +2141,52 @@
}
return list;
+ }
+
+ /// <summary>
+ /// 鍑哄簱鎷ｈ揣鑾峰彇鎵弿鏍囩鏁伴噺
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="boxNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public decimal CheckBoxForPick(string palletNo, string boxNo)
+ {
+ try
+ {
+ decimal boxNum = 0;
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("鎵樼洏鏉＄爜涓嶅彲涓虹┖!");
+ }
+ if (string.IsNullOrEmpty(boxNo))
+ {
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo).ToList();
+ boxNum = boxInfo.Sum(s => s.Qty);
+ }
+ else
+ {
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo && w.PalletNo == palletNo).ToList();
+ if (boxInfo.Count <= 0)
+ {
+ boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo2 == boxNo && w.PalletNo == palletNo).ToList();
+ if (boxInfo.Count <= 0)
+ {
+ boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo3 == boxNo && w.PalletNo == palletNo).ToList();
+ }
+ }
+ if (boxInfo == null || boxInfo.Count <= 0)
+ {
+ throw new Exception("鏍囩鏉＄爜鏈湪璇ユ墭鐩樺唴!");
+ }
+ boxNum = boxInfo.Sum(s => s.Qty);
+ }
+ return boxNum;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
}
//鑾峰彇搴撳唴鏃犵鐮佺殑鎵樼洏鍒嗛厤淇℃伅
@@ -2315,7 +2411,7 @@
pallet.Status = "0";
await Db.Updateable(pallet).ExecuteCommandAsync();
}
-
+
//淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
noticeDetail.CompleteQty += pickQty;
await Db.Updateable(noticeDetail).ExecuteCommandAsync();
@@ -2831,6 +2927,11 @@
}
boxInfos = await boxInfo.ToListAsync();
+ if (boxInfos[0].SkuNo != allot.SkuNo || boxInfos[0].LotNo != allot.LotNo)
+ {
+ throw Oops.Bah("绠辩爜鐗╂枡鎵规鍜岄�夋嫨鐗╂枡鎵规涓嶄竴鑷达紒");
+ }
+
var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
if (biaoShi == "2") //鏁ｆ敮鎷ｈ揣
{
@@ -2977,7 +3078,7 @@
await Db.Updateable(item).ExecuteCommandAsync();
}
pickQty += decimal.Parse(pickQty1);
- }
+ }
}
//鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
if (biaoShi == "1" || biaoShi == "2")
@@ -3088,6 +3189,475 @@
wave.UpdateUser = userId;
wave.UpdateTime = DateTime.Now;
await Db.Updateable(wave).ExecuteCommandAsync();
+ }
+ }
+ }
+ }
+ }
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鍑哄簱", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
+ Db.CommitTran();
+ }
+ //catch (AppFriendlyException e)
+ //{
+ // Db.RollbackTran();
+ //}
+ catch (Exception e)
+ {
+ Db.RollbackTran();
+ throw new Exception(e.Message);
+ }
+ }
+ /// <summary>
+ /// 鎴愬搧鍑哄簱pda鎷ｈ揣-JC34
+ /// </summary>
+ /// <param name="soNo"></param>
+ /// <param name="soDetailId"></param>
+ /// <param name="palletNo"></param>
+ /// <param name="boxNoList"></param>
+ /// <param name="userId"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public async Task SoSetPickCode34(string soNo, string soDetailId, string palletNo, List<string> boxNoList, int userId)
+ {
+ try
+ {
+ #region 鍒ゆ柇
+
+ if (string.IsNullOrWhiteSpace(soNo))
+ {
+ throw Oops.Bah("鍑哄簱鍗曟嵁涓嶈兘涓虹┖");
+ }
+ if (string.IsNullOrWhiteSpace(soDetailId))
+ {
+ throw Oops.Bah("鍑哄簱鐗╂枡-鎵规涓嶈兘涓虹┖");
+ }
+ if (string.IsNullOrWhiteSpace(palletNo))
+ {
+ throw Oops.Bah("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ //寮�鍚簨鍔�
+ Db.BeginTran();
+
+ //鍑哄簱鍗�
+ var notice = await Db.Queryable<BllExportNotice>().FirstAsync(m => m.IsDel == "0" && m.SONo == soNo);
+ if (notice == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
+ }
+ if (notice.Status != "3")
+ {
+ throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
+ }
+ //鍑哄簱鍗曟槑缁�
+ var noticeDetail = await Db.Queryable<BllExportNoticeDetail>()
+ .FirstAsync(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
+ if (noticeDetail == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ュ嚭搴撳崟鏄庣粏鐨勪俊鎭�");
+ }
+ //鍑哄簱鍒嗛厤淇℃伅
+ var allot = await Db.Queryable<BllExportAllot>().FirstAsync(m =>
+ m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.SONo == soNo &&
+ m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
+ if (allot == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樼殑鍒嗛厤淇℃伅");
+ }
+ //鍓╀綑鎷ｈ揣鏁伴噺锛堝緟鎷ｅ噺鍘诲凡鎷ｏ級
+ var needQty = allot.Qty - allot.CompleteQty;
+
+ //搴撳瓨鏄庣粏
+ var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.Id == allot.StockId);
+ if (stockDetail == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨鏄庣粏淇℃伅锛�");
+ }
+ //搴撳瓨鎬昏〃
+ var stock = await Db.Queryable<DataStock>().FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
+ if (stock == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨淇℃伅锛�");
+ }
+ #endregion
+
+ if (boxNoList == null || boxNoList.Count <= 0)//鏁存墭鎷ｈ揣
+ {
+ List<DataBoxInfo> boxInfos;
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);//鎵惧埌鎵樼洏涓婃墍鏈夌鐮�
+ boxInfos = await boxInfo.ToListAsync();
+ if (boxInfo.Count() <= 0)
+ {
+ throw Oops.Bah("璇ユ墭鐩樹笂娌℃湁鍙嫞璐х殑绠卞瓙");
+ }
+ var boxQty = await boxInfo.GroupBy(m => m.PalletNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
+ if (boxQty[0] > needQty)
+ {
+ throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+ }
+ decimal pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+ var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
+ var comList = new List<BllCompleteDetail>();
+ foreach (var item in boxInfos)
+ {
+ if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3) && item.BoxNo3 != null)
+ {
+ throw Oops.Bah($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ }
+ if (item.SkuNo != allot.SkuNo || item.LotNo != allot.LotNo)
+ {
+ throw Oops.Bah("褰撳墠鎵樼洏涓婃湁鍏朵粬涓嶅悓鐗╂枡鎵规锛屾嫞璐уけ璐�");
+ }
+ //娣诲姞鎷ｈ揣鏄庣粏
+ var completeDetail = new BllCompleteDetail()
+ {
+ SONo = soNo,
+ SODetailNo = int.Parse(soDetailId),
+ ExportAllotId = allot.Id,
+ StockId = allot.StockId,
+ BoxNo = item.BoxNo,
+ BoxNo2 = item.BoxNo2,
+ BoxNo3 = item.BoxNo3,
+
+ LotNo = allot.LotNo,
+ LotText = allot.LotText,
+ SupplierLot = allot.SupplierLot,
+ SkuNo = allot.SkuNo,
+ SkuName = allot.SkuName,
+ Standard = allot.Standard,
+ PalletNo = palletNo,
+ CompleteQty = item.Qty,
+
+ CreateUser = userId
+ };
+ comList.Add(completeDetail);
+
+ //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
+ await Db.Deleteable(item).ExecuteCommandAsync();
+ pickQty += item.Qty;
+ }
+ //娣诲姞鎷ｈ揣鏄庣粏
+ await Db.Insertable(comList).ExecuteCommandAsync();
+ //淇敼鍑哄簱鍒嗛厤淇℃伅
+ allot.CompleteQty += pickQty;
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
+ allot.UpdateTime = DateTime.Now;
+ await Db.Updateable(allot).ExecuteCommandAsync();
+ //鍒犻櫎搴撳瓨鏄庣粏
+ await Db.Deleteable(stockDetail).ExecuteCommandAsync();
+ //鍒犻櫎鎴栦慨鏀瑰簱瀛�
+ stock.Qty -= pickQty;
+ stock.LockQty -= pickQty;
+ if (stock.LockQty < 0)
+ {
+ stock.LockQty = 0;
+ }
+ if (stock.Qty <= 0)
+ {
+ await Db.Deleteable(stock).ExecuteCommandAsync();
+ }
+ else
+ {
+ await Db.Updateable(stock).ExecuteCommandAsync();
+ }
+ //鍒ゆ柇鎵樼洏涓婅繕鏈夋病鏈夊叾浠栫墿鏂�
+ var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
+ if (palletData == null)
+ {
+ //鏀瑰彉鎵樼洏鐘舵�佷负锛氭湭浣跨敤
+ var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+ if (pallet == null)
+ {
+ throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+ }
+ pallet.Status = "0";
+ await Db.Updateable(pallet).ExecuteCommandAsync();
+ }
+
+ //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+ noticeDetail.CompleteQty += pickQty;
+ await Db.Updateable(noticeDetail).ExecuteCommandAsync();
+
+ var num = await Db.Queryable<BllExportNoticeDetail>()
+ .CountAsync(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
+ if (num <= 0)
+ {
+ notice.Status = "4"; //鏇存敼涓烘墽琛屽畬鎴�
+ //淇敼鍑哄簱鍗曚俊鎭�
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ if (notice.IsWave == "1")
+ {
+ var waveNum = await Db.Queryable<BllExportNotice>().CountAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo && m.Status != "4");
+ if (waveNum == 0)
+ {
+ var wave = await Db.Queryable<BllWaveMage>().FirstAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo);
+ if (wave != null)
+ {
+ wave.Status = "4";
+ wave.UpdateUser = userId;
+ wave.UpdateTime = DateTime.Now;
+ await Db.Updateable(wave).ExecuteCommandAsync();
+ }
+ }
+ }
+ }
+
+ }
+ else
+ {
+ foreach (var boxNo in boxNoList)
+ {
+ var biaoShi = "0";//0锛氭暣绠辨嫞璐с��1锛氭暣鐩掓嫞璐с�� 2锛氭暎鏀嫞璐�
+ List<DataBoxInfo> boxInfos;
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+ if (await boxInfo.CountAsync() == 0)
+ {
+ biaoShi = "1";
+ boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo2 == boxNo);
+ if (await boxInfo.CountAsync() == 0)
+ {
+ biaoShi = "2";
+ boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo3 == boxNo);
+ if (await boxInfo.CountAsync() == 0)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
+ }
+ }
+ }
+ boxInfos = await boxInfo.ToListAsync();
+
+ if (boxInfos[0].SkuNo != allot.SkuNo || boxInfos[0].LotNo != allot.LotNo)
+ {
+ throw Oops.Bah("绠辩爜鐗╂枡鎵规鍜岄�夋嫨鐗╂枡鎵规涓嶄竴鑷达紒");
+ }
+
+ var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
+ if (biaoShi == "2") //鏁ｆ敮鎷ｈ揣
+ {
+ boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo).ToList();
+
+ if (boxInfos.Count() == 0)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
+ }
+ if (boxInfos.Count() > 1)
+ {
+ throw Oops.Bah("璇ヨ拷婧敮鐮佺殑淇℃伅澶т簬1鏉★紝淇℃伅閿欒锛岃鏍稿疄锛�");
+ }
+
+ if (boxInfos.Any(m => m.PalletNo != palletNo))
+ {
+ throw Oops.Bah("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
+ }
+ var boxQty = boxInfos.First().Qty;
+ //if (boxQty > needQty)
+ //{
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
+ //}
+
+ foreach (var item in boxInfos)
+ {
+ if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+ {
+ throw Oops.Bah($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ }
+ }
+ }
+ else if (biaoShi == "1")//鏁寸洅鎷ｈ揣
+ {
+ if (boxInfo.Count() == 0)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ョ洅鐮佺殑淇℃伅");
+ }
+ if (boxInfo.Any(m => m.PalletNo != palletNo))
+ {
+ throw Oops.Bah("璇ユ墭鐩樹笌鐩掔爜娌℃湁缁戝畾鍏崇郴");
+ }
+ var boxQty = await boxInfo.GroupBy(m => m.BoxNo2).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
+ //if (boxQty[0] > needQty)
+ //{
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+ //}
+
+ foreach (var item in boxInfos)
+ {
+ if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+ {
+ throw Oops.Bah($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ }
+ }
+ }
+ else //鏁寸鎷ｈ揣
+ {
+ if (boxInfo.Count() == 0)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌璇ョ鐮佺殑淇℃伅");
+ }
+ if (boxInfo.Any(m => m.PalletNo != palletNo))
+ {
+ throw Oops.Bah("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
+ }
+ var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
+ //if (boxQty[0] > needQty)
+ //{
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+ //}
+
+ foreach (var item in boxInfos)
+ {
+ if (comDetailList.Any(m => m.BoxNo == item.BoxNo))
+ {
+ throw Oops.Bah($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+ }
+ }
+ }
+ decimal pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+
+ var comList = new List<BllCompleteDetail>();
+ foreach (var item in boxInfos)
+ {
+ //娣诲姞鎷ｈ揣鏄庣粏
+ var completeDetail = new BllCompleteDetail()
+ {
+ SONo = soNo,
+ SODetailNo = int.Parse(soDetailId),
+ ExportAllotId = allot.Id,
+ StockId = allot.StockId,
+ BoxNo = item.BoxNo,
+ BoxNo2 = item.BoxNo2,
+ BoxNo3 = item.BoxNo3,
+
+ LotNo = allot.LotNo,
+ LotText = allot.LotText,
+ SupplierLot = allot.SupplierLot,
+ SkuNo = allot.SkuNo,
+ SkuName = allot.SkuName,
+ Standard = allot.Standard,
+ PalletNo = palletNo,
+ CompleteQty = item.Qty,
+
+ CreateUser = userId
+ };
+ comList.Add(completeDetail);
+
+ if (biaoShi != "3")
+ {
+ //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
+ await Db.Deleteable(item).ExecuteCommandAsync();
+
+ pickQty += item.Qty;
+ }
+ }
+ //鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
+ if (biaoShi == "1" || biaoShi == "2")
+ {
+ var boxSurplusList = new List<DataBoxInfo>();
+ if (biaoShi == "1")
+ {
+ boxSurplusList = boxInfo.Where(m => m.BoxNo2 != boxNo).ToList();
+ }
+ else
+ {
+ boxSurplusList = boxInfo.Where(m => m.BoxNo3 != boxNo).ToList();
+ }
+ foreach (var item in boxSurplusList)
+ {
+ item.BitBoxMark = "1";
+ await Db.Updateable(item).ExecuteCommandAsync();
+ }
+ }
+
+ await Db.Insertable(comList).ExecuteCommandAsync();
+ //淇敼鍑哄簱鍒嗛厤淇℃伅
+ allot.CompleteQty += pickQty;
+ allot.Status = allot.Qty <= allot.CompleteQty ? "5" : "3";
+ allot.UpdateTime = DateTime.Now;
+ if (allot.Status == "5")
+ {
+ //鍒ゆ柇璇ユ墭鐩樻槸鍚﹁繕瀛樺湪鐗╂枡 瀛樺湪鏀逛负寰呭洖搴� 寰呭洖搴撳畬鎴愬悗鏀逛负宸插畬鎴�
+ }
+ await Db.Updateable(allot).ExecuteCommandAsync();
+
+ //鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+ stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
+ stockDetail.Qty -= pickQty;
+ stockDetail.LockQty -= pickQty;
+ if (stockDetail.LockQty < 0)
+ {
+ stockDetail.LockQty = 0;
+ }
+ if (stockDetail.Qty == stockDetail.LockQty)
+ {
+ stockDetail.Status = "2";
+ }
+ else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
+ {
+ stockDetail.Status = "1";
+ }
+ else
+ {
+ stockDetail.Status = "0";
+ }
+
+ if (stockDetail.Qty <= 0)
+ {
+ await Db.Deleteable(stockDetail).ExecuteCommandAsync();
+ }
+ else
+ {
+ await Db.Updateable(stockDetail).ExecuteCommandAsync();
+ }
+ stock.Qty -= pickQty;
+ stock.LockQty -= pickQty;
+ if (stock.LockQty < 0)
+ {
+ stock.LockQty = 0;
+ }
+ if (stock.Qty <= 0)
+ {
+ await Db.Deleteable(stock).ExecuteCommandAsync();
+ }
+ else
+ {
+ await Db.Updateable(stock).ExecuteCommandAsync();
+ }
+ var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == palletNo);
+ if (num2 <= 0)
+ {
+ //鏀瑰彉鎵樼洏鐘舵��
+ var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
+ if (pallet == null)
+ {
+ throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+ }
+ pallet.Status = "0";
+ await Db.Updateable(pallet).ExecuteCommandAsync();
+ }
+ //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+ noticeDetail.CompleteQty += pickQty;
+ await Db.Updateable(noticeDetail).ExecuteCommandAsync();
+
+ var num = await Db.Queryable<BllExportNoticeDetail>()
+ .CountAsync(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
+ if (num <= 0)
+ {
+ notice.Status = "4"; //鏇存敼涓烘墽琛屽畬鎴�
+ //淇敼鍑哄簱鍗曚俊鎭�
+ await Db.Updateable(notice).ExecuteCommandAsync();
+ if (notice.IsWave == "1")
+ {
+ var waveNum = await Db.Queryable<BllExportNotice>()
+ .CountAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo && m.Status != "4");
+ if (waveNum == 0)
+ {
+ var wave = await Db.Queryable<BllWaveMage>().FirstAsync(m => m.IsDel == "0" && m.WaveNo == notice.WaveNo);
+ if (wave != null)
+ {
+ wave.Status = "4";
+ wave.UpdateUser = userId;
+ wave.UpdateTime = DateTime.Now;
+ await Db.Updateable(wave).ExecuteCommandAsync();
+ }
}
}
}
@@ -3252,7 +3822,7 @@
else
{
stockDetail.Status = "0";
- }
+ }
if (stockDetail.Qty <= 0)
{
await Db.Deleteable(stockDetail).ExecuteCommandAsync();
@@ -3480,7 +4050,7 @@
{
endroad = new AllotLocation().RoadwayToStationNum(locat.RoadwayNo, model.OutMode);
}
-
+
outDtoList.Add(new OutCommandDto()
{
TaskNo = exTask.TaskNo, // 浠诲姟鍙�
@@ -3565,8 +4135,8 @@
var info = Db.Queryable<BllExportAllot>()
.LeftJoin<DataStockDetail>((a, b) => a.PalletNo == b.PalletNo)
- .Where(a=>a.IsDel == "0" && (a.Status == "0"||a.Status =="1") && a.SONo == soNo)
- .GroupBy((a,b) => new { a.SkuNo, a.SkuName, a.LotNo}).Select((a,b) => new BoxInfo()
+ .Where(a => a.IsDel == "0" && (a.Status == "0" || a.Status == "1") && a.SONo == soNo)
+ .GroupBy((a, b) => new { a.SkuNo, a.SkuName, a.LotNo }).Select((a, b) => new BoxInfo()
{
SkuNo = a.SkuNo,
SkuName = a.SkuName,
@@ -3591,15 +4161,15 @@
}
//鑾峰彇骞冲簱鍗曟嵁涓墭鐩樹綅缃俊鎭�
- public async Task<List<BoxInfo>> GetPingKuLocationInfo(string soNo,string skuno,string lotno)
+ public async Task<List<BoxInfo>> GetPingKuLocationInfo(string soNo, string skuno, string lotno)
{
var info = Db.Queryable<BllExportAllot>()
.LeftJoin<DataStockDetail>((a, b) => a.PalletNo == b.PalletNo)
- .LeftJoin<SysWareHouse>((a,b,c)=>b.WareHouseNo == c.WareHouseNo)
- .LeftJoin<SysStorageArea>((a,b,c,d)=>b.AreaNo == d.AreaNo)
+ .LeftJoin<SysWareHouse>((a, b, c) => b.WareHouseNo == c.WareHouseNo)
+ .LeftJoin<SysStorageArea>((a, b, c, d) => b.AreaNo == d.AreaNo)
.Where(a => a.IsDel == "0" && (a.Status == "0" || a.Status == "1") && a.SONo == soNo && a.SkuNo == skuno && a.LotNo == lotno)
- .GroupBy((a, b,c,d) => new { a.PalletNo, b.LocatNo,c.WareHouseName,d.AreaName }).Select((a, b,c,d) => new BoxInfo()
+ .GroupBy((a, b, c, d) => new { a.PalletNo, b.LocatNo, c.WareHouseName, d.AreaName }).Select((a, b, c, d) => new BoxInfo()
{
PalletNo = a.PalletNo,
LocatNo = b.LocatNo,
@@ -3669,7 +4239,7 @@
{
throw Oops.Bah("鏈幏鍙栧埌瀵瑰簲鍌ㄤ綅淇℃伅锛岃妫�鏌�!");
}
- if (locat.Status != "3")
+ if (locat.Status != "1")
{
throw Oops.Bah("褰撳墠鍌ㄤ綅涓嶆槸鏈夌墿鍝侊紝璇锋鏌�!");
}
@@ -3752,7 +4322,7 @@
#region 娣诲姞鍑哄簱鎿嶄綔鏃ュ織璁板綍淇℃伅
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationSOServer().AddLogOperationSo("鍑哄簱浣滀笟", "鎷ｈ揣鏄庣粏", soNo, "瀹屾垚", $"鐢≒DA瀹屾垚浜嗗崟鎹彿涓簕soNo}鐨勫钩搴撳嚭搴�", userId);
+ var k = new OperationSOServer().AddLogOperationSo("鍑哄簱浣滀笟", "鎷ｈ揣鏄庣粏", palletNo, "瀹屾垚", $"鐢≒DA瀹屾垚浜嗘墭鐩樺彿涓簕palletNo}鐨勫钩搴撳嚭搴�", userId);
#endregion
@@ -3819,7 +4389,7 @@
}
//鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
- public async Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3,
+ public async Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3,
string pickQty1, string asnNo, int userId)
{
Db.BeginTran();
--
Gitblit v1.8.0