对接ERP2.7
部分页面修改
This commit is contained in:
1 parent
22bfe9d015
commit
59f2af943b
17 files changed
+770
-887
No files matched your search
@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Core.Extensions;
|
||||
using HHWMS.Web.Models;
|
||||
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace HHWMS.Web
|
||||
{
|
||||
@@ -18,6 +18,7 @@ namespace HHWMS.Web
|
||||
|
||||
[Display(Name = "Location.OutPort", Description = "拣货口")]
|
||||
public string OutPort { get; set; }
|
||||
private IUnitWork unitWork;
|
||||
|
||||
public InventoryVM()
|
||||
{
|
||||
@@ -26,6 +27,7 @@ namespace HHWMS.Web
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
unitWork = new UnitWork(Wtm);
|
||||
AllZones = DC.Set<LocationZone>().GetSelectListItems(Wtm, y => y.Name);
|
||||
|
||||
AllOutPorts = new List<ComboSelectListItem>
|
||||
@@ -63,5 +65,95 @@ namespace HHWMS.Web
|
||||
{
|
||||
base.DoDelete();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// ERP报工处理
|
||||
/// </summary>
|
||||
/// <param name="inventory">库存实体</param>
|
||||
/// <param name="taskType">任务类型(入库/出库)</param>
|
||||
/// <returns>返回处理结果,true表示成功,false表示失败</returns>
|
||||
public async Task<bool> ProcessErpFinishIn(Inventory inventory, TaskTypeEnum? taskType)
|
||||
{
|
||||
if (inventory == null
|
||||
//|| string.IsNullOrEmpty(inventory.ReceiptDetailId)
|
||||
|| inventory.ZoneId == 1025 ) //模具库不报工
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
// ERP相关 入库报工
|
||||
var finishInRequest = new FinishInRequest
|
||||
{
|
||||
Main = new FinishInMain
|
||||
{
|
||||
ErpCode = "003", // 账套号
|
||||
InCode = unitWork.GetSerialNumber("RW"), // 报工单号(上游单号)
|
||||
InDate = (inventory.CreateTime ?? DateTime.Now)
|
||||
.ToString("yyyy-MM-dd"), // 报工日期
|
||||
StepCode = inventory.BatchCode, // 工序(批次编码)
|
||||
WorkerCode = inventory.CreateBy, // 工人编码(创建人)
|
||||
Maker = unitWork.FindSingle<FrameworkUser>(x =>
|
||||
x.ITCode == inventory.CreateBy).Name, // 制单人(校验员)
|
||||
Type = inventory.ZoneId == 1027 ? 1: 2,
|
||||
WhCode = inventory.ZoneId == 1027 ? "xb": "cp",
|
||||
},
|
||||
Details = new List<FinishInDetail>()
|
||||
};
|
||||
|
||||
if (taskType == TaskTypeEnum.入库)
|
||||
{
|
||||
// 根据库存构建明细
|
||||
finishInRequest.Details.Add(new FinishInDetail
|
||||
{
|
||||
MoDetailId = inventory.ZoneId == 1027 ? "" : inventory.ReceiptDetailId, // 生产订单明细(ERP明细ID)
|
||||
InvCode = inventory.MaterialCode, // 物料号
|
||||
Qty = inventory.Qty ?? 0 // 完工数量
|
||||
});
|
||||
}
|
||||
else if (taskType == TaskTypeEnum.出库)
|
||||
{
|
||||
finishInRequest.Details.Add(new FinishInDetail
|
||||
{
|
||||
MaterialDetails = new List<MaterialDetail>
|
||||
{
|
||||
new MaterialDetail
|
||||
{
|
||||
MoDetailId = inventory.ZoneId == 1027 ? "" : inventory.ReceiptDetailId, // 生产订单明细ID
|
||||
InvCode = inventory.MaterialCode, // 物料号
|
||||
Qty = (decimal)inventory.Qty // 完工数量(空值兜底为0)
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 调用ERP接口
|
||||
var apiResult = await Wtm.CallAPI<FinishInResponse>("ERP", "FinishIn",
|
||||
HttpMethodEnum.POST,
|
||||
finishInRequest);
|
||||
|
||||
if (apiResult.Data != null && apiResult.Data.Result)
|
||||
{
|
||||
inventory.UploadErpFlag = 1;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
inventory.UploadErpFlag = 0;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 异常情况下设置标志为失败
|
||||
inventory.UploadErpFlag = 0;
|
||||
return false;
|
||||
}
|
||||
finally
|
||||
{
|
||||
unitWork.Update(inventory);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user