From b784d019c3848718eb95eb0d34dde34c6a262b06 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 13 四月 2026 11:14:18 +0800
Subject: [PATCH] 组盘表添加供方代码
---
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/FormulaService.cs | 80 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 29 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..69e0a57 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"
@@ -24,37 +24,59 @@
return base.AddData(saveModel);
}
- public override WebResponseContent UpdateData(SaveModel saveModel)
+ //public override WebResponseContent UpdateData(SaveModel saveModel)
+ //{
+ // Dt_Formula dt_Formula = new Dt_Formula()
+ // {
+ // Id = saveModel.MainData["id"].ObjToInt(),
+ // ProductCode = saveModel.MainData["productCode"].ToString(),
+ // ProductName = saveModel.MainData["productName"].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(),
+ // P0P1Width = decimal.Parse(saveModel.MainData["p0P1Width"].ToString()),
+ // P0P2Width = decimal.Parse(saveModel.MainData["p0P2Width"].ToString()),
+ // P0P3Width = decimal.Parse(saveModel.MainData["p0P3Width"].ToString()),
+ // P1P3Height = decimal.Parse(saveModel.MainData["p1P3Height"].ToString()),
+ // P2P3Height = decimal.Parse(saveModel.MainData["p2P3Height"].ToString()),
+
+ // //ScrewTorque = float.Parse(saveModel.MainData["ScrewTorque"].ToString()),
+ // //UpdateBy = saveModel.UpdateBy,
+ // //UpdateTime = DateTime.Now
+ // };
+ // return UpdateData(dt_Formula);
+ // //return base.UpdateData(saveModel);
+ //}
+
+ //public override WebResponseContent UpdateData(Dt_Formula entity)
+ //{
+ // return base.UpdateData(entity);
+ //}
+
+
+ /// <summary>
+ /// 鑾峰彇绔欏彴鎴愬搧
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent getEndProductList()
{
- Dt_Formula dt_Formula=new Dt_Formula()
+ try
{
- 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()),
- 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())
-
- //ScrewTorque = float.Parse(saveModel.MainData["ScrewTorque"].ToString()),
- //UpdateBy = saveModel.UpdateBy,
- //UpdateTime = DateTime.Now
- };
- return UpdateData(dt_Formula);
- //return base.UpdateData(saveModel);
- }
-
- public override WebResponseContent UpdateData(Dt_Formula entity)
- {
- return base.UpdateData(entity);
+ 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