From 5ccef03578cac085fecb4afd96e48bdf42df3aef Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期四, 04 十二月 2025 10:23:30 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/MaterielToMesService.cs | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MaterielToMesService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MaterielToMesService.cs"
index ecd6300..ea0a8d1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MaterielToMesService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MaterielToMesService.cs"
@@ -1,4 +1,6 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing Dm.filter;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using System;
using System.Collections.Generic;
@@ -9,6 +11,8 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.Outbound;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Basic;
@@ -16,11 +20,13 @@
namespace WIDESEA_BasicService
{
internal class MaterielToMesService : ServiceBase<Dt_MaterielToMes, IRepository<Dt_MaterielToMes>>, IMaterielToMesService
- {
-
- public MaterielToMesService(IRepository<Dt_MaterielToMes> BaseDal) : base(BaseDal)
+ {
+ private readonly IInvokeMESService _invokeMESService;
+ private readonly ILogger<MaterielToMesService> _logger;
+ public MaterielToMesService(IRepository<Dt_MaterielToMes> BaseDal, IInvokeMESService invokeMESService, ILogger<MaterielToMesService> logger) : base(BaseDal)
{
-
+ _invokeMESService = invokeMESService;
+ _logger = logger;
}
// 鍒涘缓涓�涓娇鐢ㄥ皬椹煎嘲鍛藉悕娉曠殑搴忓垪鍖栬缃�
JsonSerializerSettings settings = new JsonSerializerSettings
@@ -29,24 +35,50 @@
};
public IRepository<Dt_MaterielToMes> Repository => BaseDal;
- public override WebResponseContent AddData(Dt_MaterielToMes saveModel)
+ public async Task<WebResponseContent> AddMaterielToMes(Dt_MaterielToMes saveModel,int operationtype)
{
-
- WebResponseContent content = base.AddData(saveModel);
- if (content.Status)
+ try
{
- string request = JsonConvert.SerializeObject(saveModel, settings);
- var url = AppSettings.GetValue("MESUrl").ObjToString();
- string response = HttpHelper.Post( url+"", request);
+ base.AddData(saveModel);
+
+ MaterielToMesDTO dto = new MaterielToMesDTO
+ {
+ batchNo = saveModel.BatchNo,
+ factoryArea = saveModel.factoryArea,
+ materialCode = saveModel.MaterielCode,
+ newmaterialCode = saveModel.NewMaterialBarCode,
+ oldmaterialCode = saveModel.OldMaterialBarCode,
+ operationType = 1,
+ qty = saveModel.Qty,
+ supplyCode = saveModel.supplyCode,
+ unit = saveModel.Unit,
+ warehouseCode = saveModel.warehouseCode,
+ reqCode = Guid.NewGuid().ToString(),
+ reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+ };
+
+ var result = await _invokeMESService.NewMaterielToMes(dto);
+
+ if (result != null && result.code == 200)
+ {
+ await Db.Updateable<Dt_MaterielToMes>()
+ .SetColumns(it => it.ReturnToMESStatus ==1)
+ .Where(it => it.Id == saveModel.Id)
+ .ExecuteCommandAsync();
+ }
+
return WebResponseContent.Instance.OK();
}
- else
+ catch (Exception ex)
{
- return content;
+ _logger.LogError("MaterielToMesService add Dt_MaterielToMes: " + ex.Message);
+ return WebResponseContent.Instance.Error(ex.Message);
}
-
}
+
+
+
}
}
--
Gitblit v1.9.3