From c846eaf61febfeba340213ee2d692182ea0ccb90 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期四, 29 五月 2025 18:40:53 +0800
Subject: [PATCH] 11
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MESApplication/Controllers/Base/LoginController.cs | 2
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MES.Service/util/ResponseResult.cs | 2
MES.Service/service/QC/SJService.cs | 15 +
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Dto/service/SJPageResult.cs | 3
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MES.Service/Modes/MesInvItemInCDetails2.cs | 304 +++++++++++++++++++++++++++++++++++++++++++
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MES.Service/Dto/service/XJPageResult.cs | 2
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MESApplication/Controllers/QC/SJController.cs | 11 +
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/service/QC/RKJService.cs | 41 +++++
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/Controllers/QC/RKJController.cs | 30 +++
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
29 files changed, 396 insertions(+), 16 deletions(-)
diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
index 0064430..8ca5e09 100644
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ b/MES.Service/Dto/service/SJPageResult.cs
@@ -18,6 +18,9 @@
public string? FName { get; set; }
public string? Result { get; set; }
+ [SugarColumn(IsIgnore = true)]
+ public string? SearchValue { get; set; }
+
[SugarColumn(ColumnName = "STATUS_USER")] //鐢ㄤ簬SqlSugar
public string? StatusUser { get; set; }
diff --git a/MES.Service/Dto/service/XJPageResult.cs b/MES.Service/Dto/service/XJPageResult.cs
index 0f9859d..09cc6c5 100644
--- a/MES.Service/Dto/service/XJPageResult.cs
+++ b/MES.Service/Dto/service/XJPageResult.cs
@@ -8,4 +8,6 @@
public string? result { get; set; }
public string? id { get; set; }
+
+ public string? SearchValue { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemInCDetails2.cs b/MES.Service/Modes/MesInvItemInCDetails2.cs
new file mode 100644
index 0000000..0f20068
--- /dev/null
+++ b/MES.Service/Modes/MesInvItemInCDetails2.cs
@@ -0,0 +1,304 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 鐗╂枡鎴愬搧鍏ュ簱鐢宠鏉＄爜鏄庣粏
+ ///</summary>
+ [SugarTable("MES_INV_ITEM_IN_C_DETAILS2")]
+ public class MesInvItemInCDetails2
+ {
+ /// <summary>
+ /// SEQ_OUT
+ ///</summary>
+ [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true )]
+ public decimal Id { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗昳d
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_IN_ID" ,IsPrimaryKey = true )]
+ public decimal ItemInId { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏉＄爜PSN
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_BARCODE" )]
+ public string? ItemBarcode { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ ///</summary>
+ [SugarColumn(ColumnName="C_ITEM_CODE" )]
+ public string? CItemCode { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鏉＄爜
+ ///</summary>
+ [SugarColumn(ColumnName="C_ITEM_BARCODE" )]
+ public string? CItemBarcode { get; set; }
+ /// <summary>
+ /// 楠屾敹鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="QUANTITY" )]
+ public decimal? Quantity { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鏂瑰紡(1:鏈夋潯鐮�,0:鏃犳潯鐮�)
+ ///</summary>
+ [SugarColumn(ColumnName="BARCODE_FLAG" )]
+ public short? BarcodeFlag { get; set; }
+ /// <summary>
+ /// 鐜繚鏍囧織锛�0-闈炵幆淇�,1-鐜繚.鏃犳潯鐮佹墜宸ュ綍鍏ワ紝鏈夋潯鐮佷负鍐椾綑瀛楁锛�
+ ///</summary>
+ [SugarColumn(ColumnName="EP_FLAG" )]
+ public short? EpFlag { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_BY" )]
+ public string? CreateBy { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_DATE" )]
+ public DateTime? CreateDate { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
+ [SugarColumn(ColumnName="LASTUPDATE_BY" )]
+ public string? LastupdateBy { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName="LASTUPDATE_DATE" )]
+ public DateTime? LastupdateDate { get; set; }
+ /// <summary>
+ /// 浣滀笟鏂瑰紡0-鏈夌嚎鏉＄爜鏋�1-鏃犵嚎鏉＄爜鏋�
+ ///</summary>
+ [SugarColumn(ColumnName="WORK_TYPE" )]
+ public decimal? WorkType { get; set; }
+ /// <summary>
+ /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_NO" )]
+ public string? ItemNo { get; set; }
+ /// <summary>
+ /// 鍘傚鎵规
+ ///</summary>
+ [SugarColumn(ColumnName="LOT_NO" )]
+ public string? LotNo { get; set; }
+ /// <summary>
+ /// 鏄惁鍏辩鐗╂枡(0:鍚︼紝1:鏄�)
+ ///</summary>
+ [SugarColumn(ColumnName="COMANAGEMENT_FLAG" )]
+ public short? ComanagementFlag { get; set; }
+ /// <summary>
+ /// 瀹㈡埛缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="CUST_NO" )]
+ public string? CustNo { get; set; }
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ ///</summary>
+ [SugarColumn(ColumnName="CHECK_RES" )]
+ public string? CheckRes { get; set; }
+ /// <summary>
+ /// 杩涜揣鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="CHECK_QTY" )]
+ public decimal? CheckQty { get; set; }
+ /// <summary>
+ /// 妫�楠岀姸鎬�
+ ///</summary>
+ [SugarColumn(ColumnName="CHECK_STATES" )]
+ public string? CheckStates { get; set; }
+ /// <summary>
+ /// 寮哄埗鍏ュ簱鏍囪0鏃狅紝1-寮哄埗鍏ュ簱 閫�鏂欏崟浣跨敤
+ ///</summary>
+ [SugarColumn(ColumnName="FORCE_IN_FLAG" )]
+ public short? ForceInFlag { get; set; }
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="DEPOT_CODE" )]
+ public string? DepotCode { get; set; }
+ /// <summary>
+ /// 璐т綅缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="DEPOT_SECTION_CODE" )]
+ public string? DepotSectionCode { get; set; }
+ /// <summary>
+ /// 鐗硅浜嬮」
+ ///</summary>
+ [SugarColumn(ColumnName="REMARK" )]
+ public string? Remark { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏉＄爜
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_BARCODE2" )]
+ public string? ItemBarcode2 { get; set; }
+ /// <summary>
+ /// 鏂版潯鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_BARCODE3" )]
+ public string? ItemBarcode3 { get; set; }
+ /// <summary>
+ /// 浣跨敤鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="USE_QTY" )]
+ public decimal? UseQty { get; set; }
+ /// <summary>
+ /// 棰嗘枡鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="OUT_QTY" )]
+ public decimal? OutQty { get; set; }
+ /// <summary>
+ /// 鐗╂枡绠�绉�
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_SNAME" )]
+ public string? ItemSname { get; set; }
+ /// <summary>
+ /// 妗ｄ綅浣庡��
+ ///</summary>
+ [SugarColumn(ColumnName="SPOSTION" )]
+ public decimal? Spostion { get; set; }
+ /// <summary>
+ /// 妗ｄ綅楂樺��
+ ///</summary>
+ [SugarColumn(ColumnName="EPOSTION" )]
+ public decimal? Epostion { get; set; }
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ ///</summary>
+ [SugarColumn(ColumnName="CHECK_DATE" )]
+ public DateTime? CheckDate { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName="UNIT" )]
+ public string? Unit { get; set; }
+ /// <summary>
+ /// 鏄惁妫�楠�
+ ///</summary>
+ [SugarColumn(ColumnName="ISCHECK" )]
+ public decimal? Ischeck { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟
+ ///</summary>
+ [SugarColumn(ColumnName="EBELN" )]
+ public string? Ebeln { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="LOT_DATE" )]
+ public string? LotDate { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="BILL_NO" )]
+ public string? BillNo { get; set; }
+ /// <summary>
+ /// 鍏ュ簱瀹℃牳鏍囧織
+ ///</summary>
+ [SugarColumn(ColumnName="STOCK_OK" )]
+ public short? StockOk { get; set; }
+ /// <summary>
+ /// 鍒嗗巶缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="FACTORY" )]
+ public string? Factory { get; set; }
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ ///</summary>
+ [SugarColumn(ColumnName="COMPANY" )]
+ public string? Company { get; set; }
+ /// <summary>
+ /// 鍗℃澘缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="CB_NO" )]
+ public string? CbNo { get; set; }
+ /// <summary>
+ /// 绠卞彿
+ ///</summary>
+ [SugarColumn(ColumnName="BOX_NO" )]
+ public string? BoxNo { get; set; }
+ /// <summary>
+ /// 浠撳簱ID
+ ///</summary>
+ [SugarColumn(ColumnName="DEPOT_ID" )]
+ public decimal? DepotId { get; set; }
+ /// <summary>
+ /// 璐т綅ID
+ ///</summary>
+ [SugarColumn(ColumnName="DEPOT_SECTION_ID" )]
+ public decimal? DepotSectionId { get; set; }
+ /// <summary>
+ /// 琛屽彿
+ ///</summary>
+ [SugarColumn(ColumnName="LINE_NUM" )]
+ public string? LineNum { get; set; }
+ /// <summary>
+ /// 鎵爜鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="SM_QTY" )]
+ public decimal? SmQty { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗�
+ ///</summary>
+ [SugarColumn(ColumnName="VGBEL" )]
+ public string? Vgbel { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曡鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="KDPOS" )]
+ public decimal? Kdpos { get; set; }
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="WORK_NO" )]
+ public string? WorkNo { get; set; }
+ /// <summary>
+ /// 琛屽彿
+ ///</summary>
+ [SugarColumn(ColumnName="EBELN_LINE_NO" )]
+ public decimal? EbelnLineNo { get; set; }
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="CBILL_NO" )]
+ public string? CbillNo { get; set; }
+ /// <summary>
+ /// 鎬ユ枡鏍囪瘑
+ ///</summary>
+ [SugarColumn(ColumnName="URGENT_FLAG" )]
+ public decimal? UrgentFlag { get; set; }
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ ///</summary>
+ [SugarColumn(ColumnName="BOARD_STYLE" )]
+ public string? BoardStyle { get; set; }
+ /// <summary>
+ /// 浠诲姟鍗曡鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="WORK_LINE" )]
+ public decimal? WorkLine { get; set; }
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ ///</summary>
+ [SugarColumn(ColumnName="TASK_NO" )]
+ public string? TaskNo { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟�
+ ///</summary>
+ [SugarColumn(ColumnName="SUPP_NO" )]
+ public string? SuppNo { get; set; }
+ /// <summary>
+ /// 浠诲姟姹囨姤鍗�
+ ///</summary>
+ [SugarColumn(ColumnName="RBILL_NO" )]
+ public string? RbillNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_ID" )]
+ public decimal? ItemId { get; set; }
+ }
+}
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 059ac0a..b8abc21 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index 584a24e..c4efc75 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index 9cce933..c0cffee 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index 46dc651..1c42ffc 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 48afe60..672dad7 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -1,4 +1,5 @@
锘縰sing System.Net.NetworkInformation;
+using Masuit.Tools.Models;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
@@ -468,12 +469,13 @@
}
- public List<QsItemOqcReq> getPage(XJPageResult queryObj)
+ public (List<QsItemOqcReq> items, int TotalCount) getPage(XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
- return db
- .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, Womdaa, MesInvTransaction, RKJDaa001, MesLine>(
+ var totalCount = 0;
+
+ var qsItemOqcReqs = db.Queryable<QsItemOqcReq, MesItems, MesInvItemIns, Womdaa, MesInvTransaction, RKJDaa001, MesLine>(
(a, b, c, da, ca, m, l) => new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.Id.ToString(),
JoinType.Left, a.BillNo == c.BillNo,
@@ -493,6 +495,11 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) && !"鏈畬鎴�".Equals(queryObj.result),
(a, b, c, da, ca, m, l) => a.FcheckResu != null)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),
+ (a, b, c, da, ca, m, l) => a.ReleaseNo.Contains(queryObj.SearchValue)
+ || b.ItemNo.Contains(queryObj.SearchValue)
+ )
.Select((a, b, c, da, ca, m, l) => new QsItemOqcReq
{
BillNo = a.BillNo,
@@ -514,7 +521,9 @@
Quantity = m.Quantity
})
.OrderBy(a => a.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+ return (qsItemOqcReqs, totalCount);
}
//鍒犻櫎涓昏〃骞朵笖杩炵骇鍒犻櫎瀛愯〃鍜屽瓩琛�
@@ -667,4 +676,28 @@
return Convert.ToInt32(rkjDto.gid);
}
+
+ public List<MesInvItemInCDetails2> GetRKDetail(RKJDto rkjDto)
+ {
+ //鐗╂枡鏉＄爜鍜岀墿鏂欑紪鐮侊紝鏁伴噺 MES_INV_ITEM_IN_C_DETAILS2
+ var db = SqlSugarHelper.GetInstance();
+
+ var oqcReq = db.Queryable<QsItemOqcReq>()
+ .Where(s => s.Id == rkjDto.gid)
+ .Select<string?>(s => s.BillNo)
+ .First();
+
+ if (oqcReq != null)
+ {
+ //FSTATUS
+ //CHECK_RES
+ var mesInvItemIns = db.Queryable<MesInvItemIns>()
+ .Where(s => s.BillNo == oqcReq).First();
+
+ return db.Queryable<MesInvItemInCDetails2>()
+ .Where(a=>a.ItemInId == mesInvItemIns.Id).ToList();
+ }
+
+ return new List<MesInvItemInCDetails2>();
+ }
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 9362b8f..b83cc8e 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -1,4 +1,5 @@
-锘縰sing System.Data;
+锘縰sing System.Buffers;
+using System.Data;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
@@ -34,9 +35,11 @@
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
- public List<SJPageResult> getPage(SJPageResult queryObj)
+ public (List<SJPageResult> items, int TotalCount) getPage(SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
+
+ var totalCount = 0;
string[]? lineNo = null;
@@ -58,10 +61,12 @@
!"鏈畬鎴�".Equals(queryObj.Result),
a => a.Result != "鏈畬鎴�")
.WhereIF(queryObj.Comments != null, a => a.Comments == queryObj.Comments)
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),a=>a.BillNo.Contains(queryObj.SearchValue)
+ || a.ItemNo.Contains(queryObj.SearchValue))
.OrderBy(a => a.BillNo, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
- return data;
+ return (data, totalCount);
}
@@ -224,7 +229,7 @@
item.Items = getQSItems(qsItemIpiReq.Id, null);
var sjPageResult = new SJPageResult
{ Id = item.From.Id, Limit = 1, PageIndex = 1 };
- item.Result = getPage(sjPageResult)[0];
+ item.Result = getPage(sjPageResult).items[0];
return item;
}
diff --git a/MES.Service/util/ResponseResult.cs b/MES.Service/util/ResponseResult.cs
index 830da6b..cd81c43 100644
--- a/MES.Service/util/ResponseResult.cs
+++ b/MES.Service/util/ResponseResult.cs
@@ -15,6 +15,8 @@
//杩斿洖鐨勬暟鎹�
public object data { get; set; }
+ public int TotalCount { get; set; } = 0;
+
//澶辫触鐨勮繑鍥炵粨鏋�
public static ResponseResult ResponseError(Exception e)
{
diff --git a/MESApplication/Controllers/Base/LoginController.cs b/MESApplication/Controllers/Base/LoginController.cs
index aede14c..552fa75 100644
--- a/MESApplication/Controllers/Base/LoginController.cs
+++ b/MESApplication/Controllers/Base/LoginController.cs
@@ -3,6 +3,7 @@
using MES.Service.service;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace MESApplication.Controllers.Base;
@@ -105,4 +106,5 @@
return ResponseResult.ResponseError(ex);
}
}
+
}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/RKJController.cs b/MESApplication/Controllers/QC/RKJController.cs
index 3aea949..618e8d1 100644
--- a/MESApplication/Controllers/QC/RKJController.cs
+++ b/MESApplication/Controllers/QC/RKJController.cs
@@ -135,14 +135,15 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().getPage(queryObj);
+ var (items, totalCount) = new RKJService().getPage(queryObj);
+ var tbBillList = items;
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
status = 0,
message = "OK",
- data = resultInfos
+ data = resultInfos,
+ TotalCount = totalCount
};
}
catch (Exception ex)
@@ -364,4 +365,27 @@
return ResponseResult.ResponseError(ex);
}
}
+
+
+ [HttpPost("GetRKDetail")]
+ public ResponseResult GetRKDetail([FromBody] RKJDto xjDto)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList =
+ new RKJService().GetRKDetail(xjDto);
+ 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/MESApplication/Controllers/QC/SJController.cs b/MESApplication/Controllers/QC/SJController.cs
index ecef1f0..ec59913 100644
--- a/MESApplication/Controllers/QC/SJController.cs
+++ b/MESApplication/Controllers/QC/SJController.cs
@@ -41,14 +41,19 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SJService().getPage(queryObj);
+
+ var (items, totalCount) = new SJService().getPage(queryObj);
+
+ var tbBillList = items;
+
+
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
status = 0,
message = "OK",
- data = resultInfos
+ data = resultInfos,
+ TotalCount = totalCount
};
}
catch (Exception ex)
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index f4bef72..08b18ac 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>C:\Users\Administrator\Desktop\鏈�鏂板悗绔唬鐮乗MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2025-05-15T06:40:01.9090441Z||;True|2025-05-15T14:37:16.5010870+08:00||;True|2025-05-14T11:08:53.5234495+08:00||;True|2025-05-10T11:32:49.9307363+08:00||;True|2025-05-09T18:04:27.4863117+08:00||;True|2025-04-16T18:13:28.4207378+08:00||;True|2025-04-11T18:24:26.3046003+08:00||;True|2025-03-26T10:03:35.1416945+08:00||;True|2025-03-24T14:54:31.6912596+08:00||;True|2025-03-04T15:36:06.8726998+08:00||;True|2025-03-04T15:07:10.0825281+08:00||;True|2025-02-28T12:01:45.7353138+08:00||;True|2025-02-27T18:49:51.8648828+08:00||;True|2025-02-24T18:08:27.1066831+08:00||;True|2025-02-14T20:58:59.6306239+08:00||;True|2025-02-12T18:28:32.5741267+08:00||;True|2024-12-28T09:06:17.0669698+08:00||;True|2024-12-26T14:45:42.2002555+08:00||;True|2024-12-26T13:03:07.9325085+08:00||;True|2024-12-26T11:43:04.0852484+08:00||;True|2024-12-21T22:33:39.6121285+08:00||;True|2024-12-16T14:40:36.9800141+08:00||;True|2024-12-14T16:23:42.9536129+08:00||;True|2024-12-11T15:50:13.8959852+08:00||;True|2024-12-11T10:47:42.1561088+08:00||;True|2024-12-08T18:32:27.3909077+08:00||;True|2024-12-06T16:30:29.0031886+08:00||;True|2024-12-05T16:20:00.9907217+08:00||;True|2024-12-05T16:19:41.4441561+08:00||;True|2024-12-05T16:19:22.9404769+08:00||;True|2024-12-05T11:07:30.6547548+08:00||;True|2024-12-03T17:12:24.9349522+08:00||;True|2024-11-27T11:05:24.9761937+08:00||;True|2024-11-19T08:57:10.9008301+08:00||;True|2024-11-18T21:02:57.0481324+08:00||;True|2024-11-05T17:25:48.6360448+08:00||;True|2024-11-05T17:16:08.2144948+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
+ <History>True|2025-05-16T07:10:24.9670924Z||;True|2025-05-15T14:40:01.9090441+08:00||;True|2025-05-15T14:37:16.5010870+08:00||;True|2025-05-14T11:08:53.5234495+08:00||;True|2025-05-10T11:32:49.9307363+08:00||;True|2025-05-09T18:04:27.4863117+08:00||;True|2025-04-16T18:13:28.4207378+08:00||;True|2025-04-11T18:24:26.3046003+08:00||;True|2025-03-26T10:03:35.1416945+08:00||;True|2025-03-24T14:54:31.6912596+08:00||;True|2025-03-04T15:36:06.8726998+08:00||;True|2025-03-04T15:07:10.0825281+08:00||;True|2025-02-28T12:01:45.7353138+08:00||;True|2025-02-27T18:49:51.8648828+08:00||;True|2025-02-24T18:08:27.1066831+08:00||;True|2025-02-14T20:58:59.6306239+08:00||;True|2025-02-12T18:28:32.5741267+08:00||;True|2024-12-28T09:06:17.0669698+08:00||;True|2024-12-26T14:45:42.2002555+08:00||;True|2024-12-26T13:03:07.9325085+08:00||;True|2024-12-26T11:43:04.0852484+08:00||;True|2024-12-21T22:33:39.6121285+08:00||;True|2024-12-16T14:40:36.9800141+08:00||;True|2024-12-14T16:23:42.9536129+08:00||;True|2024-12-11T15:50:13.8959852+08:00||;True|2024-12-11T10:47:42.1561088+08:00||;True|2024-12-08T18:32:27.3909077+08:00||;True|2024-12-06T16:30:29.0031886+08:00||;True|2024-12-05T16:20:00.9907217+08:00||;True|2024-12-05T16:19:41.4441561+08:00||;True|2024-12-05T16:19:22.9404769+08:00||;True|2024-12-05T11:07:30.6547548+08:00||;True|2024-12-03T17:12:24.9349522+08:00||;True|2024-11-27T11:05:24.9761937+08:00||;True|2024-11-19T08:57:10.9008301+08:00||;True|2024-11-18T21:02:57.0481324+08:00||;True|2024-11-05T17:25:48.6360448+08:00||;True|2024-11-05T17:16:08.2144948+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 059ac0a..b8abc21 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index 584a24e..c4efc75 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 16db0be..6f74c1b 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index d2e9139..25c899f 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 73369a3..1536c50 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 9cce933..c0cffee 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index 46dc651..1c42ffc 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index af38aae..8fadc44 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index 74a8961..25c899f 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index 4b33833..b0c8ae7 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index 9cce933..c0cffee 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index 46dc651..1c42ffc 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index af38aae..8fadc44 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index 74a8961..25c899f 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index 4b33833..b0c8ae7 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3