From aadc2a4fe5e62be74044acbb75549ef08a2d1c5d Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期四, 24 四月 2025 09:40:37 +0800
Subject: [PATCH] 预选，车轴上架记录
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs | 170 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 90 insertions(+), 80 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
index c520dd4..5b67789 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
@@ -14,6 +14,7 @@
using WIDESEA_Common.ZY;
using Autofac.Core;
using NetTaste;
+using AngleSharp.Io;
namespace WIDESEA_StorageBasicService;
@@ -132,104 +133,113 @@
public Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld)
{
- //杩囩泩閲忎笂闄�
- decimal selectionUpperValue = selectionStandards.upperValue;
- //杩囩泩閲忎笅闄�
- decimal selectionLowerValue = selectionStandards.lowerValue;
-
- decimal mesStand = 0;
- string level = string.Empty;
-
-
- if ("left".Equals(wheelsPosition)) //鍖归厤宸﹁疆搴ц疆瀛�
+ try
{
- mesStand = decimal.Parse(CZInfo_Mes.ZLZZJ);
- level = LevelChangeHelper.LevelChangeType(CZInfo_Mes.ZLZDJ);
- wheelsStocks = wheelsStocks.Where(x => x.venderno == level && x.repair_item == newOrOld).ToList();
- }
- else //鍚﹀垯鍖归厤鍙宠疆搴ц疆瀛�
- {
- mesStand = decimal.Parse(CZInfo_Mes.YLZZJ);
- level = LevelChangeHelper.LevelChangeType(CZInfo_Mes.YLZDJ);
- wheelsStocks = wheelsStocks.Where(x => x.venderno == level && x.repair_item == newOrOld).ToList();
- }
- foreach (var item in wheelsStocks)
- {
- string Wheels_gkcc = "";
- string Wheels_gkzja = "";
- string Wheels_gkzjb = "";
- string Wheels_gkzjc = "";
+ //杩囩泩閲忎笂闄�
+ decimal selectionUpperValue = selectionStandards.upperValue;
+ //杩囩泩閲忎笅闄�
+ decimal selectionLowerValue = selectionStandards.lowerValue;
- SaveModel saveModel = new SaveModel();
- saveModel.MainData = new Dictionary<string, object>
+ decimal mesStand = 0;
+ string level = string.Empty;
+
+
+ if ("left".Equals(wheelsPosition)) //鍖归厤宸﹁疆搴ц疆瀛�
+ {
+ mesStand = decimal.Parse(CZInfo_Mes.ZLZZJ);
+ level = LevelChangeHelper.JkChangeType(CZInfo_Mes.YLZDJ);
+ wheelsStocks = wheelsStocks.Where(x => x.venderno== level && x.repair_item == newOrOld).ToList();
+ }
+ else //鍚﹀垯鍖归厤鍙宠疆搴ц疆瀛�
+ {
+ mesStand = decimal.Parse(CZInfo_Mes.YLZZJ);
+ level = LevelChangeHelper.JkChangeType(CZInfo_Mes.YLZDJ);
+
+ wheelsStocks = wheelsStocks.Where(x => x.venderno== level && x.repair_item == newOrOld).ToList();
+ }
+ foreach (var item in wheelsStocks)
+ {
+ string Wheels_gkcc = "";
+ string Wheels_gkzja = "";
+ string Wheels_gkzjb = "";
+ string Wheels_gkzjc = "";
+
+ SaveModel saveModel = new SaveModel();
+ saveModel.MainData = new Dictionary<string, object>
{
{ "cltm", item.wheel_code }
};
- WebResponseContent webResponse= _toZYService.ZY_GetCLInfo(saveModel);
- if (webResponse.Status)
- {
- var dta = JsonConvert.DeserializeObject<CLInfo_ZY>(webResponse.Data.ToString());
-
- Wheels_gkcc = dta.gkcc;
- // 姣傚瓟a鐣岄潰鍧囧��
- Wheels_gkzja = dta.GKZJA;
- //姣傚瓟b鐣岄潰鍧囧��
- Wheels_gkzjb = dta.GKZJB;
- //姣傚瓟c鐣岄潰鍧囧��
- Wheels_gkzjc = dta.GKZJC;
- }
-
- if(Wheels_gkcc !="" && Wheels_gkzja!="" && Wheels_gkzjb !="" && Wheels_gkzjc != "")
- {
- //鏌ュ嚭鏉ュ湪鑼冨洿涔嬪鐨勮繘琛屽垹闄�
- if (mesStand - (decimal.Parse(Wheels_gkcc)) < selectionLowerValue && mesStand - (decimal.Parse(Wheels_gkcc)) > selectionUpperValue)
+ WebResponseContent webResponse = _toZYService.ZY_GetCLInfo(saveModel);
+ if (webResponse.Status)
{
+ CLInfo_ZY data = (CLInfo_ZY)webResponse.Data;
- wheelsStocks.Remove(item);
+ Wheels_gkcc = data.gkcc;
+ // 姣傚瓟a鐣岄潰鍧囧��
+ Wheels_gkzja = data.GKZJA;
+ //姣傚瓟b鐣岄潰鍧囧��
+ Wheels_gkzjb = data.GKZJB;
+ //姣傚瓟c鐣岄潰鍧囧��
+ Wheels_gkzjc = data.GKZJC;
}
- if (selectionStandards.isCantainGK)
+
+ if (Wheels_gkcc != "" && Wheels_gkzja != "" && Wheels_gkzjb != "" && Wheels_gkzjc != "")
{
- //鎴潰杩囩泩閲忎笂闄�
- decimal selectionUpperValue_gk = selectionStandards.upperValue_gk;
- //鎴潰杩囩泩閲忎笅闄�
- decimal selectionLowerValue_gk = selectionStandards.lowerValue_gk;
-
- if ("left".Equals(wheelsPosition))
+ //鏌ュ嚭鏉ュ湪鑼冨洿涔嬪鐨勮繘琛屽垹闄�
+ if (mesStand - (decimal.Parse(Wheels_gkcc)) < selectionLowerValue && mesStand - (decimal.Parse(Wheels_gkcc)) > selectionUpperValue)
{
- decimal ZLZA = decimal.Parse(CZInfo_Mes.ZLZA);
- decimal ZLZB = decimal.Parse(CZInfo_Mes.ZLZB);
- decimal ZLZC = decimal.Parse(CZInfo_Mes.ZLZC);
- //鍒ゆ柇鍙栧弽锛岃繘琛屽垹闄�
- if (ZLZA - (decimal.Parse(Wheels_gkzja)) < selectionLowerValue_gk && ZLZA - (decimal.Parse(Wheels_gkzja)) > selectionUpperValue_gk
- && ZLZB - (decimal.Parse(Wheels_gkzjb)) < selectionLowerValue_gk && ZLZB - (decimal.Parse(Wheels_gkzjb)) > selectionUpperValue_gk
- && ZLZC - (decimal.Parse(Wheels_gkzjc)) < selectionLowerValue_gk && ZLZC - (decimal.Parse(Wheels_gkzjc)) > selectionUpperValue_gk)
+ wheelsStocks.Remove(item);
+ }
+ if (selectionStandards.isCantainGK)
+ {
+ //鎴潰杩囩泩閲忎笂闄�
+ decimal selectionUpperValue_gk = selectionStandards.upperValue_gk;
+ //鎴潰杩囩泩閲忎笅闄�
+ decimal selectionLowerValue_gk = selectionStandards.lowerValue_gk;
+
+ if ("left".Equals(wheelsPosition))
{
- wheelsStocks.Remove(item);
+ decimal ZLZA = decimal.Parse(CZInfo_Mes.ZLZA);
+ decimal ZLZB = decimal.Parse(CZInfo_Mes.ZLZB);
+ decimal ZLZC = decimal.Parse(CZInfo_Mes.ZLZC);
+
+ //鍒ゆ柇鍙栧弽锛岃繘琛屽垹闄�
+ if (ZLZA - (decimal.Parse(Wheels_gkzja)) < selectionLowerValue_gk && ZLZA - (decimal.Parse(Wheels_gkzja)) > selectionUpperValue_gk
+ && ZLZB - (decimal.Parse(Wheels_gkzjb)) < selectionLowerValue_gk && ZLZB - (decimal.Parse(Wheels_gkzjb)) > selectionUpperValue_gk
+ && ZLZC - (decimal.Parse(Wheels_gkzjc)) < selectionLowerValue_gk && ZLZC - (decimal.Parse(Wheels_gkzjc)) > selectionUpperValue_gk)
+ {
+ wheelsStocks.Remove(item);
+ }
+ }
+ else
+ {
+ decimal YLZA = decimal.Parse(CZInfo_Mes.YLZA);
+ decimal YLZB = decimal.Parse(CZInfo_Mes.YLZB);
+ decimal YLZC = decimal.Parse(CZInfo_Mes.YLZC);
+
+ if (YLZA - (decimal.Parse(Wheels_gkzja)) >= selectionLowerValue_gk && YLZA - (decimal.Parse(Wheels_gkzja)) <= selectionUpperValue_gk
+ && YLZB - (decimal.Parse(Wheels_gkzjb)) >= selectionLowerValue_gk && YLZB - (decimal.Parse(Wheels_gkzjb)) <= selectionUpperValue_gk
+ && YLZC - (decimal.Parse(Wheels_gkzjc)) >= selectionLowerValue_gk && YLZC - (decimal.Parse(Wheels_gkzjc)) <= selectionUpperValue_gk)
+ {
+ wheelsStocks.Remove(item);
+ }
+
+
}
}
- else
- {
- decimal YLZA = decimal.Parse(CZInfo_Mes.YLZA);
- decimal YLZB = decimal.Parse(CZInfo_Mes.YLZB);
- decimal YLZC = decimal.Parse(CZInfo_Mes.YLZC);
-
- if (YLZA - (decimal.Parse(Wheels_gkzja)) >= selectionLowerValue_gk && YLZA - (decimal.Parse(Wheels_gkzja)) <= selectionUpperValue_gk
- && YLZB - (decimal.Parse(Wheels_gkzjb)) >= selectionLowerValue_gk && YLZB - (decimal.Parse(Wheels_gkzjb)) <= selectionUpperValue_gk
- && YLZC - (decimal.Parse(Wheels_gkzjc)) >= selectionLowerValue_gk && YLZC - (decimal.Parse(Wheels_gkzjc)) <= selectionUpperValue_gk)
- {
- wheelsStocks.Remove(item);
- }
-
-
- }
}
- }
-
+
+ }
+
+ return wheelsStocks.OrderBy(x => x.dt_ins).FirstOrDefault();
}
+ catch (Exception ex)
+ {
- return wheelsStocks.OrderBy(x => x.dt_ins).FirstOrDefault();
+ throw;
+ }
}
--
Gitblit v1.9.3