diff --git a/HHWMS.Web/HHWMS.Web.csproj b/HHWMS.Web/HHWMS.Web.csproj
index c58a21e..3a446d7 100644
--- a/HHWMS.Web/HHWMS.Web.csproj
+++ b/HHWMS.Web/HHWMS.Web.csproj
@@ -44,6 +44,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/HHWMS.Web/MESToWMSService/IContract.cs b/HHWMS.Web/MESToWMSService/IContract.cs
new file mode 100644
index 0000000..cc24d3a
--- /dev/null
+++ b/HHWMS.Web/MESToWMSService/IContract.cs
@@ -0,0 +1,16 @@
+using System.ServiceModel;
+using System.ServiceModel.Channels;
+using System.Xml.Serialization;
+
+namespace MESTOWMSService
+{
+ [ServiceContract(Namespace ="mestowmsservice")]
+ public interface IContract
+ {
+ [OperationContract]
+ Result MesInWms(string bizData);
+
+ [OperationContract]
+ Result MesOutWms(string bizData);
+ }
+}
diff --git a/HHWMS.Web/MESToWMSService/WmsMesService.cs b/HHWMS.Web/MESToWMSService/WmsMesService.cs
new file mode 100644
index 0000000..fe7e7d6
--- /dev/null
+++ b/HHWMS.Web/MESToWMSService/WmsMesService.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.ServiceModel;
+using System.ServiceModel.Channels;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+using HHWMS.Web;
+using HHWMS.Web.Models;
+using Newtonsoft.Json;
+using WalkingTec.Mvvm.Core;
+using WalkingTec.Mvvm.Mvc;
+
+namespace MESTOWMSService
+{
+ public class WmsMesService : IContract
+ {
+ private readonly IUnitWork _unitwork;
+ private readonly WTMContext _wtm;
+ public WmsMesService(IUnitWork unitwork, WTMContext wtm)
+ {
+ _unitwork = unitwork;
+ _wtm = wtm;
+ }
+ public Result MesInWms(string materails)
+ {
+ try
+ {
+ _wtm.DoLog("", ActionLogTypesEnum.Normal,"mes", request: materails);
+ var data = JsonConvert.DeserializeObject(materails);
+ // 插入物料信息表
+ var materialList = new List();
+ foreach (var item in data.ISSUEMATERIALS.ISSUEITEM)
+ {
+ var material = new Material
+ {
+ MaterialCode = item.MATNR,
+ MaterialName = item.MAKTX,
+ MaterialType = item.BWART,
+ MaterialUnit = item.ERFME,
+ MaterialSpec = item.ZZXHGG,
+ Batch = item.LICHA,
+ QRCode = item.ZMBLNR,
+ Qty = decimal.Parse(item.MENGE),
+ SourceCode = item.AUFNR,
+ SupplierCode = item.ZZSCCJ,
+ CreateTime = DateTime.Now,
+ CreateBy = "mes"
+ };
+ materialList.Add(material);
+ }
+ _unitwork.BatchAdd(materialList.ToArray());
+ return new Result();
+ }
+ catch(Exception ex)
+ {
+ _wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: materails, result: "error");
+ return new Result { Status = "N", Message = ex.Message};
+ }
+ }
+
+ public Result MesOutWms(string outOrder)
+ {
+ try
+ {
+ _wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: outOrder);
+ var data = JsonConvert.DeserializeObject(outOrder);
+ // 生成出库单和明细
+ var shipment = new ShipmentHeader
+ {
+ Code = _unitwork.GetSerialNumber("MO",4),
+ BillType = "out",
+ FirstStatus = ShipStatusEnum.新建,
+ ShipmentDetails = new List(),
+ CreateTime = DateTime.Now
+ };
+ foreach(var item in data.OUTWMS.OUTITEM)
+ {
+ var material = _unitwork.FindSingle(x => x.UniqueCode.Equals(item.SN));
+ var detail = new ShipmentDetail
+ {
+ UniqueCode = item.SN,
+ MaterialCode = material.MaterialCode,
+ MaterialName = material.MaterialName,
+ MaterialSpec = material.MaterialSpec,
+ MaterialType = material.MaterialType,
+ MaterialUnit = material.MaterialUnit,
+ Batch = material.Batch,
+ Qty = material.Qty,
+ CompanyCode = item.FACTORY,
+ ManufactureDate = Convert.ToDateTime(item.MESDATE),
+ Status = ShipStatusEnum.新建,
+ CreateTime = DateTime.Now
+ };
+ shipment.ShipmentDetails.Add(detail);
+ }
+ _unitwork.Add(shipment);
+ return new Result();
+ }
+ catch (Exception ex)
+ {
+ _wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: outOrder, result: "error");
+ return new Result { Status = "N", Message = ex.Message };
+ }
+ }
+ }
+}
diff --git a/HHWMS.Web/Models/Request/Request/RequestMes.cs b/HHWMS.Web/Models/Request/Request/RequestMes.cs
index 98f6918..9de8ed6 100644
--- a/HHWMS.Web/Models/Request/Request/RequestMes.cs
+++ b/HHWMS.Web/Models/Request/Request/RequestMes.cs
@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
namespace HHWMS.Web
{
public class RequestMes
@@ -21,4 +24,130 @@ namespace HHWMS.Web
public string OverToUnits { get; set; }
public string ActivityName { get; set; }
}
+
+ public class ISSUEITEMItem
+ {
+ ///
+ /// SAP的生产订单
+ ///
+ public string AUFNR { get; set; }
+ ///
+ /// 物料的类型,261表示散料,只用在AUFNR订单上;315表示盘料,通用物料
+ ///
+ public string BWART { get; set; }
+ ///
+ ///
+ ///
+ public string CID { get; set; }
+ ///
+ ///
+ ///
+ public string CRDAT { get; set; }
+ ///
+ /// 物料的单位
+ ///
+ public string ERFME { get; set; }
+ ///
+ /// 检验单号
+ ///
+ public string JYNUM { get; set; }
+ ///
+ /// 物料批次
+ ///
+ public string LICHA { get; set; }
+ ///
+ /// 物料名称
+ ///
+ public string MAKTX { get; set; }
+ ///
+ /// 物料编码
+ ///
+ public string MATNR { get; set; }
+ ///
+ /// 物料数量
+ ///
+ public string MENGE { get; set; }
+ ///
+ ///
+ ///
+ public string POSID { get; set; }
+ ///
+ ///
+ ///
+ public string ZFLAG { get; set; }
+ ///
+ /// 物料二维码
+ ///
+ public string ZMBLNR { get; set; }
+ ///
+ ///
+ ///
+ public string ZSXH { get; set; }
+ ///
+ ///
+ ///
+ public string ZZLDJ { get; set; }
+ ///
+ /// 生产厂家
+ ///
+ public string ZZSCCJ { get; set; }
+ ///
+ /// 规格
+ ///
+ public string ZZXHGG { get; set; }
+ }
+
+ public class ISSUEMATERIALS
+ {
+ ///
+ ///
+ ///
+ public List ISSUEITEM { get; set; }
+ }
+
+ public class MesMaterials
+ {
+ ///
+ ///
+ ///
+ public ISSUEMATERIALS ISSUEMATERIALS { get; set; }
+ }
+
+ public class OUTITEMItem
+ {
+ ///
+ /// 车间
+ ///
+ public string FACTORY { get; set; }
+ ///
+ /// 时间
+ ///
+ public string MESDATE { get; set; }
+ ///
+ /// 需求设备
+ ///
+ public string RESOURCE { get; set; }
+ ///
+ /// 唯一码
+ ///
+ public string SN { get; set; }
+ }
+
+ public class OUTWMS
+ {
+ ///
+ ///
+ ///
+ public List OUTITEM { get; set; }
+ }
+
+ public class MesOut
+ {
+ ///
+ ///
+ ///
+ public OUTWMS OUTWMS { get; set; }
+ }
+
+
}
diff --git a/HHWMS.Web/Models/Request/Response/ESBResponse.cs b/HHWMS.Web/Models/Request/Response/ESBResponse.cs
new file mode 100644
index 0000000..d91275b
--- /dev/null
+++ b/HHWMS.Web/Models/Request/Response/ESBResponse.cs
@@ -0,0 +1,18 @@
+using System.Runtime.Serialization;
+
+namespace MESTOWMSService
+{
+ [DataContract]
+ public class Result
+ {
+ public Result()
+ {
+ Message = "操作成功";
+ Status = "Y";
+ }
+ [DataMember]
+ public string Status { get; set; }
+ [DataMember]
+ public string Message { get; set; }
+ }
+}
diff --git a/HHWMS.Web/Models/Shipment/ShipmentDetail.cs b/HHWMS.Web/Models/Shipment/ShipmentDetail.cs
index 94d8736..30414e4 100644
--- a/HHWMS.Web/Models/Shipment/ShipmentDetail.cs
+++ b/HHWMS.Web/Models/Shipment/ShipmentDetail.cs
@@ -26,6 +26,10 @@ namespace HHWMS.Web.Models
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string MaterialCode { get; set; }
+ [Display(Name = "Inventory.UniqueCode", Description = "唯一编码")]
+ [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
+ public string UniqueCode { get; set; }
+
[Display(Name = "Inventory.MaterialType", Description = "物料类型")]
[StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")]
public string MaterialType { get; set; }
diff --git a/HHWMS.Web/Program.cs b/HHWMS.Web/Program.cs
index cf90c53..b763197 100644
--- a/HHWMS.Web/Program.cs
+++ b/HHWMS.Web/Program.cs
@@ -14,6 +14,9 @@ using WalkingTec.Mvvm.Mvc;
using HHWMS.Web.Support;
using HHWMS.Web;
using Quartz;
+using SoapCore;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using MESTOWMSService;
var builder = WebApplication.CreateBuilder(args);
builder.Logging.ClearProviders();
@@ -50,6 +53,8 @@ builder.Services.AddWtmContext(builder.Configuration, (options) => {
options.FileSubDirSelector = SubDirSelector;
options.ReloadUserFunc = ReloadUser;
});
+builder.Services.TryAddScoped();
+builder.Services.AddSoapCore();
builder.Services.AddScoped(typeof(IUnitWork), typeof(UnitWork));
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
@@ -72,6 +77,11 @@ app.UseWtmSwagger(false);
app.UseSwaggerExt();
app.UseWtm();
app.AddQuartzJobs();
+
+app.UseEndpoints(endpoints => {
+ endpoints.UseSoapEndpoint("/wmsMesService.asmx", new SoapEncoderOptions(), SoapSerializer.DataContractSerializer);
+});
+
app.UseEndpoints(endpoints =>
{
endpoints.MapControllerRoute(