From b8782b72160d7cf1ec5b58576e149df929dc35d2 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 05 三月 2025 17:25:14 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 140 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 137 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
index 9fce273..aee204f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
@@ -293,7 +293,46 @@
}
return content;
}
-
+ /// <summary>
+ /// WMS鍚屾鎴愬搧鍑哄簱鑷矼ES
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_ShipmentOrderSync.ToString());
+ MESRoot<MesShipmentOrderSync> root = new MESRoot<MesShipmentOrderSync>()
+ {
+ From = "WMS",
+ DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Content = model
+ };
+ JsonSerializerSettings settings = new JsonSerializerSettings
+ {
+ ContractResolver = new CamelCasePropertyNamesContractResolver()
+ };
+ string request = JsonConvert.SerializeObject(root, settings);
+ string response = HttpMesHelper.Post(apiInfo.ApiAddress, request);
+ MesResponseContent mesResponseContent = response.DeserializeObject<MesResponseContent>();
+ //璋冪敤鎺ュ彛
+ if (mesResponseContent.BSucc == true)
+ {
+ content.OK(mesResponseContent.StrMsg);
+ }
+ else
+ {
+ content.Error(mesResponseContent.StrMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
/// <summary>
///
/// </summary>
@@ -936,21 +975,117 @@
{
return content.Error("鏈壘鍒颁粨搴撲俊鎭�");
}
+ //鍒ゆ柇鏄惁MES鍐呭寘淇℃伅鏄惁閲嶅
List<Dt_MesProInOrderDetail> mesProInOrderDetails = new List<Dt_MesProInOrderDetail>();
foreach (var item in bagInfoModel.BagDetails)
{
- mesProInOrderDetails.Add(_mapper.Map<Dt_MesProInOrderDetail>(item));
+ foreach (var child in item.BagItems)
+ {
+ Dt_MesProInOrderDetail mesProInOrderDetail = new Dt_MesProInOrderDetail()
+ {
+ BagNo = item.BagNo,
+ ProductCode = item.ProductCode,
+ ProductVersion = item.ProductVersion,
+ SETQty = child.SETQty,
+ OKPCSQTY = child.OKPCSQTY,
+ DateCode = item.DateCode,
+ XQty = child.XQty,
+ XSite = child.XSite,
+ Weight = item.Weight,
+ PackingDate = item.PackingDate,
+ LotNumber = child.LotNumber,
+ ERPOrder = child.ERPOrder,
+ SaleOrder = child.SaleOrder,
+ MoNumber = child.MoNumber,
+ };
+ mesProInOrderDetails.Add(mesProInOrderDetail);
+ }
+ }
+ List<Dt_ProStockInfoDetail> proStockInfoDetails = new List<Dt_ProStockInfoDetail>();
+ foreach (var item in mesProInOrderDetails)
+ {
+ proStockInfoDetails.Add(_mapper.Map<Dt_ProStockInfoDetail>(item));
}
Dt_MesProInOrder mesProInOrder = new Dt_MesProInOrder()
{
WarehouseId = warehouse.WarehouseId,
BatchNo = bagInfoModel.BatchNo,
+ WorkCenter = bagInfoModel.WorkCenter,
MesProStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
UnPackStock = bagInfoModel.UnPackStock,
Details = mesProInOrderDetails
};
+ Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo()
+ {
+ PalletCode = bagInfoModel.BatchNo,
+ PalletType = 1,
+ WarehouseId = warehouse.WarehouseId,
+ StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
+ proStockInfoDetails = proStockInfoDetails
+ };
+ _unitOfWorkManage.BeginTran();
Db.InsertNav(mesProInOrder).Include(x => x.Details).ExecuteCommand();
+ Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
return content.OK("鎺ユ敹鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ public MesResponseContent BoxStockin(MesBoxInfoModel boxInfoModel)
+ {
+ MesResponseContent content = new MesResponseContent();
+ try
+ {
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA101.ToString());
+ //鑾峰彇MES鍐呭寘淇℃伅
+ List<Dt_MesProInOrderDetail> mesProInOrderDetails = new List<Dt_MesProInOrderDetail>();
+ foreach (var item in boxInfoModel.Bags)
+ {
+ foreach (var child in item.BagItems)
+ {
+ Dt_MesProInOrderDetail mesProInOrderDetail = new Dt_MesProInOrderDetail()
+ {
+ BagNo = item.BagNo,
+ ProductCode = item.ProductCode,
+ ProductVersion = item.ProductVersion,
+ SETQty = child.SETQty,
+ OKPCSQTY = child.OKPCSQTY,
+ DateCode = item.DateCode,
+ XQty = child.XQty,
+ XSite = child.XSite,
+ Weight = item.Weight,
+ PackingDate = item.PackingDate,
+ LotNumber = child.LotNumber,
+ ERPOrder = child.ERPOrder,
+ SaleOrder = child.SaleOrder,
+ MoNumber = child.MoNumber,
+ };
+ mesProInOrderDetails.Add(mesProInOrderDetail);
+ }
+ }
+ List<Dt_ProStockInfoDetail> proStockInfoDetails = new List<Dt_ProStockInfoDetail>();
+ foreach (var item in mesProInOrderDetails)
+ {
+ proStockInfoDetails.Add(_mapper.Map<Dt_ProStockInfoDetail>(item));
+ }
+ Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo()
+ {
+ PalletCode = boxInfoModel.BoxNo,
+ PalletType = 0,
+ WarehouseId = warehouse.WarehouseId,
+ ShipmentOrder = boxInfoModel.ShipmentOrder,
+ StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
+ proStockInfoDetails = proStockInfoDetails
+ };
+ _unitOfWorkManage.BeginTran();
+ Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ return content.OK("澶栧寘鎺ユ敹鎴愬姛");
}
catch (Exception ex)
{
@@ -958,7 +1093,6 @@
}
return content;
}
-
/// <summary>
/// 鎴愬搧杩斿伐鎻愬簱
/// </summary>
--
Gitblit v1.9.3