新增PDA自动更新的功能；新增自动生成SN序列号的功能。

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/Inspect/SapDeliverRecordController.cs

@@ -37,10 +37,12 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// 接口管理/SAP交验单记录表接口
         /// </summary>
         private readonly ISapDeliverRecordService _SapDeliverRecordService;
+        private readonly IPrintLabelRecordService _PrintLabelRecordService;
 
-        public SapDeliverRecordController(ISapDeliverRecordService SapDeliverRecordService)
+        public SapDeliverRecordController(ISapDeliverRecordService SapDeliverRecordService, IPrintLabelRecordService printLabelRecordService)
         {
             _SapDeliverRecordService = SapDeliverRecordService;
+            _PrintLabelRecordService = printLabelRecordService;
         }
 
         /// <summary>
@@ -75,7 +77,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// 添加接口管理/SAP交验单记录表
         /// </summary>
         /// <returns></returns>
-        [HttpPost]
+        [HttpPost("AddSapDeliverRecord")]
         [ActionPermissionFilter(Permission = "business:sapdeliverrecord:add")]
         [Log(Title = "接口管理/SAP交验单记录表", BusinessType = BusinessType.INSERT)]
         public IActionResult AddSapDeliverRecord([FromBody] SapDeliverRecordDto parm)
@@ -352,13 +354,13 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// <summary>
         /// 根据交验单号获取交验单明细数据
         /// </summary>
-        /// <param name="deliverNo">交验单号</param>
+        /// <param name="parm">打印校验单物料明细标签的查询对象</param>
         /// <returns></returns>
         [HttpPost("QuerySapDeliverDtlData")]
         [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapDeliverDtlData")]
-        public IActionResult QuerySapDeliverDtlData(string deliverNo)
+        public IActionResult QuerySapDeliverDtlData([FromBody] PrintLabelQueryDto parm)
         {
-            var response = _SapDeliverRecordService.GetSapDeliverRecordList(deliverNo);
+            var response = _SapDeliverRecordService.GetSapDeliverRecordList(parm);
             return SUCCESS(response);
         }
         [HttpPost("GetSapDeliverRecordSum")]
@@ -385,6 +387,21 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             var response = _SapDeliverRecordService.SubmitInspectResult(deliverNo);
             return SUCCESS(response);
         }
+        [HttpPost("AddPrintLabelRecord")]
+        [ActionPermissionFilter(Permission = "business:PrintLabelRecord:add")]
+        [Log(Title = "新增打印数据", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddPrintLabelRecord([FromBody] PrintLabelRecordDto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求参数错误");
+            }
+            var modal = parm.Adapt<PrintLabelRecord>();
+            modal.PrintBy = HttpContext.GetName();
+            var response = _PrintLabelRecordService.AddPrintLabelRecord(modal);
+
+            return ToResponse(response);
+        }
         #endregion
     }
 }

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/System/SysFileController.cs

@@ -96,5 +96,6 @@ namespace ZR.Admin.WebApi.Controllers
             string sFileName = ExportExcel(list, "SysFile", "文件存储");
             return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName });
         }
+
     }
 }

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs

@@ -36,6 +36,8 @@ namespace ZR.Admin.WebApi.Controllers.System
         private readonly ISysConfigService sysConfigService;
         private readonly ISysRoleService roleService;
         private readonly OptionsSetting jwtSettings;
+        private readonly IPdaAutoUpdateService pdaAutoUpdateService;
+        private IWebHostEnvironment _HostEnvironment;
         /// <summary>
         /// 
         /// </summary>
@@ -57,7 +59,9 @@ namespace ZR.Admin.WebApi.Controllers.System
             ISysConfigService configService,
             ISysRoleService sysRoleService,
             SecurityCodeHelper captcha,
-            IOptions<OptionsSetting> jwtSettings)
+            IOptions<OptionsSetting> jwtSettings,
+            IPdaAutoUpdateService pdaAutoUpdateService,
+            IWebHostEnvironment hostEnvironment)
         {
             httpContextAccessor = contextAccessor;
             SecurityCodeHelper = captcha;
@@ -68,6 +72,8 @@ namespace ZR.Admin.WebApi.Controllers.System
             this.sysConfigService = configService;
             roleService = sysRoleService;
             this.jwtSettings = jwtSettings.Value;
+            this.pdaAutoUpdateService = pdaAutoUpdateService;
+            _HostEnvironment = hostEnvironment;
         }
 
 
@@ -260,5 +266,24 @@ namespace ZR.Admin.WebApi.Controllers.System
             }
             return ToResponse(ResultCode.CUSTOM_ERROR, "注册失败，请联系管理员");
         }
+
+        #region 20240314 孙亚龙新增 PDA程序自动更新
+        [HttpGet("GetPdaLatestmsg")]
+        public IActionResult GetPdaLatestmsg()
+        {
+            var response = pdaAutoUpdateService.GetPdaLatestmsg();
+
+            return SUCCESS(response);
+        }
+        [HttpGet("GetPdaPackage")]
+        public FileResult GetPdaPackage(string fileName)
+        {
+            string filePath = _HostEnvironment.WebRootPath + "/" + fileName;
+            Stream stream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
+            FileStreamResult actionresult = new FileStreamResult(stream, new Microsoft.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream"));
+            actionresult.FileDownloadName = fileName;
+            return actionresult;
+        }
+        #endregion
     }
 }

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/ZRModel.xml

@@ -83,6 +83,63 @@
             基础资料/库区信息表输入输出对象
             </summary>
         </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.Pn">
+            <summary>
+            物料号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.Name">
+            <summary>
+            物料名
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.Qty">
+            <summary>
+            数量
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.Unit">
+            <summary>
+            单位
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.Bn">
+            <summary>
+            批次号
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.Po">
+            <summary>
+            订单号
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.Date">
+            <summary>
+            日期
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.Sc">
+            <summary>
+            供应商代码
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.Sn">
+            <summary>
+            序列号
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.PrintBy">
+            <summary>
+            打印人
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Dto.Inspect.PrintLabelRecordDto.BnOrSnGenerationMode">
+            <summary>
+            BN/SN 生成模式
+            true：系统自动生成
+            false：扫码生成
+            </summary>
+        </member>
         <member name="T:ZR.Model.Dto.Inspect.QaInspectRecordQueryDto">
             <summary>
             质检管理/质检记录表查询对象
@@ -128,6 +185,11 @@
             接口管理/SAP交验单记录表输入输出对象
             </summary>
         </member>
+        <member name="P:ZR.Model.Dto.Inspect.SapDeliverRecordDto.PurchaseOrder">
+            <summary>
+            采购订单
+            </summary>
+        </member>
         <member name="P:ZR.Model.Dto.Inspect.SapDeliverRecordExtDto.BnSnCode">
             <summary>
             BN/SN码 
@@ -487,6 +549,78 @@
             备注 
             </summary>
         </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.Pn">
+            <summary>
+            物料号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.Name">
+            <summary>
+            物料名
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.Qty">
+            <summary>
+            物料名
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.Unit">
+            <summary>
+            物料名
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.Bn">
+            <summary>
+            物料名
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.Po">
+            <summary>
+            订单号
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.Date">
+            <summary>
+            日期
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.Sc">
+            <summary>
+            供应商代码
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.Sn">
+            <summary>
+            序列号
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.IsPrinted">
+            <summary>
+            是否已打印。0：未打印；1：已打印。
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.PrintBy">
+            <summary>
+            打印人
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.PrintDatetime">
+            <summary>
+            打印时间
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Inspect.PrintLabelRecord.BnOrSnGenerationMode">
+            <summary>
+            BN/SN 生成模式
+            true：系统自动生成
+            false：扫码生成
+            </summary>
+        </member>
         <member name="T:ZR.Model.Models.Inspect.QaInspectRecord">
              <summary>
              质检管理/质检记录表，数据实体对象
@@ -2031,6 +2165,36 @@
             权限集合
             </summary>
         </member>
+        <member name="P:ZR.Model.System.PdaAutoUpdate.PackageName">
+            <summary>
+            安装包名称
+            </summary>
+        </member>
+        <member name="P:ZR.Model.System.PdaAutoUpdate.VersionNo">
+            <summary>
+            版本号
+            </summary>
+        </member>
+        <member name="P:ZR.Model.System.PdaAutoUpdate.VersionName">
+            <summary>
+            版本名称
+            </summary>
+        </member>
+        <member name="P:ZR.Model.System.PdaAutoUpdate.PublishTime">
+            <summary>
+            发布时间
+            </summary>
+        </member>
+        <member name="P:ZR.Model.System.PdaAutoUpdate.UpdateDetails">
+            <summary>
+            更新内容
+            </summary>
+        </member>
+        <member name="P:ZR.Model.System.PdaAutoUpdate.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="T:ZR.Model.System.SysConfig">
              <summary>
              参数配置，数据实体对象

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/appsettings.json

@@ -12,7 +12,7 @@
     //"conn_db": "Data Source=192.168.0.1;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "conn_db_type": "0" //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3
   },
-  "urls": "http://localhost:8888;http://192.168.137.1:8888", // 项目启动url，如果改动端口前端对应devServer也需要进行修改 ;http://192.168.137.1:8888
+  "urls": "http://localhost:8888;http://192.168.137.1:8888;", // 项目启动url，如果改动端口前端对应devServer也需要进行修改 ;http://192.168.137.1:8888
   "corsUrls": "http://localhost:8887", //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开
   "JwtSettings": {
     "Issuer": "ZRAdmin.NET",

ZrAdminNetCore-net7.0/ZR.Model/Dto/Inspect/PrintLabelRecordDto.cs

@@ -0,0 +1,59 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.Dto.Inspect
+{
+    public class PrintLabelRecordDto
+    {
+        /// <summary>
+        /// 物料号 
+        /// </summary>
+        public string Pn { get; set; }
+        /// <summary>
+        /// 物料名
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public int Qty { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public string Unit { get; set; }
+        /// <summary>
+        /// 批次号
+        /// </summary>
+        public string Bn { get; set; }
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string Po { get; set; }
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public string Date { get; set; }
+        /// <summary>
+        /// 供应商代码
+        /// </summary>
+        public string Sc { get; set; }
+        /// <summary>
+        /// 序列号
+        /// </summary>
+        public string Sn { get; set; }
+        /// <summary>
+        /// 打印人
+        /// </summary>
+        public string PrintBy { get; set; }
+        /// <summary>
+        /// BN/SN 生成模式
+        /// true：系统自动生成
+        /// false：扫码生成
+        /// </summary>
+        public bool BnOrSnGenerationMode { get; set; }
+    }
+}

ZrAdminNetCore-net7.0/ZR.Model/Dto/Inspect/SapDeliverRecordDto.cs

@@ -40,6 +40,7 @@ namespace ZR.Model.Dto.Inspect
     {
         public string DeliverNo { get; set; }
         public string BomNo { get; set; }
+        public bool IsPrintQuery { get; set; }
     }
 
     public class SapDeliverDto
@@ -57,6 +58,10 @@ namespace ZR.Model.Dto.Inspect
 
         [Required(ErrorMessage = "交验单号不能为空")]
         public string DeliverNo { get; set; }
+        /// <summary>
+        /// 采购订单
+        /// </summary>
+        public string PurchaseOrder { get; set; }
 
         public string CheckName { get; set; }
 
@@ -141,6 +146,7 @@ namespace ZR.Model.Dto.Inspect
         public int SumQty { get; set; }
 
         public int SumCheckQty { get; set; }
+        public bool KeyFlag { get; set; }
     }
     public class SapDeliverRecordSumQueryDto : PagerInfo
     {
@@ -149,4 +155,9 @@ namespace ZR.Model.Dto.Inspect
 
         public bool? IsComplate { get; set; }
     }
+    public class PrintLabelQueryDto : PagerInfo
+    {
+        public string DeliverNo { get; set; }
+        public string MaterialSpec { get; set; }
+    }
 }

ZrAdminNetCore-net7.0/ZR.Model/Models/Inspect/PrintLabelRecord.cs

@@ -0,0 +1,79 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.Models.Inspect
+{
+    [SugarTable("print_label_record")]
+    public class PrintLabelRecord
+    {
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 物料号 
+        /// </summary>
+        public string Pn { get; set; }
+        /// <summary>
+        /// 物料名
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 物料名
+        /// </summary>
+        public int Qty { get; set; }
+        /// <summary>
+        /// 物料名
+        /// </summary>
+        public string Unit { get; set; }
+        /// <summary>
+        /// 物料名
+        /// </summary>
+        public string Bn { get; set; }
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string Po { get; set; }
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public string Date { get; set; }
+        /// <summary>
+        /// 供应商代码
+        /// </summary>
+        public string Sc { get; set; }
+        /// <summary>
+        /// 序列号
+        /// </summary>
+        public string Sn { get; set; }
+        /// <summary>
+        /// 是否已打印。0：未打印；1：已打印。
+        /// </summary>
+        [SugarColumn(ColumnName = "IsPrinted")]
+        public bool IsPrinted { get; set; }
+        /// <summary>
+        /// 打印人
+        /// </summary>
+        [SugarColumn(ColumnName = "print_by")]
+        public string PrintBy { get; set; }
+        /// <summary>
+        /// 打印时间
+        /// </summary>
+        [SugarColumn(ColumnName = "print_datetime")]
+        public DateTime PrintDatetime { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+        /// <summary>
+        /// BN/SN 生成模式
+        /// true：系统自动生成
+        /// false：扫码生成
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public bool BnOrSnGenerationMode { get; set; }
+    }
+}

ZrAdminNetCore-net7.0/ZR.Model/System/PdaAutoUpdate.cs

@@ -0,0 +1,46 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.System
+{
+    [SugarTable("pda_auto_update")]
+    public class PdaAutoUpdate
+    {
+        [SugarColumn(IsIdentity = true, IsPrimaryKey = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 安装包名称
+        /// </summary>
+        public string PackageName { get; set; }
+
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        public int VersionNo { get; set; }
+
+        /// <summary>
+        /// 版本名称
+        /// </summary>
+        public string VersionName { get; set; }
+
+        /// <summary>
+        /// 发布时间
+        /// </summary>
+        public DateTime PublishTime { get; set; }
+
+        /// <summary>
+        /// 更新内容
+        /// </summary>
+        public string UpdateDetails { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
+}

ZrAdminNetCore-net7.0/ZR.Service/BaseService.cs

@@ -1,4 +1,8 @@
-using ZR.Repository;
+using SqlSugar;
+using System.Collections.Generic;
+using System.Data;
+using ZR.Common;
+using ZR.Repository;
 
 namespace ZR.Service
 {
@@ -14,5 +18,29 @@ namespace ZR.Service
         //{
         //    this.baseRepository = repository ?? throw new ArgumentNullException(nameof(repository));
         //}
+        #region 获取序列号
+        private readonly object LockDbFlag = new object();
+        public object GetSequenceNo(string SqCode)
+        {
+            lock (LockDbFlag)
+            {
+                SugarParameter parameter1 = new("seq_code", SqCode)
+                {
+                    Direction = ParameterDirection.Input,
+                };
+                SugarParameter parameter2 = new("count_num", 1)
+                {
+                    Direction = ParameterDirection.Input,
+                };
+                SugarParameter parameter3 = new("out_id", default)
+                {
+                    Direction = ParameterDirection.Output,
+                };
+                var RetVal = UseStoredProcedureToTuple("sys_proc_get_sequences", new List<SugarParameter> { parameter1, parameter2 , parameter3 });
+                return parameter3.Value;
+            }
+        }
+        #endregion
+
     }
 }

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/Inspect/IPrintLabelRecordService.cs

@@ -0,0 +1,19 @@
+using System;
+using ZR.Model;
+using System.Collections.Generic;
+using ZR.Model.Dto.Inspect;
+using ZR.Model.Models.Inspect;
+
+namespace ZR.Service.Business.IBusinessService.Inspect
+{
+    /// <summary>
+    /// 接口管理/SAP交验单记录表service接口
+    ///
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    public interface IPrintLabelRecordService : IBaseService<PrintLabelRecord>
+    {
+        int AddPrintLabelRecord(PrintLabelRecord model);
+    }
+}

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/Inspect/ISapDeliverRecordService.cs

@@ -31,7 +31,7 @@ namespace ZR.Service.Business.IBusinessService.Inspect
 
         #region 2023 0524 孙亚龙 新增
         List<SapDeliverDto> GetListNoPage(SapDeliverQueryNoPageDto parm);
-        List<SapDeliverRecordDto> GetSapDeliverRecordList(string deliverNo);
+        PagedInfo<SapDeliverRecordDto> GetSapDeliverRecordList(PrintLabelQueryDto parm);
         SapDeliverRecordSumDto GetSapDeliverRecordSum(string materialSpecCode, string deliverNo);
         bool GetSapDeliverIsAllChecked(string deliverNo);
         PagedInfo<SapDeliverRecordSumDto> GetSapDeliverRecordSumList(SapDeliverRecordSumQueryDto parm);

ZrAdminNetCore-net7.0/ZR.Service/Business/Inspect/PrintLabelRecordService.cs

@@ -0,0 +1,45 @@
+using Infrastructure.Attribute;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model.Models.Inspect;
+using ZR.Service.Business.IBusinessService.Inspect;
+
+namespace ZR.Service.Business.Inspect
+{
+    [AppService(ServiceType = typeof(IPrintLabelRecordService), ServiceLifetime = LifeTime.Transient)]
+    public class PrintLabelRecordService : BaseService<PrintLabelRecord>, IPrintLabelRecordService
+    {
+        #region 依赖注入
+        public PrintLabelRecordService()
+        {
+            
+        }
+        #endregion
+
+        #region 业务逻辑代码
+        public int AddPrintLabelRecord(PrintLabelRecord model)
+        {
+            if (model.BnOrSnGenerationMode)
+            {
+                string SnCode = Convert.ToString(GetSequenceNo("SnCode"))[2..];
+                string BnCode = SnCode[..^4];
+                model.Bn = BnCode;
+                model.Sn = SnCode;
+            }
+            else 
+            {
+                
+            }
+            model.Date =DateTime.Now.ToString();
+            model.IsPrinted = false;
+            model.PrintDatetime = DateTime.Now;
+            return Add(model, true);
+
+        }
+        #endregion
+    }
+}

ZrAdminNetCore-net7.0/ZR.Service/Business/Inspect/SapDeliverRecordService.cs

@@ -166,7 +166,10 @@ namespace ZR.Service.Business.Inspect
             predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.BomNo), x => x.BomNo.Contains(parm.BomNo));
             //predicate.And(x => x.Qty > x.CheckQty);
             //predicate.And(x => x.CheckResult == "Wait");
-            predicate.And(x => x.SubmitInspectResult == false);
+            if (!parm.IsPrintQuery)
+            {
+                predicate.And(x => x.SubmitInspectResult == false);
+            }
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()
                 .Distinct()
@@ -176,18 +179,18 @@ namespace ZR.Service.Business.Inspect
             return response.Adapt<List<SapDeliverDto>>();
         }
 
-        public List<SapDeliverRecordDto> GetSapDeliverRecordList(string deliverNo)
+        public PagedInfo<SapDeliverRecordDto> GetSapDeliverRecordList(PrintLabelQueryDto parm)
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<SapDeliverRecord>();
-            predicate.And(x => x.DeliverNo == deliverNo);
-            //predicate.And(x => x.Qty > x.CheckQty);
+            predicate.And(x => x.DeliverNo == parm.DeliverNo);
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), x => x.MaterialSpec == parm.MaterialSpec.Trim());
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()
                 .Where(predicate.ToExpression())
-                .OrderBy(x => x.Id).ToList();
+                .OrderBy(x => x.Id).ToPage(parm);
 
-            return response.Adapt<List<SapDeliverRecordDto>>();
+            return response.Adapt<PagedInfo<SapDeliverRecordDto>>();
         }
 
         public SapDeliverRecordSumDto GetSapDeliverRecordSum(string materialSpecCode, string deliverNo)
@@ -225,17 +228,18 @@ namespace ZR.Service.Business.Inspect
             predicate.And(x => x.DeliverNo == parm.DeliverNo);
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()
-                .GroupBy(x => new { x.MaterialCode, x.MaterialName, x.MaterialSpec })
+                .GroupBy(x => new { x.MaterialCode, x.MaterialName, x.MaterialSpec, x.KeyFlag })
                 .Where(predicate.ToExpression())
                 .Select(x => new SapDeliverRecordSumDto
                 {
                     MaterialCode = x.MaterialCode,
                     MaterialName = x.MaterialName,
                     MaterialSpec = x.MaterialSpec,
+                    KeyFlag = x.KeyFlag,
                     SumQty = SqlFunc.AggregateSum(x.Qty),
                     SumCheckQty = (int)SqlFunc.AggregateSum(x.CheckQty),
                 })
-                .HavingIF(parm.IsComplate==true,x=>x.SumQty>x.SumCheckQty).ToPage(parm);
+                .HavingIF(parm.IsComplate == true, x => x.SumQty > x.SumCheckQty).ToPage(parm);
             return response;
         }
         public bool GetSapDeliverIsAllChecked(string deliverNo)

ZrAdminNetCore-net7.0/ZR.Service/System/IService/IPdaAutoUpdateService.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface IPdaAutoUpdateService : IBaseService<PdaAutoUpdate>
+    {
+        int AddPdaAutoUpdate(PdaAutoUpdate model);
+        PdaAutoUpdate GetPdaLatestmsg();
+    }
+}

ZrAdminNetCore-net7.0/ZR.Service/System/PdaAutoUpdateService.cs

@@ -0,0 +1,37 @@
+using Infrastructure.Attribute;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model.Models.Inspect;
+using ZR.Model.System;
+using ZR.Service.System.IService;
+
+namespace ZR.Service.System
+{
+    [AppService(ServiceType = typeof(IPdaAutoUpdateService), ServiceLifetime = LifeTime.Transient)]
+    public class PdaAutoUpdateService : BaseService<PdaAutoUpdate>, IPdaAutoUpdateService
+    {
+        #region 依赖注入
+        public PdaAutoUpdateService()
+        {
+
+        }
+        #endregion
+
+        #region 业务逻辑代码
+        public int AddPdaAutoUpdate(PdaAutoUpdate model)
+        {
+            model.PublishTime = DateTime.Now;
+            return Add(model, true);
+        }
+        public PdaAutoUpdate GetPdaLatestmsg()
+        {
+            var response = Queryable()
+                .OrderByDescending(x => x.Id).First();
+            return response;
+        }
+        #endregion
+    }
+}