Merge branch 'master' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/HandInStorageController.php

@@ -12,6 +12,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
+use PhpParser\Node\Stmt\DeclareDeclare;
 
 class HandInStorageController extends Controller
 {
@@ -109,8 +110,8 @@ class HandInStorageController extends Controller
         if ($info['lotatt02']&&Carbon::now()->gt($info['lotatt02']))$this->error('失效日期超过入库效期');
         if (!$info['customerid']||$isSku===false||!$info['asnno']||$isReceivedqty===false||$isExpectedqty===false) $this->error('参数错误');
         if ($info['amount'] + $info['receivedqty'] > $info['expectedqty']) $this->error('收货数大于预期数');
-        //九干仓禁止使用当前app收货
-        $res=$this->screenWarehouseAndContrast($info['customerid']);
+        //入库类型为CGRK的九干仓泗砖仓货主禁止使用当前app收货
+        $res=$this->screenWarehouseAndContrast($info['customerid'],$info['asnno']);
         if ($res)$this->error('禁止使用当前app收货,请换用新版app收货!');
         /** @var HandInStorageService $handInStorageService  */
         $handInStorageService=app('HandInStorageService');
@@ -148,8 +149,13 @@ class HandInStorageController extends Controller
         }
     }
 
-    public function screenWarehouseAndContrast($ownerCode): bool
+    public function screenWarehouseAndContrast($ownerCode,$asnno): bool
     {
+        $asnHeader=OracleDOCASNHeader::query()
+            ->where('asnno',$asnno)
+            ->select('asntype')
+            ->first();
+        if ($asnHeader&&$asnHeader['asntype']!='CGRK')return false;
         $owners=Owner::query()
             ->select('code')
             ->whereIn('warehouse_id',[2,3])//3 代表九干仓仓库id  2代表泗砖仓id
@@ -218,7 +224,7 @@ class HandInStorageController extends Controller
         $checkData=$request->input('checkData')[0];
 
         //九干仓禁止使用当前app上架
-        $res=$this->screenWarehouseAndContrast($checkData['customerid']);
+        $res=$this->screenWarehouseAndContrast($checkData['customerid'],$checkData['docno']);
         if ($res)$this->error('禁止使用当前app上架,请换用新版app上架!');
 
         /** @var HandInStorageService $handInStorageService  */

resources/views/store/receivingDashboard/punctualityProgress/index.blade.php

@@ -206,7 +206,7 @@
             },
             created() {
                 console.log(this.search.ownerIdList)
-                let url = this.getBaseUrl() + `/api/receiveBoard/agingScheduleList?size=${this.size}&current=${this.current}`
+                let url = this.getBaseUrl() + `/api/device/check/receiveBoard/agingScheduleList?size=${this.size}&current=${this.current}`
                 this.initSearchDate();
                 this.getPageResult(url);
             },
@@ -318,7 +318,7 @@
                     if (env === 'local') {
                         url = 'http://127.0.0.1:8116'
                     } else if (env === 'production') {
-                        url = 'https://device.baoshi56.com'
+                        url = 'https://api.baoshi56.com'
                     }
                     return url;
                 },
@@ -328,11 +328,11 @@
                     } else if (flag === 'next' && this.current < this.resData.details.pages) {
                         this.current++;
                     }
-                    let url = this.getBaseUrl() + `/api/receiveBoard/agingScheduleList?size=${this.size}&current=${this.current}`
+                    let url = this.getBaseUrl() + `/api/device/check/receiveBoard/agingScheduleList?size=${this.size}&current=${this.current}`
                     this.getPageResult(url);
                 },
                 showDetail(receiveTaskNo, reservationNo, asnNo,createSingleTime) {
-                    let url = this.getBaseUrl() + `/api/receiveBoard/agingScheduleDetail?receiveTaskNo=${receiveTaskNo}&reservationNo=${reservationNo}&asnNo=${asnNo}&createSingleTime=${createSingleTime}`
+                    let url = this.getBaseUrl() + `/api/device/check/receiveBoard/agingScheduleDetail?receiveTaskNo=${receiveTaskNo}&reservationNo=${reservationNo}&asnNo=${asnNo}&createSingleTime=${createSingleTime}`
                     axios.get(url, this.getSearch()).then(res => {
                         if (res.data.code !== 200) {
                             this.resData.itemDetail = null;
@@ -343,7 +343,7 @@
                 },
                 deleteTask(receiveTaskNo) {
                     if(!confirm('确定要删除收获任务号单号为：“'+receiveTaskNo+'”的开单任务吗？')){return};
-                    let url = this.getBaseUrl() + `/api/receiveBoard/deleteTask?receiveTaskNo=${receiveTaskNo}`
+                    let url = this.getBaseUrl() + `/api/device/check/receiveBoard/deleteTask?receiveTaskNo=${receiveTaskNo}`
                     axios.get(url).then(res => {
                         if (res.data.code !== 200 || !res.data.data) {
                             window.tempTip.setDuration(2000);

resources/views/store/receivingDashboard/receivingTableList/index.blade.php

@@ -232,7 +232,7 @@
                 current: 1,
             },
             created() {
-                let url = this.getBaseUrl() + `/api/receiveBoard/formList?size=${this.size}&current=${this.current}`
+                let url = this.getBaseUrl() + `/api/device/check/receiveBoard/formList?size=${this.size}&current=${this.current}`
                 this.initSearchDate();
                 this.getPageResult(url);
             },
@@ -344,7 +344,7 @@
                     if (env === 'local') {
                         url = 'http://127.0.0.1:8116'
                     } else if (env === 'production') {
-                        url = 'https://device.baoshi56.com'
+                        url = 'https://api.baoshi56.com'
                     }
                     return url;
                 },
@@ -354,11 +354,11 @@
                     } else if (flag === 'next' && this.current < this.resData.details.pages) {
                         this.current++;
                     }
-                    let url = this.getBaseUrl() + `/api/receiveBoard/formList?size=${this.size}&current=${this.current}`
+                    let url = this.getBaseUrl() + `/api/device/check/receiveBoard/formList?size=${this.size}&current=${this.current}`
                     this.getPageResult(url);
                 },
                 showDetail({receiveTaskNo, reservationNo, asnNo,asnStatus,asnType,customerCode,warehouseId}) {
-                    let url = this.getBaseUrl() + `/api/receiveBoard/receiveDetail?receiveTaskNo=${receiveTaskNo}&reservationNo=${reservationNo}&asnNo=${asnNo}`
+                    let url = this.getBaseUrl() + `/api/device/check/receiveBoard/receiveDetail?receiveTaskNo=${receiveTaskNo}&reservationNo=${reservationNo}&asnNo=${asnNo}`
                     axios.get(url, this.getSearch()).then(res => {
                         if (res.data.code !== 200) {
                             this.resData.itemDetail = null;
@@ -402,7 +402,7 @@
                 },
                 closeAsn(item) {
                     if(!confirm('确定要关闭ASN单号为：“'+item.asnNo+'”的订单吗？')){return};
-                    let url = this.getBaseUrl() + `/api/receiveBoard/closeAsn`
+                    let url = this.getBaseUrl() + `/api/device/check/receiveBoard/closeAsn`
                     axios.post(url, this.getCloseAsnParam(item)).then(res => {
                         if (res.data.code !== 200 || !res.data.data) {
                             window.tempTip.setDuration(2000);
@@ -421,7 +421,7 @@
                 },
                 closeAsnDetail() {
                     if(!confirm('确定要关闭ASN单号为：“'+this.resData.asnNo+'”的订单吗？')){return};
-                    let url = this.getBaseUrl() + `/api/receiveBoard/closeAsn`
+                    let url = this.getBaseUrl() + `/api/device/check/receiveBoard/closeAsn`
                     axios.post(url,this.getCloseAsnDetailParam()).then(res => {
                         if (res.data.code !== 200 || !res.data.data) {
                             window.tempTip.setDuration(2000);
@@ -440,7 +440,7 @@
                 },
                 deleteTask(receiveTaskNo) {
                     if(!confirm('确定要删除收获任务号单号为：“'+receiveTaskNo+'”的开单任务吗？')){return};
-                    let url = this.getBaseUrl() + `/api/receiveBoard/deleteTask?receiveTaskNo=${receiveTaskNo}`
+                    let url = this.getBaseUrl() + `/api/device/check/receiveBoard/deleteTask?receiveTaskNo=${receiveTaskNo}`
                     axios.get(url).then(res => {
                         if (res.data.code !== 200 || !res.data.data) {
                             window.tempTip.setDuration(2000);

resources/views/store/receivingDashboard/stayPutawayList.blade.php

@@ -149,7 +149,7 @@
                 current: 1,
             },
             created() {
-                let url = this.getBaseUrl() + `/api/receiveBoard/stayPutawayList?size=${this.size}&current=${this.current}`
+                let url = this.getBaseUrl() + `/api/device/check/receiveBoard/stayPutawayList?size=${this.size}&current=${this.current}`
                 this.initSearchDate();
                 this.getPageResult(url);
             },
@@ -238,7 +238,7 @@
                     if (env === 'local') {
                         url = 'http://127.0.0.1:8116'
                     } else if (env === 'production') {
-                        url = 'https://device.baoshi56.com'
+                        url = 'https://api.baoshi56.com'
                     }
                     return url;
                 },
@@ -248,7 +248,7 @@
                     } else if (flag === 'next' && this.current < this.resData.details.pages) {
                         this.current++;
                     }
-                    let url = this.getBaseUrl() + `/api/receiveBoard/stayPutawayList?size=${this.size}&current=${this.current}`
+                    let url = this.getBaseUrl() + `/api/device/check/receiveBoard/stayPutawayList?size=${this.size}&current=${this.current}`
                     this.getPageResult(url);
                 },
             },