From 5a15fa73d5f6a39917013871a65eb11a8c013391 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 05 十一月 2025 17:30:56 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 379 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 312 insertions(+), 67 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 472a077..5c09857 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"
@@ -3,6 +3,7 @@
using Mapster;
using Masuit.Tools;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+using NewLife;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.Table.PivotTable;
@@ -117,28 +118,61 @@
{
orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
});
- //鐩樼偣鍑哄簱
-
- if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
+
+ var allocateOrderdetail = orderDetails.Where(x => true).ToList();
+
+ await ERPAllocateOut(stock);
+
+ //璋冩嫧鍑哄簱
+ if (task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
{
if (orderDetails.Count > 0)
- content = await ERPAllocate(orderDetails);
+ await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�).ToList());
}
//鍏朵粬鍑哄簱
else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
{
if (orderDetails.Count > 0)
- content = await ERPMixedSend(orderDetails);
+ {
+ await ERPMixedSend(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.鍏朵粬鍑哄簱鍗�).ToList());
+ }
}
//鐢熶骇棰嗘枡鍑哄簱
else if (task.TaskType == (int)TaskOutboundTypeEnum.MaterialRequisition)
{
if (orderDetails.Count > 0)
- content = await ERPProduction(orderDetails);
+ {
+ content = await ERPProduction(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.鐢熶骇棰嗘枡鍗�).ToList());
+ }
+ }
+ List<DtBoxingInfo> boxingInfos = new List<DtBoxingInfo>();
+ foreach (var item in allocateOrderdetail)
+ {
+ var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == item.PalletCode);
+ if (boxingInfo == null)
+ {
+ continue;
+ }
+ var boxingdetail = boxingInfo.BoxingInfoDetails.Where(x => x.MaterielCode == item.MaterielCode).ToList();
+ if (boxingdetail.Count() > 0)
+ {
+ foreach (var detail in boxingdetail)
+ {
+ //detail.Quantity = detail.Quantity - item.OutboundQuantity;
+ detail.Warehouse = "WMS鍑哄簱缂撳瓨鍖�";
+ detail.WareHouseId = "205";
+ //if (detail.Quantity <= 0)
+ //{
+ // boxingInfo.BoxingInfoDetails.Remove(detail);
+ //}
+ }
+ }
+ boxingInfos.Add(boxingInfo);
}
await _unitOfWorkManage.UseTranAsync(async () =>
{
await DeleteStockInfoAsync(stock.Id);
+ _boxingInfoRepository.UpdateDataNav(boxingInfos);
await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
await AddStockInfoHtyAsync(stockInfo_Hty);
await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
@@ -148,8 +182,6 @@
await _orderOutDetailsRepository.DeleteDataAsync(orderDetails);
await SqlSugarHelper.DbWMS.Insertable(orderdetailshtys).ExecuteCommandAsync();
- //_orderOutDetailsRepository.DeleteAndMoveIntoHty(orderDetails,OperateTypeEnum.鑷姩鍒犻櫎);
-
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
@@ -158,6 +190,8 @@
}
catch (Exception ex)
{
+ task.ErrorMessage = ex.Message;
+ await BaseDal.UpdateDataAsync(task);
return content.Error(ex.Message);
}
return content;
@@ -240,12 +274,7 @@
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 ERPAllocate(stock);
await _unitOfWorkManage.UseTranAsync(async () =>
{
@@ -440,7 +469,7 @@
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();
+ var ERPStock = SqlSugarHelper.DBERPtext.Queryable<鐢ㄥ弸鍗虫椂搴撳瓨_ST>().Where(x => x.瀛樺偍鍦扮偣鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName && x.搴撳瓨鏁伴噺 >= item.Quantity).ToList().FirstOrDefault();
if (ERPStock == null)
{
return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
@@ -510,8 +539,8 @@
}
var taskDTO = CreateListTaskDTO(taskNew);
- var result1 = UpdateLocationStatus(StartAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- var result2 = UpdateLocationStatus(Endlocation, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result1 = UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result2 = UpdateLocationStatus(Endlocation, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
await _unitOfWorkManage.UseTranAsync(async () =>
{
@@ -656,6 +685,11 @@
#endregion
#region 璇锋眰鍑哄簱
+ /// <summary>
+ /// 鎵嬪姩鍑哄簱鑷崇紦瀛樺尯鍩�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
{
WebResponseContent content = new WebResponseContent();
@@ -683,25 +717,7 @@
return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
}
- 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 = "107",
- AllocateWarehouseId = "205",
- OutboundQuantity = x.Quantity,
- });
- });
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });
var taskDto = CreateListTaskDTO(taskNew);
var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
@@ -711,13 +727,160 @@
_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 async Task<WebResponseContent> OtherOutBoundTaskAsync(List<DtStockInfoDetail> details)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.Id == details[0].StockId);
+ if (stock == null)
+ {
+ return content.Error("鏈壘鍒板簱瀛樿〃澶翠俊鎭�");
+ }
+ if (stock.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
+ {
+ return content.Error("璇风‘璁ゅ簱瀛樿揣浣嶇姸鎬佹槸鍚︿负鏈夎揣");
+ }
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == stock.PalletCode);
+ if (task != null)
+ {
+ return content.Error("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+ if (stock.LocationInfo.AreaId == 2)
+ {
+ return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
+ }
+
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });
+
+ List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
+ details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
+ {
+ if (x.Quantity < x.OutboundQuantity)
+ {
+ throw new Exception($"{x.MaterielName}{x.MaterielCode}鍑哄簱鏁伴噺涓嶅彲澶т簬搴撳瓨鏁伴噺");
+ }
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = stock.PalletCode,
+ OrderType = (int)OrderTypeEmun.鍏朵粬鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = "",
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = "",
+ OutboundQuantity = x.OutboundQuantity,
+ });
+ });
+ stock.StockInfoDetails = details;
+
+ var taskDto = CreateListTaskDTO(taskNew);
+ var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.AddDataAsync(taskNew);
+ await _stockInfoRepository.UpdateDataNavAsync(stock);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ await _orderOutDetailsRepository.AddDataAsync(outDetails);
+ });
+ return content = await SendWCSTask(taskDto);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鎵嬪姩璋冩嫧
+ /// </summary>
+ /// <param name="details"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> HandAllocateOutBoundTaskAsync(List<DtStockInfoDetail> details)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.Id == details[0].StockId);
+ if (stock == null)
+ {
+ return content.Error("鏈壘鍒板簱瀛樿〃澶翠俊鎭�");
+ }
+ if (stock.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
+ {
+ return content.Error("璇风‘璁ゅ簱瀛樿揣浣嶇姸鎬佹槸鍚︿负鏈夎揣");
+ }
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == stock.PalletCode);
+ if (task != null)
+ {
+ return content.Error("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+ if (stock.LocationInfo.AreaId == 2)
+ {
+ return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
+ }
+
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });
+
+ List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
+ details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
+ {
+ var areaName = _areaInfoRepository.QueryFirst(y => y.AreaName == x.Remark);
+ if (areaName == null)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄤ粨搴搟x.Remark}鏁版嵁");
+ }
+ if (x.Quantity < x.OutboundQuantity)
+ {
+ throw new Exception($"{x.MaterielName}{x.MaterielCode}鍑哄簱鏁伴噺涓嶅彲澶т簬搴撳瓨鏁伴噺");
+ }
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = stock.PalletCode,
+ OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = x.Remark,
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = areaName.AreaName,
+ OutboundQuantity = x.OutboundQuantity,
+ });
+ });
+
+ stock.StockInfoDetails = details;
+
+ var taskDto = CreateListTaskDTO(taskNew);
+ var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.AddDataAsync(taskNew);
+ await _stockInfoRepository.UpdateDataNavAsync(stock);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ await _orderOutDetailsRepository.AddDataAsync(outDetails);
+ });
+ return content = await SendWCSTask(taskDto);
+ }
+ catch (Exception ex)
+ {
+ return content.Error();
}
}
@@ -1223,6 +1386,29 @@
}
#endregion
+ #region 鑾峰彇浠诲姟鏁版嵁
+ public async Task<WebResponseContent> GetTaskData()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = BaseDal.QueryData(x => true);
+ Dictionary<string,object> obj=new Dictionary<string, object>()
+ {
+ {"name","宸插畬鎴�"},
+ };
+
+
+ return content.OK(data:obj);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ #endregion
+
#endregion 澶栭儴鎺ュ彛鏂规硶
#region 璋冪敤WCS鎺ュ彛
@@ -1237,6 +1423,7 @@
}
return wcsBasez + address;
}
+
public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
{
WebResponseContent content = new WebResponseContent();
@@ -1282,14 +1469,14 @@
OrgCode = "102",
UserCode = "MH0551"
},
- documentTypeCode = "TransIn002",
+ documentTypeCode = "LL20",
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
issueList = orderOutDetails.Select(item => new issueList
{
- PickListID = item.MaterielID,
+ PickListID = item.ERPOrderId,
//瀛樺偍鍦扮偣
- WhCode = item.WareHouseId,
+ WhCode = "205",
//棰嗘枡鏁伴噺
IssueQty = item.OutboundQuantity,
}).ToList()
@@ -1300,12 +1487,12 @@
var result = await HttpsClient.PostAsync(ERPProduction, materialRequisition.ToJsonString());
- var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
- if (respone.ResultStatus)
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (respone.d.ResultStatus)
{
return content.OK();
}
- return content.Error(respone.ResultMsg);
+ return content.Error(respone.d.ResultMsg);
}
catch (Exception ex)
{
@@ -1318,11 +1505,14 @@
/// <param name="palletCode"></param>
/// <returns></returns>
///
- public async Task<WebResponseContent> ERPAllocate(DtStockInfo stock)
+ public async Task ERPAllocate(DtStockInfo stock)
{
- WebResponseContent content = new WebResponseContent();
try
{
+ if (stock == null)
+ {
+ throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ }
Allocate allocate = new Allocate
{
context = new Context
@@ -1352,25 +1542,78 @@
// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
- var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
- if (respone.ResultStatus)
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
{
- return content.OK();
+ throw new Exception(respone.d.ResultMsg);
}
- return content.Error(respone.ResultMsg);
+
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ throw new Exception(ex.Message);
+ }
+ }
+
+ public async Task ERPAllocateOut(DtStockInfo stock)
+ {
+ try
+ {
+ if (stock == null)
+ {
+ throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ }
+ 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 = stock.StockInfoDetails.Select(item => new transferInList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = "205",
+ //璋冨叆鏁伴噺
+ TransInQty = item.Quantity,
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = "107",
+ }).ToList()
+ };
+ var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
+ {
+ throw new Exception(respone.d.ResultMsg);
+ }
+
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
}
}
- public async Task<WebResponseContent> ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
+ public async Task ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
{
- WebResponseContent content = new WebResponseContent();
try
{
+ if (orderOutDetails.Count <= 0)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄥ嚭搴撴暟鎹�");
+ }
List<transferInList> transferInList=new List<transferInList>();
orderOutDetails.ForEach(x =>
{
@@ -1383,7 +1626,7 @@
//璋冨叆鏁伴噺
TransInQty = x.OutboundQuantity,
// 璋冨嚭浠撳簱缂栫爜
- TransOutWHCode = x.WareHouseId,
+ TransOutWHCode = "205",
});
});
Allocate allocate = new Allocate
@@ -1404,16 +1647,15 @@
// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
- var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
- if (respone.ResultStatus)
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
{
- return content.OK();
+ throw new Exception($"ERP璋冩嫧鍑哄簱{respone.d.ResultMsg}");
}
- return content.Error(respone.ResultMsg);
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ throw new Exception(ex.Message);
}
}
/// <summary>
@@ -1421,11 +1663,14 @@
/// </summary>
/// <param name="palletCode"></param>
/// <returns></returns>
- public async Task<WebResponseContent> ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
+ public async Task ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
{
- WebResponseContent content = new WebResponseContent();
try
{
+ if (orderOutDetails.Count <= 0)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄥ嚭搴撴暟鎹�");
+ }
MixedSend send = new MixedSend
{
context = new Context
@@ -1435,7 +1680,7 @@
OrgCode = "102",
UserCode = "MH0551"
},
- documentTypeCode = "TransIn002",
+ documentTypeCode = "MiscShip001",
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
@@ -1444,9 +1689,10 @@
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//瀛樺偍鍦扮偣缂栧彿
- WhCode = item.WareHouseId,
+ WhCode = "205",
//鏉傚彂鏁伴噺
Qty = item.OutboundQuantity,
+
BenefitDeptCode = "0505",
}).ToList()
};
@@ -1454,16 +1700,15 @@
// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
var result = await HttpsClient.PostAsync(ERPMixedSend, send.ToJsonString());
- var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
- if (respone.ResultStatus)
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
{
- return content.OK();
+ throw new Exception($"ERP鍏朵粬鍑哄簱{respone.d.ResultMsg}");
}
- return content.Error(respone.ResultMsg);
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ throw new Exception(ex.Message);
}
}
/// <summary>
--
Gitblit v1.9.3