二次加工单-录入导入时的验证，复制成本单去除

app/Http/Controllers/MeasureMonitorController.php

@@ -2,13 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use App\Events\TeamAuditEvent;
-use App\Events\WeighedEvent;
 use App\MeasuringMachine;
 use App\Package;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Gate;
 require_once '../app/library/baidu-api-speech/AipSpeech.php';
 class MeasureMonitorController extends Controller
 {

app/Http/Controllers/ProcessController.php

@@ -965,23 +965,25 @@ class ProcessController extends Controller
                     $this->log(__METHOD__,"二次加工单录入导入商品数据时添加货主".__FUNCTION__,json_encode($owner),Auth::user()['id']);
                 }
             }
-            $commodity = Commodity::query()->whereNull('owner_id')
-                ->where('sku',$commodityData['sku'])->where('name',$commodityData['name'])->first();
-            if (!$commodity)$commodity = Commodity::create($commodityData);
-            $commodityBarCode=CommodityBarcode::create([
-                'code' => $barcode,
-                'commodity_id' => $commodity->id
-            ]);
+            $commodity = Commodity::query()->with('barcodes')->whereNull('owner_id')
+                ->where('sku',$commodityData['sku'])->first();
+            if (!$commodity){
+                $commodity = Commodity::create($commodityData);
+                $commodityBarCode=CommodityBarcode::create([
+                    'code' => $barcode,
+                    'commodity_id' => $commodity->id
+                ]);
+                $commodity_barcodes = [$commodityBarCode];
+            }else $commodity_barcodes = $commodity->barcodes;
+
             $this->log(__METHOD__,"二次加工单录入导入商品数据时添加商品及条码".__FUNCTION__,
                 json_encode($commodity)." || ".json_encode($commodityBarCode),Auth::user()['id']);
             $processContent=['bill_type'=>'入库单','commodity_id'=>$commodity->id,'wms_code'=>$wmsCode,'amount'=>$amount,
-                'commodity_name'=>$commodity->name,'commodity_barcodes'=>[$commodityBarCode],'commodity_sku'=>$commodity->sku,
+                'commodity_name'=>$commodity->name,'commodity_barcodes'=>$commodity_barcodes,'commodity_sku'=>$commodity->sku,
                 'lineNo'=>1,'owner_id'=>$owner->id,'owner_name'=>$owner->name,'addBtnShow'=>false,'type'=>false];
             array_push($processContents,$processContent);
-            $processContent['type']=true;
-            array_push($processContents,$processContent);
         }
-        return ['success'=>true,'data'=>$processContents,'errors'=>$errors];
+        return ['success'=>true,'data'=>$processContents,'errors'=>count($errors)>0?$errors:''];
     }
 
 

resources/js/utilities/sort.js

@@ -0,0 +1,5 @@
+
+function sort(array) {
+    array = [{id:12,name:'a12458',value:'周及'},{id:15,name:'d12458',value:'蓝及'},];
+
+}

resources/views/process/create.blade.php

@@ -589,7 +589,7 @@
                                 res.data.data.forEach(function (processContent) {
                                     _this.processContents.unshift(processContent);
                                     _this.commodityIds.push(processContent.commodity_id+"_"+processContent.type);
-                                    if (!processContent.type) sum += Number(processContent.amount);
+                                    sum += Number(processContent.amount);
                                 });
                                 _this.sum += sum;
                                 if (res.data.errors){

routes/api.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Route;
 
 /*
 |--------------------------------------------------------------------------
@@ -12,10 +13,5 @@ use Illuminate\Http\Request;
 | is assigned the "api" middleware group. Enjoy building your API!
 |
 */
-Route::prefix('log')->group(function(){ //日志记录
-    Route::post('f134g/save', "Api\LogController@save");//记录
-    Route::post('rejected/jianshang/send', "Api\jianshang\RejectedController@fakingReceiveSend");//faking rejected发给笕尚的退货信息
-});
-Route::post('rejected/jianshang/send', "Api\jianshang\RejectedController@fakingReceiveSend");//faking rejected发给笕尚的退货信息
 
 

routes/api/thirdPart/flux.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Route;
 
 
 /*
@@ -13,7 +14,6 @@ Route::post('receive/new', "ReceiveController@new_");//增加新波次消息
 文件地址前缀：/api/thirdPart/flux/package
 */
 Route::post('package/new', "PackageController@new_");//增加新包裹消息
-Route::post('package/new2', "PackageController2@new_");//增加新包裹消息
 //accomplishToWMS() 发往WMS的称重和纸条包裹信息
 
 /*