Browse Source

Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

tangdi 2 years ago
parent
commit
90e52cc595

+ 2 - 2
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -6845,7 +6845,7 @@ namespace Business.Replenishment
                     }
 
                     //采购单按照需求日期从小到大排
-                    pchPurDtls = curPurDtls.OrderBy(p => p.DueDate).ToList();
+                    pchPurDtls = pchPurDtls.OrderBy(p => p.DueDate).ToList();
                     for (int k = 0; k < pchPurDtls.Count; k++)
                     {
                         if (sumNeedQty >= needQty)
@@ -7057,7 +7057,7 @@ namespace Business.Replenishment
                         entity.um = "";
                         entity.purgroup = "";
                         entity.suppliercode = pch.supplier_number;
-                        entity.supplier = pch.supplier_name;
+                        entity.supplier = string.IsNullOrEmpty(pch.supplier_name) ? "" : pch.supplier_name;
                         entity.requestdate = demandplans[i].arrivaldate;
                         entity.needdate = demandplans[i].requestdate;
                         entity.ponumber = pud.PurOrd;