仓库详情优化，发货提交接口优化

app/admin/controller/Reorder.php

@@ -589,13 +589,15 @@ class Reorder extends Base
                 ->field("a.name as wsm_name,a.supplierNo")
                 ->find();
             $info['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+        }
 
-            $tmp = $userCommon->handle('getCodeAndName', ['code' => [
-                $orderinfo['supplierNo'],
-                $orderinfo['customer_code'],
-                $wsmcode['supplierNo']??'',
-            ]]);
+        $tmp = $userCommon->handle('getCodeAndName', ['code' => [
+            $orderinfo['supplierNo'],
+            $orderinfo['customer_code'],
+            $wsmcode['supplierNo']??'',
+        ]]);
 
+        if(!empty($wsmcode['supplierNo'])){
             $info['wsm_supplier'] =$tmp['data'][$wsmcode['supplierNo']]??'';//isset($wsmcode['name']) ? $wsmcode['name']:"";
             $info['wsm_supplierNo'] =$wsmcode['supplierNo']??'';//isset($wsmcode['code']) ? $wsmcode['code']:"";
         }

app/admin/controller/Sale.php

@@ -4139,17 +4139,23 @@ class Sale extends Base
                 if (!in_array($own_roleid, config('app.wsm_cgder_role'))) throw new \think\Exception('库存品只能由库管人员操作');
             } elseif ($einfo['is_stock'] == 0 || $einfo['order_type'] == 3) {
                 //非库存品和采返商品只能由供应商负责人操作
-	            if($einfo['order_type'] == 3){
-		            $personid = Db::name('good_zixun')->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
-		                          ->where(['a.spuCode' => $einfo['good_code'], 'a.is_del' => 0])
-		                          ->value('personid');
-	            }else{
-		            $personid = Db::name('good')->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
-		                          ->where(['a.spuCode' => $einfo['good_code'], 'a.is_del' => 0])
-		                          ->value('personid');
-	            }
+                if ($einfo['order_type'] == 3) {
+                    $supplierNo = Db::name('good_zixun')
+//                        ->leftJoin("supplier b", "a.supplierNo=b.code")
+                        ->where(['spuCode' => $einfo['good_code'], 'is_del' => 0])
+                        ->value('supplierNo');
+                } else {
+                    $supplierNo = Db::name('good')
+//                        ->alias("a")
+//                        ->leftJoin("supplier b", "a.supplierNo=b.code")
+                        ->where(['spuCode' => $einfo['good_code'], 'is_del' => 0])
+                        ->value('supplierNo');
+                }
+
+                $userCommon = new \app\admin\common\User();
+                $temp = $userCommon->handle('sInfo', ['code' => $supplierNo]);
 
-                if (($this->level == 2) && ($uid != $personid)) throw new \think\Exception('非库存品和采返商品只能由供应商负责人操作');
+                if (($this->level == 2) && ($uid != $temp['data']['personid'])) throw new \think\Exception('非库存品和采返商品只能由供应商负责人操作');
             }
 
             if ($up) {