暂时取消PDA端的权限校验功能。修正快速出库库存数据不准的问题。

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

@@ -61,7 +61,7 @@ namespace ZR.Admin.WebApi.Controllers.InStore
         {
             bool isPDA = false;
             ClientInfo clientInfo = HttpContext.GetClientInfo();
-            if (clientInfo.OS.ToString().Contains("Android 10"))
+            if (clientInfo.OS.ToString().Contains("Android 10") || clientInfo.OS.ToString().Contains("Android 9"))
             {
                 isPDA = true;
             }
@@ -180,7 +180,7 @@ namespace ZR.Admin.WebApi.Controllers.InStore
         /// <returns></returns>
         /// <exception cref="CustomException"></exception>
         [HttpPost("AddCheckedSapDeliverInstoreDtlResult")]
-        [ActionPermissionFilter(Permission = "business:ininstorerecord:AddCheckedSapDeliverInstoreDtlResult")]
+        //[ActionPermissionFilter(Permission = "business:ininstorerecord:AddCheckedSapDeliverInstoreDtlResult")]
         public IActionResult AddCheckedSapDeliverInstoreDtlResult([FromBody] QaInspectRecordDto parm)
         {
             if (parm == null)

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

@@ -222,7 +222,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// <param name="parm"></param>
         /// <returns></returns>
         [HttpPost("QueryCheckedSapDeliverData")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QueryCheckedSapDeliverData")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QueryCheckedSapDeliverData")]
         public IActionResult QueryCheckedSapDeliverData([FromBody] QaInspectRecordQueryNoPageDto parm)
         {
             var response = _QaInspectRecordService.GetCheckedDeliverData(parm);
@@ -234,7 +234,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// <param name="deliverNo">交验单号</param>
         /// <returns></returns>
         [HttpPost("QueryCheckedSapDeliverDtlData")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QueryCheckedSapDeliverDtlData")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QueryCheckedSapDeliverDtlData")]
         public IActionResult QueryCheckedSapDeliverDtlData(string deliverNo)
         {
             var response = _QaInspectRecordService.GetCheckedSapDeliverRecordList(deliverNo);
@@ -262,7 +262,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// <returns></returns>
         /// <exception cref="CustomException"></exception>
         [HttpPost("addSapDeliverDtlInspectResult")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:addSapDeliverDtlInspectResult")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:addSapDeliverDtlInspectResult")]
         public IActionResult AddSapDeliverDtlInspectResult([FromBody] SapDeliverRecordExtDto parm)
         {
             if (parm == null)
@@ -450,7 +450,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// <returns></returns>
         /// <exception cref="CustomException"></exception>
         [HttpPost("InspectOneClickOutStore")]
-        [ActionPermissionFilter(Permission = "business:QaInspectRecord:InspectOneClickOutStore")]
+        //[ActionPermissionFilter(Permission = "business:QaInspectRecord:InspectOneClickOutStore")]
         public IActionResult InspectOneClickOutStore([FromBody] SapDeliverRecordExtDto parm)
         {
             if (parm == null)

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

@@ -344,7 +344,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// <param name="parm">交验单查询Dto实体类 -- 无分页参数</param>
         /// <returns></returns>
         [HttpPost("QuerySapDeliverData")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapDeliverData")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapDeliverData")]
         public IActionResult QuerySapDeliverData([FromBody] SapDeliverQueryNoPageDto parm)
         {
             var response = _SapDeliverRecordService.GetListNoPage(parm);
@@ -357,7 +357,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// <param name="parm">打印校验单物料明细标签的查询对象</param>
         /// <returns></returns>
         [HttpPost("QuerySapDeliverDtlData")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapDeliverDtlData")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapDeliverDtlData")]
         public IActionResult QuerySapDeliverDtlData([FromBody] PrintLabelQueryDto parm)
         {
             var response = _SapDeliverRecordService.GetSapDeliverRecordList(parm);
@@ -388,7 +388,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             return SUCCESS(response);
         }
         [HttpPost("AddPrintLabelRecord")]
-        [ActionPermissionFilter(Permission = "business:PrintLabelRecord:add")]
+        //[ActionPermissionFilter(Permission = "business:PrintLabelRecord:add")]
         [Log(Title = "新增打印数据", BusinessType = BusinessType.INSERT)]
         public IActionResult AddPrintLabelRecord([FromBody] PrintLabelRecordDto parm)
         {

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

@@ -196,7 +196,7 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         /// <returns></returns>
         /// <exception cref="CustomException"></exception>
         [HttpPost("AddOutAssembleRecordForFile")]
-        [ActionPermissionFilter(Permission = "AddOutAssembleRecordForFile")]
+        //[ActionPermissionFilter(Permission = "AddOutAssembleRecordForFile")]
         public async Task<IActionResult> AddOutAssembleRecordForFile([FromForm] SapBomRecordAssembleExtDto assembleDataDto)
         {
             IFormFile? formFile;

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

@@ -57,7 +57,7 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         {
             bool isPDA = false;
             ClientInfo clientInfo = HttpContext.GetClientInfo();
-            if (clientInfo.OS.ToString().Contains("Android 10"))
+            if (clientInfo.OS.ToString().Contains("Android 10") || clientInfo.OS.ToString().Contains("Android 9"))
             {
                 isPDA = true;
             }

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

@@ -228,7 +228,7 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         /// <param name="parm">关键件Bom清单查询Dto实体类 -- 无分页参数</param>
         /// <returns></returns>
         [HttpPost("QueryBomList")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QueryBomList")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QueryBomList")]
         public IActionResult QueryBomList([FromBody] SapBomRecordQueryNoPageDto parm)
         {
             var response = _SapBomRecordService.GetBomList(parm);
@@ -241,14 +241,14 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         /// <param name="outTaskNo">Bom单号</param>
         /// <returns></returns>
         [HttpPost("QuerySapBomRecordList")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapBomRecordList")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapBomRecordList")]
         public IActionResult QuerySapBomRecordList(string bomNo)
         {
             var response = _SapBomRecordService.GetBomRecordList(bomNo);
             return SUCCESS(response);
         }
         [HttpPost("QuerySapBomRecordListForMaterialSpec")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapBomRecordListForMaterialSpec")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapBomRecordListForMaterialSpec")]
         public IActionResult QuerySapBomRecordListForMaterialSpec(string bomNo, string materialSpecCode)
         {
             var response = _SapBomRecordService.GetBomRecordList(bomNo, materialSpecCode);

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

@@ -58,7 +58,7 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         /// <param name="parm">出库任务单查询Dto实体类 -- 无分页参数</param>
         /// <returns></returns>
         [HttpPost("QuerySapOutTaskList")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapOutTaskList")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapOutTaskList")]
         public IActionResult QuerySapOutTaskList([FromBody] SapOutTaskQueryNoPageDto parm)
         {
             var response = _SapOutTaskRecordService.GetSapOutTaskList(parm);
@@ -71,7 +71,7 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         /// <param name="outTaskNo">出库任务单号</param>
         /// <returns></returns>
         [HttpPost("QuerySapOutTaskRecordList")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapOutTaskRecordList")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapOutTaskRecordList")]
         public IActionResult QuerySapOutTaskRecordList(string outTaskNo)
         {
             var response = _SapOutTaskRecordService.GetSapOutTaskRecordList(outTaskNo);
@@ -79,7 +79,7 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         }
 
         [HttpPost("QuerySapOutTaskListForMaterialSpec")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapOutTaskListForMaterialSpec")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapOutTaskListForMaterialSpec")]
         public IActionResult QuerySapOutTaskListForMaterialSpec(string outTaskNo, string materialSpecCode)
         {
             var response = _SapOutTaskRecordService.GetSapOutTaskRecordList(outTaskNo, materialSpecCode);
@@ -87,7 +87,7 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         }
 
         [HttpPost("QuerySapOutTaskListUnfinished")]
-        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapOutTaskListUnfinished")]
+        //[ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapOutTaskListUnfinished")]
         public IActionResult QuerySapOutTaskListUnfinished([FromBody] UnfinishedSapOutTaskRecordDto parm)
         {
             var response = _SapOutTaskRecordService.GetUnFinishedSapOutTaskRecordList(parm);

ZrAdminNetCore-net7.0/ZR.Service/Business/Balance/StkBalanceDtlService.cs

@@ -166,7 +166,7 @@ namespace ZR.Service.Business.Balance
         }
         public int AddStkBalanceDtlReturnIdentity(StkBalanceDtl model)
         {
-            return Add(model, true);
+            return AddReturnIdentity(model, true);
         }
         /// <summary>
         /// 修改库存管理/库存明细表