From 5ae3e9f5a944a887ab022bf1b0a5afdee20af70e Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期六, 22 三月 2025 11:31:06 +0800
Subject: [PATCH] 修改工艺表和工艺接口
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/ProcessServer.cs | 205 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 128 insertions(+), 77 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs"
index a22ef55..3934275 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs"
@@ -1,9 +1,11 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
+using AutoMapper;
using AutoMapper.Configuration.Conventions;
using SqlSugar;
using WIDESEA_ISerialPortRepository;
@@ -22,11 +24,14 @@
private IPutakeRepository _putakeRepository;
private IUnitOfWorkManage _unitOfWorkManage;
private ITorqueOpRepository _torqueOpRepository;
- public ProcessServer(IProcessRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IPutakeRepository putakeRepository, ITorqueOpRepository torqueOpRepository) : base(BaseDal)
+ private readonly IMapper _mapper;
+
+ public ProcessServer(IProcessRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IPutakeRepository putakeRepository, ITorqueOpRepository torqueOpRepository, IMapper mapper) : base(BaseDal)
{
_putakeRepository = putakeRepository;
_unitOfWorkManage = unitOfWorkManage;
_torqueOpRepository = torqueOpRepository;
+ _mapper = mapper;
}
public override PageGridData<Dt_Process> GetPageData(PageDataOptions options)
@@ -39,9 +44,10 @@
return base.GetPageData(options);
}
-
-
- //鑾峰彇濂楃瓛鏁伴噺
+ /// <summary>
+ /// 鑾峰彇濂楃瓛鏁伴噺
+ /// </summary>
+ /// <returns>杩斿洖鐝粍銆佹�绘楠ゃ�佸绛掓暟閲�</returns>
public WebResponseContent GetSleeveandStep()
{
try
@@ -152,115 +158,160 @@
{
try
{
- var allProcesses = BaseDal.QueryData().OrderBy(x => x.SetpNum).ToList(); // 鎸� setnum 鎺掑簭
+ var allProcesses = BaseDal.QueryData().OrderBy(x => x.SetpNum).ToList(); // 鎸� SetpNum 鎺掑簭
+ Dt_Process proces = _mapper.Map<Dt_Process>(addProcessDTO);
- if (addProcessDTO.id == 0) // 娣诲姞
+ #region 娣诲姞
+ if (addProcessDTO.CraftID == 0) // 娣诲姞
{
- // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄧ浉鍚岀殑 setnum
- if (allProcesses.Any(x => x.SetpNum == addProcessDTO.setpNum && x.CraftType == addProcessDTO.craftstype))
- {
- return new WebResponseContent { Status = false, Message = $"姝ラ {addProcessDTO.setpNum} 宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�" };
- }
+ //// 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄧ浉鍚岀殑 SetpNum
+ //if (allProcesses.Any(x => x.SetpNum == addProcessDTO.setpNum && x.CraftType == addProcessDTO.craftstype))
+ //{
+ // return new WebResponseContent { Status = false, Message = $"姝ラ {addProcessDTO.setpNum} 宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�" };
+ //}
+
+ //// 闇�瑕佽皟鏁村悗缁楠ょ殑搴忓彿
+ //foreach (var process in allProcesses.Where(x => x.SetpNum >= addProcessDTO.setpNum))
+ //{
+ // process.SetpNum++; // 鍚庣Щ涓�浣�
+ // BaseDal.UpdateData(process);
+ //}
// 闇�瑕佽皟鏁村悗缁楠ょ殑搴忓彿
- foreach (var process in allProcesses.Where(x => x.SetpNum >= addProcessDTO.setpNum))
- {
- process.SetpNum++; // 鍚庣Щ涓�浣�
- BaseDal.UpdateData(process);
- }
-
- // 鍒涘缓鏂板伐鑹烘楠�
- var proces = new Dt_Process
- {
- Nodal=addProcessDTO.Nodal,
- SetpNum = addProcessDTO.setpNum,
- CraftType = addProcessDTO.craftstype,
- CraftsStep = addProcessDTO.craftsstep,
- CraftContent = addProcessDTO.craftcontent,
- Tools = addProcessDTO.tools,
- Material = addProcessDTO.material,
- ArticleOneid = addProcessDTO.aritcleoneid,
- ArticleOne = addProcessDTO.articleone,
- ArticleTowid = addProcessDTO.aritcletowid,
- ArticleTwo = addProcessDTO.articletwo,
- CreateDate = DateTime.Now,
- //涓虹┖灏辨槸0锛屼笉涓虹┖灏辨槸1
- TorqueSum = (string.IsNullOrEmpty(addProcessDTO.articleone) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.articletwo) ? 0 : 1)
- };
-
+ var processList = allProcesses.Where(x => x.SetpNum >= addProcessDTO.SetpNum).ToList();
+ if (processList != null)
+ {
+ for (int i = 0; i < processList.Count; i++)
+ {
+ processList[i].SetpNum += 1;
+ }
+ }
+
+ // 鍒涘缓鏂板伐鑹烘楠�
+
+ proces.TorqueSum = (string.IsNullOrEmpty(addProcessDTO.ArticleOne) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.ArticleTwo) ? 0 : 1);
+ proces.CreateDate = DateTime.Now;
+
+ //var proces = new Dt_Process
+ //{
+ // Nodal = addProcessDTO.Nodal,
+ // SetpNum = addProcessDTO.setpNum,
+ // CraftType = addProcessDTO.craftstype,
+ // CraftsStep = addProcessDTO.craftsstep,
+ // CraftContent = addProcessDTO.craftcontent,
+ // Tools = addProcessDTO.tools,
+ // Material = addProcessDTO.material,
+ // ArticleOneid = addProcessDTO.aritcleoneid,
+ // ArticleOne = addProcessDTO.articleone,
+ // ArticleTowid = addProcessDTO.aritcletowid,
+ // ArticleTwo = addProcessDTO.articletwo,
+ // CreateDate = DateTime.Now,
+ // PointAxisXYZ = addProcessDTO.PointAxisXYZ,
+ // PointAxisHPB = addProcessDTO.PointAxisHPB,
+ // //涓虹┖灏辨槸0锛屼笉涓虹┖灏辨槸1
+ // TorqueSum = (string.IsNullOrEmpty(addProcessDTO.articleone) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.articletwo) ? 0 : 1)
+ //};
+
+ _unitOfWorkManage.BeginTran();
BaseDal.AddData(proces);
+ BaseDal.UpdateData(processList);
+ _unitOfWorkManage.CommitTran();
return new WebResponseContent { Status = true, Data = proces };
}
+ #endregion
+ #region 淇敼
else // 鏇存柊
{
- var existingProcess = allProcesses.FirstOrDefault(x => x.CraftID == addProcessDTO.id);
+ var existingProcess = allProcesses.FirstOrDefault(x => x.CraftID == addProcessDTO.CraftID);
if (existingProcess == null)
{
return new WebResponseContent { Status = false, Message = "鏈壘鍒拌宸ヨ壓姝ラ锛屾棤娉曟洿鏂帮紒" };
}
int oldSetNum = existingProcess.SetpNum;
- int newSetNum = addProcessDTO.setpNum;
+ int newSetNum = addProcessDTO.SetpNum;
- if (oldSetNum == newSetNum) // 濡傛灉娌℃敼椤哄簭锛岀洿鎺ユ洿鏂板叾浠栧唴瀹�
+ if (existingProcess.SetpNum == addProcessDTO.SetpNum) // 濡傛灉娌℃敼椤哄簭锛岀洿鎺ユ洿鏂板叾浠栧唴瀹�
{
- existingProcess.Nodal = addProcessDTO.Nodal;
- existingProcess.CraftType = addProcessDTO.craftstype;
- existingProcess.CraftsStep = addProcessDTO.craftsstep;
- existingProcess.CraftContent = addProcessDTO.craftcontent;
- existingProcess.Tools = addProcessDTO.tools;
- existingProcess.Material = addProcessDTO.material;
- existingProcess.ArticleOneid = addProcessDTO.aritcleoneid;
- existingProcess.ArticleOne = addProcessDTO.articleone;
- existingProcess.ArticleTowid = addProcessDTO.aritcletowid;
- existingProcess.ArticleTwo = addProcessDTO.articletwo;
- existingProcess.CreateDate = DateTime.Now;
- existingProcess.TorqueSum = (string.IsNullOrEmpty(addProcessDTO.articleone) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.articletwo) ? 0 : 1);
+ proces.TorqueSum = (string.IsNullOrEmpty(addProcessDTO.ArticleOne) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.ArticleTwo) ? 0 : 1);
+ proces.ModifyDate = DateTime.Now;
- BaseDal.UpdateData(existingProcess);
- return new WebResponseContent { Status = true, Data = existingProcess };
+ //existingProcess.Nodal = addProcessDTO.Nodal;
+ //existingProcess.CraftType = addProcessDTO.craftstype;
+ //existingProcess.CraftsStep = addProcessDTO.craftsstep;
+ //existingProcess.CraftContent = addProcessDTO.craftcontent;
+ //existingProcess.Tools = addProcessDTO.tools;
+ //existingProcess.Material = addProcessDTO.material;
+ //existingProcess.ArticleOneid = addProcessDTO.aritcleoneid;
+ //existingProcess.ArticleOne = addProcessDTO.articleone;
+ //existingProcess.ArticleTowid = addProcessDTO.aritcletowid;
+ //existingProcess.ArticleTwo = addProcessDTO.articletwo;
+ //existingProcess.CreateDate = DateTime.Now;
+ //existingProcess.TorqueSum = (string.IsNullOrEmpty(addProcessDTO.articleone) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.articletwo) ? 0 : 1);
+
+ BaseDal.UpdateData(proces);
+ return new WebResponseContent { Status = true, Data = proces };
}
// 鏇存柊 TorqueSum
-
-
-
// 璋冩暣椤哄簭
if (newSetNum < oldSetNum) // 鍚戝墠绉诲姩锛屽悗缁暟鎹線鍚庣Щ
{
- foreach (var process in allProcesses.Where(x => x.SetpNum >= newSetNum && x.SetpNum < oldSetNum))
+ var processList = allProcesses.Where(x => x.SetpNum >= newSetNum && x.SetpNum < oldSetNum).ToList();
+
+ for (int i = 0; i < processList.Count; i++)
{
- process.SetpNum++; // 鍚庣Щ涓�浣�
- BaseDal.UpdateData(process);
+ processList[i].SetpNum += 1;
}
+
+ BaseDal.UpdateData(processList);
+ //foreach (var process in allProcesses.Where(x => x.SetpNum >= newSetNum && x.SetpNum < oldSetNum))
+ //{
+ // process.SetpNum++; // 鍚庣Щ涓�浣�
+ // BaseDal.UpdateData(process);
+ //}
}
else if (newSetNum > oldSetNum) // 鍚戝悗绉诲姩锛屽墠闈㈡暟鎹線鍓嶇Щ
{
- foreach (var process in allProcesses.Where(x => x.SetpNum > oldSetNum && x.SetpNum <= newSetNum))
+ var processList = allProcesses.Where(x => x.SetpNum > oldSetNum && x.SetpNum <= newSetNum).ToList();
+
+ for (int i = 0; i < processList.Count; i++)
{
- process.SetpNum--; // 鍓嶇Щ涓�浣�
- BaseDal.UpdateData(process);
+ processList[i].SetpNum -= 1;
}
+
+ BaseDal.UpdateData(processList);
+
+ //foreach (var process in allProcesses.Where(x => x.SetpNum > oldSetNum && x.SetpNum <= newSetNum))
+ //{
+ // process.SetpNum--; // 鍓嶇Щ涓�浣�
+ // BaseDal.UpdateData(process);
+ //}
}
- // 鏇存柊褰撳墠姝ラ鐨勬柊搴忓彿
- existingProcess.SetpNum = newSetNum;
- existingProcess.Nodal = addProcessDTO.Nodal;
- existingProcess.CraftType = addProcessDTO.craftstype;
- existingProcess.CraftsStep = addProcessDTO.craftsstep;
- existingProcess.CraftContent = addProcessDTO.craftcontent;
- existingProcess.Tools = addProcessDTO.tools;
- existingProcess.Material = addProcessDTO.material;
- existingProcess.ArticleOneid = addProcessDTO.aritcleoneid;
- existingProcess.ArticleOne = addProcessDTO.articleone;
- existingProcess.ArticleTowid = addProcessDTO.aritcletowid;
- existingProcess.ArticleTwo = addProcessDTO.articletwo;
- existingProcess.CreateDate = DateTime.Now;
+ proces.SetpNum = newSetNum;
+ proces.TorqueSum = (string.IsNullOrEmpty(addProcessDTO.ArticleOne) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.ArticleTwo) ? 0 : 1);
+ proces.ModifyDate = DateTime.Now;
- BaseDal.UpdateData(existingProcess);
- return new WebResponseContent { Status = true, Data = existingProcess };
+ //// 鏇存柊褰撳墠姝ラ鐨勬柊搴忓彿
+ //existingProcess.SetpNum = newSetNum;
+ //existingProcess.Nodal = addProcessDTO.Nodal;
+ //existingProcess.CraftType = addProcessDTO.craftstype;
+ //existingProcess.CraftsStep = addProcessDTO.craftsstep;
+ //existingProcess.CraftContent = addProcessDTO.craftcontent;
+ //existingProcess.Tools = addProcessDTO.tools;
+ //existingProcess.Material = addProcessDTO.material;
+ //existingProcess.ArticleOneid = addProcessDTO.aritcleoneid;
+ //existingProcess.ArticleOne = addProcessDTO.articleone;
+ //existingProcess.ArticleTowid = addProcessDTO.aritcletowid;
+ //existingProcess.ArticleTwo = addProcessDTO.articletwo;
+ //existingProcess.CreateDate = DateTime.Now;
+
+ BaseDal.UpdateData(proces);
+ return new WebResponseContent { Status = true, Data = proces };
}
+ #endregion
}
catch (Exception ex)
{
--
Gitblit v1.9.3