Skip to content

黄成意 / yunxin

Go to a project
Commit e4c488cc by PRY5YKGJ82EZEPX\Administrator
Options

更新联营物料

parent cd844c43
Inline Side-by-side
Showing with 33 additions and 17 deletions
app/Http/Controllers/ApiController.php
...@@ -79,7 +79,7 @@ class ApiController extends Controller ...@@ -79,7 +79,7 @@ class ApiController extends Controller
private function ApiAbnormalListExport($request, $id){ private function ApiAbnormalListExport($request, $id){
$data= $request->input(); $data= $request->input();
$data['is_consign'] = 1; //供应商代发 $data['is_consign'] = 1; //供应商代发
$id = (new UploadLogModel())->addLog($request->account_id,1,$data); $id = (new UploadLogModel())->addLog($request->account_id,2,$data);
if(!$id) return Export(20003,'任务推送失败'); if(!$id) return Export(20003,'任务推送失败');
dispatch(new JopExportAbnormlList($id)); dispatch(new JopExportAbnormlList($id));
Export(0,$id); Export(0,$id);
...@@ -98,7 +98,7 @@ class ApiController extends Controller ...@@ -98,7 +98,7 @@ class ApiController extends Controller
private function ApiPutawayListExport($request, $id){ private function ApiPutawayListExport($request, $id){
$data= $request->input(); $data= $request->input();
$data['picking_type'] = 2; //寄售 $data['picking_type'] = 2; //寄售
$id = (new UploadLogModel())->addLog($request->account_id,1,$data); $id = (new UploadLogModel())->addLog($request->account_id,3,$data);
if(!$id) return Export(20003,'任务推送失败'); if(!$id) return Export(20003,'任务推送失败');
dispatch(new JopExportPutawayList($id)); dispatch(new JopExportPutawayList($id));
Export(0,$id); Export(0,$id);
...@@ -141,22 +141,22 @@ class ApiController extends Controller ...@@ -141,22 +141,22 @@ class ApiController extends Controller
$input['supplier_com_code'] = $request->supplier_com_code; $input['supplier_com_code'] = $request->supplier_com_code;
ExportLayui2((new ServerMicModel())->getSkuList($input)); ExportLayui2((new ServerMicModel())->getSkuList($input));
} }
//自营商品列表导出
private function ApiGoodsListExport($request, $id){
$id = (new UploadLogModel())->addLog($request->account_id,4,$request->input());
if(!$id) return Export(20003,'任务推送失败');
dispatch(new JopExportGoodsList($id));
Export(0,$id);
}
//联营商品导出 //联营商品导出
private function ApiGoodsComListExport($request, $id){ private function ApiGoodsComListExport($request, $id){
$data= $request->input(); $data= $request->input();
$data['supplier_com_code'] = $request->supplier_com_code; $data['supplier_com_code'] = $request->supplier_com_code;
$id = (new UploadLogModel())->addLog($request->account_id,1,$data,$request->mobile); $id = (new UploadLogModel())->addLog($request->account_id,5,$data,$request->mobile);
if(!$id) return Export(20003,'任务推送失败'); if(!$id) return Export(20003,'任务推送失败');
dispatch(new JopExportGoodsComList($id)); dispatch(new JopExportGoodsComList($id));
Export(0,$id); Export(0,$id);
} }
//商品列表导出
private function ApiGoodsListExport($request, $id){
$id = (new UploadLogModel())->addLog($request->account_id,1,$request->input());
if(!$id) return Export(20003,'任务推送失败');
dispatch(new JopExportGoodsList($id));
Export(0,$id);
}
//查询品牌 //查询品牌
private function GetBrand($request){ private function GetBrand($request){
(new ServerFoostoneModel($request->appid,$request->key))->getBrand($request->input("p"),100,2); (new ServerFoostoneModel($request->appid,$request->key))->getBrand($request->input("p"),100,2);
......
app/Http/function.php
...@@ -1183,4 +1183,11 @@ function sctonum($num, $double = 5){ ...@@ -1183,4 +1183,11 @@ function sctonum($num, $double = 5){
return bcmul($a[0], bcpow(10, $a[1], $double), $double); return bcmul($a[0], bcpow(10, $a[1], $double), $double);
} }
} }
function unicodeDecode($unicode_str){
$json = '{"str":"'.$unicode_str.'"}';
$arr = json_decode($json,true);
print_r($arr);
die();
if(empty($arr)) return '';
return $arr['str'];
}
app/Map/UploadLogMap.php
...@@ -14,10 +14,20 @@ class UploadLogMap{ ...@@ -14,10 +14,20 @@ class UploadLogMap{
self::STATUS_SUCCESS => "处理成功", self::STATUS_SUCCESS => "处理成功",
self::STATUS_ERROR => "处理失败", self::STATUS_ERROR => "处理失败",
]; ];
//类型：1 批量导入sku价格 2 //类型：1:订单导出 2:退货导出 3:入库导出 4:自营商品导出 5:联营商品导出 6:批量导入联营物料 7:批量修改联营物料
const type_import_sku = 1; const type_export_order = 1;
const type_update_sku = 1; const type_export_refund = 2;
const type_export_putaway = 3;
const type_export_self_goods = 4;
const type_export_com_goods = 5;
const type_import_sku = 6;
const type_update_sku = 7;
static $type = [ static $type = [
self::type_export_order =>'订单导出',
self::type_export_refund =>'退货导出',
self::type_export_putaway =>'入库导出',
self::type_export_self_goods =>'自营商品导出',
self::type_export_com_goods =>'联营商品导出',
self::type_import_sku =>'批量导入联营sku', self::type_import_sku =>'批量导入联营sku',
self::type_update_sku =>'批量修改联营sku' self::type_update_sku =>'批量修改联营sku'
]; ];
......
app/Model/UploadLogModel.php
...@@ -28,7 +28,6 @@ class UploadLogModel extends Model ...@@ -28,7 +28,6 @@ class UploadLogModel extends Model
$type = @$collert['type']; //日志类型 $type = @$collert['type']; //日志类型
//查数据 //查数据
$list=$this->where('type',$type)->where("create_uid",$create_uid)->orderBy('id','desc')->paginate($limit,['*'],'p',$p)->toArray(); $list=$this->where('type',$type)->where("create_uid",$create_uid)->orderBy('id','desc')->paginate($limit,['*'],'p',$p)->toArray();
$data = $list['data']; $data = $list['data'];
if ($type == UploadLogMap::type_import_sku){ if ($type == UploadLogMap::type_import_sku){
//如果是联营sku导入，查询状态 //如果是联营sku导入，查询状态
......
doc/v2.0.md
...@@ -69,7 +69,7 @@ ADD INDEX `idx_supplier_com_name` (`supplier_com_name`) ; ...@@ -69,7 +69,7 @@ ADD INDEX `idx_supplier_com_name` (`supplier_com_name`) ;
-- 上传日志添加字段 -- 上传日志添加字段
ALTER TABLE `lie_upload_log` ALTER TABLE `lie_upload_log`
MODIFY COLUMN `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '1: 批量导入联营物料 2: 批量修改联营物料' AFTER `id`; MODIFY COLUMN `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '1:订单导出 2:退货导出 3:入库导出 4:自营商品导出 5:联营商品导出 6:批量导入联营物料 7:批量修改联营物料' AFTER `id`,
ADD COLUMN `create_name` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人名称' AFTER `create_uid`; ADD COLUMN `create_name` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人名称' AFTER `create_uid`;
原因：添加联营账号 原因：添加联营账号
......
public/pc/js/controller/UploadLogList.js
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
pageName: 'p' //页码的参数名称，默认：page pageName: 'p' //页码的参数名称，默认：page
,limitName: 'limit' //每页数据量的参数名，默认：limit ,limitName: 'limit' //每页数据量的参数名，默认：limit
} }
,where: {"type":1} //formJson('form1') ,where: {"type":6} //formJson('form1')
,loading:true ,loading:true
,first: true //不显示首页 ,first: true //不显示首页
,last: false //不显示尾页 ,last: false //不显示尾页
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment