|
|
@@ -62,6 +62,7 @@ class WareHouse extends BaseController
|
|
|
$wsm_mobile = isset($post['wsm_mobile']) && $post['wsm_mobile']!=="" ? trim($post['wsm_mobile']):"";
|
|
|
$addr_code = isset($post['addr_code']) && $post['addr_code']!=="" ? trim($post['addr_code']):"";
|
|
|
$wsm_addr = isset($post['wsm_addr']) && $post['wsm_addr']!=="" ? trim($post['wsm_addr']):"";
|
|
|
+ $addrs_code = isset($post['addrs_code']) && $post['addrs_code']!=="" ? trim($post['addrs_code']):"";
|
|
|
Db::startTrans();
|
|
|
try{
|
|
|
$wsm_code = makeNo("WSM");
|
|
|
@@ -74,6 +75,7 @@ class WareHouse extends BaseController
|
|
|
'contactor'=>$contactor,
|
|
|
'mobile'=>$mobile,
|
|
|
'position'=>$position,
|
|
|
+ "addrs_code"=>$addrs_code,
|
|
|
'status'=>1,
|
|
|
'addtime'=>date("Y-m-d H:i:s"),
|
|
|
'updatetime'=>date("Y-m-d H:i:s")
|
|
|
@@ -141,7 +143,7 @@ class WareHouse extends BaseController
|
|
|
$page>=ceil($count/$size) ? $page = ceil($count/$size): '';
|
|
|
$list = Db::name("warehouse_info")->alias("a")->join("warehouse_addr as b ","a.wsm_code=b.wsm_code","left")
|
|
|
->where($condition)->field("a.id.a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.mobile,a.position,a.status,a.addtime,
|
|
|
- a.updatetime,b.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code")->page($page,$size)->order("a.addtime desc")
|
|
|
+ a.updatetime,b.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->page($page,$size)->order("a.addtime desc")
|
|
|
->select();
|
|
|
foreach ($list as $key=>$value){
|
|
|
if($value['supplierNo']!=""){
|
|
|
@@ -170,7 +172,7 @@ class WareHouse extends BaseController
|
|
|
};
|
|
|
$warse = Db::name("warehouse_info")->alias("a")->join("warehouse_addr as b ","a.wsm_code=b.wsm_code","left")
|
|
|
->where(["a.id"=>$id,"a.is_del"=>0])->field("a.id.a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.mobile,a.position,a.status,a.addtime,
|
|
|
- a.updatetime,b.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code")->find();
|
|
|
+ a.updatetime,b.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->find();
|
|
|
if(empty($warse)){
|
|
|
return error_show(1004,"未找到数据");
|
|
|
}
|
|
|
@@ -224,6 +226,7 @@ class WareHouse extends BaseController
|
|
|
$wsm_name = isset($post['wsm_name']) && $post['wsm_name']!=="" ? trim($post['wsm_name']):"";
|
|
|
$wsm_mobile = isset($post['wsm_mobile']) && $post['wsm_mobile']!=="" ? trim($post['wsm_mobile']):"";
|
|
|
$addr_code = isset($post['addr_code']) && $post['addr_code']!=="" ? $post['addr_code']:"";
|
|
|
+ $addrs_code = isset($post['addrs_code']) && $post['addrs_code']!=="" ? $post['addrs_code']:"";
|
|
|
$wsm_addr = isset($post['wsm_addr']) && $post['wsm_addr']!=="" ? trim($post['wsm_addr']):"";
|
|
|
Db::startTrans();
|
|
|
try{
|
|
|
@@ -233,6 +236,7 @@ class WareHouse extends BaseController
|
|
|
'contactor'=>$contactor,
|
|
|
'mobile'=>$mobile,
|
|
|
'position'=>$position,
|
|
|
+ "addrs_code"=>$addrs_code,
|
|
|
'updatetime'=>date("Y-m-d H:i:s")
|
|
|
];
|
|
|
$add = Db::name('warehouse_info')->where($warse)->update($data);
|
panlumeng