交货单调整

MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -6778,7 +6778,7 @@ namespace Business.Replenishment
                 //当前采购明细对应的采购单
                 var curPurMsts = purOrdMasters.Where(p => curPurDtls.Select(m => m.PurOrd).Distinct().Contains(p.PurOrd)).ToList();
                 //当前采购明细对应的送货单
-                var curShds = shdzbs.Where(p => p.sh_material_code == demandplans[i].itemnum && curPurDtls.Select(m => m.PurOrd).Contains(p.sh_material_code)).ToList();
+                var curShds = shdzbs.Where(p => p.sh_material_code == demandplans[i].itemnum && curPurDtls.Select(m => m.PurOrd).Contains(p.po_bill)).ToList();
                 //数据库中当前采购单明细被交货单占用情况
                 var curDbOccupys = dbPolistds.Where(p => curPurDtls.Select(m => m.PurOrd).Contains(p.ponumber) && p.itemnum == demandplans[i].itemnum).ToList();
                 //本次计算中采购单明细被交货单占用情况
@@ -6907,7 +6907,7 @@ namespace Business.Replenishment
                             break;
                         }
                         //当前采购明细剩余数量=订单数量-送货单数量(不是由交货单转的送货单)
-                        decimal syQty = pchPurDtls[k].QtyOrded - pchShds.Where(p => p.po_billline == pchPurDtls[k].Line).Sum(p=>p.sh_delivery_quantity);
+                        decimal syQty = pchPurDtls[k].QtyOrded - pchShds.Where(p => p.po_billline == pchPurDtls[k].Line.ToString()).Sum(p=>p.sh_delivery_quantity);
                         //当前采购明细被占用数量(已占用数量)
                         var occupy = curDbOccupys.Where(p => p.ponumber == pchPurDtls[k].PurOrd && p.itemnum == pchPurDtls[k].ItemNum && p.poline == pchPurDtls[k].Line).ToList();
                         decimal yzyQty = occupy.Sum(p => p.schedqty);
@@ -6954,7 +6954,7 @@ namespace Business.Replenishment
                         entity.um = "";
                         entity.purgroup = "";
                         entity.suppliercode = curChaes[j].supplier_number;
-                        entity.supplier = curChaes[j].supplier_name;
+                        entity.supplier = string.IsNullOrEmpty(curChaes[j].supplier_name) ? "" : curChaes[j].supplier_name;
                         entity.requestdate = demandplans[i].arrivaldate;
                         entity.needdate = demandplans[i].requestdate;
                         entity.ponumber = pchPurDtls[k].PurOrd;

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/scm_shdzb.cs

@@ -35,7 +35,7 @@ namespace Business.Domain
         /// 采购单行号
         /// </summary>
         [Comment("采购单行号")]
-        public int po_billline { get; set; }
+        public string po_billline { get; set; }
 
         /// <summary>
         /// 送货数量