Просмотр исходного кода

代码扫描工具发现问题修改

Murphy 2 лет назад
Родитель
Сommit
9111475ea4

+ 4 - 2
MicroServices/Business/Business.Application/DOP/SyncDOPAppService.cs

@@ -235,9 +235,11 @@ namespace Business.DOP
                 //产品线和系列
                 var itemProdRange = yearDemandList.Find(b => b.Model == a.Model);
                 if (itemProdRange != null)
+                {
                     a.ProLine = itemProdRange.ProdLine;
-                    a.Series= itemProdRange.ProdRange;
-
+                    a.Series = itemProdRange.ProdRange;
+                }
+     
                 //工厂库存
                 var itemSap = ItemInvList.Find(b => b.MATNR == a.ItemNumber);
                 if(itemSap!=null)

+ 1 - 1
MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -513,7 +513,7 @@ namespace Business.ResourceExamineManagement
         public string GetMaxSerialNumber(long id, JObject? formData = null)
         {
             var modelList = _rf_serialnumber.Select(s => s.Id == id);
-            if (modelList == null && modelList.Count < 1)
+            if (modelList == null || modelList.Count < 1)
             {
                 return string.Empty;
             }

+ 4 - 7
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -2581,7 +2581,6 @@ namespace Business.ResourceExamineManagement
             var periodSd = _periodSequenceDet.Select(s => s.Domain == domain && (s.Status == "" || s.Status == "r") && stime <= s.PlanDate && s.PlanDate <= etime).ToList();
             if (periodSd.Any())
             {
-                periodSd.Select(s => s.WorkOrds).ToList();
                 List<mes_morder> mo_Mes_Morders = _mysql_mes_morder.GetListAsync(x => domain == x.factory_id.ToString() && periodSd.Select(s => s.WorkOrds).Contains(x.morder_no) && (x.morder_state == MorderEnum.Initial_state || x.morder_state == MorderEnum.Xd_state) && !x.IsDeleted).Result;
                 return await OrderResourceCheck(mo_Mes_Morders, domain, userAccount);
             }
@@ -3151,7 +3150,6 @@ namespace Business.ResourceExamineManagement
             List<long> itemIds = bomlist.Select(p => p.icitem_id).ToList();
             itemIds.AddRange(bomchildlist.Select(p => p.icitem_id).ToList());
             itemIds.AddRange(subdtllist.Select(p => p.icitem_id).ToList());
-            itemIds.Distinct();
             icitemlist.AddRange(_ic_item.GetListAsync(p => itemIds.Contains(p.mysql_id) && !p.IsDeleted).Result);
         }
 
@@ -3350,8 +3348,7 @@ namespace Business.ResourceExamineManagement
 
                     if (headAccount.Any())
                     {
-                        headAccount.Distinct();
-                        newNbr.User1 = string.Join(",", headAccount);
+                        newNbr.User1 = string.Join(",", headAccount.Distinct());
                         string[] user2 = headAccount.ToArray();
                         newNbr.User2 =JsonConvert.SerializeObject(user2);
                     }
@@ -3479,7 +3476,7 @@ namespace Business.ResourceExamineManagement
         public string GetMaxSerialNumber(long id, JObject? formData = null)
         {
             var modelList = _rf_serialnumber.Select(s => s.Id == id);
-            if (modelList == null && modelList.Count < 1)
+            if (modelList == null || modelList.Count < 1)
             {
                 return string.Empty;
             }
@@ -3645,8 +3642,8 @@ namespace Business.ResourceExamineManagement
                         _nbrMaster.Insert(nbrMasterList);
                         nbrMasterList.ForEach(a =>
                         {
-                            string sql = string.Format("exec pr_WMS_BPM_AddMobileTask @TaskID='{0}',@PlanDate='{1}',@ExecuterTypeID=2,@CreateUser='{2}'",a.Nbr,a.Date.Value.ToString("yyyy-MM-dd"),a.CreateUser);
-                            _businessDbContext.Database.ExecuteSqlRaw(sql);
+                            string sql ="exec pr_WMS_BPM_AddMobileTask @TaskID='{0}',@PlanDate='{1}',@ExecuterTypeID=2,@CreateUser='{2}'";
+                            _businessDbContext.Database.ExecuteSqlRaw(sql, a.Nbr, a.Date.Value.ToString("yyyy-MM-dd"), a.CreateUser);
                         });
 
                         if (itemstockoccupy.Any())