From 02893d929e7d2b650dc32ff14e6b12e6ca39dc75 Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期二, 02 十二月 2025 17:15:40 +0800
Subject: [PATCH] 1.新增获取巡检单所有不良描述
---
StandardPda/MES.Service/Dto/service/XJCloseInspectionDto.cs | 9
StandardPda/MES.Service/service/QC/SJService.cs | 45 +++-
StandardPda/MES.Service/service/QC/BaseService.cs | 17 +
StandardPda/MESApplication/Controllers/QC/SJController.cs | 85 ++++++++
StandardPda/MESApplication/Controllers/QC/BaseController.cs | 36 +++
StandardPda/MESApplication/Controllers/QC/XJController.cs | 78 +++++++
StandardPda/MES.Service/service/QC/XJService.cs | 303 ++++++++++++++++++++++++++----
7 files changed, 518 insertions(+), 55 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/service/XJCloseInspectionDto.cs b/StandardPda/MES.Service/Dto/service/XJCloseInspectionDto.cs
new file mode 100644
index 0000000..51a269e
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/service/XJCloseInspectionDto.cs
@@ -0,0 +1,9 @@
+锘縰sing MES.Service.Dto.@base;
+
+namespace MES.Service.Dto.service;
+
+public class XJCloseInspectionDto : Page
+{
+ public string billNo { get; set; }
+ public int id { get; set; }
+}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/QC/BaseService.cs b/StandardPda/MES.Service/service/QC/BaseService.cs
index 897d4b9..5ae3697 100644
--- a/StandardPda/MES.Service/service/QC/BaseService.cs
+++ b/StandardPda/MES.Service/service/QC/BaseService.cs
@@ -81,4 +81,21 @@
});
return mesQsImages;
}
+
+
+
+ public List<MesQsImage> getXjAllImgByFid(int id, string qsType)
+ {
+ var db = SqlSugarHelper.GetInstance();
+ var mesQsImages = db
+ .Queryable<MesQsImage, QsQaItemXj01>((a, b) =>
+ new JoinQueryInfos(JoinType.Left, a.Fid == int.Parse("666" + b.Id.ToString())))
+ .Where((a, b) => b.Pid == id && a.Id != null).ToList();
+ mesQsImages.ForEach(s =>
+ {
+ if (s.ImageData is { Length: > 0 })
+ s.base64Date = Convert.ToBase64String(s.ImageData);
+ });
+ return mesQsImages;
+ }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/QC/SJService.cs b/StandardPda/MES.Service/service/QC/SJService.cs
index acd61fa..aa04f96 100644
--- a/StandardPda/MES.Service/service/QC/SJService.cs
+++ b/StandardPda/MES.Service/service/QC/SJService.cs
@@ -77,13 +77,37 @@
public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
- int totalCount = 0;
+ string[]? lineNo = null;
+
+ // if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
+ // lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
+
+ var totalCount = 0;
string searchValue = queryObj.searchValue?.Trim();
- var query = db.Queryable<SJPageResult>();
+ // ========= 鏋勫缓鍩虹 query =========
+ var query = db.Queryable<SJPageResult>()
+ .WhereIF(lineNo != null && lineNo.Length > 0,
+ a => lineNo.Contains(a.line))
+ .WhereIF(queryObj.Id != null,
+ a => a.Id == queryObj.Id)
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
+ a => a.BillNo == queryObj.BillNo)
+ // 鏈畬鎴�
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ "鏈畬鎴�".Equals(queryObj.Result),
+ a => a.FSubmit == 0 || a.FSubmit == null)
+ // 宸插畬鎴�
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ !"鏈畬鎴�".Equals(queryObj.Result),
+ a => a.FSubmit == 1);
- // 1锔忊儯 濡傛灉 SearchValue 涓虹┖ 鈫� 鏌ヨ鍏ㄩ儴
+ // ========= SearchValue 鍒ゆ柇 =========
+
+ // SearchValue 涓虹┖锛氳繑鍥炲叏閮�
if (string.IsNullOrWhiteSpace(searchValue))
{
var allData = query
@@ -91,27 +115,26 @@
.ToPageList(
Math.Max(queryObj.PageIndex, 1),
Math.Max(queryObj.Limit, 1),
- ref totalCount);
+ ref totalCount
+ );
return (allData, totalCount);
}
- // 2锔忊儯 SearchValue 闈炵┖ 鈫� 妯＄硦鍖归厤 BILL_NO 鎴� ITEM_NO
+ // SearchValue 涓嶄负绌猴細妯＄硦鏌� BILL_NO / ITEM_NO
query = query.Where(a =>
SqlFunc.Like(SqlFunc.Trim(a.BillNo).ToLower(), $"%{searchValue.ToLower()}%") ||
SqlFunc.Like(SqlFunc.Trim(a.ItemNo).ToLower(), $"%{searchValue.ToLower()}%")
);
+ // ========= 鎵ц鍒嗛〉 =========
var data = query
.OrderBy(a => a.BillNo, OrderByType.Desc)
.ToPageList(
Math.Max(queryObj.PageIndex, 1),
Math.Max(queryObj.Limit, 1),
- ref totalCount);
-
- // 3锔忊儯 濡傛灉娌℃湁鍖归厤鏁版嵁 鈫� 杩斿洖绌哄垪琛�
- if (totalCount == 0)
- return (new List<SJPageResult>(), 0);
+ ref totalCount
+ );
return (data, totalCount);
}
@@ -125,6 +148,8 @@
+
+
//SetQSItem
// public List<QsItemIpiItem> SetQSItems(string itemNo)
// {
diff --git a/StandardPda/MES.Service/service/QC/XJService.cs b/StandardPda/MES.Service/service/QC/XJService.cs
index c01fc0b..87d9c7b 100644
--- a/StandardPda/MES.Service/service/QC/XJService.cs
+++ b/StandardPda/MES.Service/service/QC/XJService.cs
@@ -3,6 +3,7 @@
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using System.Data;
namespace MES.Service.service.QC;
@@ -107,63 +108,181 @@
}).ToList();
}
+ //public (List<QsQaItemXj> item, int TotalCount) getPage(XJPageResult queryObj)
+ //{
+ // var db = SqlSugarHelper.GetInstance();
+
+ // var id = Convert.ToDecimal(queryObj.id);
+
+ // var totalCount = 0;
+
+ // string[]? lineNo = null;
+
+ // // if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
+ // // lineNo = _baseService.getUserLineNo(queryObj.createUser);
+
+ // var pageList = db
+ // .Queryable<QsQaItemXj, Womdaa,
+ // MesItems>((s, a, b) =>
+ // new JoinQueryInfos(
+ // JoinType.Inner, s.BillNo == a.Daa001,
+ // JoinType.Left, s.ItemId == b.Id
+ // )
+ // )
+
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ // "鏈畬鎴�".Equals(queryObj.result),
+ // (s, a, b) => s.Fsubmit == null || s.Fsubmit == 0)
+ // // .WhereIF(
+ // // StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ // // !"鏈畬鎴�".Equals(queryObj.result),
+ // // (s, a, b) => s.FcheckResu != null)
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ // !"鏈畬鎴�".Equals(queryObj.result),
+ // (s, a, b) => s.Fsubmit == 1)
+ // .WhereIF(id > 0, (s, a, b) => s.Id == id)
+ // .Select((s, a, b) => new QsQaItemXj
+ // {
+ // Id = s.Id,
+ // PlanQty = a.Daa008,
+ // CreateBy = s.CreateBy,
+ // CreateDate = s.CreateDate,
+ // ReleaseNo = s.ReleaseNo,
+ // ItemNo = s.ItemNo,
+ // BillNo = s.BillNo,
+ // ItemName = b.ItemName,
+ // ItemModel = b.ItemModel,
+ // FcheckBy = s.FcheckBy,
+ // FcheckResu = s.FcheckResu,
+ // Remarks = s.Remarks,
+ // Fsubmit = s.Fsubmit,
+ // FcheckDate = s.FcheckDate,
+ // FsubmitBy = s.FsubmitBy
+ // }).OrderBy(s => s.CreateDate, OrderByType.Desc)
+ // .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+ // return (pageList, totalCount);
+ //}
+
public (List<QsQaItemXj> item, int TotalCount) getPage(XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
var id = Convert.ToDecimal(queryObj.id);
-
var totalCount = 0;
- string[]? lineNo = null;
-
- // if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
- // lineNo = _baseService.getUserLineNo(queryObj.createUser);
-
var pageList = db
- .Queryable<QsQaItemXj, Womdaa,
- MesItems>((s, a, b) =>
+ .Queryable<QsQaItemXj, Womdaa, MesItems>((s, a, b) =>
new JoinQueryInfos(
JoinType.Inner, s.BillNo == a.Daa001,
JoinType.Left, s.ItemId == b.Id
)
)
-
+
+ // 猸� 妯＄硦鎼滅储锛圔illNo 鎴� ItemNo 鏂板
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),
+ (s, a, b) =>
+ s.BillNo.Contains(queryObj.SearchValue) ||
+ s.ItemNo.Contains(queryObj.SearchValue)
+ )
+
+ // 猸� 鐘舵�佺瓫閫夛細鏈畬鎴�
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (s, a, b) => s.Fsubmit == null || s.Fsubmit == 0)
- // .WhereIF(
- // StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- // !"鏈畬鎴�".Equals(queryObj.result),
- // (s, a, b) => s.FcheckResu != null)
+ (s, a, b) => s.Fsubmit == null || s.Fsubmit == 0
+ )
+
+ // 猸� 鐘舵�佺瓫閫夛細宸插畬鎴�
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (s, a, b) => s.Fsubmit == 1)
+ (s, a, b) => s.Fsubmit == 1
+ )
+
+ // 猸� ID 鏌ヨ锛堝崟鏉★級
.WhereIF(id > 0, (s, a, b) => s.Id == id)
- .Select((s, a, b) => new QsQaItemXj
+
+ // 猸� select 瀹炰綋杩斿洖
+ .Select((s, a, b) => new QsQaItemXj
{
Id = s.Id,
- PlanQty = a.Daa008,
+ ReleaseNo = s.ReleaseNo,
+ FcheckDate = s.FcheckDate,
+ FcheckBy = s.FcheckBy,
+ ItemNo = s.ItemNo,
+ FcheckResu = s.FcheckResu,
CreateBy = s.CreateBy,
CreateDate = s.CreateDate,
- ReleaseNo = s.ReleaseNo,
- ItemNo = s.ItemNo,
+ LastupdateBy = s.LastupdateBy,
+ LastupdateDate = s.LastupdateDate,
+ Modify1By = s.Modify1By,
+ ItemUnit = s.ItemUnit,
BillNo = s.BillNo,
- ItemName = b.ItemName,
- ItemModel = b.ItemModel,
- FcheckBy = s.FcheckBy,
- FcheckResu = s.FcheckResu,
- Remarks = s.Remarks,
+ MoidNum = s.MoidNum,
+ FsubmitBy = s.FsubmitBy,
+ FsubmitDate = s.FsubmitDate,
Fsubmit = s.Fsubmit,
- FcheckDate = s.FcheckDate,
- FsubmitBy = s.FsubmitBy
- }).OrderBy(s => s.CreateDate, OrderByType.Desc)
+ Remarks = s.Remarks,
+ ItemId = s.ItemId,
+
+ // 猸� 棰濆瀛楁锛堟潵鑷繛琛級
+ PlanQty = a.Daa008,
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel
+ })
+
+ .OrderBy(s => s.CreateDate, OrderByType.Desc)
+
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
return (pageList, totalCount);
}
+
+
+ public object CloseInspection(XJCloseInspectionDto dto)
+ {
+ try
+ {
+ var db = SqlSugarHelper.GetInstance();
+
+ var sql = string.Format(
+ @"UPDATE QS_QA_ITEM_XJ
+ SET FSUBMIT = 1,
+ FCHECK_RESU = '鎵嬪姩鍏抽棴'
+ WHERE ID = '{0}'",
+ dto.id);
+
+ db.Ado.ExecuteCommand(sql);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = "鍏抽棴鎴愬姛"
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
public bool XJQaSubmit(LLJDto rkjDto)
{
@@ -311,36 +430,92 @@
return Convert.ToInt32(xj.Id);
}
+ //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;
- SqlSugarHelper.UseTransactionWithOracle(db =>
+ // 鉁� 浣跨敤 lambda 杩斿洖鎻掑叆鏉℃暟锛屼繚璇� Func<SqlSugarClient, int> 姣忔潯璺緞閮芥湁杩斿洖鍊�
+ int insertCount = SqlSugarHelper.UseTransactionWithOracle(db =>
{
- foreach (var item in items) item.Pid = xjDto.gid;
+ // 1锔忊儯 妫�鏌ヨ〃閲屾槸鍚﹀瓨鍦ㄧ浉鍚� gid 鐨勬暟鎹�
+ var existingCount = db.Queryable<QsQaItemXj01>()
+ .Count(s => s.Pid == xjDto.gid);
+
+ // 2锔忊儯 濡傛灉瀛樺湪锛屽垯鍏堝垹闄�
+ if (existingCount > 0)
+ {
+ db.Deleteable<QsQaItemXj01>()
+ .Where(s => s.Pid == xjDto.gid)
+ .ExecuteCommand();
+ }
+
+ // 3锔忊儯 缁欐瘡鏉℃槑缁嗚缃� Pid 骞舵彃鍏ワ紝杩斿洖鎻掑叆鏉℃暟
+ foreach (var item in items)
+ {
+ item.Pid = xjDto.gid;
+ }
return db.Insertable(items).ExecuteCommand();
});
+ // 4锔忊儯 閲嶆柊鑾峰彇鎻掑叆鍚庣殑鏄庣粏
xjDto.items = getJYItem(xjDto.gid, null);
- xjDto.items.ForEach(s =>
+ // 5锔忊儯 瀵规病鏈� Max/Min/StandardValue 鐨勬槑缁嗙敓鎴愰粯璁ゆ娴嬬粨鏋�
+ foreach (var s in xjDto.items)
{
- 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);
- });
+ if (s.MaxValue != null || s.StandardValue != null || s.MinValue != null)
+ continue;
- return Convert.ToInt32(xjDto.gid);
+ var detail = new QsQaItemXj02
+ {
+ Pid = s.Id,
+ Gid = xjDto.gid,
+ Fstand = "鈭�",
+ FcheckResu = "1",
+ UpdateBy = xjDto.userNo,
+ count = (int?)s.LevelNum
+ };
+ SetQSItemDetail(detail);
+ }
+
+ // 6锔忊儯 杩斿洖鎻掑叆鏉℃暟
+ return insertCount;
}
+
+
public XJDto getXjDetail02ById(decimal? id)
@@ -539,6 +714,45 @@
});
}
+ /// <summary>
+ /// 鑾峰彇棣栨鍗曟墍鏈変笉鑹弿杩�
+ /// </summary>
+ /// <param name="id">妫�楠屽崟ID</param>
+ /// <returns>涓嶈壇鎻忚堪鏁版嵁琛�</returns>
+ public DataTable getBlmsItem1(string id)
+ {
+ OracleSQLHelper SQLHelper = new();
+ // 鏌ヨ棣栨妫�楠屽崟鐨勪笉鑹弿杩�
+ var sql1 = string.Format(
+ @"select PROJ_NAME, REMARKS
+ from QS_QA_ITEM_XJ01 f
+ where PID = '" + id + "' and REMARKS is not null order by PROJ_NAME");
+
+ return SQLHelper.ExecuteQuery(sql1);
+ }
+
+
+
+ /// <summary>
+ /// 鑾峰彇宸℃妫�鍗曟墍鏈変笉鑹弿杩�
+ /// </summary>
+ /// <param name="id">妫�楠屽崟ID</param>
+ /// <returns>涓嶈壇鎻忚堪鏁版嵁琛�</returns>
+ public DataTable ggetBlmsItem1(string id)
+ {
+ OracleSQLHelper SQLHelper = new();
+ // 鏌ヨ棣栨妫�楠屽崟鐨勪笉鑹弿杩�
+ var sql1 = string.Format(
+ @"select PROJ_NAME, REMARKS
+ from QS_QA_ITEM_XJ01 f
+ where PID = '" + id + "' and REMARKS is not null order by PROJ_NAME");
+
+ return SQLHelper.ExecuteQuery(sql1);
+ }
+
+
+
+
//瀛欒〃淇敼澶囨敞瀛楁
public int saveRemarksById(XJDto dto)
{
@@ -550,5 +764,10 @@
.Where(it => it.Id == dto.id)
.ExecuteCommand();
});
+
+
+
+
+
}
}
\ No newline at end of file
diff --git a/StandardPda/MESApplication/Controllers/QC/BaseController.cs b/StandardPda/MESApplication/Controllers/QC/BaseController.cs
index ce28c73..60d11f8 100644
--- a/StandardPda/MESApplication/Controllers/QC/BaseController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/BaseController.cs
@@ -139,4 +139,40 @@
return ResponseResult.ResponseError(ex);
}
}
+
+
+ /// <summary>
+ /// 鑾峰彇宸℃妫�鍗曚釜妫�楠屽崟涓婁紶鐨勬墍鏈夊浘鐗�
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("getXjAllImgByFid")]
+ public ResponseResult getXjAllImgByFid([FromBody] JObject data)
+ {
+ var id = int.Parse(data["id"].ToString());
+ var qsType = data["qsType"].ToString();
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList =
+ new BaseService().getXjAllImgByFid(id, qsType);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+
+
+
+
}
\ No newline at end of file
diff --git a/StandardPda/MESApplication/Controllers/QC/SJController.cs b/StandardPda/MESApplication/Controllers/QC/SJController.cs
index 33fa226..7ac7a40 100644
--- a/StandardPda/MESApplication/Controllers/QC/SJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/SJController.cs
@@ -6,9 +6,12 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using SixLabors.ImageSharp.Drawing;
+using SqlSugar;
using System.Collections.Generic;
using System.Data;
using System.Dynamic;
+using DbType = System.Data.DbType;
namespace MESApplication.Controllers.QC;
@@ -447,7 +450,79 @@
dynamic resultInfos = new ExpandoObject();
var tbBillList = new SJService().SJQaSubmit(rkjDto);
resultInfos.tbBillList = tbBillList;
+ //================= 鍒ゆ柇妫�楠屽悎鏍肩敓鎴愬贰妫�鍗� =========
+ var sqlPass1 = $@"
+ SELECT
+ IS_PASS
+ FROM QS_ITEM_IPI_REQ
+ WHERE ID = '{rkjDto.gid}'
+ ";
+ var dtPass1 = SQLHelper.ExecuteQuery(sqlPass1);
+
+ var sqlPass3 = $@"select C.ID from QS_ITEM_IPI_REQ A
+LEFT JOIN V_MES_SJ B on b.BILL_NO = A.BILL_NO
+LEFT JOIN WOMDAA C on C.DAA001 = B.DAA001
+WHERE A.ID = '{rkjDto.gid}'
+";
+
+ var dtPass3 = SQLHelper.ExecuteQuery(sqlPass3);
+
+ var value4 = dtPass3.Rows[0][0];
+ int sqlPass2 = Convert.ToInt32(value4);
+
+
+ bool isPass = false;
+
+ if (dtPass1 != null && dtPass1.Rows.Count > 0)
+ {
+ var value = dtPass1.Rows[0]["IS_PASS"]?.ToString();
+
+ // 鍒ゆ柇涓哄悎鏍硷紙IS_PASS = 1锛�
+ if (value == "1")
+ {
+ isPass = true;
+ }
+ }
+
+ // 濡傛灉鍚堟牸锛屾墽琛屽瓨鍌ㄨ繃绋�
+ if (isPass)
+ {
+ var db = SqlSugarHelper.GetInstance();
+
+ // ===== 杈撳嚭鍙傛暟 =====
+ var outFlag = new SugarParameter("P_FLAG", null,
+ DbType.Int32, ParameterDirection.Output, 10);
+
+ var outText = new SugarParameter("P_TEXT", null,
+ DbType.String, ParameterDirection.Output, 4000);
+
+ // ===== 杈撳叆鍙傛暟 =====
+ var parameters = new List<SugarParameter>
+ {
+ new SugarParameter("P_ID", sqlPass2, DbType.Int64, ParameterDirection.Input),
+ new SugarParameter("P_USER", rkjDto.userNo, DbType.String, ParameterDirection.Input),
+ new SugarParameter("P_ISH", 0, DbType.Int64, ParameterDirection.Input),
+
+ // 杈撳嚭鍙傛暟蹇呴』甯︿笂
+ outFlag,
+ outText
+ };
+
+ // ===== 鎵ц瀛樺偍杩囩▼ =====
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_XJ_GENERATE(:P_ID, :P_USER, :P_ISH, :P_FLAG, :P_TEXT); END;",
+ parameters);
+
+ // ===== 璇诲彇杈撳嚭鍙傛暟骞惰浆鎹㈡垚 ResponseResult =====
+ var result = new ResponseResult
+ {
+ status = outFlag.Value?.ToString() == "1" ? 1 : 0, // 0 琛ㄧず鎴愬姛锛�1 琛ㄧず澶辫触
+ message = outText.Value?.ToString()
+ };
+
+ return result;
+ }
return new ResponseResult
{
status = 0,
@@ -455,6 +530,7 @@
data = resultInfos
};
}
+
catch (Exception ex)
{
return ResponseResult.ResponseError(ex);
@@ -462,6 +538,15 @@
}
+
+
+
+
+
+
+
+
+
/// <summary>
/// 鑾峰彇涓�鑷存�ф牳瀵归」鐩�
/// </summary>
diff --git a/StandardPda/MESApplication/Controllers/QC/XJController.cs b/StandardPda/MESApplication/Controllers/QC/XJController.cs
index 0ddd9d0..57719f7 100644
--- a/StandardPda/MESApplication/Controllers/QC/XJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/XJController.cs
@@ -1,10 +1,11 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
+锘縰sing MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using System.Dynamic;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace MESApplication.Controllers.QC;
@@ -228,6 +229,38 @@
return ResponseResult.ResponseError(ex);
}
}
+
+
+ [HttpPost("closeInspection")]
+ public ResponseResult CloseInspection([FromBody] XJCloseInspectionDto dto)
+ {
+ try
+ {
+ var service = new XJService();
+ var result = service.CloseInspection(dto);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = result
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+
+
+
+
+
+
+
+
[HttpPost("saveItem")]
public ResponseResult saveItem([FromBody] XJDto xjDto)
@@ -465,4 +498,43 @@
return ResponseResult.ResponseError(ex);
}
}
-}
\ No newline at end of file
+ /// <summary>
+ /// 鑾峰彇宸℃妫�鍗曟墍鏈変笉鑹弿杩�
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost("getJYBlmsItem")]
+ public ResponseResult getJYBlmsItem([FromBody] JObject data)
+ {
+ var id = data["id"]?.ToString();
+
+ try
+ {
+ var tbBillList = new XJService().getBlmsItem1(id);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = tbBillList
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+}
+
--
Gitblit v1.9.3