Переглянути джерело

Merge branch 'master-new-wgg' of wugg/phpstock into master-new

wugg 2 роки тому
батько
коміт
afa56345bc
1 змінених файлів з 2 додано та 3 видалено
  1. 2 3
      app/admin/model/OrderOutChild.php

+ 2 - 3
app/admin/model/OrderOutChild.php

@@ -100,11 +100,10 @@ class OrderOutChild extends Model
 
         if (empty($child)) throw new Exception("工单信息不能为空");
         $stock = self::name("good_stock")->alias("a")
-            ->leftJoin("warehouse_info b", "a.wsm_code=b.wsm_code and b.wsm_type in (2,5)")
-            ->where(["spuCode" => $child['spuCode'], "a.is_del" => 0, "b.companyNo" => $child['companyNo']])
+            ->leftJoin("warehouse_info b", "a.wsm_code=b.wsm_code")
+            ->where(["spuCode" => $child['spuCode'], "a.is_del" => 0,"b.wsm_type"=>[2,5], "b.companyNo" => $child['companyNo']])
             ->order("a.usable_stock desc")
             ->column("a.id,a.usable_stock,a.wait_out_stock,b.wsm_code,b.supplierNo,b.supplierName", "a.id");
-
         if (empty($stock)) throw new Exception("商品库存信息未找到");
         $wsmArr = self::GetKeyBySum($stock, intval($child['num']));
         if (empty($wsmArr)) throw new Exception("库存数不足生成工单");