Browse Source

Merge branch 'plm' of ssh://192.168.10.210:10022/wugg/stock into plm

panlumeng 3 years ago
parent
commit
13ef197171

+ 5 - 1
app/admin/controller/Orderback.php

@@ -109,11 +109,15 @@ class Orderback extends \app\BaseController
       $info['origin_price']=$orderinfo['origin_price'];
       $info['sale_price']=$orderinfo['sale_price'];
       $info['total_price']=$orderinfo['total_price'];
+      $info['addr_cn']=GetAddr($info['addr_code']);
       $goon = Db::name('good')->alias('b')->join("good_type a", "a.good_code=b.good_code", "left")
           ->where(['a.type_code' => $info['good_code']])->find();
       if (empty($goon)) {
           return error_show(1003, "未找到商品数据");
       }
+      $retutninfo = Db::name("order_return")->where(['returnCode'=>$info['returnCode']])->find();
+      $info['apply_id'] = $retutninfo['apply_id'];
+      $info['apply_name'] = $retutninfo['apply_name'];
       $int = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
       $info['wsm_name']="";
       $info['wsm_supplier']='';
@@ -167,7 +171,7 @@ class Orderback extends \app\BaseController
       $info['normal_num'] = $normal;
       $info['remark'] = $remark;
      $str = $info['status'];
-      $info['status'] = 2;
+      $info['status'] =empty($errorlist)?3: 2;
       $info['updatetime'] = date("Y-m-d H:i:s");
       Db::startTrans();
       try{

+ 23 - 1
app/admin/controller/Purch.php

@@ -492,9 +492,31 @@ class Purch extends \app\BaseController
         if(empty($goon)){
             return error_show(1002,"未找到商品数据");
         }
+        $idinf['wsm_name'] ="";
+        $idinf['wsm_supplier'] ="";
+        $idinf['wsm_supplierNo'] ="";
+        $idinf['wsm_contactor'] ="";
+        $idinf['wsm_mobile'] ="";
+        $idinf['addr_code'] ="";
+        $idinf['wsm_addr'] ="";
+        if($dn['wsm_code']!=""){
+            $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
+                ->leftJoin("warehouse_addr c","a.wsm_code=c.wsm_code and c.is_del=0")
+                ->where(["a.wsm_code"=>$dn['wsm_code']])->field("a.name as wsm_name,b.name,b.code,c.wsm_name as wsm_contactor,c.wsm_mobile,c.wsm_addr,c.addr_code")->find();
+            $idinf['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+            $idinf['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
+            $idinf['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
+            $idinf['wsm_contactor'] =isset($wsmcode['wsm_contactor']) ? $wsmcode['wsm_contactor']:"";
+            $idinf['wsm_mobile'] =isset($wsmcode['wsm_mobile']) ? $wsmcode['wsm_mobile']:"";
+            // $data['wsm_addr'] =isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
+            $idinf['addr_code'] =isset($wsmcode['addr_code']) ? $wsmcode['addr_code']:"";
+            $idinf['addr_cn'] =isset($wsmcode['addr_code']) ? GetAddr($wsmcode['addr_code']):"";
+            $idinf['wsm_addr']=isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
+        }
+        $idinf['info'] =$dn;
         $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
         $idinf['can']=$int;
-         $idinf['order_type']=$dn['order_type'];
+        $idinf['order_type']=$dn['order_type'];
        return  app_show(0,"获取成功",$idinf);
 
     }

+ 1 - 1
app/admin/controller/Salezx.php

@@ -269,7 +269,7 @@ class Salezx extends \app\BaseController
         if($supplier==false){
             return error_show(1004,"未找到平台供应商数据");
         }
-        $wsm=Db::name("warehouse_info")->where(["supplierNo"=>$zxinfo['gsyNo'],"wsm_type"=>2])->find();
+        $wsm=Db::name("warehouse_info")->where(["supplierNo"=>$zxinfo['gysNo'],"wsm_type"=>2])->find();
         if(empty($wsm)){
             return error_show(1004,"未找到供应商仓库数据");
         }

+ 195 - 19
app/command/good.php

@@ -24,21 +24,197 @@ class good extends Command
         $this->db =Db::connect("mysql2");
         $data = $this->Getdata();
         foreach ($data as $value){
-            $isT=Db::table("good")->where("good_code","=",$value['good_code'])->find();
+            $value['spucode']= str_replace("GY","SPU",$value['good_code']);
+            $value['item_code']=str_replace("GY","SKU",$value['good_code']);
+            $isT=Db::name("good")->where("good_code","=",$value['good_code'])->find();
+            $temp=[
+                "spuCode"=>$value['spucode'],
+                "good_code"=>$value['good_code'],
+                "createrid"=>0,
+                "ownerid"=>0,
+                "cgderid"=>0,
+                "creater"=>$value['creater']??"",
+                "owner"=>$value['owner']??"",
+                "cgder"=>$value['cg_saler']==""?"":$value['cg_saler'],
+                "gys_code"=>$value['gys_code'],
+                "license"=>'',
+                "platform_code"=>$value['item']??"",
+                "cat_id"=>$this->getCat($value['sort_f'],$value['sort_s'],$value['sort_t']),
+                "addtime"=>isset($value['addtime'])&&$value['addtime']!=""? $value['addtime']:date("Y-m-d H:i:s"),
+                "updatetime"=>isset($value['updatetime'])&&$value['updatetime']!=""? $value['updatetime']:date("Y-m-d H:i:s"),
+            ];
             if($isT){
-                Db::table("good")->where($isT)->save($value);
+                Db::name("good")->where($isT)->save($temp);
             }else{
-                Db::table("good")->save($value);
+                Db::name("good")->save($temp);
             }
+            $this->addType($value);
+            $this->laddle($value);
         }
     }
+    public function laddle($value){
+        if($value['step_num_1']!=""){
+            $temp=[
+                "skuCode"=>$value['item_code'],
+                "platform_code"=>$value['item']??"",
+                "min_num"=>$value['step_num_1'],
+                "max_num"=>$value['step_num_2']??0,
+                "sale_price"=>$value['step_price_1'],
+                "origin_price"=>$value['market_fee'],
+                "ladder"=>1,
+                "addtime"=>date("Y-m-d H:i:s"),
+                "updatetime"=>date("Y-m-d H:i:s")
+            ];
+            $upda= Db::name("good_ladder")->where(["skuCode"=>$value['item_code'],"platform_code"=>$temp['platform_code'],"ladder"=>$temp['ladder']])->find();
+            if($upda){
+                Db::name("good_ladder")->where($upda)->save($temp);
+            }else{
+                Db::name("good_ladder")->save($temp);
+            }
+        }
+        if($value['step_num_2']!=""){
+            $temp=[
+                "skuCode"=>$value['item_code'],
+                "platform_code"=>$value['item']??"",
+                "min_num"=>$value['step_num_2'],
+                "max_num"=>$value['step_num_3']??0,
+                "sale_price"=>$value['step_price_2'],
+                "origin_price"=>$value['market_fee'],
+                "ladder"=>2,
+                "addtime"=>date("Y-m-d H:i:s"),
+                "updatetime"=>date("Y-m-d H:i:s")
+            ];
+            $upda= Db::name("good_ladder")->where(["skuCode"=>$value['item_code'],"platform_code"=>$temp['platform_code'],"ladder"=>$temp['ladder']])->find();
+            if($upda){
+                Db::name("good_ladder")->where($upda)->save($temp);
+            }else{
+                Db::name("good_ladder")->save($temp);
+            }
+        }
+        if($value['step_num_3']!=""){
+            $temp=[
+                "skuCode"=>$value['item_code'],
+                "platform_code"=>$value['item']??"",
+                "min_num"=>$value['step_num_3'],
+                "max_num"=>0,
+                "sale_price"=>$value['step_price_3'],
+                "origin_price"=>$value['market_fee'],
+                "ladder"=>3,
+                "addtime"=>date("Y-m-d H:i:s"),
+                "updatetime"=>date("Y-m-d H:i:s")
+            ];
+            $upda= Db::name("good_ladder")->where(["skuCode"=>$value['item_code'],"platform_code"=>$temp['platform_code'],"ladder"=>$temp['ladder']])->find();
+            if($upda){
+                Db::name("good_ladder")->where($upda)->save($temp);
+            }else{
+                Db::name("good_ladder")->save($temp);
+            }
+        }
+    }
+
+    public function getCat($f,$s,$t){
+        if($f==''){
+            return 0;
+        }
+        $first = Db::name("cat")->where(['cat_name'=>$f,"level"=>1])->find();
+        if(empty($first)){
+            return 0;
+        }
+        if($s==""){
+            return $first['id'];
+        }
+        $sec = Db::name("cat")->where(['cat_name'=>$s,"level"=>2,"pid"=>$first['id']])->find();
+        if(empty($sec)){
+            return $first['id'];
+        }
+        if($t==""){
+            return $sec['id'];
+        }
+        $thd = Db::name("cat")->where(['cat_name'=>$t,"level"=>3,"pid"=>$sec['id']])->find();
+        if(empty($thd)){
+            return $sec['id'];
+        }
+        return $thd['id'];
+
+    }
 
+    public function addType($value){
+        $data=[
+            "skuCode"=>$value['item_code'],
+            "spuCode"=>$value['spucode'],
+            "good_name"=>$value['good_name'],
+            "good_desc"=>'',
+            "good_img"=>'',
+            "good_type"=>$value['good_type'],
+            "good_title"=>'',
+            "barnd"=>$value['brand'],
+            "model"=>$value['model'],
+            "origin_place"=>$value['good_addr'],
+            "unit"=>$value['unit'],
+            "weight"=>$value['good_weight'],
+            "color"=>$value['color']??'',
+            "material"=>$value['material']??'',
+            "craft_desc"=>'',
+            "specs"=>$value['specs'],
+            "good_size"=>"",
+            "packing_size"=>$value['pack_size'],
+            "packing_way"=>"",
+            "packing_specs"=>"",
+            "packing_weight"=>"0",
+            "bar_code"=>$value['bar_code'],
+            "supply_area"=>$value['supply_area'],
+            "packing_img"=>"",
+            "delivery_place"=>$value['shipment'],
+            "delivery_day"=>intval($value['logistics']),
+            "market_price"=>$value['market_fee'],
+            "warn_stock"=>0,
+            "web_url"=>"",
+            "is_diff"=>$value['is_diff']=="是"?1 :0,
+            "cert_fee"=>$value['cert_fee']??0,
+            "packing_fee"=>$value['packing_fee']??0,
+            "mark_fee"=>$value['mark_fee']??0,
+            "cost_fee"=>$value['cost_fee']??0,
+            "demo_fee"=>0,
+            "noble_metal"=>$value['noble_metal'],
+            "open_fee"=>0,
+            "response_time"=>intval($value['fk_day']),
+            "lead_time"=>intval($value['duration']),
+            "custom_moq"=>intval($value['min_num']),
+            "custome_day"=>0,
+            "sample_day"=>intval($value['sampling_period']),
+            "sample_fee"=>floor($value['sample_fee']),
+            "nake_price"=>$value['nake_fee'],
+            "addtime"=>date("Y-m-d H:i:s"),
+            "updatetime"=>date("Y-m-d H:i:s")
+        ];
+        $ist = Db::name("good_type")->where(["skuCode"=>$data['skuCode']])->find();
+        if($ist){
+            Db::name("good_type")->where($ist)->save($data);
+        }else{
+            Db::name("good_type")->save($data);
+        }
+    }
+
+    public function Getplat($name){
+        $plat=Db::name("platform")->where(["paltform_name"=>$name])->find();
+        return isset($plat['paltform_code'])&&$plat['paltform_code']!='' ?$plat['paltform_code']:$name;
+    }
     public function  Getdata(){
         $date = date("Y-m-d H:i:s",strtotime("-1 day"));
         $sql="SELECT
-b.Date1618678149288 as 'createtime',
+b.Date1618678149288 as 'addtime',
 b.ShortText1621438752474 as 'good_code',
 b.ShortText1615776172238 as 'item',
+(SELECT 
+    b_.`name` 
+  FROM
+    h_org_user b_ 
+  WHERE b_.id =b.creater) as 'creater',
+		(SELECT 
+    b_.`name` 
+  FROM
+    h_org_user b_ 
+  WHERE b_.id =b.`owner`) as 'owner',
 b.text1615776332933 as 'good_name',
 b.ShortText1622973543024 as 'old_item',
 b.ShortText1618630964434 as 'tkcode',
@@ -53,8 +229,8 @@ b.text1618677035673 as 'good_type',
 b.text1619509430228 as 'specs',
 b.ShortText1618677119629 as 'is_main',
 b.ShortText1617875730953 as 'is_diff',
-b.Number1618677207590 as 'good_weight',
-b.Number1619054377997 as 'box_weight',
+ifnull(b.Number1618677207590,0)  as 'good_weight',
+ifnull(b.Number1619054377997,0)  as 'box_weight',
 b.ShortText1618677229373 as 'box_specs',
 b.text1618677251640 as 'box_size',
 b.text1618677252567 as 'pack_size',
@@ -63,23 +239,23 @@ b.ShortText1618677293358 as 'good_addr',
 b.ShortText1618677303623 as 'fk_day',
 b.ShortText1618677324610 as 'supply_area',
 b.text1619517580239 as 'shipment',
-b.ShortText1615776990102 as 'gys_code',
+ifnull(b.ShortText1615776990102,'') as 'gys_code',
 b.Number1618677463881 as 'min_num',
 b.number1619054436137 as 'order_minnum',
 b.Number1617867853654 as 'duration',
 b.Number1618677510201 as 'sampling_period',
-b.Number1618677523586 as 'sample_fee',
-b.number1615788597819 as 'cost_fee',
+ifnull(b.Number1618677523586,0) as 'sample_fee',
+ifnull(b.number1615788597819,0)  as 'nake_fee',
 b.number1617867867574 as 'logistics',
-b.number1615788674789 as 'logistics_fee',
-b.number1615788650916 as 'cert_fee',
-b.number1615788639684 as 'packing_fee',
-b.number1615788611295 as 'mark_fee',
-b.number1617875705335 as 'tech_fee',
-b.number1615788686735 as 'unit_price',
-b.ShortText1615454226082 as 'noble_metal',
-b.number1618677641446 as 'metal_weight',
-b.Number1616399256021 as 'market_fee',
+ifnull(b.number1615788674789,0)  as 'logistics_fee',
+ifnull(b.number1615788650916,0)  as 'cert_fee',
+ifnull(b.number1615788639684,0)  as 'packing_fee',
+ifnull(b.number1615788611295,0)  as 'mark_fee',
+ifnull(b.number1617875705335,0)  as 'cost_fee',
+ifnull(b.number1615788686735,0)  as 'unit_price',
+ifnull(b.ShortText1615454226082,'') as 'noble_metal',
+ifnull(b.number1618677641446,0)  as 'metal_weight',
+ifnull(b.Number1616399256021,0)  as 'market_fee',
 b.ShortText1616119282513 as 'wsm_nature',
 b.ShortText1619054472299 as 'is_step',
 b.ShortText1618677768792 as 'tax',
@@ -113,7 +289,7 @@ b.ShortText1618558317611 as 'sort_t',
 b.ShortText1616222832962 as 'supplier',
 b.ShortText1631180192195 as 'change',
 b.modifiedTime as 'updatetime'
- from ibt0b_SPXX b where modifiedTime>='{$date}'";
+ from ibt0b_SPXX b ";
     $result = $this->db->query($sql);
     return $result;
     }