更新联营物料上传

app/Jobs/JopExportGoodsComList.php

@@ -21,7 +21,7 @@ class JopExportGoodsComList extends Job implements ShouldQueue
 {
 {
     use InteractsWithQueue, SerializesModels;
     use InteractsWithQueue, SerializesModels;
     private $id;
     private $id;
-    const limit = 1000; //分页条数
+    const limit = 800; //分页条数
     public function __construct($id)
     public function __construct($id)
     {
     {
         $this->id=$id;
         $this->id=$id;
@@ -111,7 +111,7 @@ class JopExportGoodsComList extends Job implements ShouldQueue
                 $s['limit'] = self::limit;
                 $s['limit'] = self::limit;
                 G("d");
                 G("d");
                 $searchArr = $ServerEsModel->searchSku($s);
                 $searchArr = $ServerEsModel->searchSku($s);
-                echo "查询es耗时:".G('d','e')."<br/>";
+                //echo "查询es耗时:".G('d','e')."<br/>";
 
 
                 if ($searchArr['error_code'] > 0){
                 if ($searchArr['error_code'] > 0){
                     $UploadLogModel->UpdateLogArr($this->id,'1003:没有数据',3,$log);
                     $UploadLogModel->UpdateLogArr($this->id,'1003:没有数据',3,$log);
@@ -124,7 +124,7 @@ class JopExportGoodsComList extends Job implements ShouldQueue
                 G("f");
                 G("f");
                 //print_r($micData);
                 //print_r($micData);
                 $res = $ServerMicModel->synchronization($micData,2);
                 $res = $ServerMicModel->synchronization($micData,2);
-                echo "查询基石耗时:".G('f','h')."<br/>";
+                //echo "查询基石耗时:".G('f','h')."<br/>";
                 if ($res['code'] > 0){
                 if ($res['code'] > 0){
                     $UploadLogModel->UpdateLogArr($this->id,'1004:没有数据',3,$log);
                     $UploadLogModel->UpdateLogArr($this->id,'1004:没有数据',3,$log);
                     return true;
                     return true;
@@ -156,7 +156,7 @@ class JopExportGoodsComList extends Job implements ShouldQueue
         $Url=$UploadFileModel->SaveDownFile($filename);
         $Url=$UploadFileModel->SaveDownFile($filename);
         fclose($x);
         fclose($x);
         unlink($filePath);
         unlink($filePath);
-        echo  "总耗时：".G('a','c');
+        //echo  "总耗时：".G('a','c');
         if(!$Url){
         if(!$Url){
             $UploadLogModel->UpdateLogArr($this->id,'导出失败',3,$log);
             $UploadLogModel->UpdateLogArr($this->id,'导出失败',3,$log);
             return true;
             return true;

doc/v2.0.md

@@ -57,9 +57,9 @@
 
 
 -- 添加联营供应商信息
 -- 添加联营供应商信息
 ALTER TABLE `lie_supplier_account`
 ALTER TABLE `lie_supplier_account`
-ADD COLUMN `supplier_name`  varchar(64) NOT NULL AFTER `supplier_self_id`,
-ADD COLUMN `supplier_code`  varchar(16) NOT NULL DEFAULT '' COMMENT '自营供应商编码' AFTER `supplier_self_name`,
-ADD COLUMN `supplier_com_id`  smallint(5) UNSIGNED NOT NULL DEFAULT 0 COMMENT '联营供应商id' AFTER `supplier_self_code`,
+ADD COLUMN `supplier_name`  varchar(64) NOT NULL AFTER `supplier_id`,
+ADD COLUMN `supplier_code`  varchar(16) NOT NULL DEFAULT '' COMMENT '自营供应商编码' AFTER `supplier_name`,
+ADD COLUMN `supplier_com_id`  smallint(5) UNSIGNED NOT NULL DEFAULT 0 COMMENT '联营供应商id' AFTER `supplier_code`,
 ADD COLUMN `supplier_com_name`  varchar(64) NOT NULL DEFAULT '' COMMENT '联营供应商名称' AFTER `supplier_com_id`,
 ADD COLUMN `supplier_com_name`  varchar(64) NOT NULL DEFAULT '' COMMENT '联营供应商名称' AFTER `supplier_com_id`,
 ADD COLUMN `supplier_com_code`  varchar(16) NOT NULL DEFAULT '' COMMENT '联营供应商编码' AFTER `supplier_com_name`;
 ADD COLUMN `supplier_com_code`  varchar(16) NOT NULL DEFAULT '' COMMENT '联营供应商编码' AFTER `supplier_com_name`;
 
 
@@ -72,7 +72,7 @@ ALTER TABLE `lie_upload_log`
 MODIFY COLUMN `type`  tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '1:订单导出  2:退货导出 3:入库导出 4:自营商品导出 5:联营商品导出  6:批量导入联营物料  7:批量修改联营物料' 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`;
 
 
-原因：添加联营账号
+原因：添加联营数据上传账号