From 6b74e1dcf5642c8f56975471e27780d695953989 Mon Sep 17 00:00:00 2001
From: 陈勇 <竞男@ASUNA>
Date: 星期日, 26 四月 2026 15:48:01 +0800
Subject: [PATCH] 同步代码
---
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs"
index d2f2daf..2ac1ba5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushWorkOrderInfo.cs"
@@ -22,19 +22,35 @@
{
public partial class MESService
{
-
+ /// <summary>
+ /// MES鎺ㄩ�佹秱瑁呭伐鍗�
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
public WebResponseContent pushWorkOrderInfo(object json)
{
WebResponseContent content = new WebResponseContent();
try
{
if (string.IsNullOrEmpty(json.ToString())) throw new Exception("璇锋眰鍙傛暟涓虹┖");
-
- var result = JsonConvert.DeserializeObject<pushWorkOrderInfo>(json.ToString());
+ Console.WriteLine(json);
+ var result = JsonConvert.DeserializeObject<List<pushWorkOrderInfo>>(json.ToString());
var paintingOrderInfos = new List<Dt_PaintingOrderInfo>();
- foreach (var item in result.list)
+ foreach (var item in result)
{
+ //var paintingInfo = _paintingOrderInfoRepository.QueryFirst(x => x.workOrderNo == item.workOrderNo && x.workOrderType == item.workOrderType);
+ //if (null != paintingInfo)
+ //{
+ // paintingInfo.pvi = item.pvi;
+ // paintingInfo.carBodyCharacteristic = item.carBodyCharacteristic;
+ // paintingInfo.twoToneCharacteristic = item.twoToneCharacteristic;
+ // paintingInfo.pbMaterial = item.pbMaterial;
+
+ // _paintingOrderInfoRepository.UpdateData(paintingInfo);
+ //}
+ //else
+ //{
Dt_PaintingOrderInfo paintingOrderInfo = new Dt_PaintingOrderInfo()
{
biwMaterial = item.biwMaterial,
@@ -56,10 +72,10 @@
workOrderType = item.workOrderType,
workshopCode = item.workshopCode,
};
-
paintingOrderInfos.Add(paintingOrderInfo);
}
_paintingOrderInfoRepository.AddData(paintingOrderInfos);
+ //}
LogFactory.GetLog("娑傝宸ュ崟淇℃伅").Info(true, $"\r\r--------------------------------------");
LogFactory.GetLog("娑傝宸ュ崟淇℃伅").Info(true, result.ToJsonString());
@@ -68,7 +84,7 @@
catch (Exception ex)
{
LogFactory.GetLog("娑傝宸ュ崟淇℃伅").Info(true, $"\r\r--------------------------------------");
- LogFactory.GetLog("娑傝宸ュ崟淇℃伅").Info(true, ex.Message);
+ LogFactory.GetLog("娑傝宸ュ崟淇℃伅").Info(true, $"娑傝宸ュ崟鎺ユ敹寮傚父:{ex.Message}");
return content.Error(ex.Message);
}
}
--
Gitblit v1.9.3