using MES.Service.DB;
|
using MES.Service.Dto.service;
|
using MES.Service.Modes;
|
using MES.Service.util;
|
using Newtonsoft.Json.Linq;
|
using SqlSugar;
|
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
|
|
namespace MES.Service.service.QC;
|
|
public class XJService
|
{
|
private static readonly OracleSQLHelper SQLHelper = new();
|
|
private readonly BaseService _baseService = new();
|
|
|
private readonly string[] statusArray = ["开工", "待开工","已开工" ,"未开工"];
|
|
//生成最新的检验单号
|
public string getMaxReleaseNo()
|
{
|
var sql =
|
string.Format(
|
"select max(RELEASE_NO) from QS_QA_ITEM_XJ where RELEASE_NO like 'XJN%' and to_char(CREATE_DATE,'yyyy-mm-dd') = '{0}'",
|
DateTime.Now.ToString("yyyy-MM-dd"));
|
|
var executeScalar = SQLHelper.ExecuteScalar(sql);
|
var date = DateTime.Now.ToString("yyMMdd");
|
var number = "0001";
|
var olReleaseNo = executeScalar.ToString();
|
//判断今天是否生成了巡检单
|
if (string.IsNullOrEmpty(olReleaseNo)) return "XJN" + date + number;
|
//截取后四位的流水号累加
|
var substring = Convert.ToInt32(olReleaseNo.Substring(10));
|
substring += 1;
|
number = substring.ToString("D4");
|
|
//如果为空直接返回0001
|
return "XJN" + date + number;
|
}
|
|
public class DaaInfoDto
|
{
|
public decimal? Id { get; set; }
|
public string Daa001 { get; set; }
|
public string? Daa003 { get; set; }
|
public string? Daa004 { get; set; }
|
public decimal? Daa008 { get; set; }
|
public string? Daa015 { get; set; }
|
public string? Daa020 { get; set; }
|
public string? ItemNo { get; set; } // 来自关联表
|
public string? ItemName { get; set; }
|
}
|
|
public List<DaaInfoDto> getItem(string daa001)
|
{
|
var db = SqlSugarHelper.GetInstance();
|
|
//in的写法 https://www.donet5.com/Home/Doc?typeId=1187
|
|
return db.Queryable<Womdaa,MesItems>((a, b) => new JoinQueryInfos(
|
JoinType.Inner, a.Daa002 == b.Id.ToString()))
|
.Where(a =>
|
a.Daa001 == daa001 &&
|
statusArray.Contains(a.Daa018))
|
.Select((a, b) => new DaaInfoDto
|
{
|
Daa001= daa001,
|
Daa003=a.Daa003,
|
Daa004=a.Daa004,
|
Daa008=a.Daa008,
|
Daa015=a.Daa015,
|
Daa020=a.Daa020,
|
ItemNo=b.ItemNo,
|
ItemName = b.ItemName,
|
Id =a.Id
|
})
|
.ToList();
|
}
|
|
public List<QCUserLine> getLineAll(string UserNo)
|
{
|
var db = SqlSugarHelper.GetInstance();
|
|
return db.Queryable<QCUserLine>()
|
.Where(a => a.UserCode == UserNo)
|
.Select(a => new QCUserLine
|
{
|
LineNo = a.LineNo,
|
LineName = a.LineName
|
}).OrderBy("LINENO").ToList();
|
}
|
|
|
|
public List<Womdaa> getDaa001(JObject data)
|
{
|
var daa020 = data["daa020"]?.ToString();
|
var item = data["item"]?.ToString();
|
|
var db = SqlSugarHelper.GetInstance();
|
return db.Queryable<Womdaa, MesItems>((a, b) =>
|
new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
|
.WhereIF(!string.IsNullOrEmpty(daa020), (a, b) => a.Daa015 == daa020)
|
.WhereIF(!string.IsNullOrEmpty(item), (a, b) => b.ItemNo == item)
|
.Where((a, b) => statusArray.Contains(a.Daa018))
|
.Select<Womdaa>(a => new Womdaa
|
{
|
Id = a.Id,
|
Daa001 = a.Daa001,
|
Daa003 = a.Daa003,
|
Daa008 = a.Daa008
|
}).ToList();
|
}
|
|
public List<MesItems> getBoardItem(string lineNo)
|
{
|
var db = SqlSugarHelper.GetInstance();
|
return db.Queryable<Womdaa, MesItems>((a, b) =>
|
new JoinQueryInfos(JoinType.Inner, a.Daa002 == b.Id.ToString()))
|
.Where((a, b) => statusArray.Contains(a.Daa018) &&
|
a.Daa015 == lineNo)
|
.OrderBy((a, b) => b.ItemName)
|
.Select<MesItems>((a, b) =>
|
new MesItems
|
{
|
Id = b.Id,
|
ItemNo = b.ItemNo,
|
ItemName = b.ItemName,
|
ItemModel = b.ItemModel
|
}).ToList();
|
}
|
|
public List<string?> GetItemProj(string? itemNo)
|
{ //获取物料所有的检验计划名称
|
|
var db = SqlSugarHelper.GetInstance();
|
|
var plans = db.Queryable<MesQa>().Where(a => a.ItemNo == itemNo && a.QsType == "2")
|
.Select(s => s.QaPlan)
|
.Distinct()
|
.ToList();
|
|
return plans;
|
}
|
|
public (List<QsQaItemXj> items, int totalCount) getPage(
|
XJPageResult queryObj)
|
{
|
var db = SqlSugarHelper.GetInstance();
|
|
int totalCount = 0;
|
|
var id = Convert.ToDecimal(queryObj.id);
|
|
string[]? lineNo = null;
|
|
//if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
|
// lineNo = _baseService.getUserLineNo(queryObj.createUser);
|
|
var query = db
|
.Queryable<QsQaItemXj, Womdaa, MesLine,
|
MesItems, SysUser,Womcaa,SysDepartment, MesUserDepartmentQc,MesItems>((s, a, c, b, us,ca,d,dq,i) =>
|
new JoinQueryInfos(
|
JoinType.Inner, s.BillNo == a.Daa001,
|
JoinType.Left, a.Daa015 == c.LineNo,
|
JoinType.Left, s.ItemId == b.Id,
|
JoinType.Left, us.Fcode == s.CreateBy,
|
JoinType.Left, ca.Caa020 == a.Daa021,
|
JoinType.Left, d.Departmentcode == c.Departmentcode,
|
JoinType.Left, dq.Departmentcode == d.Departmentcode,//查询用户权限
|
JoinType.Left, i.Id == Convert.ToDecimal(a.Daa002)
|
)
|
)
|
//.WhereIF(lineNo != null && lineNo.Length > 0,
|
// (s, a, c, b) => lineNo.Contains(c.LineNo))
|
.WhereIF(
|
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
|
"未完成".Equals(queryObj.result),
|
(s, a, c, b, us) =>
|
s.SubmitStatus == 0 || s.SubmitStatus == null)
|
.WhereIF(
|
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
|
!"未完成".Equals(queryObj.result),
|
(s, a, c, b, us) => s.SubmitStatus == 1)
|
.WhereIF(id > 0, (s, a, c, b, us,ca) => s.Id == id)
|
.WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
|
(s, a, c, b, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser)
|
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
|
(s, a, c, b, us, ca, d, dq,i) =>
|
s.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
|
i.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
|
ca.Caa015.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
|
i.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
|
.Select((s, a, c, b, us,ca,d) => new QsQaItemXj
|
{
|
Daa020 = c.LineNo,
|
Id = s.Id,
|
PlanQty = a.Daa008,
|
LineName = c.LineName,
|
CreateUser = us.Fname,
|
CreateBy = s.CreateBy,
|
CreateDate = s.CreateDate,
|
ReleaseNo = s.ReleaseNo,
|
ItemNo = s.ItemNo,
|
BillNo = s.BillNo,
|
ItemName = b.ItemName,
|
ItemModel = b.ItemModel,
|
CheckBy = s.CheckBy,
|
CheckResult = s.CheckResult,
|
Remarks = s.Remarks,
|
SaleOrder = ca.Caa015,
|
DepartName = d.Departmentname,
|
PlanName = s.PlanName
|
|
}).OrderBy(s => s.CreateDate, OrderByType.Desc);
|
var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
|
ref totalCount);
|
|
return (items, totalCount);
|
}
|
|
|
public List<QsQaItemXj01> setJYItem(string itemNo, string planName)
|
{
|
var db = SqlSugarHelper.GetInstance();
|
|
var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
|
&& s.ItemNo == itemNo && s.Fsubmit == 1 && s.QaPlan == planName).Count();
|
|
if (count <= 0) return new List<QsQaItemXj01>();
|
|
decimal? QsId = db.Queryable<MesQa>()
|
.Where(s => s.QsType == "2"
|
&& s.ItemNo == itemNo
|
&& s.QaPlan == planName
|
&& s.Fsubmit == 1)
|
.Select(s => s.Id)
|
.First();
|
|
return db
|
.Queryable<MesQualityStandard>()
|
.Where(b => b.Pid== QsId).Select(b => new QsQaItemXj01
|
{
|
ProjName = b.ProjName,
|
ItemMod = b.ItemMod,
|
InspectionMethod = b.InspectionMethod,
|
UsingInstruments = b.UsingInstruments,
|
LevelNum = SqlFunc.IsNull(
|
SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
|
b.InspectionLevel),
|
MaxValue = b.MaxValue,
|
StandardValue = b.StandardValue,
|
MinValue = b.MinValue,
|
Notes = b.Notes,
|
FcheckLevel = b.FcheckLevel,
|
FacLevel = b.FacLevel,
|
QsCode = b.QsCode,
|
QsName = b.QsName,
|
result = "未检测",
|
isCheck = 0,
|
Picture = b.Picture,
|
Picturename = b.Picturename
|
}).ToList();
|
}
|
|
public List<QsQaItemXj01> getJYItem(decimal? pid, decimal? id)
|
{
|
var db = SqlSugarHelper.GetInstance();
|
var qsQaItemXj01s = db.Queryable<QsQaItemXj01>()
|
.WhereIF(pid > 0, a => a.Pid == pid)
|
.WhereIF(id > 0, a => a.Id == id)
|
.ToList();
|
|
var array = qsQaItemXj01s.Select(s => s.Id).ToArray();
|
var qsQaItemDetails = db.Queryable<QsQaItemXj02>()
|
.Where(s => array.Contains(s.Pid))
|
.GroupBy(s => s.Pid)
|
.Select(s => new
|
{
|
s.Pid,
|
count = SqlFunc.AggregateCount(s.Id)
|
}).ToList();
|
|
qsQaItemXj01s.ForEach(s =>
|
{
|
var find = qsQaItemDetails.Find(a => s.Id == a.Pid);
|
if (find == null)
|
{
|
s.isCheck = 0;
|
s.result = "未完成";
|
}
|
else
|
{
|
s.isCheck = find.count;
|
if (find.count == s.LevelNum && s.IsPass == 1)
|
s.result = "合格";
|
else if (find.count == s.LevelNum && s.IsPass == 0)
|
s.result = "不合格";
|
else
|
s.result = "未完成";
|
}
|
|
//过滤出图片id不为空的数据转为base64
|
if (s.Picture is { Length: > 0 })
|
s.imageData = Convert.ToBase64String(s.Picture);
|
});
|
|
//排序，未完成的排在前面
|
qsQaItemXj01s = qsQaItemXj01s.OrderBy(s => s.isCheck).ToList();
|
|
return qsQaItemXj01s;
|
}
|
|
|
public int save(XJDto xjDto)
|
{
|
var xj = xjDto.from;
|
var items = xjDto.items;
|
var userNo = xjDto.userNo;
|
|
SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
var commit = 0;
|
|
xj.CreateBy = userNo;
|
xj.CreateDate = DateTime.Now;
|
|
var pid = db.Insertable(xj).ExecuteReturnIdentity();
|
|
xj.Id = pid;
|
|
xjDto.gid = pid;
|
|
foreach (var item in items) item.Pid = pid;
|
|
commit += db.Insertable(items).ExecuteCommand();
|
|
return commit;
|
});
|
|
xjDto.items = getJYItem(xj.Id, null);
|
|
xjDto.items.ForEach(s =>
|
{
|
if (s.MaxValue != null || s.StandardValue != null ||
|
s.MinValue != null) return;
|
var detail = new QsQaItemXj02();
|
detail.Pid = s.Id;
|
detail.Gid = xjDto.gid;
|
detail.Fstand = "√";
|
detail.FcheckResu = "1";
|
detail.UpdateBy = xjDto.userNo;
|
detail.count = (int?)s.LevelNum;
|
SetQSItemDetail(detail);
|
});
|
|
return Convert.ToInt32(xj.Id);
|
}
|
|
public bool XJQaSubmit(LLJDto rkjDto)
|
{
|
var useTransactionWithOracle =
|
SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
return db.Updateable<QsQaItemXj>()
|
.SetColumns(s => s.SubmitStatus == 1)
|
.SetColumns(s => s.SubmitBy == rkjDto.userNo)
|
.SetColumns(s => s.SubmitDate == DateTime.Now)
|
.Where(s => s.Id == rkjDto.gid)
|
.ExecuteCommand();
|
});
|
|
var db = SqlSugarHelper.GetInstance();
|
// 创建参数
|
var FID = new SugarParameter("P_ID", rkjDto.gid);
|
|
|
var FRes = new SugarParameter("c_result", null, true); // 输出参数
|
var FMsg = new SugarParameter("c_msg", null, true);
|
|
// 执行存储过程
|
db.Ado.UseStoredProcedure().GetDataTable("PRC_XJ_UPDATE_RES_JK", FID, FRes, FMsg);
|
|
int result = int.Parse((string)FRes.Value);
|
string message = FMsg.Value == DBNull.Value ? string.Empty : (string)FMsg.Value;
|
if (result == 1)
|
{
|
//存储过程失败则事务进行回滚
|
//db.Ado.RollbackTran();
|
throw new Exception(message);
|
}
|
|
|
return useTransactionWithOracle > 0;
|
}
|
|
// public int saveItem(XJDto xjDto)
|
// {
|
// var items = xjDto.items;
|
// var userNo = xjDto.userNo;
|
//
|
// SqlSugarHelper.UseTransactionWithOracle(db =>
|
// {
|
// foreach (var item in items) item.Pid = xjDto.gid;
|
//
|
// return db.Insertable(items).ExecuteCommand();
|
// });
|
//
|
// xjDto.items = getJYItem(xjDto.gid, null);
|
//
|
// xjDto.items.ForEach(s =>
|
// {
|
// if (s.MaxValue != null || s.StandardValue != null ||
|
// s.MinValue != null) return;
|
// var detail = new QsQaItemXj02();
|
// detail.Pid = s.Id;
|
// detail.Gid = xjDto.gid;
|
// detail.Fstand = "√";
|
// detail.FcheckResu = "1";
|
// detail.UpdateBy = xjDto.userNo;
|
// detail.count = (int?)s.LevelNum;
|
// SetQSItemDetail(detail);
|
// });
|
//
|
// return Convert.ToInt32(xjDto.gid);
|
// }
|
public int saveItem(XJDto xjDto)
|
{
|
var items = xjDto.items;
|
var userNo = xjDto.userNo;
|
|
var db = SqlSugarHelper.GetInstance();
|
|
var del = db.Deleteable<QsQaItemXj01>()
|
.Where(s => s.Pid == xjDto.gid)
|
.ExecuteCommand();
|
|
//QsItemIpiItemDetail
|
var del1 = db.Deleteable<QsQaItemXj02>()
|
.Where(s => s.Gid == xjDto.gid)
|
.ExecuteCommand();
|
|
// 数据验证
|
var validationResult = ValidateItemsData(items);
|
if (!validationResult.isValid)
|
throw new Exception($"检验项目验证失败: {validationResult.errorMsg}");
|
|
return SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
// 设置外键关联并批量插入子表
|
foreach (var item in items) item.Pid = xjDto.gid;
|
db.Insertable(items).ExecuteCommand();
|
|
// 获取检验项目数据
|
var jyItems = getJYItemOptimized(db, xjDto.gid.Value);
|
|
if (jyItems.Any())
|
{
|
// 处理业务逻辑计算
|
var allDetails =
|
PrepareDetailsData(jyItems, xjDto.gid.Value, userNo);
|
|
if (allDetails.Count > 0)
|
{
|
// 批量插入检验详情
|
db.Insertable(allDetails).ExecuteCommand();
|
|
// 计算结果
|
var (pidResults, fcheckResu) =
|
CalculateResults(allDetails, jyItems);
|
|
// 批量更新检验项目结果
|
foreach (var (pidValue, result) in pidResults)
|
{
|
db.Updateable<QsQaItemXj01>()
|
.SetColumns(s => s.IsPass == result)
|
.Where(s => s.Id == pidValue)
|
.ExecuteCommand();
|
}
|
|
// 更新主表检验结果
|
var totalSum = jyItems.Where(x =>
|
x.MaxValue == null && x.StandardValue == null &&
|
x.MinValue == null)
|
.Sum(x => x.LevelNum);
|
if (totalSum == allDetails.Count)
|
{
|
db.Updateable<QsQaItemXj>()
|
.SetColumns(s => s.CheckResult == fcheckResu)
|
.SetColumns(s => s.CheckDate == DateTime.Now)
|
.SetColumns(s => s.CheckBy == userNo)
|
.SetColumns(s => s.LastUpdateBy == userNo)
|
.SetColumns(s => s.LastUpdateDate == DateTime.Now)
|
.Where(s => s.Id == xjDto.gid)
|
.ExecuteCommand();
|
}
|
}
|
}
|
|
return Convert.ToInt32(xjDto.gid);
|
});
|
}
|
|
private List<QsQaItemXj01> getJYItemOptimized(ISqlSugarClient db,
|
decimal xjId)
|
{
|
return db.Queryable<QsQaItemXj01>()
|
.Where(a => a.Pid == xjId)
|
.ToList();
|
}
|
|
private (bool isValid, string errorMsg) ValidateItemsData(
|
List<QsQaItemXj01> items)
|
{
|
if (items == null || !items.Any()) return (false, "检验项目不能为空");
|
|
var invalidItems = items
|
.Where(x => x.LevelNum <= 0 || string.IsNullOrEmpty(x.ProjName))
|
.ToList();
|
if (invalidItems.Any())
|
return (false, $"存在{invalidItems.Count}个无效的检验项目");
|
|
return (true, "");
|
}
|
|
private List<QsQaItemXj02> PrepareDetailsData(List<QsQaItemXj01> jyItems,
|
decimal gid, string userNo)
|
{
|
var allDetails = new List<QsQaItemXj02>();
|
var now = DateTime.Now;
|
|
foreach (var s in jyItems)
|
{
|
if (s.MaxValue != null || s.StandardValue != null ||
|
s.MinValue != null)
|
continue;
|
|
for (var i = 0; i < s.LevelNum; i++)
|
{
|
allDetails.Add(new QsQaItemXj02
|
{
|
Gid = gid,
|
Pid = s.Id,
|
Fstand = "√",
|
FcheckResu = "1",
|
CreateBy = userNo,
|
CreateDate = now
|
});
|
}
|
}
|
|
return allDetails;
|
}
|
|
private (List<(decimal pid, int result)> pidResults, string fcheckResu)
|
CalculateResults(
|
List<QsQaItemXj02> allDetails, List<QsQaItemXj01> jyItems)
|
{
|
var pidGroups = allDetails.GroupBy(x => x.Pid).ToList();
|
var pidResults = new List<(decimal pid, int result)>();
|
|
foreach (var group in pidGroups)
|
{
|
var count = group.Count();
|
var passCount = group.Count(x => x.Fstand == "√");
|
var result = (count == passCount) ? 1 : 0;
|
pidResults.Add((group.Key.Value, result));
|
}
|
|
var totalSum = jyItems.Where(x =>
|
x.MaxValue == null && x.StandardValue == null &&
|
x.MinValue == null)
|
.Sum(x => x.LevelNum);
|
var totalCount = allDetails.Count;
|
var totalPassCount = allDetails.Count(x => x.Fstand == "√");
|
var fcheckResu =
|
(totalSum == totalCount && totalCount == totalPassCount)
|
? "合格"
|
: "不合格";
|
|
return (pidResults, fcheckResu);
|
}
|
|
|
public XJDto getXjDetail02ById(decimal? id)
|
{
|
var xjDto = new XJDto();
|
|
var db = SqlSugarHelper.GetInstance();
|
var qsQaItemXj01 =
|
db.Queryable<QsQaItemXj01>().Single(s => s.Id == id);
|
|
if (qsQaItemXj01.IsPass == 0)
|
qsQaItemXj01.result = "不合格";
|
else if (qsQaItemXj01.IsPass == 1)
|
qsQaItemXj01.result = "合格";
|
else
|
qsQaItemXj01.result = "未完成";
|
|
if (qsQaItemXj01.Picture is { Length: > 0 })
|
qsQaItemXj01.imageData =
|
Convert.ToBase64String(qsQaItemXj01.Picture);
|
|
xjDto.ItemXj01 = qsQaItemXj01;
|
|
|
xjDto.ItemXj02s = db.Queryable<QsQaItemXj02>().Where(s => s.Pid == id)
|
.ToList();
|
|
return xjDto;
|
}
|
|
public int SetQSItemDetail(QsQaItemXj02 detail)
|
{
|
var oracle = SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
List<QsQaItemXj02> result = new();
|
for (var i = 0; i < detail.count; i++)
|
{
|
var item = new QsQaItemXj02();
|
item.Gid = detail.Gid;
|
item.Pid = detail.Pid;
|
item.Fstand = detail.Fstand;
|
item.FcheckResu = detail.FcheckResu;
|
item.CreateBy = detail.UpdateBy;
|
item.CreateDate = DateTime.Now;
|
result.Add(item);
|
}
|
|
return db.Insertable(result).ExecuteCommand();
|
});
|
|
detail.CreateBy = detail.UpdateBy;
|
|
autoResult(detail);
|
|
return oracle;
|
}
|
|
private int autoResult(QsQaItemXj02 detail)
|
{
|
var db = SqlSugarHelper.GetInstance();
|
|
// Single 没有查询到结果时返回Null，如果结果大于1条会抛出错误
|
var QsQaItemXj01 = db.Queryable<QsQaItemXj01>()
|
.Single(s => s.Id == detail.Pid);
|
|
if (QsQaItemXj01 == null) return 0;
|
|
var count = db.Queryable<QsQaItemXj02>()
|
.Where(s => s.Pid == detail.Pid).Count();
|
|
|
var result = 0;
|
|
if (QsQaItemXj01.LevelNum != count) return 0;
|
|
var passCount = db.Queryable<QsQaItemXj02>()
|
.Where(s => s.Pid == detail.Pid && s.Fstand == "√").Count();
|
|
if (count == passCount) result = 1;
|
|
var useTransactionWithOracle =
|
SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
var commit = 0;
|
commit += db.Updateable<QsQaItemXj01>()
|
.SetColumns(s => s.IsPass == result)
|
.Where(s => s.Id == detail.Pid)
|
.ExecuteCommand();
|
|
return commit;
|
});
|
|
//获取检验单的检验项目理论个数
|
var sum = db.Queryable<QsQaItemXj01>()
|
.Where(s => s.Pid == detail.Gid).Sum(it => it.LevelNum);
|
|
if (sum == null || sum == 0) return 1;
|
|
//获取检验单下的检验项目实际个数
|
var icount = db.Queryable<QsQaItemXj02>()
|
.Where(s => s.Gid == detail.Gid).Count();
|
|
if (icount == 0) return 1;
|
|
//实际个数等于理论个数时对检验单进行判定
|
if (sum == icount)
|
{
|
var FcheckResu = "不合格";
|
|
//获取这个检验单下的所有合格的检验结果
|
passCount = db.Queryable<QsQaItemXj02>()
|
.Where(s => s.Gid == detail.Gid && s.Fstand == "√").Count();
|
|
//合格的检验结果等于总检验数视为合格
|
if (icount == passCount) FcheckResu = "合格";
|
|
SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
return db.Updateable<QsQaItemXj>()
|
.SetColumns(s => s.CheckResult == FcheckResu)
|
.SetColumns(s => s.CheckDate == DateTime.Now)
|
.SetColumns(s => s.CheckBy == detail.CreateBy)
|
.SetColumns(s => s.LastUpdateBy == detail.CreateBy)
|
.SetColumns(s => s.LastUpdateDate == DateTime.Now)
|
.Where(s => s.Id == detail.Gid)
|
.ExecuteCommand();
|
});
|
}
|
|
return useTransactionWithOracle;
|
}
|
|
public int UpdateQSItemDetail(QsQaItemXj02 detail)
|
{
|
var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
return db.Updateable<QsQaItemXj02>()
|
.SetColumns(s => s.UpdateBy == detail.UpdateBy)
|
.SetColumns(s => s.UpdateDate == DateTime.Now)
|
.SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.Fstand),
|
s => s.Fstand == detail.Fstand)
|
.SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.FcheckResu),
|
s => s.FcheckResu == detail.FcheckResu)
|
.Where(s => s.Id == detail.Id)
|
.ExecuteCommand();
|
});
|
|
detail.CreateBy = detail.UpdateBy;
|
|
withOracle += autoResult(detail);
|
|
return withOracle;
|
}
|
|
//删除主表并且连级删除子表和孙表
|
public int removeXJ(decimal? id)
|
{
|
var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
var commit = 0;
|
commit += db.Deleteable<QsQaItemXj>().Where(s => s.Id == id)
|
.ExecuteCommand();
|
commit += db.Deleteable<QsQaItemXj01>().Where(s => s.Pid == id)
|
.ExecuteCommand();
|
commit += db.Deleteable<QsQaItemXj02>().Where(s => s.Gid == id)
|
.ExecuteCommand();
|
return commit;
|
});
|
|
return withOracle;
|
}
|
|
//主表修改备注字段
|
public int saveRemarksGid(XJDto dto)
|
{
|
return SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
return db.Updateable<QsQaItemXj>()
|
.SetColumns(it =>
|
it.Remarks == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
|
.Where(it => it.Id == dto.gid)
|
.ExecuteCommand();
|
});
|
}
|
|
//子表修改备注字段
|
public int saveRemarksPid(XJDto dto)
|
{
|
return SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
return db.Updateable<QsQaItemXj01>()
|
.SetColumns(it =>
|
it.Remarks == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
|
.Where(it => it.Id == dto.pid)
|
.ExecuteCommand();
|
});
|
}
|
|
public int saveNotesPid(XJDto dto)
|
{
|
return SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
return db.Updateable<QsQaItemXj01>()
|
.SetColumns(it =>
|
it.Notes == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
|
.Where(it => it.Id == dto.pid)
|
.ExecuteCommand();
|
});
|
}
|
|
//孙表修改备注字段
|
public int saveRemarksById(XJDto dto)
|
{
|
return SqlSugarHelper.UseTransactionWithOracle(db =>
|
{
|
return db.Updateable<QsQaItemXj02>()
|
.SetColumns(it =>
|
it.Remarks == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
|
.Where(it => it.Id == dto.id)
|
.ExecuteCommand();
|
});
|
}
|
|
public List<XJBadReason>? GetReason(string billNo)
|
{
|
var db = SqlSugarHelper.GetInstance();
|
|
var count = db.Queryable<XJBadReason>().Where(s => s.BillNo == billNo).Count();
|
|
if (count <= 0) return null;
|
|
var reason = db
|
.Queryable<XJBadReason>()
|
.Where(s => s.BillNo == billNo).Select(
|
b => new XJBadReason
|
{
|
Reason = b.Reason
|
}).ToList();
|
|
return reason;
|
}
|
|
public decimal SavePlan(decimal pid, string PlanName)
|
{
|
var db = SqlSugarHelper.GetInstance();
|
var res = db.Updateable<QsQaItemXj>()
|
.SetColumns(a => a.PlanName == PlanName)
|
.Where(a => a.Id == pid)
|
.ExecuteCommand();
|
|
return res;
|
|
}
|
|
public (decimal?, string?, string?) CreateNew(string? DaaNo, string? userNo, string? planName)
|
{
|
var db = SqlSugarHelper.GetInstance();
|
// 创建参数
|
var FitemNo = new SugarParameter("P_DAA001", DaaNo);
|
var FuserNo = new SugarParameter("P_USER", userNo);
|
var FplanName = new SugarParameter("P_PLAN_NAME", planName);
|
|
|
var FRes = new SugarParameter("P_FLAG", null, true); // 输出参数
|
var FMsg = new SugarParameter("P_TEXT", null, true);
|
var FBillNo = new SugarParameter("po_BILL_NO", null, true);
|
|
// 执行存储过程
|
db.Ado.UseStoredProcedure().GetDataTable("PRC_XJ_GENERATE_JK", FitemNo, FuserNo, FplanName, FRes, FMsg, FBillNo);
|
|
// 获取输出结果
|
var Res = Convert.ToInt32(FRes.Value);
|
var Msg = FMsg.Value?.ToString();
|
var BillNo = FBillNo.Value?.ToString();
|
|
Console.WriteLine($"结果: {Res}, 返回消息: {Msg},单据号：{BillNo}");
|
|
return (Res, Msg, BillNo);
|
}
|
|
}
|
