Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

647556386

2025-11-22 68628c6cc163cddfcc745c225a9f3f34767261ef

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_BasicService/MaterielToMesService.cs

@@ -1,4 +1,6 @@
using Newtonsoft.Json;
using 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);
            }


            
        }



    }
}