From 2eea48595c784d1d6d58d526f1da12427dfa0a25 Mon Sep 17 00:00:00 2001
From: zhengqifeng <zhengqifeng@hnkhzn.com>
Date: 星期二, 30 十二月 2025 14:34:49 +0800
Subject: [PATCH] 1
---
/dev/null | 13 -------------
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/FormulaService.cs | 42 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 41 insertions(+), 14 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 5250084..35c819e 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"
@@ -1,8 +1,10 @@
-锘縰sing System;
+锘縰sing SqlSugar.Extensions;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Model.Models;
@@ -16,5 +18,43 @@
}
public IRepository<Dt_Formula> Repository => BaseDal;
+
+ public override WebResponseContent AddData(SaveModel saveModel)
+ {
+ return base.AddData(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 = 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);
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_BoxingInfoService/BoxingDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_BoxingInfoService/BoxingDetailService.cs"
deleted file mode 100644
index 3d0e580..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_BoxingInfoService/BoxingDetailService.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing WIDESEAWCS_Core.BaseRepository;
-using WIDESEAWCS_Core.BaseServices;
-using WIDESEAWCS_IBoxingInfoService;
-using WIDESEAWCS_Model.Models;
-
-namespace WIDESEAWCS_BoxingInfoService
-{
- public partial class BoxingDetailService : ServiceBase<Dt_BoxingDetail, IRepository<Dt_BoxingDetail>>, IBoxingDetailService
- {
- public IRepository<Dt_BoxingDetail> Repository => BaseDal;
-
- public BoxingDetailService(IRepository<Dt_BoxingDetail> BaseDal) : base(BaseDal)
- {
-
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_BoxingInfoService/BoxingService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_BoxingInfoService/BoxingService.cs"
deleted file mode 100644
index b69d7fa..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_BoxingInfoService/BoxingService.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing WIDESEA_IBoxingInfoService;
-using WIDESEAWCS_Core.BaseRepository;
-using WIDESEAWCS_Core.BaseServices;
-using WIDESEAWCS_Model.Models;
-
-namespace WIDESEA_BoxingInfoService
-{
- public partial class BoxingService : ServiceBase<Dt_Boxing, IRepository<Dt_Boxing>>, IBoxingService
- {
- public IRepository<Dt_Boxing> Repository => BaseDal;
-
- public BoxingService(IRepository<Dt_Boxing> BaseDal) : base(BaseDal)
- {
-
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_BoxingInfoService/WIDESEAWCS_BoxingInfoService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_BoxingInfoService/WIDESEAWCS_BoxingInfoService.csproj"
deleted file mode 100644
index 0c33b03..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_BoxingInfoService/WIDESEAWCS_BoxingInfoService.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_IBoxingInfoService\WIDESEAWCS_IBoxingInfoService.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_IBoxingInfoService/IBoxingDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_IBoxingInfoService/IBoxingDetailService.cs"
deleted file mode 100644
index bc9d90e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_IBoxingInfoService/IBoxingDetailService.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEAWCS_Core.BaseServices;
-using WIDESEAWCS_Model.Models;
-
-namespace WIDESEAWCS_IBoxingInfoService
-{
- public interface IBoxingDetailService : IService<Dt_BoxingDetail>
- {
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_IBoxingInfoService/IBoxingService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_IBoxingInfoService/IBoxingService.cs"
deleted file mode 100644
index 64d5fb0..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_IBoxingInfoService/IBoxingService.cs"
+++ /dev/null
@@ -1,10 +0,0 @@
-锘縰sing WIDESEAWCS_Core.BaseServices;
-using WIDESEAWCS_Model.Models;
-
-namespace WIDESEA_IBoxingInfoService
-{
- public interface IBoxingService : IService<Dt_Boxing>
- {
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_IBoxingInfoService/WIDESEAWCS_IBoxingInfoService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_IBoxingInfoService/WIDESEAWCS_IBoxingInfoService.csproj"
deleted file mode 100644
index b5732c6..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEA_IBoxingInfoService/WIDESEAWCS_IBoxingInfoService.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEAWCS_Model\WIDESEAWCS_Model.csproj" />
- </ItemGroup>
-
-</Project>
--
Gitblit v1.9.3