修改近15天退货管理的审核状态

app/Http/Controllers/PriceModelController.php

@@ -1086,6 +1086,7 @@ class PriceModelController extends Controller
                     if (!isset($item["feature"]))$item["feature"] = null;
                     unset($item["features"]);
                     unset($item["featureFormat"]);
+                    unset($item["type"]);
                 }
                 app("OwnerPriceOperationItemService")->insert($params["items"]);
                 DB::insert(DB::raw("INSERT INTO owner_price_operation_owner VALUES(?,?)"),[$model->id,request("owner_id")]);

app/Services/CommodityService.php

@@ -612,8 +612,7 @@ Class CommodityService
                     ];
                     continue;
                 };
-            }
-            if (
+            }else if (
                 /*  $commodity->sku != $basSku->sku ||
                   $commodity->name != $basSku->descr_c ||
                   $commodity->length != $basSku->skulength ||

app/Services/RejectedBillService.php

@@ -66,10 +66,10 @@ Class RejectedBillService
     {
         //是否审核
         $updates=$this->getNeedUpdateCheckedStatusByWms($asnHerders);
-        if (count($updates) > 1) $this->batchUpdate($updates);
+        if ($updates && count($updates) > 1) $this->batchUpdate($updates);
         //是否入库
         $updateParams=$this->getNeedUpdateLoadedStatusByWms($asnHerders);
-        if (count($updateParams) > 1) $this->batchUpdate($updateParams);
+        if ($updateParams && count($updateParams) > 1) $this->batchUpdate($updateParams);
     }
 
     public function getNeedUpdateLoadedStatusByWms($asnHerders)

bashupMysql.sh

@@ -6,7 +6,7 @@ cd $folder
 #当前日期
 time_now=$(date  "+%Y-%m-%d")
 #当前时间的前30天 %H:%M:%S
-time_30day_ago=$(date -d"30 day ago" "+%Y-%m-%d 00:00:00")
+time_30day_ago=$(date -d"15 day ago" "+%Y-%m-%d 00:00:00")
 #当前日期的前三天
 time_3day_ago=$(date -d"3 day ago" "+%Y-%m-%d")
 #数据库服务器ip，填写服务器的公网地址即可
@@ -57,4 +57,4 @@ mysql  -u$test_user -p$test_password  $test_db< $time_noww_m_s_waybill_orders.sq
 mysqldump -h$host -u$user -p$password --single-transaction -q -e $db order_commodities --where="created_at>='$time_30day_ago'" > $time_noworder_commodities.sql
 mysql  -u$test_user -p$test_password  $test_db< $time_noworder_commodities.sql
 
-sudo rm -rf $time_3day_ago*
+#sudo rm -rf $time_3day_ago*

database/migrations/2020_09_11_102338_add_authorities_labor_reports.php

@@ -16,6 +16,7 @@ class AddAuthoritiesLaborReports extends Migration
     {
         (new Authority(['name'=>'人事管理-临时工报表-删除','alias_name'=>'人事管理-临时工报表-删除']))->save();
         (new Authority(['name'=>'人事管理-临时工报表-修改劳务所','alias_name'=>'人事管理-临时工报表-修改劳务所']))->save();
+        (new Authority(['name'=>'人事管理-临时工报表-可见全部组','alias_name'=>'人事管理-临时工报表-可见全部组']))->save();
     }
 
     /**
@@ -27,5 +28,6 @@ class AddAuthoritiesLaborReports extends Migration
     {
         Authority::where('name','人事管理-临时工报表-删除')->delete();
         Authority::where('name','人事管理-临时工报表-修改劳务所')->delete();
+        Authority::where('name','人事管理-临时工报表-可见全部组')->delete();
     }
 }

syncProject.sh

@@ -1,13 +1,11 @@
 #!/bin/bash
-
-cd $src
 Ip="was.baoshi56.com"
 username="haozi"
 password="haozi"
 files=("app" "config" "database" "public" "resources" "routes" "webpack.mix.js" "composer.json" "tests")
 src=/var/www/bswas_test
 dsc=/var/www/was
-
+cd $src
 for i in ${files[*]}
 do
 expect -c "
@@ -18,8 +16,7 @@ expect {
 }
 expect eof"
 done
-
-sudo php artisan migrate
-sudo composer update
-sudo npm run dev
+php artisan migrate
+composer update
+npm run dev