|
|
@@ -108,6 +108,7 @@ public function __construct(App $app)
|
|
|
->leftJoin("good_stock c", "c.spuCode=b.spuCode")
|
|
|
->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
|
|
|
->where($condtion)
|
|
|
+ ->field("b.*,c.id as stock_id,c.usable_stock,c.wait_in_stock,c.wait_out_stock,c.wsm_code,u.uid,u.nickname,u.itemid")
|
|
|
->page($page, $size)
|
|
|
->select()
|
|
|
->toArray();
|
|
|
@@ -131,7 +132,7 @@ public function __construct(App $app)
|
|
|
$value['brand_name'] = isset($brands[$value['brand_id']]) ? $brands[$value['brand_id']] : '';
|
|
|
$value['unit'] = isset($units[$value['good_unit']]) ? $units[$value['good_unit']] : '';
|
|
|
$value['companyName'] = isset($business[$value['companyNo']]) ? $business[$value['companyNo']] : '';
|
|
|
-
|
|
|
+ $value['bninfo'] =Db::name("good_stock_info")->where([["stockid","=",$value['stock_id']],["balance_num",">",0]])->select()->toArray();
|
|
|
//规格信息
|
|
|
$spec = Db::name("good_spec")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->select()->toArray();
|
|
|
|
|
|
@@ -149,17 +150,8 @@ public function __construct(App $app)
|
|
|
}
|
|
|
}
|
|
|
$value['specinfo'] = $speclist;
|
|
|
-
|
|
|
- //采购人
|
|
|
-// $value['cgder'] = Db::name('supplier')
|
|
|
-// ->where([
|
|
|
-// 'code' => $value['supplierNo'],
|
|
|
-// 'is_del' => 0,
|
|
|
-// ])->value('person', '');
|
|
|
$value['cgder'] = isset($supplier['person']) ? $supplier['person'] : '';
|
|
|
-
|
|
|
$value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
|
|
|
-
|
|
|
$data[] = $value;
|
|
|
}
|
|
|
|
|
|
@@ -623,9 +615,9 @@ public function edit()
|
|
|
"good_name"=>$value["value2"],
|
|
|
"origin_price"=>0,
|
|
|
"origin_num"=>isset($stock) ? $stock['balance_num']:0,
|
|
|
- "check_num"=>$value["value14"],
|
|
|
- "is_profit"=>intval($value["value14"])>=$stock_num ?0:1,
|
|
|
- "diff_num"=>intval($value["value14"])>=$stock_num ?intval($value["value14"])-$stock_num:$stock_num-intval($value["value14"]),
|
|
|
+ "check_num"=>$value["value16"],
|
|
|
+ "is_profit"=>intval($value["value16"])>=$stock_num ?0:1,
|
|
|
+ "diff_num"=>intval($value["value16"])>=$stock_num ?intval($value["value16"])-$stock_num:$stock_num-intval($value["value16"]),
|
|
|
'addtime'=>date("Y-m-d H:i:s"),
|
|
|
'updatetime'=>date("Y-m-d H:i:s"),
|
|
|
"check_code"=>$fo['check_code']
|
