ZhongRui/ALDbanyunxiangmu.git

pan

2025-11-11 fd38e10c2e982540a3aaf5804ecbc925991b06dd

提交

已删除4个文件

已修改4个文件

	.gitignore	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .gitignore

@@ -279,3 +279,7 @@
椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs
椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs
椤圭洰浠ｇ爜/WIDESEA_WMSClient/src/api/http.js
椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db
椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal
椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db
椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal

 项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db

Binary files differ

 项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal

Binary files differ

 项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db

Binary files differ

 项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal

Binary files differ

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs

@@ -43,7 +43,10 @@

        public async Task<ResponseModel> FeedbackInbound(FeedbackInboundRequestModel model)
        {
            string json = JsonConvert.SerializeObject(model);
            string json =JsonConvert.SerializeObject(model, new JsonSerializerSettings
            {           
                ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
            });
            var content = new StringContent(json, Encoding.UTF8, "application/json");
            var _client = _httpClientFactory.CreateClient("MESUrl");
            _client.DefaultRequestHeaders.Clear();
@@ -63,7 +66,10 @@

        public async Task FeedbackOutbound(FeedbackOutboundRequestModel model)
        {
            string json = JsonConvert.SerializeObject(model);
            string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
            {
                ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
            });
            var content = new StringContent(json, Encoding.UTF8, "application/json");
            var _client = _httpClientFactory.CreateClient("MESUrl");
            _client.DefaultRequestHeaders.Clear();
@@ -83,7 +89,10 @@

        public async Task<ResponseModel> NewMaterielToMes(MaterielToMesDTO model)
        {
            string json = JsonConvert.SerializeObject(model);
            string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
            {
                ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
            });


            //string userDataEncoded = Uri.EscapeDataString(json);
@@ -190,7 +199,8 @@
                                        reqTime = DateTime.Now.ToString(),
                                        business_type = inboundOrder.BusinessType,
                                        factoryArea = inboundOrder.FactoryArea,
                                        operationType = 1,
                                        operationType=1,
                                        Operator= inboundOrder.Modifier,
                                        orderNo = inboundOrder.UpperOrderNo,
                                        status = inboundOrder.OrderStatus,
                                        details = new List<FeedbackInboundDetailsModel>()

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs

@@ -1,4 +1,5 @@
锘縰sing System;
锘縰sing Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -155,6 +156,9 @@

        public int operationType { get; set; }

        [JsonProperty("operator")]
        public string Operator { get; set; }

        /// <summary>
        /// 
        /// </summary>

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -252,6 +252,7 @@
                            business_type = inboundOrder.BusinessType,
                            factoryArea = inboundOrder.FactoryArea,
                            operationType = 1,
                            Operator = inboundOrder.Modifier,
                            orderNo = inboundOrder.UpperOrderNo,
                            status = inboundOrder.OrderStatus,
                            details = new List<FeedbackInboundDetailsModel>()

			@@ -279,3 +279,7 @@
			椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs
			椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs
			椤圭洰浠ｇ爜/WIDESEA_WMSClient/src/api/http.js
			椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db
			椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal
			椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db
			椤圭洰浠ｇ爜/WMS鏃犱粨鍌ㄧ増/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal

			@@ -43,7 +43,10 @@

			public async Task<ResponseModel> FeedbackInbound(FeedbackInboundRequestModel model)
			{
			string json = JsonConvert.SerializeObject(model);
			string json =JsonConvert.SerializeObject(model, new JsonSerializerSettings
			{
			ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
			});
			var content = new StringContent(json, Encoding.UTF8, "application/json");
			var _client = _httpClientFactory.CreateClient("MESUrl");
			_client.DefaultRequestHeaders.Clear();
			@@ -63,7 +66,10 @@

			public async Task FeedbackOutbound(FeedbackOutboundRequestModel model)
			{
			string json = JsonConvert.SerializeObject(model);
			string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
			{
			ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
			});
			var content = new StringContent(json, Encoding.UTF8, "application/json");
			var _client = _httpClientFactory.CreateClient("MESUrl");
			_client.DefaultRequestHeaders.Clear();
			@@ -83,7 +89,10 @@

			public async Task<ResponseModel> NewMaterielToMes(MaterielToMesDTO model)
			{
			string json = JsonConvert.SerializeObject(model);
			string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
			{
			ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
			});


			//string userDataEncoded = Uri.EscapeDataString(json);
			@@ -190,7 +199,8 @@
			reqTime = DateTime.Now.ToString(),
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			operationType=1,
			Operator= inboundOrder.Modifier,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()

			@@ -1,4 +1,5 @@
			锘縰sing System;
			锘縰sing Newtonsoft.Json;
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Text;
			@@ -155,6 +156,9 @@

			public int operationType { get; set; }

			[JsonProperty("operator")]
			public string Operator { get; set; }

			/// <summary>
			///
			/// </summary>

			@@ -252,6 +252,7 @@
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			Operator = inboundOrder.Modifier,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()