From 4177159725e0b9653251201b597617a9bac6cc8a Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 09:39:46 +0800
Subject: [PATCH] 1
---
/dev/null | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 111 +++++++++++-------------------------
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8ec93a91-d59a-425d-8fc0-681c90b68b09.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs | 5 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MESRoot.cs | 20 ------
5 files changed, 41 insertions(+), 95 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/209d19f7-ad8b-42a7-92df-9dab2bb6c939.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/209d19f7-ad8b-42a7-92df-9dab2bb6c939.vsidx"
deleted file mode 100644
index b21af01..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/209d19f7-ad8b-42a7-92df-9dab2bb6c939.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4fec8e67-dfd5-4718-85f6-34a768d755a0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4fec8e67-dfd5-4718-85f6-34a768d755a0.vsidx"
deleted file mode 100644
index 7722bfe..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4fec8e67-dfd5-4718-85f6-34a768d755a0.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7642b8c6-bd3f-4908-bf14-ca43dc4c45ad.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7642b8c6-bd3f-4908-bf14-ca43dc4c45ad.vsidx"
deleted file mode 100644
index 6362841..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7642b8c6-bd3f-4908-bf14-ca43dc4c45ad.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8539cb77-7e84-4341-9770-afbaf8607c93.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8539cb77-7e84-4341-9770-afbaf8607c93.vsidx"
deleted file mode 100644
index 95c4a80..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8539cb77-7e84-4341-9770-afbaf8607c93.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8ec93a91-d59a-425d-8fc0-681c90b68b09.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8ec93a91-d59a-425d-8fc0-681c90b68b09.vsidx"
new file mode 100644
index 0000000..5c3eb59
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8ec93a91-d59a-425d-8fc0-681c90b68b09.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9a6f3e3f-267f-457e-88be-6812e6a8e247.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9a6f3e3f-267f-457e-88be-6812e6a8e247.vsidx"
deleted file mode 100644
index d012826..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9a6f3e3f-267f-457e-88be-6812e6a8e247.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a63d93b5-0f8b-4b4b-8211-14cdd9f243a4.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a63d93b5-0f8b-4b4b-8211-14cdd9f243a4.vsidx"
deleted file mode 100644
index 437bf64..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a63d93b5-0f8b-4b4b-8211-14cdd9f243a4.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ada0bd9e-f806-415d-b86e-59eb628932d2.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ada0bd9e-f806-415d-b86e-59eb628932d2.vsidx"
deleted file mode 100644
index 067d0c3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ada0bd9e-f806-415d-b86e-59eb628932d2.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ded353f3-6bf3-40c6-8b96-96fcf461f35c.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ded353f3-6bf3-40c6-8b96-96fcf461f35c.vsidx"
deleted file mode 100644
index 2812549..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ded353f3-6bf3-40c6-8b96-96fcf461f35c.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e49a0bc0-cdc7-48fe-8168-5c02ceadda79.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e49a0bc0-cdc7-48fe-8168-5c02ceadda79.vsidx"
deleted file mode 100644
index 0f75075..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e49a0bc0-cdc7-48fe-8168-5c02ceadda79.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MESRoot.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MESRoot.cs"
index 38b8feb..b7125f4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MESRoot.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MESRoot.cs"
@@ -20,23 +20,5 @@
public T Content { get; set; }
}
- /// <summary>
- ///娴嬭瘯鏋跺悓姝�
- /// </summary>
- public class TestToolSynInfo
- {
- /// <summary>
- /// 娴嬭瘯鏋舵壒娆″彿
- /// </summary>
- public string ToolCode { get; set; }
- /// <summary>
- /// 娴嬭瘯鏋剁墿鏂欏悕绉�
- /// </summary>
- public string MaterialName { get; set; }
- /// <summary>
- /// 鍒濆瀵垮懡
- /// </summary>
- public int Life { get; set; }
-
- }
+
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs"
index 2d6376a..f529847 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs"
@@ -67,8 +67,13 @@
/// </summary>
public string ToolCode { get; set; }
/// <summary>
+ /// 娴嬭瘯鏋剁墿鏂欏悕绉�
+ /// </summary>
+ public string MaterialName { get; set; }
+ /// <summary>
/// 鍒濆瀵垮懡
/// </summary>
public int Life { get; set; }
+
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index 2ddf7aa..1c93c43 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -355,7 +355,7 @@
{
return WebResponseContent.Instance.Error($"{batchNo}娴嬭瘯鏋跺凡瀛樺湪");
}
- if (models.Count>=2)
+ if (models.Count >= 2)
{
return WebResponseContent.Instance.Error($"缁勭洏鏄庣粏涓嶅敮涓�");
}
@@ -468,7 +468,7 @@
float beforeQuantity = 0;
Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
-
+
if (stockInfo == null)
{
stockInfo = new Dt_StockInfo()
@@ -617,41 +617,41 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- //public WebResponseContent FeedbackInboundOrder(int id)
- //{
- // try
- // {
- // Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First();
- // if (inboundOrder == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
- // }
- // if (inboundOrder.Details == null || inboundOrder.Details.Count == 0)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
- // }
- // if (inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
- // {
- // return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟嵁宸插畬鎴�");
- // }
+ public WebResponseContent FeedbackInboundOrder(int id)
+ {
+ try
+ {
+ Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First();
+ if (inboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
+ }
+ if (inboundOrder.Details == null || inboundOrder.Details.Count == 0)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
+ }
+ if (inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟嵁宸插畬鎴�");
+ }
- // List<Dt_StockInfo> stockInfos = Db.Queryable<Dt_StockInfo>().Where(x => x.Details.Any(v => v.OrderNo == inboundOrder.InboundOrderNo)).Includes(x => x.Details).ToList();
- // List<Dt_Warehouse> warehouses = Db.Queryable<Dt_Warehouse>().ToList();
+ List<Dt_StockInfo> stockInfos = Db.Queryable<Dt_StockInfo>().Where(x => x.Details.Any(v => v.OrderNo == inboundOrder.InboundOrderNo)).Includes(x => x.Details).ToList();
+ List<Dt_Warehouse> warehouses = Db.Queryable<Dt_Warehouse>().ToList();
- // List<ERPInboundDetailModel> detailModels = new List<ERPInboundDetailModel>();
- // foreach (var item in inboundOrder.Details)
- // {
- // Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(v => v.InboundOrderRowNo == item.RowNo && v.MaterielCode == item.MaterielCode));
- // if (stockInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛樹俊鎭�");
- // }
+ List<ERPInboundDetailModel> detailModels = new List<ERPInboundDetailModel>();
+ foreach (var item in inboundOrder.Details)
+ {
+ Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(v => v.InboundOrderRowNo == item.RowNo && v.MaterielCode == item.MaterielCode));
+ if (stockInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛樹俊鎭�");
+ }
- // Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseId == stockInfo.WarehouseId);
- // if (warehouse == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
- // }
+ Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseId == stockInfo.WarehouseId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
+ }
ERPInboundDetailModel detailModel = new ERPInboundDetailModel()
{
@@ -711,7 +711,7 @@
else if (warehouse.WarehouseCode == WarehouseEnum.HA152.ObjToString())
{
Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
- if(palletTypeInfo == null)
+ if (palletTypeInfo == null)
{
throw new Exception($"鎵樼洏鍙烽敊璇�");
}
@@ -719,46 +719,5 @@
}
return -1;
}
- // ERPInboundDetailModel detailModel = new ERPInboundDetailModel()
- // {
- // ExpiryDate = stockInfo.Details.FirstOrDefault()?.EffectiveDate ?? "",
- // LocationCode = warehouse.WarehouseCode,
- // MaterialsCode = item.MaterielCode,
- // MfgDate = stockInfo.Details.FirstOrDefault()?.ProductionDate ?? "",
- // QtyCustoms = "0",
- // Quantity = stockInfo.Details.Sum(x => x.StockQuantity).ToString(),
- // Rack = stockInfo.LocationCode,
- // ReceiptCode = inboundOrder.UpperOrderNo,
- // ReceiptSerNo = item.RowNo.ToString()
- // };
- // detailModels.Add(detailModel);
- // }
- // Dt_Warehouse? warehouse2 = warehouses.FirstOrDefault(x => x.WarehouseId == inboundOrder.WarehouseId);
- // if (warehouse2 == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
- // }
- // ERPInboundModel model = new ERPInboundModel()
- // {
- // Code = inboundOrder.InboundOrderNo,
- // CreatorCode = inboundOrder.Creater,//娴嬭瘯
- // EntDate = inboundOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
- // StockDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- // SuppliersId = inboundOrder.SupplierId,
- // Type = "S",
- // UniqueTag = inboundOrder.Id.ToString(),
- // WarehouseCode = warehouse2.WarehouseCode,
- // Way = 1,
- // Details = detailModels
- // };
- // //娴嬭瘯娉ㄩ噴
- // _invokeERPService.InvokeInboundOrderApi(model);
- // return WebResponseContent.Instance.OK();
- // }
- // catch (Exception ex)
- // {
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
}
}
--
Gitblit v1.9.3