From ba8aa925e7901381ceb394adb53eca8723d1c4c5 Mon Sep 17 00:00:00 2001
From: leiqunqing <zhengqifeng@hnkhzn.com>
Date: 星期一, 19 一月 2026 11:05:49 +0800
Subject: [PATCH] 完善工位界面
---
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/FormulaService.cs | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/FormulaService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/FormulaService.cs"
index 35c819e..200ea66 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/FormulaService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/FormulaService.cs"
@@ -31,18 +31,18 @@
Id = saveModel.MainData["id"].ObjToInt(),
ProductCode = saveModel.MainData["productCode"].ToString(),
ProductName = saveModel.MainData["productName"].ToString(),
- ProductLength = float.Parse(saveModel.MainData["productLength"].ToString()),
- ProductWidth = float.Parse(saveModel.MainData["productWidth"].ToString()),
- ProductHeight = float.Parse(saveModel.MainData["productHeight"].ToString()),
- ScrewDownsetDistance = float.Parse(saveModel.MainData["screwDownsetDistance"].ToString()),
- ScrewTorqueOutput = float.Parse(saveModel.MainData["screwTorqueOutput"].ToString()),
+ ProductLength = decimal.Parse(saveModel.MainData["productLength"].ToString()),
+ ProductWidth = decimal.Parse(saveModel.MainData["productWidth"].ToString()),
+ ProductHeight = decimal.Parse(saveModel.MainData["productHeight"].ToString()),
+ ScrewDownsetDistance = decimal.Parse(saveModel.MainData["screwDownsetDistance"].ToString()),
+ ScrewTorqueOutput = decimal.Parse(saveModel.MainData["screwTorqueOutput"].ToString()),
DintAutoScrewOn = saveModel.MainData["dintAutoScrewOn"].ObjToInt(),
- XDirectionDistance1 = float.Parse(saveModel.MainData["xDirectionDistance1"].ToString()),
- YDirectionHeight1 = float.Parse(saveModel.MainData["yDirectionHeight1"].ToString()),
- XDirectionDistance2 = float.Parse(saveModel.MainData["xDirectionDistance2"].ToString()),
- YDirectionHeight2 = float.Parse(saveModel.MainData["yDirectionHeight2"].ToString()),
- XDirectionDistance3 = float.Parse(saveModel.MainData["xDirectionDistance3"].ToString()),
- YDirectionHeight3 = float.Parse(saveModel.MainData["yDirectionHeight3"].ToString())
+ XDirectionDistance1 = decimal.Parse(saveModel.MainData["xDirectionDistance1"].ToString()),
+ YDirectionHeight1 = decimal.Parse(saveModel.MainData["yDirectionHeight1"].ToString()),
+ XDirectionDistance2 = decimal.Parse(saveModel.MainData["xDirectionDistance2"].ToString()),
+ YDirectionHeight2 = decimal.Parse(saveModel.MainData["yDirectionHeight2"].ToString()),
+ XDirectionDistance3 = decimal.Parse(saveModel.MainData["xDirectionDistance3"].ToString()),
+ YDirectionHeight3 = decimal.Parse(saveModel.MainData["yDirectionHeight3"].ToString())
//ScrewTorque = float.Parse(saveModel.MainData["ScrewTorque"].ToString()),
//UpdateBy = saveModel.UpdateBy,
@@ -56,5 +56,28 @@
{
return base.UpdateData(entity);
}
+
+
+ /// <summary>
+ /// 鑾峰彇绔欏彴鎴愬搧
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent getEndProductList()
+ {
+ try
+ {
+ List<Dt_Formula> dt_Formulas = BaseDal.QueryData(x => 1 == 1);
+ var resultList = dt_Formulas.Select(item => new
+ {
+ key = item.ProductCode,
+ value = item.ProductCode
+ }).ToList();
+ return WebResponseContent.Instance.OK("鏌ヨ绔欏彴鎴愬搧鎴愬姛", resultList);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"鏌ヨ绔欏彴鎴愬搧澶辫触锛歿ex.Message}");
+ }
+ }
}
}
--
Gitblit v1.9.3