|
|
@@ -118,7 +118,8 @@ class Reorder extends Base
|
|
|
"remark" => $remark,
|
|
|
"order_type" => $order['order_type'],
|
|
|
"is_addr" => $is_addr,
|
|
|
- "status" => $order['is_stock'] == 1 ? (Db::name('order_out_child')->where(['is_del' => 0, 'orderCode' => $ordeCode])->value('id', 0) ? 11 : 4) : 1,//库存品未分仓选4，分仓选11，非库存品选1
|
|
|
+// "status" => $order['is_stock'] == 1 ? (Db::name('order_out_child')->where(['is_del' => 0, 'orderCode' => $ordeCode])->value('id', 0) ? 11 : 4) : 1,//库存品未分仓选4，分仓选11，非库存品选1
|
|
|
+ "status" => $order['is_stock'] == 1 ? ($is_addr==1? 11 : 4) : 1,//库存品 无地址选4，分仓选11，非库存品选1
|
|
|
"is_del" => 0,
|
|
|
"addtime" => $date,
|
|
|
"updatetime" => $date,
|
