PDA查询界面(质检、入库、出库、装配记录查询)接入主程序API。

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/InStore/InInstoreRecordController.cs

@@ -15,6 +15,7 @@ using ZR.Model.Models.Balance;
 using ZR.Model.Models.Inspect;
 using ZR.Service.Business.IBusinessService.Balance;
 using ZR.Service.Business.IBusinessService.Inspect;
+using UAParser;
 
 namespace ZR.Admin.WebApi.Controllers.InStore
 {
@@ -56,7 +57,13 @@ namespace ZR.Admin.WebApi.Controllers.InStore
         [ActionPermissionFilter(Permission = "business:ininstorerecord:list")]
         public IActionResult QueryInInstoreRecord([FromQuery] InInstoreRecordQueryDto parm)
         {
-            var response = _InInstoreRecordService.GetList(parm);
+            bool isPDA = false;
+            ClientInfo clientInfo = HttpContext.GetClientInfo();
+            if (clientInfo.OS.ToString().Contains("Android 10"))
+            {
+                isPDA = true;
+            }
+            var response = _InInstoreRecordService.GetList(parm, isPDA);
             return SUCCESS(response);
         }
 

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

@@ -11,6 +11,7 @@ using ZR.Service.Business.IBusinessService.Inspect;
 using ZR.Model.Dto.Inspect;
 using ZR.Model.Models.Inspect;
 using ZR.Service.Business.Inspect;
+using UAParser;
 
 namespace ZR.Admin.WebApi.Controllers.Inspect
 {
@@ -52,7 +53,13 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         [ActionPermissionFilter(Permission = "business:qainspectrecord:list")]
         public IActionResult QueryQaInspectRecord([FromQuery] QaInspectRecordQueryDto parm)
         {
-            var response = _QaInspectRecordService.GetList(parm);
+            bool isPDA = false;
+            ClientInfo clientInfo = HttpContext.GetClientInfo();
+            if (clientInfo.OS.ToString().Contains("Android 10"))
+            {
+                isPDA = true;
+            }
+            var response = _QaInspectRecordService.GetList(parm, isPDA);
             return SUCCESS(response);
         }
 

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/OutStore/OutAssembleRecordController.cs

@@ -54,7 +54,13 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         [ActionPermissionFilter(Permission = "business:outassemblerecord:list")]
         public IActionResult QueryOutAssembleRecord([FromQuery] OutAssembleRecordQueryDto parm)
         {
-            var response = _OutAssembleRecordService.GetList(parm);
+            bool isPDA = false;
+            ClientInfo clientInfo = HttpContext.GetClientInfo();
+            if (clientInfo.OS.ToString().Contains("Android 10"))
+            {
+                isPDA = true;
+            }
+            var response = _OutAssembleRecordService.GetList(parm, isPDA);
             return SUCCESS(response);
         }
 

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/OutStore/OutOutstoreRecordController.cs

@@ -14,6 +14,7 @@ using ZR.Service.Business.IBusinessService.Balance;
 using ZR.Model.Dto.Balance;
 using ZR.Model.Models.Balance;
 using ZR.Model.Models;
+using UAParser;
 
 namespace ZR.Admin.WebApi.Controllers.OutStore
 {
@@ -53,7 +54,13 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         [ActionPermissionFilter(Permission = "business:outoutstorerecord:list")]
         public IActionResult QueryOutOutstoreRecord([FromQuery] OutOutstoreRecordQueryDto parm)
         {
-            var response = _OutOutstoreRecordService.GetList(parm);
+            bool isPDA = false;
+            ClientInfo clientInfo = HttpContext.GetClientInfo();
+            if (clientInfo.OS.ToString().Contains("Android 10"))
+            {
+                isPDA = true;
+            }
+            var response = _OutOutstoreRecordService.GetList(parm, isPDA);
             return SUCCESS(response);
         }
 

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Properties/launchSettings.json

@@ -13,7 +13,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchUrl": "",
-      "applicationUrl": "http://localhost:8888",
+      "applicationUrl": "http://localhost:8888;http://192.168.137.1:8888",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": ""
       }

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

@@ -1245,9 +1245,6 @@
             </summary>
         </member>
         <member name="P:ZR.Model.PagerInfo.TotalPage">
-            <summary>
-            总页码
-            </summary>
             <summary>
             总页数
             </summary>

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

@@ -7,11 +7,11 @@
     }
   },
   "ConnectionStrings": {
-    //"conn_db": "Data Source=localhost;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
-    "conn_db": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    "conn_db": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    //"conn_db": "Data Source=39.106.7.239;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", //项目启动url，如果改动端口前端对应devServer也需要进行修改
+  "urls": "http://localhost:8888;http://192.168.137.1:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改
   "corsUrls": "http://localhost:8887", //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开
   "JwtSettings": {
     "Issuer": "ZRAdmin.NET",
@@ -19,7 +19,7 @@
     "SecretKey": "SecretKey-ZRADMIN.NET-20210101",
     "Expire": 1440 //jwt登录过期时间（分）
   },
-  "InitDb": false,//是否初始化db
+  "InitDb": false, //是否初始化db
   "DemoMode": false, //是否演示模式
   "Upload": {
     "uploadUrl": "http://localhost:8888", //本地存储资源访问路径
@@ -44,8 +44,8 @@
     "SendUser": "@all"
   },
   "gen": {
-    //"conn": "Data Source=localhost;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
-    "conn": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    "conn": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    //"conn": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "dbType": 0, //MySql = 0, SqlServer = 1
     "autoPre": true, //自动去除表前缀
     "author": "admin",
@@ -103,6 +103,6 @@
   },
   //验证码配置
   "CaptchaOptions": {
-    "length": 4//验证码长度
+    "length": 4 //验证码长度
   }
 }

ZrAdminNetCore-net7.0/ZR.Model/PagerInfo.cs

@@ -20,9 +20,6 @@ namespace ZR.Model
         /// </summary>
         public int TotalNum { get; set; }
         /// <summary>
-        /// 总页码
-        /// </summary>
-        /// <summary>
         /// 总页数
         /// </summary>
         public int TotalPage

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/InStore/IInInstoreRecordService.cs

@@ -14,7 +14,7 @@ namespace ZR.Service.Business.IBusinessService.InStore
     /// </summary>
     public interface IInInstoreRecordService : IBaseService<InInstoreRecord>
     {
-        PagedInfo<InInstoreRecordDto> GetList(InInstoreRecordQueryDto parm);
+        PagedInfo<InInstoreRecordDto> GetList(InInstoreRecordQueryDto parm, bool isPdaQuery = false);
 
         int AddInInstoreRecord(InInstoreRecord parm);
 

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

@@ -14,7 +14,7 @@ namespace ZR.Service.Business.IBusinessService.Inspect
     /// </summary>
     public interface IQaInspectRecordService : IBaseService<QaInspectRecord>
     {
-        PagedInfo<QaInspectRecordDto> GetList(QaInspectRecordQueryDto parm);
+        PagedInfo<QaInspectRecordDto> GetList(QaInspectRecordQueryDto parm, bool isPdaQuery = false);
 
         int AddQaInspectRecord(QaInspectRecord parm);
 

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/OutStore/IOutAssembleRecordService.cs

@@ -14,7 +14,7 @@ namespace ZR.Service.Business.IBusinessService.OutStore
     /// </summary>
     public interface IOutAssembleRecordService : IBaseService<OutAssembleRecord>
     {
-        PagedInfo<OutAssembleRecordDto> GetList(OutAssembleRecordQueryDto parm);
+        PagedInfo<OutAssembleRecordDto> GetList(OutAssembleRecordQueryDto parm, bool isPdaQuery = false);
 
         int AddOutAssembleRecord(OutAssembleRecord parm);
 

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/OutStore/IOutOutstoreRecordService.cs

@@ -14,7 +14,7 @@ namespace ZR.Service.Business.IBusinessService.OutStore
     /// </summary>
     public interface IOutOutstoreRecordService : IBaseService<OutOutstoreRecord>
     {
-        PagedInfo<OutOutstoreRecordDto> GetList(OutOutstoreRecordQueryDto parm);
+        PagedInfo<OutOutstoreRecordDto> GetList(OutOutstoreRecordQueryDto parm, bool isPdaQuery = false);
 
         int AddOutOutstoreRecord(OutOutstoreRecord parm);
 

ZrAdminNetCore-net7.0/ZR.Service/Business/InStore/InInstoreRecordService.cs

@@ -28,7 +28,7 @@ namespace ZR.Service.Business.InStore
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        public PagedInfo<InInstoreRecordDto> GetList(InInstoreRecordQueryDto parm)
+        public PagedInfo<InInstoreRecordDto> GetList(InInstoreRecordQueryDto parm, bool isPdaQuery = false)
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<InInstoreRecord>();
@@ -41,9 +41,18 @@ namespace ZR.Service.Business.InStore
             predicate.AndIF(!string.IsNullOrEmpty(parm.DeliverNo), it => it.DeliverNo.Contains(parm.DeliverNo));
             predicate.AndIF(!string.IsNullOrEmpty(parm.BomNo), it => it.BomNo.Contains(parm.BomNo));
             predicate.AndIF(!string.IsNullOrEmpty(parm.InspectNo), it => it.InspectNo.Contains(parm.InspectNo));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), it => it.MaterialName.Contains(parm.MaterialName));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), it => it.MaterialSpec.Contains(parm.MaterialSpec));
+
+            if (!isPdaQuery)
+            {
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode));
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), d => d.MaterialName.Contains(parm.MaterialName));
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), d => d.MaterialSpec.Contains(parm.MaterialSpec));
+            }
+            else
+            {
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode) || d.MaterialName.Contains(parm.MaterialCode) || d.MaterialSpec.Contains(parm.MaterialCode));
+            }
+
             predicate.AndIF(!string.IsNullOrEmpty(parm.BnSnCode), it => it.BnSnCode.Contains(parm.BnSnCode));
             predicate.AndIF(!string.IsNullOrEmpty(parm.Category), it => it.Category == parm.Category);
             predicate.AndIF(parm.Result != null, it => it.Result == parm.Result);

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

@@ -32,7 +32,7 @@ namespace ZR.Service.Business.Inspect
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        public PagedInfo<QaInspectRecordDto> GetList(QaInspectRecordQueryDto parm)
+        public PagedInfo<QaInspectRecordDto> GetList(QaInspectRecordQueryDto parm, bool isPdaQuery = false)
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<QaInspectRecord>();
@@ -45,9 +45,16 @@ namespace ZR.Service.Business.Inspect
             predicate.AndIF(!string.IsNullOrEmpty(parm.DeliverNo), d => d.DeliverNo.Contains(parm.DeliverNo));
             predicate.AndIF(!string.IsNullOrEmpty(parm.BomNo), d => d.BomNo.Contains(parm.BomNo));
             predicate.AndIF(!string.IsNullOrEmpty(parm.InspectNo), d => d.InspectNo.Contains(parm.InspectNo));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), d => d.MaterialName.Contains(parm.MaterialName));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), d => d.MaterialSpec.Contains(parm.MaterialSpec));
+            if (!isPdaQuery)
+            {
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode));
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), d => d.MaterialName.Contains(parm.MaterialName));
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), d => d.MaterialSpec.Contains(parm.MaterialSpec));
+            }
+            else
+            {
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode) || d.MaterialName.Contains(parm.MaterialCode) || d.MaterialSpec.Contains(parm.MaterialCode));
+            }
             predicate.AndIF(!string.IsNullOrEmpty(parm.BnSnCode), d => d.BnSnCode.Contains(parm.BnSnCode));
             predicate.AndIF(!string.IsNullOrEmpty(parm.Category), d => d.Category == parm.Category);
             predicate.AndIF(!string.IsNullOrEmpty(parm.Result), d => d.Result == parm.Result);

ZrAdminNetCore-net7.0/ZR.Service/Business/OutStore/OutAssembleRecordService.cs

@@ -27,7 +27,7 @@ namespace ZR.Service.Business.OutStore
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        public PagedInfo<OutAssembleRecordDto> GetList(OutAssembleRecordQueryDto parm)
+        public PagedInfo<OutAssembleRecordDto> GetList(OutAssembleRecordQueryDto parm, bool isPdaQuery = false)
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<OutAssembleRecord>();
@@ -38,9 +38,18 @@ namespace ZR.Service.Business.OutStore
                 predicate.And(it => it.CreateTime >= parm.BeginTime && it.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.BomNo), it => it.BomNo.Contains(parm.BomNo));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), it => it.MaterialName.Contains(parm.MaterialName));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), it => it.MaterialSpec.Contains(parm.MaterialSpec));
+
+            if (!isPdaQuery)
+            {
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode));
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), d => d.MaterialName.Contains(parm.MaterialName));
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), d => d.MaterialSpec.Contains(parm.MaterialSpec));
+            }
+            else
+            {
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode) || d.MaterialName.Contains(parm.MaterialCode) || d.MaterialSpec.Contains(parm.MaterialCode));
+            }
+
             predicate.AndIF(!string.IsNullOrEmpty(parm.BnSnCode), it => it.BnSnCode.Contains(parm.BnSnCode));
             predicate.AndIF(!string.IsNullOrEmpty(parm.Category), it => it.Category == parm.Category);
             predicate.AndIF(parm.KeyFlag != null, it => it.KeyFlag == parm.KeyFlag);

ZrAdminNetCore-net7.0/ZR.Service/Business/OutStore/OutOutstoreRecordService.cs

@@ -27,7 +27,7 @@ namespace ZR.Service.Business.OutStore
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        public PagedInfo<OutOutstoreRecordDto> GetList(OutOutstoreRecordQueryDto parm)
+        public PagedInfo<OutOutstoreRecordDto> GetList(OutOutstoreRecordQueryDto parm, bool isPdaQuery = false)
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<OutOutstoreRecord>();
@@ -39,9 +39,18 @@ namespace ZR.Service.Business.OutStore
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.OutSotreNo), it => it.OutSotreNo.Contains(parm.OutSotreNo));
             predicate.AndIF(!string.IsNullOrEmpty(parm.BomNo), it => it.BomNo.Contains(parm.BomNo));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), it => it.MaterialName.Contains(parm.MaterialName));
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), it => it.MaterialSpec.Contains(parm.MaterialSpec));
+
+            if (!isPdaQuery)
+            {
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode));
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), d => d.MaterialName.Contains(parm.MaterialName));
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), d => d.MaterialSpec.Contains(parm.MaterialSpec));
+            }
+            else
+            {
+                predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode) || d.MaterialName.Contains(parm.MaterialCode) || d.MaterialSpec.Contains(parm.MaterialCode));
+            }
+
             predicate.AndIF(!string.IsNullOrEmpty(parm.BnSnCode), it => it.BnSnCode.Contains(parm.BnSnCode));
             predicate.AndIF(!string.IsNullOrEmpty(parm.Category), it => it.Category == parm.Category);
             predicate.AndIF(!string.IsNullOrEmpty(parm.CreateBy), it => it.CreateBy.Contains(parm.CreateBy));