优化

src/WMS.Web.Domain/Services/InStockService.cs

@@ -718,8 +718,6 @@ namespace WMS.Web.Domain.Services
                     erpDetails.Add(item);
             }
 
-            try
-            {
             foreach (var s in erpDetails)
             {
                 var erp_details = entity.ErpDetails
@@ -744,14 +742,6 @@ namespace WMS.Web.Domain.Services
             if (entity == null) return Result.ReFailure(ResultCodes.DateWriteError);
             return Result.ReSuccess();
         }
-            catch (Exception ex)
-            {
-                _logger.LogInformation($"采购下推-同步：错误：{JsonConvert.SerializeObject(entity)} 操作人:{loginInfo.UserInfo.StaffId}");
-                return Result.ReFailure(ResultCodes.ErpSynsError);
-            }
-
-            
-        }
 
         /// <summary>
         /// 下推
@@ -762,7 +752,8 @@ namespace WMS.Web.Domain.Services
         /// <returns></returns>
         private async Task<(Result result, SyncStatus syncStatus, string erpBillNo)> Push(ErpPushDto dto, InStockErpDetails erpDetail, string billNo, IErpService sc_erpService)
         {
-
+            try
+            {
                 //下推动作
                 var res = await sc_erpService.Push(dto);
                 if (!res.IsSuccess)
@@ -802,6 +793,14 @@ namespace WMS.Web.Domain.Services
                 _logger.LogInformation($"入库单->同步金蝶成功->单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}");
                 return (Result.ReSuccess(), SyncStatus.Success, o_dto.Numbers.First());
             }
+            catch (Exception ex)
+            {
+                _logger.LogInformation($"入库单-同步：错误：{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{ex.Message}");
+                var result = Result.ReFailure(ex.Message, 50001);
+                return (result, SyncStatus.Fail, "");
+            }
+
+        }
 
 
     }

src/WMS.Web.Domain/Services/Public/LoginService.cs

@@ -173,8 +173,8 @@ namespace WMS.Web.Domain.Services.Public
                     loginInfo.TokenInfo = token;
 
                     //var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式
-                    
+                    var ops_login_time = token.Expired - DateTime.Now;//用于正式
-                    _redisClientService.SetStringKey<LoginInDto>($"wms_login_{token.Token}", loginInfo, token.Expired.TimeOfDay);
+                    _redisClientService.SetStringKey<LoginInDto>($"wms_login_{token.Token}", loginInfo, ops_login_time);
 
                     _logger.LogInformation($"登录信息：用户人员信息->{staffName}（{r.UserInfo.StaffId}），公司名称->{r.UserInfo.CompanyName}"+"，过期时间："+token.Expired.ToString("yyyy-MM-dd HH:mm:ss"));
 

src/WMS.Web.Domain/Values/SyncStatus.cs

@@ -34,6 +34,6 @@ namespace WMS.Web.Domain.Values
         /// 同步中
         /// </summary>
         [EnumRemark("同步中")]
-        SyncIng = 4
+        SyncIng = 4,
     }
 }