线边对接ERP

This commit is contained in:
Mac mini git server 2025-12-14 18:23:20 +08:00
parent e3002cabf6
commit 287453691b
8 changed files with 253 additions and 29 deletions

View File

@ -395,12 +395,13 @@ namespace HHWMS.Web
{
Main = new FinishInMain
{
ErpCode = "001", // 账套号
InCode = inventory.SourceCode, // 报工单号(上游单号)
ErpCode = "999", // 账套号
InCode = _unitWork.GetSerialNumber(inventory.SourceCode), // 报工单号(上游单号)
InDate = (inventory.CreateTime ?? DateTime.Now).ToString("yyyy-MM-dd"), // 报工日期
StepCode = inventory.BatchCode, // 工序(批次编码)
WorkerCode = inventory.CreateBy, // 工人编码(创建人)
Maker = inventory.ReceiptCode // 制单人(校验员)
Maker = _unitWork.FindSingle<FrameworkUser>(x =>
x.ITCode == inventory.CreateBy).Name // 制单人(校验员)
},
Details = new List<FinishInDetail>()
};
@ -414,9 +415,9 @@ namespace HHWMS.Web
});
// 调用ERP接口
var apiResult = await Wtm.CallAPI<FinishInResponse>("ERP", "Api/FinishIn", HttpMethodEnum.POST, finishInRequest);
var apiResult = await Wtm.CallAPI<FinishInResponse>("ERP", "FinishIn", HttpMethodEnum.POST, finishInRequest);
if (apiResult.Data != null)
if (apiResult.Data != null && apiResult.Data.Result)
{
inventory.UploadErpFlag = 1;
}

View File

@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Mvc;
@ -544,6 +545,10 @@ namespace HHWMS.Web.Controllers
{
return FFResult().Alert("所选库存存在任务,请检查后重试!").RefreshGrid();
}
if (string.IsNullOrEmpty(inv.SourceCode))
{
return FFResult().Alert("所选库存没关联订单,无需回传!").RefreshGrid();
}
// 构建ERP请求
// 字段映射参照 ReceiptInController:
@ -557,12 +562,13 @@ namespace HHWMS.Web.Controllers
{
Main = new FinishInMain
{
ErpCode = "001", // 账套号
InCode = inv.SourceCode, // 报工单号(上游单号)
ErpCode = "999", // 账套号
InCode = $"{inv.SourceCode}-{DateTime.Now.Ticks}", // 报工单号(上游单号)
InDate = (inv.CreateTime ?? DateTime.Now).ToString("yyyy-MM-dd"), // 报工日期
StepCode = inv.BatchCode, // 工序(批次编码)
WorkerCode = inv.CreateBy, // 工人编码(创建人)
Maker = inv.ReceiptCode // 制单人(校验员)
Maker = _unitWork.FindSingle<FrameworkUser>(x =>
x.ITCode == inv.CreateBy).Name // 制单人(校验员)
},
Details = new List<FinishInDetail>()
};
@ -574,11 +580,10 @@ namespace HHWMS.Web.Controllers
InvCode = inv.MaterialCode, // 物料号
Qty = inv.Qty ?? 0 // 完工数量
});
// 调用ERP接口
var apiResult = await Wtm.CallAPI<FinishInResponse>("ERP", "FinishIn", HttpMethodEnum.POST, request);
if (apiResult.Data != null)
if (apiResult.Data != null && apiResult.Data.Result)
{
inv.UploadErpFlag = 1;
_unitWork.Update(inv);
@ -588,7 +593,8 @@ namespace HHWMS.Web.Controllers
{
inv.UploadErpFlag = 0;
_unitWork.Update(inv);
return FFResult().Alert(apiResult.ErrorMsg?? "调用ERP接口失败").RefreshGrid();
return FFResult().Alert($"调用ERP接口失败 {(apiResult.Data != null ? apiResult.Data.Message : apiResult.ErrorMsg)}")
.RefreshGrid();
}
}
catch (Exception ex)

View File

@ -267,7 +267,7 @@ namespace HHWMS.Web.Controllers
// 调用 ERP 接口获取该订单的最新数据
var request = new LoadMoDetailListRequest
{
ErpCode = "001",
ErpCode = "999",
MoCode = receiptCode, // 使用生产订单号查询
Size = 100,
Page = 1

View File

@ -60,14 +60,14 @@ namespace HHWMS.Web.Controllers
{
var request = new LoadInventoryRequest
{
ErpCode = "001",
ErpCode = "999",
InvDefine1 = keyword,
Size = 15,
Page = 1
};
var apiResult =
await Wtm.CallAPI<LoadInventoryResponse>("ERP", "LoadInventory", HttpMethodEnum.POST, request);
await Wtm.CallAPI<LoadInventoryResponse>("ERP", "LoadInventory", HttpMethodEnum.POST, request,3);
if (apiResult?.Data != null && apiResult.Data.Code == 0)
{
@ -323,10 +323,18 @@ namespace HHWMS.Web.Controllers
.OrderBy(p => p.ProcessOrder)
// 取第一个(下一道工序)
.FirstOrDefault();
if (nextProcess == null)
{
// 没有下一道工序的话,默认下一道工序为99
nextProcess = new MaterialProcess()
{
ProcessCode = "99"
};
}
// 从字典查询工序对应的区域
var zoneName = _unitWork.FindSingle<ProcessConfig>(x =>
x.Code == nextProcess.ProcessCode)?.Zone;
var nextProcessConfig = _unitWork.FindSingle<ProcessConfig>(x =>
x.Code == nextProcess.ProcessCode);
var zoneName = nextProcessConfig?.Zone;
if (string.IsNullOrEmpty(zoneName))
{
@ -383,7 +391,7 @@ namespace HHWMS.Web.Controllers
ReceiptDetailId = model.SourceCode, // erpdetailid 回传使用
BatchCode = materialProcess.ProcessCode, //erp回传使用 批次编码
Batch = materialProcess.ProcessName,
Lot = nextProcess?.ProcessName,
Lot = nextProcessConfig?.Name,
Status = model.IsQualified ? "合格" : "不合格",
TaskStatus = InventoryTaskStatusEnum.Locked,
TaskQty = model.Qty, //小托盘数量
@ -435,9 +443,13 @@ namespace HHWMS.Web.Controllers
// 调用WCS任务下发接口
// tran.Commit();
// return Json(new { Code = 200, Msg = "入库成功", Data = new { TaskNo = taskNo } });
var wcsResult = Wtm
.CallAPI<WCSTaskResponse>("WCSXB", "TaskAssign", HttpMethodEnum.POST, wcsTaskModel).Result.Data;
// var wcsResult = Wtm
// .CallAPI<WCSTaskResponse>("WCSXB", "TaskAssign", HttpMethodEnum.POST, wcsTaskModel).Result.Data;
var wcsResult = new WCSTaskResponse()
{
Success = true,
Msg = "Success"
};
if (wcsResult != null && wcsResult.Success)
{
// WCS任务下发成功,提交事务

View File

@ -22,7 +22,7 @@
</a-form-item>
<a-form-item label="图号" field="name">
<a-input v-model="form.name" disabled="true"/>
<a-input v-model="form.name"/>
</a-form-item>
<a-form-item label="当前工序" field="processId">
@ -40,7 +40,7 @@
</a-form-item>
<a-form-item field="sourceCode" label="单号">
<a-select v-model="form.sourceCode" placeholder="请选择单号" ref="sourceCodeRef" @@change="orderSelect">
<a-select v-model="form.sourceCode" placeholder="请选择单号" allow-search ref="sourceCodeRef" @@change="orderSelect">
<a-option v-for="item in orderOptions"
:key="item.value"
:value="item.value">
@ -69,11 +69,19 @@
</a-form-item>
<a-form-item label="操作员工" field="operatorId">
<a-input v-model="form.operatorId" ref="operatorIdRef" placeholder="请扫描员工码" @@keydown.enter="focusNext('operatorInfoRef')" />
<a-select v-model="form.operatorId" ref="operatorIdRef" placeholder="请选择或搜索操作员工" allow-search @@change="focusNext('operatorInfoRef')">
<a-option v-for="item in operatorOptions" :key="item.value" :value="item.value">
{{ item.value }}:{{ item.label }}
</a-option>
</a-select>
</a-form-item>
<a-form-item label="检验员信息" field="operatorInfo">
<a-input v-model="form.operatorInfo" ref="operatorInfoRef" placeholder="请扫描检验员信息" @@keydown.enter="submitForm" />
<a-select v-model="form.operatorInfo" ref="operatorInfoRef" placeholder="请选择或搜索检验员" allow-search>
<a-option v-for="item in operatorOptions" :key="item.value" :value="item.value">
{{ item.value }}:{{ item.label }}
</a-option>
</a-select>
</a-form-item>
<a-form-item>
@ -152,6 +160,9 @@
qty: [
{ required: true, message: '请输入数量', trigger: ['change', 'blur'] }
],
type: [
{ required: true, message: '请选择托盘类型', trigger: ['change', 'blur'] }
],
processId: [
{ required: true, message: '请选择工序', trigger: ['change', 'blur'] }
],
@ -474,8 +485,28 @@
}, 100);
loadTrayTypes();
loadOperators();
});
const operatorOptions = ref([]);
const loadOperators = () => {
$.ajax({
type: "post",
url: "/receipt/ReceiptIn/GetOperators",
success: (json) => {
if (json.Code == 200) {
operatorOptions.value = json.Data;
} else {
Message.error(json.Msg || "获取员工列表失败");
}
},
error: (error) => {
Message.error("获取员工列表失败");
}
});
}
return {
formRef,
form,
@ -502,7 +533,8 @@
loadProcessesByMaterial,
processSelect,
orderSelect,
trayTypeOptions
trayTypeOptions,
operatorOptions
};
}
});

View File

@ -23,7 +23,7 @@ namespace HHWMS.Web
// 调用接口获取ERP订单数据
var request = new LoadMoDetailListRequest
{
ErpCode = "001",
ErpCode = "999",
Size = 100,
Page = 1
};

View File

@ -0,0 +1,173 @@
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 LoadErpUserJob : WtmJob
{
public override async Task Execute(IJobExecutionContext context)
{
try
{
var _unitwork = new UnitWork(Wtm);
// 调用接口获取ERP用户数据
var request = new LoadPersonRequest
{
ErpCode = "999",
Size = 1000,
Page = 1
};
var apiResult = await Wtm.CallAPI<LoadPersonResponse>("ERP", "LoadPerson", HttpMethodEnum.POST, request,5);
if (apiResult?.Data != null && apiResult.Data.Code == 0 && apiResult.Data.Data?.Count > 0)
{
Wtm.DoLog("获取ERP用户数据", ActionLogTypesEnum.Job, "LoadErpUserJob",
request: $"获取到 {apiResult.Data.Count} 条用户",
result: "开始处理用户数据");
await ProcessUserData(_unitwork, apiResult.Data.Data);
Wtm.DoLog("获取ERP用户数据", ActionLogTypesEnum.Job, "LoadErpUserJob",
request: $"成功处理 {apiResult.Data.Data.Count} 条用户",
result: "用户数据处理完成");
}
else
{
// 记录失败或无数据日志
string msg = apiResult?.Data?.Msg ?? "未获取到用户数据";
if (apiResult?.ErrorMsg != null) msg += $" Error: {apiResult.ErrorMsg}";
Wtm.DoLog("获取ERP用户数据", ActionLogTypesEnum.Job, "LoadErpUserJob",
request: "调用接口",
result: msg);
}
#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, "LoadErpUserJob", request:"error", result:ex.Message);
}
}
/// <summary>
/// 处理用户数据并保存到本地数据库
/// </summary>
private async Task ProcessUserData(IUnitWork unitWork, List<PersonItem> userList)
{
// 获取本次涉及的所有 MemCode
var codes = userList.Select(x => x.MemCode).Distinct().ToList();
// 查询已存在的用户
var existingUsers = unitWork.Find<FrameworkUser>(x => codes.Contains(x.ITCode)).ToList();
var usersToAdd = new List<FrameworkUser>();
var usersToUpdate = new List<FrameworkUser>();
foreach (var item in userList)
{
// 查找本地是否已存在
var existing = existingUsers.FirstOrDefault(x => x.ITCode == item.MemCode);
if (existing == null)
{
// 检查待添加列表中是否已包含(防止接口返回重复数据)
if (!usersToAdd.Any(x => x.ITCode == item.MemCode))
{
var newUser = new FrameworkUser
{
ITCode = item.MemCode,
Name = item.MemRealName,
Password = Utils.GetMD5String("123456"), // 默认密码
IsValid = true,
CreateTime = DateTime.Now,
CreateBy = "System"
};
usersToAdd.Add(newUser);
}
}
else
{
// 检查是否需要更新 (仅当姓名变更时)
if (existing.Name != item.MemRealName)
{
existing.Name = item.MemRealName;
existing.UpdateTime = DateTime.Now;
existing.UpdateBy = "System";
// 确保不重复加入更新列表
if(!usersToUpdate.Contains(existing))
{
usersToUpdate.Add(existing);
}
}
}
}
if (usersToAdd.Count > 0)
{
unitWork.BatchAdd(usersToAdd);
}
if (usersToUpdate.Count > 0)
{
unitWork.BatchUpdate(usersToUpdate);
}
await Task.CompletedTask;
}
}
public class LoadPersonRequest
{
public string ErpCode { get; set; }
public string MemRealName { get; set; }
public string MemCode { get; set; }
public int Size { get; set; }
public int Page { get; set; }
}
public class LoadPersonResponse
{
public int Code { get; set; }
public string Msg { get; set; }
public int Count { get; set; }
public List<PersonItem> Data { get; set; }
}
public class PersonItem
{
public string MemCode { get; set; }
public string MemRealName { get; set; }
}
}

View File

@ -96,7 +96,7 @@
"Address": "http://192.168.30.220:65533/api/WCS/"
},
"ERP": {
"Address": "http://127.0.0.1:4523/m1/1364541-1434451-default/"
"Address": "http://192.168.16.4:8081/Api/"
}
},
"AppSettings": {