From ec15cf34499727cbd0e75be96c9793dd824a06c0 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期三, 12 十一月 2025 10:09:23 +0800
Subject: [PATCH] 提交

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 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/InvokeMESService.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/InvokeMESService.cs"
index e41ddf5..51b35eb 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/InvokeMESService.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/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.Operator,
                                         orderNo = inboundOrder.UpperOrderNo,
                                         status = inboundOrder.OrderStatus,
                                         details = new List<FeedbackInboundDetailsModel>()
@@ -205,7 +215,7 @@
                                            batchNo = group.Key.BatchNo,
                                            lineNo = group.Key.InboundOrderRowNo,
                                            // warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
-                                           warehouseCode = "1072",
+                                           warehouseCode =group.Key.WarehouseCode,
                                            unit = group.Key.Unit,
                                            barcodes = group.Select(row => new FeedbackBarcodesModel
                                            {

--
Gitblit v1.9.3