From 7af31afc6df4ca90c4d6e5c561313b9758ccc4aa Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期四, 22 一月 2026 09:31:23 +0800
Subject: [PATCH] 1
---
/dev/null | 0
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/834cf2d4-40eb-4690-bfa4-bad052f0e898.vsidx | 0
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8e7ab058-25f7-482b-9868-d2c3a9414aa5.vsidx | 0
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/aa1655b5-bbae-48ea-b7d3-5716a47f67b4.vsidx | 0
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/TakeStockOrderCPService.cs | 8 ++++
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 16 ++++++--
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 2
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs | 40 +++++++++++++------
WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 | 0
WMS/WIDESEA_WMSServer/WIDESEA_Common/HouseAdjustment.cs | 2 +
10 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0bbc4c8d-52fc-48e7-998a-998139b31e02.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/834cf2d4-40eb-4690-bfa4-bad052f0e898.vsidx
similarity index 64%
rename from WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0bbc4c8d-52fc-48e7-998a-998139b31e02.vsidx
rename to WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/834cf2d4-40eb-4690-bfa4-bad052f0e898.vsidx
index d327a24..8bdc441 100644
--- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0bbc4c8d-52fc-48e7-998a-998139b31e02.vsidx
+++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/834cf2d4-40eb-4690-bfa4-bad052f0e898.vsidx
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8e7ab058-25f7-482b-9868-d2c3a9414aa5.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8e7ab058-25f7-482b-9868-d2c3a9414aa5.vsidx
new file mode 100644
index 0000000..a165085
--- /dev/null
+++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8e7ab058-25f7-482b-9868-d2c3a9414aa5.vsidx
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c1d52971-2c06-44dd-9a29-da27923e6af5.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/aa1655b5-bbae-48ea-b7d3-5716a47f67b4.vsidx
similarity index 60%
rename from WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c1d52971-2c06-44dd-9a29-da27923e6af5.vsidx
rename to WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/aa1655b5-bbae-48ea-b7d3-5716a47f67b4.vsidx
index c197404..485b8e3 100644
--- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c1d52971-2c06-44dd-9a29-da27923e6af5.vsidx
+++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/aa1655b5-bbae-48ea-b7d3-5716a47f67b4.vsidx
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d36a016b-a94a-49ea-9e1f-c42b0b35806c.vsidx b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d36a016b-a94a-49ea-9e1f-c42b0b35806c.vsidx
deleted file mode 100644
index 03b68e9..0000000
--- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d36a016b-a94a-49ea-9e1f-c42b0b35806c.vsidx
+++ /dev/null
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2
index 146da04..acb2837 100644
--- a/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2
+++ b/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2
Binary files differ
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Common/HouseAdjustment.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Common/HouseAdjustment.cs
index a787046..de462bd 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_Common/HouseAdjustment.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_Common/HouseAdjustment.cs
@@ -8,6 +8,8 @@
{
public class HouseAdjustment
{
+ public string No { get; set; }
+
public List<detailList> DetailList = new List<detailList>();
public class detailList
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
index 92a3b43..cf22938 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
@@ -956,7 +956,6 @@
};
var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseSyncretism, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
- // 鍒ゆ柇Success鐨勫��
if (!response.Success)
{
throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
@@ -971,6 +970,7 @@
_stockRepository.StockInfoDetailRepository.DeleteData(sameItem.SourceItem);
}
_stockRepository.StockInfoRepository.UpdateData(targetstockInfo);
+ _stockRepository.StockInfoDetailRepository.UpdateData(targetstockInfo.Details);
_stockRepository.StockInfoRepository.DeleteData(stockInfo);
_unitOfWorkManage.CommitTran();
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/TakeStockOrderCPService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/TakeStockOrderCPService.cs
index 4955f16..92fe5bc 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/TakeStockOrderCPService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/TakeStockOrderCPService.cs
@@ -78,11 +78,17 @@
OrderNo = houseInventoryOut.No,
WarehouseId = warehouse.WarehouseId,
TakeStockStatus = TakeStockDetailStatusEnum.鏈洏鐐�.ObjToInt(),
+ Creater = "SMOM",
+ CreateDate = DateTime.Now,
Details = new List<Dt_TakeStockOrderDetailCP>()
};
foreach (var item in orderAddDTO1.Details)
{
+ if (item.LPNNo == null)
+ {
+ return WebResponseContent.Instance.Error("鐩樼偣鎵樼洏鍙蜂笉鑳戒负绌�");
+ }
Dt_TakeStockOrderDetailCP takeStockOrderDetail = new Dt_TakeStockOrderDetailCP()
{
TakeStockId = takeStockOrderCP.Id,
@@ -91,6 +97,8 @@
BatchNo = item.BatchNo,
MaterielSpec = item.MaterieSpec,
SysQty = item.OrderQuantity,
+ Creater = "SMOM",
+ CreateDate = DateTime.Now,
TakeDetalStatus = TakeStockDetailStatusEnum.鏈洏鐐�.ObjToInt(),
};
takeStockOrderCP.Details.Add(takeStockOrderDetail);
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
index 93af907..28bdeab 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
@@ -65,6 +65,7 @@
}
List<int> orderId = newOutboundOrderDetails.Select(x => x.OrderId).Distinct().ToList();
List<Dt_NewOutboundOrder> outboundOrders = _outboundService.NewOutboundOrderService.Repository.QueryData(x => orderId.Contains(x.Id));
+ _unitOfWorkManage.BeginTran();
var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutProduct);
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId));
List<string> palletcodelpn = new List<string>();
@@ -103,7 +104,7 @@
}
locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList()));
- _unitOfWorkManage.BeginTran();
+
BaseDal.AddData(tasks);
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
@@ -143,7 +144,7 @@
{
throw new Exception("鏈壘鍒板簱瀛樹俊鎭�,鎴栧簱瀛樼姸鎬佷笉涓哄叆搴撳畬鎴�");
}
-
+ _unitOfWorkManage.BeginTran();
var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutSyncretism);
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId));
foreach (var item in stockInfos)
@@ -157,7 +158,7 @@
}
locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList()));
- _unitOfWorkManage.BeginTran();
+
BaseDal.AddData(tasks);
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
@@ -199,10 +200,16 @@
throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�");
}
List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
+ _unitOfWorkManage.BeginTran();
foreach (var takeStock in takeStockOrderCPs)
{
+ takeStock.TakeStockStatus = TakeStockStatusEnum.鐩樼偣涓�.ObjToInt();
List<Dt_TakeStockOrderDetailCP> takeStockOrderDetailCPs = _takeStockOrderDetailCPRepository.QueryData(x => x.TakeStockId == takeStock.Id);
-
+ foreach (var item in takeStockOrderDetailCPs)
+ {
+ item.TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱涓�.ObjToInt();
+ _takeStockOrderDetailCPRepository.UpdateData(item);
+ }
var lpngroup = takeStockOrderDetailCPs.GroupBy(x => x.TakePalletCode);
foreach (var lpngroups in lpngroup)
{
@@ -233,11 +240,12 @@
}
locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList()));
- _unitOfWorkManage.BeginTran();
+
BaseDal.AddData(tasks);
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
_stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetails);
+ _takeStockOrderCPRepository.UpdateData(takeStockOrderCPs);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock.ObjToInt(), StockChangeType.Outbound.ObjToInt(), "", tasks?.Select(x => x.TaskNum).ToList());
_basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
@@ -262,19 +270,25 @@
WebResponseContent responseContent = new WebResponseContent();
try
{
+ if (houseAdjustment.DetailList.Count == 0)
+ {
+ return WebResponseContent.Instance.Error("鏃犳槑缁嗕俊鎭�");
+ }
+ List<Dt_StockInfoDetail> stockdetail = new List<Dt_StockInfoDetail>();
foreach (var item in houseAdjustment.DetailList)
{
- Dt_StockInfoDetail dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfoDetail>().LeftJoin<Dt_StockInfo>((stockdetail, stock) => stockdetail.StockId == stock.Id)
- .Where((stockdetail, stock) => stockdetail.MaterielCode == item.MaterielCode && stockdetail.MaterielName == item.MaterielName && stockdetail.LinId == item.LinId && stockdetail.BatchNo == item.BatchNo && stock.PalletCode == item.LPNNo).Select((stockdetail, stock) => stockdetail).First();
- if (dt_StockInfo == null)
+ var dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfoDetail>().LeftJoin<Dt_StockInfo>((stockdetail, stock) => stockdetail.StockId == stock.Id)
+ .Where((stockdetail, stock) => stockdetail.MaterielCode == item.MaterielCode && stockdetail.BatchNo == item.BatchNo && stock.PalletCode == item.LPNNo).Select((stockdetail, stock) => stockdetail).First();
+ if (dt_StockInfo != null)
{
- return WebResponseContent.Instance.Error("鏈壘鍒版搴撳瓨鏁版嵁");
+ dt_StockInfo.StockQuantity = item.OrderQuantity;
+ stockdetail.Add(dt_StockInfo);
}
- dt_StockInfo.StockQuantity = item.OrderQuantity;
- _unitOfWorkManage.BeginTran();
- _stockInfoDetailRepository.UpdateData(dt_StockInfo);
- _unitOfWorkManage.CommitTran();
+
}
+ _unitOfWorkManage.BeginTran();
+ _stockInfoDetailRepository.UpdateData(stockdetail);
+ _unitOfWorkManage.CommitTran();
}
catch (Exception ex)
{
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 170c786..1e5a5e8 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -3317,7 +3317,7 @@
// 鏌ユ壘鑱旀兂鎵撳嵃鏈�
foreach (string printer in allPrinters)
{
- if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase));
+ if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase))
{
Console.WriteLine($"鉁� 鎵惧埌鑱旀兂鎵撳嵃鏈�: {printer}");
return printer;
@@ -3506,7 +3506,12 @@
try
{
//鑾峰彇瀵瑰簲鐩樼偣鍗�
- Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details).First();
+ Dt_TakeStockOrderDetailCP takeStockOrderDetailCP = _takeStockOrderDetailCPRepository.QueryFirst(x => x.TakePalletCode == task.PalletCode);
+ if (takeStockOrderDetailCP == null)
+ {
+ return content.Error($"鐩樼偣鍗曪紝鎵樼洏鍙穥takeStockOrderDetailCP.TakePalletCode}涓嶅瓨鍦�");
+ }
+ Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.Id == takeStockOrderDetailCP.TakeStockId).Includes(x => x.Details).First();
if (takeStockOrder == null)
{
return content.Error($"鐩樼偣鍗晎task.OrderNo}涓嶅瓨鍦�");
@@ -3533,7 +3538,10 @@
{
return content.Error($"{stockInfo.PalletCode}鐩樼偣鏄庣粏鐘舵�佷笉姝ｇ‘");
}
- takeStockOrderDetail.TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ takeStockOrder.Details.ForEach(x =>
+ {
+ x.TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ });
stockInfo.StockStatus = StockStatusEmun.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
stockInfo.Details.ForEach(x =>
{
@@ -3565,7 +3573,7 @@
_basicService.LocationInfoService.UpdateData(locationInfo);
_returnOrderRepository.AddData(returnOrder);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, LocationStatusEnum.Lock.ObjToInt(), LocationChangeType.OutboundCompleted.ObjToInt(), takeStockOrder?.OrderNo ?? "", task.TaskNum);
- _takeStockOrderDetailCPRepository.UpdateData(takeStockOrderDetail);
+ _takeStockOrderCPRepository.UpdateData(takeStockOrder);
_stockRepository.StockInfoRepository.UpdateData(stockInfo);
_stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
--
Gitblit v1.9.3