ad

app/admin/model/GoodTax.php

@@ -34,6 +34,6 @@ class GoodTax extends Base
 
     public function inCategory(){
         return $this->hasOne(TaxCategory::class,'tax_id','id')
-        ->bind(["in_tax_name"=>"cat_name","in_tax_short_name"=>"short_name","in_tax_merge_code"=>"merge_code","in_tax_cat_code"=>"cat_code","in_bind_tax"=>"tax","addtax","sumitem"]);
+        ->bind(["in_tax_name"=>"cat_name","in_tax_short_name"=>"short_name","in_tax_merge_code"=>"merge_code","in_tax_cat_code"=>"cat_code","in_bind_tax"=>"tax","addTax"=>"addtax","sumitem"]);
     }
 }

app/command/sysGood.php

@@ -63,7 +63,7 @@ class sysGood extends Command
 
         $fields = "spuCode,good_name,craft_desc,supplierNo,companyNo,supplierName,companyName,good_img,
          good_info_img,good_thumb_img,creater,createrid,{$isZx} as isZx,is_combind,cgd_supplier_code cgd_supplierNo,
-         cgd_supplier_name cgd_supplierName,isChild,addtime,updatetime";
+         cgd_supplier_name cgd_supplierName,isChild,addtime,updatetime,'' exam_info";
       if ($isZx == 0) {
             $fields .=",after_sales,is_stock";
         }else{
@@ -83,34 +83,17 @@ class sysGood extends Command
 
     protected function populateItem(&$item)
     {
-        $item['tax_id'] = $item['tax_id'] ?? 0;
         $item['cgd_inv_good_name'] = $item['cgd_inv_good_name'] ?? '';
-        $item['inv_cat_name'] = '';
-        $item['inv_cat_code'] = '';
-        $item['inv_tax'] = '';
-        $item['inv_good_name'] = $item['cgd_inv_good_name'] ?? '';
-        $item['cgd_inv_cat_code'] = '';
-        $item['cgd_inv_cat_name'] = '';
-        $item['cgd_inv_tax'] = isset($item['cgd_inv_tax'])?(str_replace('%','',$item['cgd_inv_tax'])/100):"";
-        $item['cat_diff'] = 0;
-        $item['tax_diff'] = 0;
-
-        if (!is_null($item['tax_id']) && $item['tax_id'] != 0) {
-            $taxInfo = TaxRelation::with(["incomeTax", "outputTax"])
-                ->where(['income_tax_id' => $item['tax_id'], "companyNo" => $item['companyNo']])
-                ->findOrEmpty();
-
-            if (!$taxInfo->isEmpty()) {
-                $item['inv_cat_name'] = $taxInfo['output_short_name'];
-                $item['inv_cat_code'] = $taxInfo['output_merge_code'];
-                $item['inv_tax'] =  str_replace("%",'',$taxInfo['output_bind_tax'])/100;
-                $item['cgd_inv_cat_code'] = $taxInfo['income_merge_code'];
-                $item['cgd_inv_cat_name']= $taxInfo['income_short_name'];
-                $item['cat_diff'] = $taxInfo['output_merge_code']===$taxInfo['income_merge_code']?1:2;
-                $item['tax_diff'] = $taxInfo['output_bind_tax']===$item['cgd_inv_tax']?1:2;
-            }
-        }
-
+        $item['inv_cat_name'] = $item['inv_cat_name'] ?? '';
+        $item['inv_cat_code'] =$item['inv_cat_code'] ?? '';
+        $item['inv_good_name'] = $item['inv_good_name'] ?? '';
+        $item['cgd_inv_cat_code'] =$item['cgd_inv_cat_code'] ?? '';
+        $item['cgd_inv_cat_name'] = $item['cgd_inv_cat_name'] ?? '';
+        $item['inv_tag']=isset($item['sumitem'])?($item['sumitem']=='是'?1:0):0;
+        $item['inv_tax'] = isset($item['inv_tax'])&& $item['inv_tax']!='' ? (str_replace('%', '', $item['inv_tax']) / 100) : '';
+        $item['cgd_inv_tax'] = isset($item['cgd_inv_tax'])&& $item['cgd_inv_tax']!=''?(str_replace('%','',$item['cgd_inv_tax'])/100):"";
+        $item['cat_diff'] = ($item['inv_cat_code'] != '' || $item['cgd_inv_cat_code'] != '') ? 0 : (($item['inv_cat_code'] !=  $item['cgd_inv_cat_code']) ?2 : 1);
+        $item['tax_diff'] = ($item['inv_cat_code'] != '' || $item['cgd_inv_cat_code'] != '') ? 0: (($item['inv_cat_tax'] !=$item['cgd_inv_cat_tax'] ) ? 2 : 1);
         $item['status'] = ($item['inv_cat_code'] != '' && $item['cgd_inv_cat_code'] != '') ? 2 : (($item['inv_cat_code'] != '' || $item['cgd_inv_cat_code'] != '') ? 1 : 0);
     }
      protected function addGood($goods)
@@ -121,8 +104,7 @@ class sysGood extends Command
             ->column('id,status,updatetime', 'spuCode');
         $saveAll = [];
         foreach ($goods as $item) {
-            if (!isset($idsArr[$item['spuCode']]) ||
-                ($idsArr[$item['spuCode']]['updatetime'] != $item['updatetime'])) {
+            if (!isset($idsArr[$item['spuCode']]) ||($idsArr[$item['spuCode']]['updatetime'] != $item['updatetime']) || $idsArr[$item['spuCode']]['status'] != 2) {
                 $item['id'] = $idsArr[$item['spuCode']]['id'] ?? null;
                 $saveAll[] = $item->toArray();
             }