去掉无用的参数

修改表单构建关联字段的逻辑
修改外部插件说明

app/Gdoo/Stock/Controllers/DeliveryController.php

@@ -379,7 +379,7 @@ class DeliveryController extends WorkflowController
         return $form;
     }
 
-    // 获取库存(不含不满件)
+    // 获取库存
     public function getBatchSelectAction()
     {
         $search = search_form(['advanced' => ''], [

app/Gdoo/Stock/Controllers/DirectController.php

@@ -137,8 +137,8 @@ class DirectController extends WorkflowController
             pu.name as product_unit,
             p.material_type,
             p.product_type,
-            SUBSTRING(batch_sn, 3, 4) as batch_sn,
-            case when right(w.name, 4) = '不满件库' then 'B' else '' end warehouse_type
+            batch_sn,
+            w.name as warehouse_name
         ")
         ->orderBy('p.code', 'asc')
         ->get();

app/Gdoo/Stock/Controllers/Record10Controller.php

@@ -43,12 +43,14 @@ class Record10Controller extends WorkflowController
             }
             $model->orderBy($header['sort'], $header['order']);
 
-            // 川南库管登录
+            /*
+            // 外部库管登录
             if (auth()->id() == 2177) {
                 $model->whereIn('stock_record10.warehouse_id', [20001, 20047]);
             } else {
                 $model->whereNotIn('stock_record10.warehouse_id', [20001, 20047]);
             }
+            */
 
             foreach ($search['where'] as $where) {
                 if ($where['active']) {

app/Gdoo/Stock/Controllers/ReportController.php

@@ -31,9 +31,8 @@ class ReportController extends DefaultController
             ['form_type' => 'dialog', 'name' => '仓库', 'field' => 'warehouse_id', 'options' => ['url' => 'stock/warehouse/dialog', 'query' => ['multi'=>0]]],
             ['form_type' => 'dialog', 'name' => '产品', 'field' => 'product_id', 'options' => ['url' => 'product/product/dialog', 'query' => ['multi'=>0]]],
             ['form_type' => 'text', 'name' => '批号', 'field' => 'batch_sn', 'options' => []],
-            ['form_type' => 'select', 'name' => '内销/外销', 'field' => 'type', 'options' => [['id'=>'内销','name'=>'内销'],['id'=>'外贸','name'=>'外贸']]],
+            ['form_type' => 'select', 'name' => '内销/外销', 'field' => 'type', 'options' => [['id'=>'内销','name'=>'内销'],['id'=>'外销','name'=>'外销']]],
             //['form_type' => 'select', 'name' => '是否统计批号', 'field' => 'batch', 'value' => 0, 'options' => [['id'=>1,'name'=>'是'],['id'=>0,'name'=>'否']]],
-            ['form_type' => 'select', 'name' => '包含不满件库', 'field' => 'bmj', 'value' => 0, 'options' => [['id'=>1,'name'=>'是'],['id'=>0,'name'=>'否']]],
             ['form_type' => 'date2', 'name' => '单据日期', 'field' => 'date', 'value' => [$sdate, $edate], 'options' => []],
         ], 'model');
 
@@ -85,10 +84,9 @@ class ReportController extends DefaultController
         ], [
             ['form_type' => 'dialog', 'name' => '仓库', 'field' => 'warehouse_id', 'options' => ['url' => 'stock/warehouse/dialog', 'query' => ['multi'=>0]]],
             ['form_type' => 'text', 'name' => '存货编码', 'field' => 'product_code', 'options' => []],
-            ['form_type' => 'select', 'name' => '内销/外销', 'field' => 'type', 'options' => [['id'=>'1','name'=>'内销'],['id'=>'2','name'=>'外贸']]],
+            ['form_type' => 'select', 'name' => '内销/外销', 'field' => 'type', 'options' => [['id'=>'1','name'=>'内销'],['id'=>'2','name'=>'外销']]],
             ['form_type' => 'date2', 'name' => '生产日期', 'field' => 'date', 'value' => [], 'options' => []],
             ['form_type' => 'select', 'name' => '统计批号', 'field' => 'batch', 'value' => 1, 'options' => [['id'=>1,'name'=>'是'],['id'=>0,'name'=>'否']]],
-            ['form_type' => 'select', 'name' => '包含不满件库', 'field' => 'bmj', 'value' => 0, 'options' => [['id'=>1,'name'=>'是'],['id'=>0,'name'=>'否']]],
             
         ], 'model');
 
@@ -144,9 +142,8 @@ class ReportController extends DefaultController
             ['form_type' => 'dialog', 'name' => '仓库', 'field' => 'warehouse_id', 'options' => ['url' => 'stock/warehouse/dialog', 'query' => ['multi'=>0]]],
             ['form_type' => 'dialog', 'name' => '产品', 'field' => 'product_id', 'options' => ['url' => 'product/product/dialog', 'query' => ['multi'=>0]]],
             ['form_type' => 'text', 'name' => '批号', 'field' => 'batch_sn', 'options' => []],
-            ['form_type' => 'select', 'name' => '内销/外销', 'field' => 'type', 'options' => [['id'=>'内销','name'=>'内销'],['id'=>'外贸','name'=>'外贸']]],
+            ['form_type' => 'select', 'name' => '内销/外销', 'field' => 'type', 'options' => [['id'=>'内销','name'=>'内销'],['id'=>'外销','name'=>'外销']]],
             ['form_type' => 'select', 'name' => '统计批号', 'field' => 'batch', 'value' => 0, 'options' => [['id'=>1,'name'=>'是'],['id'=>0,'name'=>'否']]],
-            ['form_type' => 'select', 'name' => '包含不满件库', 'field' => 'bmj', 'value' => 0, 'options' => [['id'=>1,'name'=>'是'],['id'=>0,'name'=>'否']]],
             ['form_type' => 'date2', 'name' => '单据日期', 'field' => 'date', 'value' => [$sdate, $edate], 'options' => []],
         ], 'model');