啊鑫
2024-09-22 5e11da1d662cd0c629ab2d854de2e5babb399ca3
来料检验的分页
已修改25个文件
已删除1个文件
344 ■■■■■ 文件已修改
MES.Service/bin/Debug/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Debug/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Release/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Release/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/QC/LljService.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/QC/LljController.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.xml 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.xml 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish.zip 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.xml 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/web.config 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
MES.Service/service/QC/LljService.cs
@@ -11,13 +11,15 @@
public class LljService
{
    public List<LtsLlj> GetPage(XJPageResult queryObj)
    public (List<LtsLlj> item, int TotalCount) GetPage(XJPageResult queryObj)
    {
        var db = SqlSugarHelper.GetInstance();
        var id = Convert.ToDecimal(queryObj.id);
        return db.Queryable<LtsLlj>()
        var totalCount = 0;
        var pageList = db.Queryable<LtsLlj>()
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
@@ -28,7 +30,9 @@
                a => a.FcheckResu != null)
            .WhereIF(id > 0, a => a.Id == id)
            .OrderByDescending(a => a.Id)
            .ToPageList(queryObj.PageIndex, queryObj.Limit);
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
        return (pageList, totalCount);
    }
    //根据检验标准来计算检验个数
MESApplication/Controllers/QC/LljController.cs
@@ -18,14 +18,15 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var (item, totalCount) = new LljService().GetPage(queryObj);
            var tbBillList =
                new LljService().GetPage(queryObj);
            resultInfos.tbBillList = tbBillList;
                resultInfos.tbBillList = item;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
                data = resultInfos,
                TotalCount = totalCount
            };
        }
        catch (Exception ex)
MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -426,6 +426,78 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.GetList">
            <summary>
                获取所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.GetById(System.Int32)">
            <summary>
                根据主键获取
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.DeleteByIds(System.Object[])">
            <summary>
                根据主键删除
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.Add(MES.Service.Modes.ProductionOrder)">
            <summary>
                添加
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.InsertReturnIdentity(MES.Service.Modes.ProductionOrder)">
            <summary>
                添加返回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.Update(MES.Service.Modes.ProductionOrder)">
            <summary>
                修改
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.GetList">
            <summary>
                获取所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.GetById(System.Int32)">
            <summary>
                根据主键获取
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.DeleteByIds(System.Object[])">
            <summary>
                根据主键删除
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.Add(MES.Service.Modes.ProductionOrderSub)">
            <summary>
                添加
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.InsertReturnIdentity(MES.Service.Modes.ProductionOrderSub)">
            <summary>
                添加返回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.Update(MES.Service.Modes.ProductionOrderSub)">
            <summary>
                修改
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.GetList">
            <summary>
                获取所有
@@ -678,6 +750,42 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.GetList">
            <summary>
                获取所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.GetById(System.Int32)">
            <summary>
                根据主键获取
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.DeleteByIds(System.Object[])">
            <summary>
                根据主键删除
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.Add(MES.Service.Modes.MesRfPrnbarcode)">
            <summary>
                添加
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.InsertReturnIdentity(MES.Service.Modes.MesRfPrnbarcode)">
            <summary>
                添加返回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.Update(MES.Service.Modes.MesRfPrnbarcode)">
            <summary>
                修改
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
            <summary>
                获取所有
MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -426,6 +426,78 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.GetList">
            <summary>
                获取所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.GetById(System.Int32)">
            <summary>
                根据主键获取
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.DeleteByIds(System.Object[])">
            <summary>
                根据主键删除
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.Add(MES.Service.Modes.ProductionOrder)">
            <summary>
                添加
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.InsertReturnIdentity(MES.Service.Modes.ProductionOrder)">
            <summary>
                添加返回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.Update(MES.Service.Modes.ProductionOrder)">
            <summary>
                修改
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.GetList">
            <summary>
                获取所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.GetById(System.Int32)">
            <summary>
                根据主键获取
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.DeleteByIds(System.Object[])">
            <summary>
                根据主键删除
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.Add(MES.Service.Modes.ProductionOrderSub)">
            <summary>
                添加
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.InsertReturnIdentity(MES.Service.Modes.ProductionOrderSub)">
            <summary>
                添加返回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.Update(MES.Service.Modes.ProductionOrderSub)">
            <summary>
                修改
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.GetList">
            <summary>
                获取所有
@@ -678,6 +750,42 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.GetList">
            <summary>
            获取所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.GetById(System.Int32)">
            <summary>
            根据主键获取
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.DeleteByIds(System.Object[])">
            <summary>
            根据主键删除
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.Add(MES.Service.Modes.MesRfPrnbarcode)">
            <summary>
            添加
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.InsertReturnIdentity(MES.Service.Modes.MesRfPrnbarcode)">
            <summary>
            添加返回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.Update(MES.Service.Modes.MesRfPrnbarcode)">
            <summary>
            修改
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
            <summary>
                获取所有
MESApplication/bin/Release/net8.0/publish.zip
Binary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -426,6 +426,78 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.GetList">
            <summary>
                获取所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.GetById(System.Int32)">
            <summary>
                根据主键获取
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.DeleteByIds(System.Object[])">
            <summary>
                根据主键删除
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.Add(MES.Service.Modes.ProductionOrder)">
            <summary>
                添加
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.InsertReturnIdentity(MES.Service.Modes.ProductionOrder)">
            <summary>
                添加返回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderController.Update(MES.Service.Modes.ProductionOrder)">
            <summary>
                修改
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.GetList">
            <summary>
                获取所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.GetById(System.Int32)">
            <summary>
                根据主键获取
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.DeleteByIds(System.Object[])">
            <summary>
                根据主键删除
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.Add(MES.Service.Modes.ProductionOrderSub)">
            <summary>
                添加
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.InsertReturnIdentity(MES.Service.Modes.ProductionOrderSub)">
            <summary>
                添加返回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.ProductionOrderSubController.Update(MES.Service.Modes.ProductionOrderSub)">
            <summary>
                修改
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.GetList">
            <summary>
                获取所有
@@ -678,6 +750,42 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.GetList">
            <summary>
            获取所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.GetById(System.Int32)">
            <summary>
            根据主键获取
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.DeleteByIds(System.Object[])">
            <summary>
            根据主键删除
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.Add(MES.Service.Modes.MesRfPrnbarcode)">
            <summary>
            添加
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.InsertReturnIdentity(MES.Service.Modes.MesRfPrnbarcode)">
            <summary>
            添加返回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.MesRfPrnbarcodeController.Update(MES.Service.Modes.MesRfPrnbarcode)">
            <summary>
            修改
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
            <summary>
                获取所有
MESApplication/bin/Release/net8.0/publish/web.config
@@ -8,5 +8,4 @@
      <aspNetCore processPath="dotnet" arguments=".\MESApplication.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
    </system.webServer>
  </location>
</configuration>
<!--ProjectGuid: C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA-->
</configuration>