From dda095e27b535d5748340f127c5f83c0d1324226 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 29 十月 2025 17:30:58 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 502 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 420 insertions(+), 82 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 9b5afe4..be50ff1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -11,6 +11,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Metadata;
@@ -31,6 +32,9 @@
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Basic;
using WIDESEA_Model.Models.ERP;
+using WIDESEA_Model.Models.Order;
+using WIDESEA_OrderRepository;
+using WIDESEA_StorageTaskRepository;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_QuartzJob.Models;
using static System.Collections.Specialized.BitVector32;
@@ -52,8 +56,7 @@
private readonly IDt_AreaInfoRepository _areaInfoRepository; //鍖哄煙
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
- private readonly IDt_OutboundOrderRepository _outorderRepository;
- private readonly IDt_OutboundOrderDetailRepository _outorderdetailRepository;
+ private readonly IDt_OrderOutDetailsRepository _orderOutDetailsRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -68,8 +71,7 @@
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
ISys_ConfigService configService,
- IDt_OutboundOrderRepository outorderRepository,
- IDt_OutboundOrderDetailRepository outorderdetailRepository) : base(BaseDal)
+ IDt_OrderOutDetailsRepository orderOutDetailsRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -83,8 +85,7 @@
_stockInfoDetailRepository = stockInfoDetailRepository;
_stationManagerRepository = stationManagerRepository;
_configService = configService;
- _outorderRepository = outorderRepository;
- _outorderdetailRepository = outorderdetailRepository;
+ _orderOutDetailsRepository = orderOutDetailsRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -104,29 +105,45 @@
taskHty.FinishTime = DateTime.Now;
taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
-
- //DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
- //stockInfo_Hty.ModifyDate = DateTime.Now;
stock.ModifyDate = DateTime.Now;
stock.LocationCode = task.TargetAddress;
var result1 = UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
var result2 = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
-
+ DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
+ //鐩樼偣鍑哄簱
+ var orderDetails = _orderOutDetailsRepository.QueryData(x => x.PalletCode == task.PalletCode);
+ if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
+ {
+ if (orderDetails.Count > 0)
+ content = await ERPAllocate(orderDetails);
+ }
+ //鍏朵粬鍑哄簱
+ else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
+ {
+ if (orderDetails.Count > 0)
+ content = await ERPMixedSend(orderDetails);
+ }
+ //鐢熶骇棰嗘枡鍑哄簱
+ else if (task.TaskType == (int)TaskOutboundTypeEnum.MaterialRequisition)
+ {
+ if (orderDetails.Count > 0)
+ content = await ERPProduction(orderDetails);
+ }
await _unitOfWorkManage.UseTranAsync(async () =>
{
- //await DeleteStockInfoAsync(stock.Id);
- //await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
- //await AddStockInfoHtyAsync(stockInfo_Hty);
- _stockInfoRepository.UpdateData(stock);
+ await DeleteStockInfoAsync(stock.Id);
+ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ await AddStockInfoHtyAsync(stockInfo_Hty);
await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
await _locationRepository.UpdateDataAsync(result1.Item2);
await _locationRepository.UpdateDataAsync(result2.Item2);
-
+ //_orderOutDetailsRepository.DeleteAndMoveIntoHty(orderDetails,OperateTypeEnum.鑷姩鍒犻櫎);
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
content.OK("鍑哄簱瀹屾垚");
+
}
catch (Exception ex)
{
@@ -134,8 +151,6 @@
}
return content;
}
-
-
#endregion 鍑哄簱浠诲姟瀹屾垚
@@ -195,45 +210,69 @@
WebResponseContent content = new WebResponseContent();
try
{
- var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
+ var boxinfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
- if (stock == null)
+ if (boxinfo == null)
{
return content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
}
- stock.LocationCode = task.TargetAddress;
- stock.StockStatus = (int)StockStateEmun.宸插叆搴�;
+
+ var stock = CreateStock(boxinfo, task);
task.TaskState = (int)TaskInStatusEnum.InFinish;
var taskHty = task.Adapt<Dt_Task_Hty>();
taskHty.FinishTime = DateTime.Now;
taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
- var result1 = UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- var result2 = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+
+ var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+
+ content = await ERPAllocate(stock);
+ //if (!content.Status)
+ //{
+ // throw new Exception(content.Message);
+ //}
+ //stock.Remark = "";
+
await _unitOfWorkManage.UseTranAsync(async () =>
{
- await _stockInfoRepository.UpdateDataAsync(stock);
+ await _stockInfoRepository.AddDataNavAsync(stock);
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
- await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
- await _locationRepository.UpdateDataAsync(result1.Item2);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
await _locationRepository.UpdateDataAsync(result2.Item2);
-
+ await _locationRepository.UpdateDataAsync(result1.Item2);
});
content.OK("鍏ュ簱瀹屾垚");
}
catch (Exception ex)
{
+ task.ErrorMessage = ex.Message;
+ await BaseDal.UpdateDataAsync(task);
return content.Error(ex.Message);
}
return content;
}
-
+ public DtStockInfo CreateStock(DtBoxingInfo boxingInfo,Dt_Task task)
+ {
+ var boxDetail = boxingInfo.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
+ boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
+ return new DtStockInfo()
+ {
+ PalletCode = task.PalletCode,
+ LocationCode = task.TargetAddress,
+ CreateDate = DateTime.Now,
+ Creater = "system",
+ IsFullExit = boxingInfo.IsFullExit,
+ StockInfoDetails = boxDetail,
+ StockStatus = (int)StockStateEmun.宸插叆搴�
+ };
+ }
#endregion 鍏ュ簱浠诲姟瀹屾垚
#region AGV鎼繍浠诲姟瀹屾垚
@@ -382,20 +421,21 @@
WebResponseContent content = new WebResponseContent();
try
{
- var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
- if (stock == null)
+ var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
+
+ if (boxingInfo == null)
{
return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡缁勭洏鎴愬姛");
}
- //foreach (var item in boxingInfo.BoxingInfoDetails)
- //{
- // var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_鐢ㄥ弸搴撳瓨涓�瑙堣〃_ST>().Where(x => x.浠撳簱鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName).ToList().FirstOrDefault();
- // if (ERPStock == null)
- // {
- // return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
- // }
- //}
+ foreach (var item in boxingInfo.BoxingInfoDetails)
+ {
+ var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_鐢ㄥ弸搴撳瓨涓�瑙堣〃_ST>().Where(x => x.浠撳簱鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName).ToList().FirstOrDefault();
+ if (ERPStock == null)
+ {
+ return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
+ }
+ }
var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
if (StartAddress == null)
@@ -472,6 +512,7 @@
BaseDal.AddData(taskNew);
});
return content = await SendWCSTask(taskDTO);
+ //return content.OK("鎴愬姛");
}
catch (Exception err)
{
@@ -519,11 +560,11 @@
Dt_Task taskNew = new Dt_Task();
if (StartAddress.Floor != location.Floor)
{
- taskNew = RequestAcrossFloorTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto.PalletCode);
+ taskNew = RequestAcrossFloorTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto);
}
else
{
- taskNew = RequestAGVCarryTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto.PalletCode);
+ taskNew = RequestAGVCarryTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto);
}
return taskNew;
@@ -547,29 +588,12 @@
if (task == null)
return content.Error("鏈壘鍒颁换鍔�");
- if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskInStatusEnum.SC_InFinish || taskState == (int)TaskRelocationStatusEnum.SC_RelocationFinish || taskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
- {
- var taskHty = CreateHistoricalTask(task);
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- var asb = await BaseDal.DeleteDataByIdAsync(task.TaskId);
- var asbHty = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
- if (asb && asbHty)
- content.OK();
- else
- throw new Exception();
- });
+ task.TaskState = taskState;
+ var asb = await BaseDal.UpdateDataAsync(task);
+ if (asb)
content.OK();
- }
else
- {
- task.TaskState = taskState;
- var asb = await BaseDal.UpdateDataAsync(task);
- if (asb)
- content.OK();
- else
- content.Error();
- }
+ content.Error();
}
catch (Exception ex)
{
@@ -622,29 +646,99 @@
#endregion
#region 璇锋眰鍑哄簱
- public async Task<WebResponseContent> OtherOutBoundTaskAsync(string palletCode)
+ public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
{
WebResponseContent content = new WebResponseContent();
try
{
- DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == palletCode);
+ DtStockInfo stcok = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
if (stcok == null)
{
return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
}
+
+ if (stcok.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
+ {
+ return content.Error("璇风‘璁ゅ簱瀛樿揣浣嶇姸鎬佹槸鍚︿负鏈夎揣");
+ }
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
+ if (task != null)
+ {
+ return content.Error("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+
var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == stcok.LocationCode);
if (location.AreaId == 2)
{
return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
}
- Dt_Task taskNew= await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });
- return content.OK(data: taskNew);
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });
+ List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
+ stcok.StockInfoDetails.ForEach(x =>
+ {
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = stcok.PalletCode,
+ OrderType = (int)OrderTypeEmun.鐩樼偣鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "1001708040006492",
+ AllocateWarehouseId = "1002008120000270",
+ OutboundQuantity = x.Quantity,
+ });
+ });
+
+ var taskDto = CreateListTaskDTO(taskNew);
+ var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ BaseDal.AddData(taskNew);
+ _stockInfoRepository.UpdateData(stcok);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ _orderOutDetailsRepository.AddData(outDetails);
+ });
+ return content = await SendWCSTask(taskDto);
}
catch (Exception ex)
{
return content.Error(ex.Message);
}
+ }
+
+ public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) GetlcoationState(Dt_Task task,int StatusChangeTypeEnum)
+ {
+ List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
+ List<DtLocationInfo> locations = new List<DtLocationInfo>();
+ var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.InStockDisable, task.TaskNum.Value, StatusChangeTypeEnum);
+ var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.Lock, task.TaskNum.Value, StatusChangeTypeEnum);
+ locationStatusChangeRecords.AddRange(result1.Item1);
+ locationStatusChangeRecords.AddRange(result2.Item1);
+ locations.AddRange(result1.Item2);
+ locations.AddRange(result2.Item2);
+
+ return (locationStatusChangeRecords,locations);
+ }
+
+ public (List<DtLocationStatusChangeRecord>, List<DtLocationInfo>) GetlcoationState(List<Dt_Task> tasks, int StatusChangeTypeEnum)
+ {
+ List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
+ List<DtLocationInfo> locations = new List<DtLocationInfo>();
+ foreach (var item in tasks)
+ {
+ var result1 = UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, StatusChangeTypeEnum);
+ var result2 = UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, StatusChangeTypeEnum);
+ locationStatusChangeRecords.AddRange(result1.Item1);
+ locationStatusChangeRecords.AddRange(result2.Item1);
+ locations.AddRange(result1.Item2);
+ locations.AddRange(result2.Item2);
+ }
+ return (locationStatusChangeRecords, locations);
}
@@ -731,9 +825,9 @@
Roadway = "SC1",
TargetAddress = location.LocationCode,
Dispatchertime = DateTime.Now,
- MaterialNo = "",
+ MaterialNo = taskDto.MaterielCode,
NextAddress = station.stationChildCode,
- OrderNo = null,
+ OrderNo = taskDto.OrderNo,
PalletCode = taskDto.PalletCode,
SourceAddress = taskDto.Position,
CurrentAddress = taskDto.Position,
@@ -756,11 +850,11 @@
Dt_Task taskNew = new Dt_Task();
if (StartAddress.Floor != location.Floor)
{
- taskNew = RequestAcrossFloorTask(StartAddress, location, taskDto.TaskType, taskDto.PalletCode);
+ taskNew = RequestAcrossFloorTask(StartAddress, location, taskDto.TaskType, taskDto);
}
else
{
- taskNew = RequestAGVCarryTask(StartAddress, location, taskDto.TaskType, taskDto.PalletCode);
+ taskNew = RequestAGVCarryTask(StartAddress, location, taskDto.TaskType, taskDto);
}
return taskNew;
@@ -834,7 +928,7 @@
#endregion
#region 璇锋眰璺ㄦゼ灞備换鍔�
- public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, string palletCode)
+ public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, RequestTaskDto taskDto)
{
WebResponseContent content = new WebResponseContent();
@@ -845,10 +939,10 @@
Roadway = "AGV",
TargetAddress = EndAddress.LocationCode,
Dispatchertime = DateTime.Now,
- MaterialNo = "",
+ MaterialNo = taskDto.MaterielCode,
NextAddress = next.stationChildCode,
- OrderNo = null,
- PalletCode = palletCode,
+ OrderNo = taskDto.OrderNo,
+ PalletCode = taskDto.PalletCode,
SourceAddress = StartAddress.LocationCode,
CurrentAddress = StartAddress.LocationCode,
TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
@@ -865,7 +959,7 @@
#endregion
#region 璇锋眰AGV鎼繍浠诲姟
- public Dt_Task RequestAGVCarryTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, string palletCode)
+ public Dt_Task RequestAGVCarryTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, RequestTaskDto taskDto)
{
WebResponseContent content = new WebResponseContent();
@@ -875,10 +969,10 @@
Roadway = "AGV",
TargetAddress = EndAddress.LocationCode,
Dispatchertime = DateTime.Now,
- MaterialNo = "",
+ MaterialNo = taskDto.MaterielCode,
NextAddress = EndAddress.LocationCode,
- OrderNo = null,
- PalletCode = palletCode,
+ OrderNo = taskDto.OrderNo,
+ PalletCode = taskDto.PalletCode,
SourceAddress = StartAddress.LocationCode,
CurrentAddress = StartAddress.LocationCode,
TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
@@ -1159,12 +1253,66 @@
return wcsBasez + address;
}
- public async Task<WebResponseContent> SendERPTaskCompletion(string palletCode)
+ /// <summary>
+ /// 鐢熶骇棰嗘枡
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> ERPProduction(List<Dt_OrderOutDetails> orderOutDetails)
{
WebResponseContent content = new WebResponseContent();
try
{
- DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x=>x.PalletCode== palletCode);
+ MaterialRequisition materialRequisition = new MaterialRequisition
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+ issueList = orderOutDetails.Select(item => new issueList
+ {
+ PickListID = item.MaterielID,
+ //瀛樺偍鍦扮偣
+ WhCode = item.WareHouseId,
+ //棰嗘枡鏁伴噺
+ IssueQty = item.OutboundQuantity,
+ }).ToList()
+
+ };
+ var ERPProduction = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MaterialRequisition);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+
+ var result = await HttpsClient.PostAsync(ERPProduction, materialRequisition.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
+ if (respone.ResultStatus)
+ {
+ return content.OK();
+ }
+ return content.Error(respone.ResultMsg);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 璋冩嫧
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ ///
+ public async Task<WebResponseContent> ERPAllocate(DtStockInfo stock)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
Allocate allocate = new Allocate
{
context = new Context
@@ -1180,10 +1328,162 @@
transferInList = stock.StockInfoDetails.Select(item => new transferInList
{
+ //鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
- TransInWHCode = item.Warehouse,
- TransInQty = item.Quantity,
- TransOutWHCode = "001",
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = "1001708040006492",
+ //璋冨叆鏁伴噺
+ TransInQty = item.OutboundQuantity,
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = item.WareHouseId,
+ }).ToList()
+ };
+ //var inputJson = Masuit.Tools.ObjectExtensions.ToDictionary(allocate);
+
+ var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
+ if (respone.ResultStatus)
+ {
+ return content.OK();
+ }
+ return content.Error(respone.ResultMsg);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ public async Task<WebResponseContent> ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Allocate allocate = new Allocate
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+
+ transferInList = orderOutDetails.Select(item => new transferInList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = item.AllocateWarehouseId,
+ //璋冨叆鏁伴噺
+ TransInQty = item.OutboundQuantity,
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = item.WareHouseId,
+ }).ToList()
+ };
+ var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
+ if (respone.ResultStatus)
+ {
+ return content.OK();
+ }
+ return content.Error(respone.ResultMsg);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鏉傚彂
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ MixedSend send = new MixedSend
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+
+ miscShipList = orderOutDetails.Select(item => new miscShipList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //瀛樺偍鍦扮偣缂栧彿
+ WhCode = item.WareHouseId,
+ //鏉傚彂鏁伴噺
+ Qty = item.OutboundQuantity,
+ BenefitDeptCode = "0505",
+ }).ToList()
+ };
+ var ERPMixedSend = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MixedSend);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpsClient.PostAsync(ERPMixedSend, send.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
+ if (respone.ResultStatus)
+ {
+ return content.OK();
+ }
+ return content.Error(respone.ResultMsg);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鏉傛敹
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> ERPMixedReceive(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+ MixedReceive allocate = new MixedReceive
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+
+ miscRcvList = stock.StockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(item => new miscRcvList
+ {
+ ItemCode = item.MaterielCode,
+ WhCode = item.Warehouse,
+ Qty = item.OutboundQuantity,
+ CostPrice = 0,
}).ToList()
};
return content.OK(data: allocate);
@@ -1193,7 +1493,45 @@
return content.Error(ex.Message);
}
}
+ /// <summary>
+ /// 閫�鏂�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> ERPreturnMaterialList(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+ ReturnMaterials allocate = new ReturnMaterials
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+ returnMaterialList = stock.StockInfoDetails.Select(item => new returnMaterialList
+ {
+ PickListID = item.MaterielCode,
+ WhCode = item.Warehouse,
+ RecedeQty = item.OutboundQuantity,
+ RecedeReason = 1,
+ }).ToList()
+ };
+ return content.OK(data: allocate);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
#endregion
--
Gitblit v1.9.3