采购建议新增库容

AutoTurnOver.DB/purchase_advise.cs

@@ -680,7 +680,7 @@ and t1.quantity_init_advise>=0 and ( t3.buyer_name in ('张莹霞1') and t1.ware
                                     var itemStorageCapacity = (skuStorageCapacityList.FirstOrDefault(s => s.bailun_sku_warehouse_code == itemMap.bailun_sku_warehouse_code) ?? new dc_base_storage_capacity() { });
 
                                     // 扣除采购在途，调拨采购临时，调拨暂存，调拨计划
-                                    itemStorageCapacity.stock = (itemStorageCapacity.stock - skuTransit.quantity_purchase - skuTransit.quantity_transfer_temporary_storage - skuTransit.quantity_transfer_temp_schedule - skuTransit.quantity_transfer_plan);
+                                    itemStorageCapacity.stock = Math.Max(0, (itemStorageCapacity.stock - skuTransit.quantity_purchase - skuTransit.quantity_transfer_temporary_storage - skuTransit.quantity_transfer_temp_schedule - skuTransit.quantity_transfer_plan));
 
                                     var use_quantity = 0;
                                     if (itemStorageCapacity.stock >= sum_stock)
@@ -743,12 +743,16 @@ and t1.quantity_init_advise>=0 and ( t3.buyer_name in ('张莹霞1') and t1.ware
                 // 把需要监控库容的按库容调整
                 foreach (var item in not_mother_datas.Where(s => dc_base_storage_capacity_configs.Any(v => s.bailun_sku_warehouse_code == v.bailun_sku_warehouse_code)))
                 {
-                    if (item.bailun_sku_warehouse_code == "220912001ESFBABLEM" || item.bailun_sku_warehouse_code == "948890401FMUSFBA"|| item.bailun_sku_warehouse_code == "948890401MMDUSFBA")
-                    {
-
-                    }
 
                     var storageCapacity = (int)Math.Ceiling((skuStorageCapacityList.FirstOrDefault(s => s.bailun_sku_warehouse_code == item.bailun_sku_warehouse_code) ?? new dc_base_storage_capacity()).stock);
+                    var skuTransit = _connection.QueryFirstOrDefault<dc_mid_transit>(" select * from dc_mid_transit where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", new
+                    {
+                        bailun_sku = item.bailun_sku,
+                        warehouse_code = item.warehouse_code
+                    }) ?? new dc_mid_transit();
+                    // 扣除采购在途，调拨采购临时，调拨暂存，调拨计划
+                    storageCapacity = Math.Max(0, (storageCapacity - skuTransit.quantity_purchase - skuTransit.quantity_transfer_temporary_storage - skuTransit.quantity_transfer_temp_schedule - skuTransit.quantity_transfer_plan));
+
                     var quantity_final_advise = item.quantity_final_advise;
                     item.storage_capacity_quantity = storageCapacity;
                     item.quantity_final_advise = Math.Min(quantity_final_advise, storageCapacity);