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

app/admin/model/OrderOutChild.php

@@ -29,7 +29,7 @@ class OrderOutChild extends Model
         $wsmlist = self::name("good_stock")->alias("a")
             ->leftJoin("warehouse_info b", "a.wsm_code=b.wsm_code and b.wsm_type in (2,5)")
             ->field("a.id,a.usable_stock,a.wait_out_stock,b.wsm_code,b.supplierNo,b.supplierName")
-            ->where(["spuCode" => $sale['good_code'], "a.is_del" => 0, "b.companyNo" => $sale['companyNo']])
+            ->where(["spuCode" => $sale['good_code'], "a.is_del" => 0, "b.companyNo" => $sale['supplierNo']])
             ->where("a.usable_stock", ">=", $num)
             ->order("a.usable_stock asc")
             ->findOrEmpty();
@@ -37,11 +37,12 @@ class OrderOutChild extends Model
             "outChildCode" => '',
             "outCode" => $outCode,
             "orderCode" => $sale['orderCode'],
-            "companyNo" => $sale['companyNo'],
-            "companyName" => $sale['companyName'],
-            "supplierNo" => $sale['supplierNo'],
-            "supplierName" => $sale['supplierName'],
-            "cutomer_code" => $sale['cutomer_code'],
+            "companyNo" => $sale['supplierNo'],
+            "companyName" => $sale['supplierName'],
+            "supplierNo" => $sale['supNo'],
+            "supplierName" => $sale['supName'],
+            "customer_code" => $sale['customer_code'],
+            "customer_name" => $sale['customerName'],
             "spuCode" => $sale['good_code'],
             "skuCode" => $sale['skuCode'],
             "good_name" => $sale['good_name'],
@@ -55,9 +56,8 @@ class OrderOutChild extends Model
             "addtime" => date("Y-m-d H:i:s"),
             "updatetime" => date("Y-m-d H:i:s")
         ];
-
         if ($wsmlist->isEmpty()) self::BratchChild($child);
-        else self::SingleChild($child, $wsmlist['id']);
+        else self::SingleChild($child, intval($wsmlist['id']));
         $outup = self::name("order_out")->where(["outCode" => $outCode, "is_del" => 0])->update(["send_status" => 2, "status" => 1, "updatetime" => date("Y-m-d H:i:s")]);
         if ($outup == false) throw new \Exception("发货单信息更新失败");
         return true;
@@ -94,17 +94,17 @@ class OrderOutChild extends Model
             ->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, $child['num']);
+        $wsmArr = self::GetKeyBySum($stock, intval($child['num']));
         if (empty($wsmArr)) throw new Exception("库存数不足生成工单");
         $i = 0;
         foreach ($wsmArr as $key => $val) {
             $i++;
-            $child['outChildCode'] = substr(makeNo("TCD"), 0, -3) . str_pad($i, 3, '0', STR_PAD_LEFT);
+            $child['outChildCode'] = substr(makeNo("TCD"), 0, -3) . str_pad(strval($i), 3, '0', STR_PAD_LEFT);
             $child['num'] = $val['desc_num'] ?? 0;
             $child['wsm_code'] = $val['wsm_code'];
             $childout = self::insert($child);
             if ($childout == false) throw new \Exception("工单生成失败");
-            $bnadd = GoodStockInfo::ChildAddBn($child['outChildCode'], $val['id']);
+            $bnadd = GoodStockInfo::ChildAddBn($child['outChildCode'], intval($val['id']));
             if ($bnadd == false) throw new \Exception("库存更新失败");
         }
     }