|
@@ -90,7 +90,7 @@ class WareHouse extends BaseController
|
|
|
$add = Db::name('warehouse_info')->insert($data,true);
|
|
|
if($add>0){
|
|
|
$st = ["order_code"=>$wsm_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
|
|
|
- ActionLog::logAdd($post['token'],$st,"resign_info",1,$st);
|
|
|
+ ActionLog::logAdd($post['token'],$st,"warehouse_info",1,$data);
|
|
|
$addrinfo = [
|
|
|
"wsm_code"=>$wsm_code,
|
|
|
"wsm_type"=> $wsm_type,
|
|
@@ -104,9 +104,8 @@ class WareHouse extends BaseController
|
|
|
];
|
|
|
$addri = DB::name("warehouse_addr")->insert($addrinfo);
|
|
|
if($addri){
|
|
|
-
|
|
|
$sf = ["order_code"=>$wsm_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
|
|
|
- ActionLog::logAdd($post['token'],$sf,"resign_info",1,$sf);
|
|
|
+ ActionLog::logAdd($post['token'],$sf,"warehouse_addr",1,$addrinfo);
|
|
|
Db::commit();
|
|
|
return app_show(0,'仓库创建成功');
|
|
|
}
|
|
@@ -269,6 +268,8 @@ class WareHouse extends BaseController
|
|
|
];
|
|
|
$add = Db::name('warehouse_info')->where($warse)->update($data);
|
|
|
if($add){
|
|
|
+ $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
|
|
|
+ ActionLog::logAdd($post['token'],$st,"warehouse_info",0,$data);
|
|
|
$addrinfo = [
|
|
|
"wsm_type"=> $wsm_type,
|
|
|
"wsm_name"=>$wsm_name,
|
|
@@ -279,6 +280,8 @@ class WareHouse extends BaseController
|
|
|
];
|
|
|
$addri = DB::name("warehouse_addr")->where(["wsm_code"=>$warse['wsm_code'],"is_del"=>0])->update($addrinfo);
|
|
|
if($addri){
|
|
|
+ $sti = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
|
|
|
+ ActionLog::logAdd($post['token'],$sti,"warehouse_info",0,$addrinfo);
|
|
|
Db::commit();
|
|
|
return app_show(0,'仓库更新成功');
|
|
|
}
|
|
@@ -304,6 +307,8 @@ class WareHouse extends BaseController
|
|
|
$warse['is_del'] = 1;
|
|
|
$warse['updatetime'] = date("Y-m-d H:i:s");
|
|
|
$Del= Db::name("warehouse_info")->save($warse);
|
|
|
+ $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"del"];
|
|
|
+ ActionLog::logAdd($post['token'],$st,"warehouse_info",0,$warse);
|
|
|
return $Del? app_show(0,'仓库删除成功'): error_show(1005,'仓库删除失败');
|
|
|
}
|
|
|
|
|
@@ -325,7 +330,7 @@ class WareHouse extends BaseController
|
|
|
$warse['status'] = $status;
|
|
|
$warse['updatetime'] = date("Y-m-d H:i:s");
|
|
|
$Del= Db::name("warehouse_info")->save($warse);
|
|
|
- $st = ["order_code"=>$id,"status"=>$vmp,"action_remark"=>'',"action_type"=>"create"];
|
|
|
+ $st = ["order_code"=>$id,"status"=>$vmp,"action_remark"=>'',"action_type"=>"edit"];
|
|
|
ActionLog::logAdd($post['token'],$st,"warehouse_info",$warse['status'],$st);
|
|
|
return $Del? app_show(0,'仓库状态修改成功'): error_show(1005,'仓库状态修改失败');
|
|
|
}
|