From daea1a90c2fa1b5cc2f52e62be15bd95cc4155f6 Mon Sep 17 00:00:00 2001
From: Tiandele <tiandele@hnkhzn.com>
Date: 星期五, 20 三月 2026 17:16:04 +0800
Subject: [PATCH] 优化手动锁车逻辑
---
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs"
index fbd7dda..846e291 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs"
@@ -1,31 +1,64 @@
-锘縰sing System;
+锘縰sing Masuit.Tools;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common;
using WIDESEA_Core;
namespace WIDESEA_StoragIntegrationServices
{
/// <summary>
- /// BDC璇锋眰鐒婅鐗瑰緛涓嬪彂
- /// 鎺ュ彛鎻忚堪: 杞﹁韩杩涘叆BDC鏃讹紝BDC璇诲彇杞﹁韩涓婄殑涓�缁存潯鐮佸悜MES璇锋眰鐒婅鐗瑰緛淇℃伅
+ /// 璁㈠崟銆佸伐鍗曟挙鎺�
+ /// 鎺ュ彛鎻忚堪:閫氱煡BDC娑傝宸ュ崟/鎬昏宸ュ崟/璁㈠崟鎾ゆ帓
+ /// 1- 宸ュ崟/璁㈠崟鎾ゆ帓鏀寔閮ㄥ垎鎾ゆ帓
+ /// 2- 璇曞埗绫诲瀷宸ュ崟/璁㈠崟鎾ゆ帓BDC搴撳凡杩嘊DC03/BDC05宸ュ崟涓嶆敮鎸佹挙鎺�
+ /// 3-闈炶瘯鍒剁被鍨嬪伐鍗�/璁㈠崟鎾ゆ帓涓�鍙ョ粦瀹氱姸鎬侊紝宸插畬鎴愮粦瀹氱殑宸ュ崟/璁㈠崟涓嶆敮鎸佹挙鎺�
+ /// 4-鎬昏宸ュ崟宸叉媺鍔ㄩ攣杞︾殑杞﹁韩宸ュ崟涓嶆敮鎸佹挙鎺�
/// </summary>
public partial class MESService
{
- public WebResponseContent removeWorkOrderInfo(string jsonData)
+ public WebResponseContent removeWorkOrderInfo(object jsonData)
{
WebResponseContent content = new WebResponseContent();
try
- {
+ {
+ if (string.IsNullOrEmpty(jsonData.ToString())) throw new Exception("璇锋眰鍙傛暟涓虹┖");
+ Console.WriteLine(jsonData);
+ var result = JsonConvert.DeserializeObject<List<removeWorkOrderInfo>>(jsonData.ToString());
+ //if (result.plantCode != "1052") throw new Exception("闈炴湰宸ュ巶宸ュ崟/璁㈠崟,鏃犳硶鎺掓挙,璇烽噸璇�");
+ List<removeWorkOrderInfoRespon> removeWorkOrderInfos = new List<removeWorkOrderInfoRespon>();
+ foreach (var item in result)
+ {
+ if (item.workshopCode == "TZ")
+ {
+ var orderinfo = _paintingOrderInfoRepository.QueryFirst(x => x.workOrderNo == item.workOrderNo && x.workOrderType == item.orderType);
+ if (orderinfo == null) throw new Exception($"鏈壘鍒板伐鍗曞彿{item.workOrderNo}宸ュ崟绫诲瀷涓簕item.orderType}鐨勬秱瑁呭伐鍗�");
+ _paintingOrderInfoRepository.DeleteData(orderinfo);
+ }
+ else
+ {
+ var orderinfo = _assemblyOrderInfoRepository.QueryFirst(x => x.workOrderNo == item.workOrderNo && x.orderType == item.orderType);
+ if (orderinfo == null) throw new Exception($"鏈壘鍒板伐鍗曞彿{item.workOrderNo}宸ュ崟绫诲瀷涓簕item.orderType}鐨勬�昏宸ュ崟");
+
+ //if (!string.IsNullOrEmpty(orderinfo.pvi)) throw new Exception($"鎬昏宸ュ崟鍙穥item.workOrderNo}宸叉媺鍔ㄩ攣杞︾殑杞﹁韩宸ュ崟涓嶆敮鎸佹挙鎺�");
+
+ _assemblyOrderInfoRepository.DeleteData(orderinfo);
+ }
+ }
+
+ LogFactory.GetLog("璁㈠崟/宸ュ崟鎺掓挙").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("璁㈠崟/宸ュ崟鎺掓挙").Info(true, result.ToJsonString());
return content.OK();
}
catch (Exception ex)
{
-
- return content.OK(ex.Message);
+ LogFactory.GetLog("璁㈠崟/宸ュ崟鎺掓挙").Info(true, jsonData.ToJsonString());
+ return content.Error($"鎺掓挙澶辫触:{ex.Message}");
}
}
--
Gitblit v1.9.3