线边对接ERP
This commit is contained in:
1 parent
e3002cabf6
commit
287453691b
8 files changed
+253
-29
No files matched your search
@@ -267,7 +267,7 @@ namespace HHWMS.Web.Controllers
|
||||
// 调用 ERP 接口获取该订单的最新数据
|
||||
var request = new LoadMoDetailListRequest
|
||||
{
|
||||
ErpCode = "001",
|
||||
ErpCode = "999",
|
||||
MoCode = receiptCode, // 使用生产订单号查询
|
||||
Size = 100,
|
||||
Page = 1
|
||||
|
||||
@@ -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任务下发成功,提交事务
|
||||
|
||||
Reference in new issue
Block a user