signalr 取消,长时间会有问题,打开浏览器会白屏

对接erp,接口 线边任务完成根据detailid,分入库 出库报工
todo 成品的报工(定时器回传 or 入库/拣货的时候回传)
This commit is contained in:
zhougf committed 2025-12-30 21:20:06 +08:00
1 parent 00119151c9
commit c3ec557c4d
19 files changed
+403 -362

No files matched your search

@@ -0,0 +1,92 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using HHWMS.Web.Models;
using Quartz;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Support.Quartz;
namespace HHWMS.Web
{
//[QuartzRepeat(10,10, true, 30)]
[PersistJobDataAfterExecution]
[DisallowConcurrentExecution]
public class FinishInJob : WtmJob
{
public override async Task Execute(IJobExecutionContext context)
{
try
{
var _unitwork = new UnitWork(Wtm);
var inv = _unitwork.FindSingle<Inventory>(x => x.UploadErpFlag == 0
&& x.TaskStatus != InventoryTaskStatusEnum.Locked
&& !string.IsNullOrEmpty(x.SourceCode)
);
var request = new FinishInRequest
{
Main = new FinishInMain
{
ErpCode = "002", // 账套号
InCode = _unitwork.GetSerialNumber("RW"), // 报工单号(上游单号)
InDate = (inv.CreateTime ?? DateTime.Now).ToString("yyyy-MM-dd"), // 报工日期
StepCode = inv.BatchCode, // 工序(批次编码)
WorkerCode = inv.CreateBy, // 工人编码(创建人)
Maker = _unitwork.FindSingle<FrameworkUser>(x =>
x.ITCode == inv.CreateBy).Name // 制单人(校验员)
},
Details = new List<FinishInDetail>()
};
// 根据库存构建明细
request.Details.Add(new FinishInDetail
{
MoDetailId = inv.ReceiptDetailId, // 生产订单明细(ERP明细ID)
InvCode = inv.MaterialCode, // 物料号
Qty = inv.Qty ?? 0 // 完工数量
});
// 调用ERP接口
var apiResult = await Wtm.CallAPI<FinishInResponse>("ERP", "FinishIn", HttpMethodEnum.POST, request);
if (apiResult.Data != null && apiResult.Data.Result)
{
inv.UploadErpFlag = 1;
_unitwork.Update(inv);
}
else
{
inv.UploadErpFlag = 0;
_unitwork.Update(inv);
}
#region 更新时间
var job = _unitwork.FindSingle<SysJob>(x =>
x.JobName == context.JobDetail.Key.Name
);
if (job != null)
{
job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(
context.FireTimeUtc.DateTime,
TimeZoneInfo.Local
);
// 只执行一次 没有下次执行时间
if (context.NextFireTimeUtc != null)
{
job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(
context.NextFireTimeUtc.Value.DateTime,
TimeZoneInfo.Local
);
}
_unitwork.Update<SysJob>(job);
}
#endregion
}
catch(Exception ex) {
Wtm.DoLog("ERP报工失败", ActionLogTypesEnum.Job, "FinishInJob", request:"error", result:ex.Message);
}
}
}
}
@@ -23,7 +23,7 @@ namespace HHWMS.Web
// 调用接口获取ERP订单数据
var request = new LoadMoDetailListRequest
{
ErpCode = "999",
ErpCode = "002",
Size = 100,
Page = 1
};
@@ -23,7 +23,7 @@ namespace HHWMS.Web
// 调用接口获取ERP用户数据
var request = new LoadPersonRequest
{
ErpCode = "999",
ErpCode = "002",
Size = 1000,
Page = 1
};