From c4b7483bb96d813e4f2f4bccf8bbfe89f3f9b08c Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 29 十二月 2024 10:54:44 +0800
Subject: [PATCH] 更新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 99 +++++++++++++++++++++++++++++++------------------
1 files changed, 62 insertions(+), 37 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 fa1ada2..562fae5 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"
@@ -1,4 +1,6 @@
-锘縰sing SqlSugar.Extensions;
+锘�
+using Newtonsoft.Json.Serialization;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -14,6 +16,7 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.MES;
@@ -23,7 +26,7 @@
namespace WIDESEA_TaskInfoService
{
- public partial class TaskService
+ public partial class TaskService
{
/// <summary>
/// 娴嬭瘯鏋跺嚭浠�
@@ -35,13 +38,13 @@
MesResponseContent responseContent = new MesResponseContent();
try
{
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode==WarehouseEnum.HA64.ToString());
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA64.ToString());
//鑾峰彇搴撳瓨璁板綍
- Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
- x.WarehouseId == warehouse.WarehouseId &&
- x.StockStatus==(int)StockStatusEmun.鍏ュ簱瀹屾垚)
- .Includes(x => x.Details).Where(x => x.Details.Any(x => x.BatchNo == model.ToolCode)).First();
- if (stockInfo==null)
+ List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
+ x.WarehouseId == warehouse.WarehouseId &&
+ x.StockStatus == (int)StockStatusEmun.鍏ュ簱瀹屾垚).Includes(x => x.Details).ToList();
+ Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(x => x.BatchNo == model.ToolCode));
+ if (stockInfo == null)
{
return responseContent.Error($"娴嬭瘯鏋�:{model.ToolCode}鏃犲彲鐢ㄥ簱瀛�");
}
@@ -49,7 +52,7 @@
x.WarehouseId == stockInfo.WarehouseId &&
x.LocationStatus == (int)LocationStatusEnum.InStock &&
(x.EnableStatus == (int)EnableStatusEnum.Normal || x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
- if (locationInfo==null)
+ if (locationInfo == null)
{
return responseContent.Error($"娴嬭瘯鏋惰揣浣�:{stockInfo.LocationCode}鍑哄簱鏉′欢涓嶆弧瓒�");
}
@@ -62,7 +65,7 @@
NextAddress = "",
Roadway = locationInfo.RoadwayNo,
SourceAddress = stockInfo.LocationCode,
- TargetAddress = "",
+ TargetAddress = model.TargetAddressCode,
TaskStatus = (int)TaskStatusEnum.New,
TaskType = (int)TaskTypeEnum.Outbound,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
@@ -82,11 +85,9 @@
BaseDal.AddData(taskOut);
//鍔犲叆璐т綅鍙樺姩璁板綍
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum);
- //鍔犲叆搴撳瓨鍙樺姩璁板綍
- //_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.MaterielGroup);
_unitOfWorkManage.CommitTran();
//灏嗕换鍔℃帹閫佸埌WCS
- PushTasksToWCS(new List<Dt_Task>() { taskOut },"AGV");
+ WebResponseContent content = PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV");
responseContent.OK();
}
catch (Exception ex)
@@ -108,11 +109,11 @@
//鑾峰彇娴嬭瘯鏋跺師搴撳瓨淇℃伅
Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA64.ToString());
//鑾峰彇搴撳瓨璁板綍
- Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
+ List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
x.WarehouseId == warehouse.WarehouseId &&
- x.StockStatus == (int)StockStatusEmun.鍑哄簱瀹屾垚)
- .Includes(x => x.Details).Where(x => x.Details.Any(x => x.BatchNo == backModel.TestToolCode)).First();
- if (stockInfo==null)
+ x.StockStatus == (int)StockStatusEmun.鍑哄簱瀹屾垚).Includes(x => x.Details).ToList();
+ Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(x => x.BatchNo == backModel.TestToolCode));
+ if (stockInfo == null)
{
return responseContent.Error($"{backModel.TestToolCode}搴撳瓨淇℃伅涓嶅瓨鍦�");
}
@@ -127,17 +128,21 @@
SourceAddress = backModel.SourceAddressCode,
TargetAddress = "",
TaskStatus = (int)TaskStatusEnum.New,
- TaskType = (int)TaskTypeEnum.Outbound,
+ TaskType = (int)TaskTypeEnum.ProductionReturn,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
PalletType = stockInfo.PalletType,
WarehouseId = stockInfo.WarehouseId,
};
//鏇存敼搴撳瓨鐘舵��
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
- _unitOfWorkManage.BeginTran();
+ stockInfo.StockStatus = StockStatusEmun.閫�搴�.ObjToInt();
+ BaseDal.AddData(taskIn);
_stockRepository.StockInfoRepository.UpdateData(stockInfo);
- _unitOfWorkManage.CommitTran();
-
+ //灏嗕换鍔℃帹閫佸埌WCS
+ WebResponseContent content = PushTasksToWCS(new List<Dt_Task>() { taskIn }, "AGV"); ;
+ if (!content.Status)
+ {
+ return responseContent.Error();
+ }
responseContent.OK();
}
catch (Exception ex)
@@ -151,7 +156,7 @@
/// 娴嬭瘯鏋舵姤搴�
/// </summary>
/// <returns></returns>
- public MesResponseContent TestScrap(TestToolScrap toolScrap)
+ public MesResponseContent TestScrap(TestToolScrap toolScraps)
{
MesResponseContent responseContent = new MesResponseContent();
try
@@ -159,20 +164,25 @@
//鑾峰彇娴嬭瘯鏋舵壒娆″彿搴撳瓨
Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA64.ToString());
//鑾峰彇搴撳瓨璁板綍
- Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
- x.WarehouseId == warehouse.WarehouseId && x.StockStatus==StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt())
- .Includes(x => x.Details).Where(x => x.Details.Any(x => x.BatchNo == toolScrap.ToolCode)).First();
- if (stockInfo == null)
+ List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
+ x.WarehouseId == warehouse.WarehouseId &&
+ x.StockStatus == (int)StockStatusEmun.鍑哄簱瀹屾垚).Includes(x => x.Details).ToList();
+ List<Dt_StockInfo> stockInfoUpdates = new List<Dt_StockInfo>();
+ List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
+ foreach (var item in toolScraps.ToolCodes)
{
- return responseContent.Error($"{toolScrap.ToolCode}搴撳瓨淇℃伅涓嶅瓨鍦�");
+ Dt_StockInfo stockInfo = stockInfos.Find(x => x.Details.Any(x => x.BatchNo == item));
+ if (stockInfo == null)
+ {
+ return responseContent.Error($"{item}搴撳瓨淇℃伅涓嶅瓨鍦�");
+ }
+ stockInfoUpdates.Add(stockInfo);
}
//娓呴櫎搴撳瓨淇℃伅
_unitOfWorkManage.BeginTran();
- _stockRepository.StockInfoRepository.DeleteData(stockInfo);
- _stockRepository.StockInfoDetailRepository.DeleteData(stockInfo.Details);
- _stockRepository.StockInfoRepository.DeleteAndMoveIntoHty(stockInfo,OperateTypeEnum.鑷姩鍒犻櫎);
- _stockRepository.StockInfoDetailRepository.DeleteAndMoveIntoHty(stockInfo.Details, OperateTypeEnum.鑷姩鍒犻櫎);
+ _stockRepository.StockInfoRepository.DeleteAndMoveIntoHty(stockInfoUpdates, OperateTypeEnum.鑷姩鍒犻櫎);
_unitOfWorkManage.CommitTran();
+ responseContent.OK($"鎶ュ簾鎴愬姛");
}
catch (Exception ex)
{
@@ -188,17 +198,32 @@
/// <returns></returns>
public WebResponseContent TestSynStock(TestToolSynInfo toolSynInfo)
{
- WebResponseContent content= new WebResponseContent();
+ WebResponseContent content = new WebResponseContent();
try
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x=>x.ApiCode==APIEnum.WMS_MES_TestToolSync.ToString());
- Root<TestToolSynInfo> root = new Root<TestToolSynInfo>()
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_TestToolSync.ToString());
+ MESRoot<TestToolSynInfo> root = new MESRoot<TestToolSynInfo>()
{
From = "WMS",
- DateTime = DateTime.Now.ToString(),
- Content=toolSynInfo
+ DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Content = toolSynInfo
};
+ 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)
{
--
Gitblit v1.9.3