修改

app/Service/ExportFileService.php

@@ -2,42 +2,20 @@
 
 namespace App\Service;
 
-
 use App\Exports\ExportOrder;
 use App\Exports\MyExport;
-use App\Model\Area;
-use App\Model\BasicMaterial;
-use App\Model\BasicRollFilm;
 use App\Model\BasicType;
-use App\Model\CarDepart;
-use App\Model\CarFiles;
-use App\Model\CarType;
-use App\Model\Company;
 use App\Model\Construction;
 use App\Model\ConstructionInfo;
-use App\Model\ConstructionOrder;
-use App\Model\ConstructionOrderImg;
-use App\Model\ConstructionOrderSub;
 use App\Model\ConstructionProductInfo;
 use App\Model\Customer;
 use App\Model\Depart;
 use App\Model\Employee;
-use App\Model\FoursShop;
 use App\Model\InOutRecord;
 use App\Model\Inventory;
 use App\Model\InventorySub;
 use App\Model\InvoiceOrder;
 use App\Model\InvoiceOrderInfo;
-use App\Model\Material;
-use App\Model\MaterialCharge;
-use App\Model\MaterialChargeSub;
-use App\Model\MaterialOrder;
-use App\Model\MaterialOrderApply;
-use App\Model\MaterialOrderIn;
-use App\Model\MaterialOrderSend;
-use App\Model\MaterialOrderSendSub;
-use App\Model\MaterialReturn;
-use App\Model\MaterialReturnSub;
 use App\Model\PaymentReceipt;
 use App\Model\PaymentReceiptInfo;
 use App\Model\Product;
@@ -46,17 +24,11 @@ use App\Model\PurchaseOrderInfo;
 use App\Model\PurchaseOrderSpecialInfo;
 use App\Model\ReturnExchangeOrder;
 use App\Model\ReturnExchangeOrderProductInfo;
-use App\Model\RollFilm;
-use App\Model\RollFilmCombine;
-use App\Model\RollFilmCompany;
-use App\Model\RollFilmInventory;
 use App\Model\SalesOrder;
 use App\Model\SalesOrderOtherFee;
 use App\Model\SalesOrderProductInfo;
 use App\Model\Storehouse;
 use App\Model\Supplier;
-use App\Model\Transfer;
-use App\Model\TransferSub;
 use App\Model\U8Job;
 use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Facades\Excel;
@@ -1363,24 +1335,4 @@ class ExportFileService extends Service
         $bool = Excel::store(new ExportOrder($data,$type,$headers),"/public/export/{$filename}", null, 'Xlsx', []);
         return $filename;
     }
-
-    public function saveExportData2($data, $headers, $type = 'default', $file_name = '') {
-        if (empty($file_name)) {
-            $file_name = self::$filename . "_" . date("Y-m-d") . "_" . rand(1000, 9999);
-        }
-        $filename = $file_name . '.xlsx';
-
-        // 使用流式写入
-        $writer = new \Maatwebsite\Excel\Writers\LaravelExcelWriter();
-        $writer->download($filename, function ($excel) use ($data, $headers) {
-            $excel->setTitle('Export Data');
-            $excel->setCreator('Your Name')->setCompany('Your Company');
-            $excel->sheet('Sheet1', function ($sheet) use ($data, $headers) {
-                $sheet->fromArray($data, null, 'A1', true, false);
-                $sheet->prependRow(1, $headers);
-            });
-        });
-
-        return $filename;
-    }
 }

app/Service/ImportService.php

@@ -663,6 +663,7 @@ class ImportService extends Service
             $tmp['retail_price'] = $value['7'] ?? 0;
             $tmp['product_attribute'] = $value['8'] ?? 0;
             $tmp['build_fee'] = $value['9'] ?? 0;
+            $tmp['item_code'] = $value['10'] ?? "";
             foreach ($map as $m => $v){
                 if($value[$v['col']]){
                     if(! is_numeric($value[$v['col']])) return [false,$v['name'] . ': 请输入数字且最多两位小数'];
@@ -694,6 +695,8 @@ class ImportService extends Service
 
                 //安装费
                 if($tmp['build_fee'] == "") unset($tmp['build_fee']);
+                //商品编码
+                if($tmp['item_code'] == "") unset($tmp['item_code']);
 
                 //产品主表
                 $update[$product_id] = $tmp;

app/Service/InventoryService.php

@@ -246,7 +246,7 @@ class InventoryService extends Service
     }
 
     public function orderRule(&$data, $user, $is_add = true){
-        if(empty($data['counted_id'])) return [false,'盘点人不能为空'];
+        if(empty($data['counted_id'])) $data['counted_id'] = $user['id'];
         if(empty($data['counted_time'])) return [false,'盘点日期不能为空'];
         $data['counted_time'] = $this->changeDateToDate($data['counted_time']);
         if(empty($data['storehouse_id'])) return [false,'仓库不能为空'];

app/Service/ProductInventoryService.php

@@ -35,7 +35,7 @@ class ProductInventoryService extends Service
         $return = [];
         if(! empty($array)){
             foreach ($array as $value){
-                $num = bcsub($value['num'], $value['lock_number'],2);
+                $num = bcsub($value['number'], $value['lock_number'],2);
 
                 $return[] = [
                     'id' => $value['id'],

app/Service/ProductService.php

@@ -247,6 +247,7 @@ class ProductService extends Service
             $model->cost = $data['cost'] ?? 0;
             $model->retail_price = $data['retail_price'] ?? 0;
             $model->build_fee = $data['build_fee'] ?? 0;
+            $model->item_code = $data['item_code'] ?? "";
             $model->mark = $data['mark'] ?? '';
             $model->state = $data['state'] ?? 0;
             $model->product_attribute = $data['product_attribute'] ?? 0;
@@ -368,6 +369,7 @@ class ProductService extends Service
             $model->cost = $data['cost'] ?? 0;
             $model->retail_price = $data['retail_price'] ?? 0;
             $model->build_fee = $data['build_fee'] ?? 0;
+            $model->item_code = $data['item_code'] ?? "";
             $model->mark = $data['mark'] ?? '';
             $model->state = $data['state'] ?? 0;
             $model->product_attribute = $data['product_attribute'] ?? 0;
@@ -591,7 +593,7 @@ class ProductService extends Service
     public function productListIndex($data,$user){
         $model = Product::ProductClear($user,$data);
         $model = $model->where('del_time',0)
-            ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','cost','state','crt_id','crt_time','mark','depart_id','top_depart_id','install_time','product_attribute','is_use','build_fee')
+            ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','cost','state','crt_id','crt_time','mark','depart_id','top_depart_id','install_time','product_attribute','is_use','build_fee','item_code')
             ->orderby('product_attribute', 'desc')
             ->orderby('id', 'desc');
 
@@ -651,7 +653,7 @@ class ProductService extends Service
     public function productList($data,$user){
         $model = Product::ProductClear($user,$data);
         $model = $model->where('del_time',0)
-            ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','cost','state','crt_id','crt_time','mark','depart_id','top_depart_id','install_time','product_attribute','is_use','build_fee')
+            ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','cost','state','crt_id','crt_time','mark','depart_id','top_depart_id','install_time','product_attribute','is_use','build_fee','item_code')
             ->where('is_use', Product::is_use_one)
             ->orderby('product_attribute', 'desc')
             ->orderby('id', 'desc');
@@ -869,7 +871,7 @@ class ProductService extends Service
             $data['data'][$key]['color'] = Product::$product_attribute_color[$value['product_attribute']] ?? [];
             $data['data'][$key]['img'] = $img[$value['id']] ?? "";
             //库存
-            $data['data'][$key]['stock'] = $stock_map[$value['id']] ?? [];
+            $data['data'][$key]['stock'] = $stock_map[$value['id']] ?? (object)[];
             //成本
             $data['data'][$key]['cost_show'] = $value['cost'];
         }

app/Service/StorehouseService.php

@@ -82,7 +82,7 @@ class StorehouseService extends Service
     public function storehouseList($data, $user){
         $model = Storehouse::TopClear($user,$data);
         $model = $model->where('del_time',0)
-            ->select('id','title','depart_id')
+            ->select('id','title','depart_id','top_depart_id')
             ->orderBy('id','asc');
 
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');

config/excel/productTable.php

@@ -39,5 +39,9 @@ return [
     [
         'key' => 'build_fee',
         'value' => '安装费',
+    ],
+    [
+        'key' => 'item_code',
+        'value' => '商品编号',
     ]
 ];