From 73b5a00c842b8f9f02b80f4e5265ceecb443a2fe Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Tue, 3 Jan 2023 11:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=B7=A5=E4=BD=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=201.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/devicetype/ZyDevicetypeListRef.vue  | 479 +++++++++---------
 .../src/views/erp/tool/ZyToolListRef.vue      |  31 +-
 .../src/views/team/StationList.vue            |  42 +-
 .../src/views/team/StationMachineList.vue     |  10 +-
 .../src/views/team/StationToolList.vue        |  10 +-
 .../tool/controller/ZyToolController.java     |   4 +-
 .../team/controller/StationController.java    |  23 +-
 .../modules/team/service/IStationService.java |   4 +
 .../team/service/impl/StationServiceImpl.java |  28 +
 9 files changed, 374 insertions(+), 257 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue b/ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue
index 8c94a44b..9a27a0cc 100644
--- a/ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue
+++ b/ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue
@@ -1,23 +1,48 @@
 <template>
   <a-card :bordered="false">
-<!--    &lt;!&ndash; 查询区域 &ndash;&gt;-->
-<!--    <div class="table-page-search-wrapper">-->
-<!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
-<!--        <a-row :gutter="24">-->
-<!--        </a-row>-->
-<!--      </a-form>-->
-<!--    </div>-->
-<!--    &lt;!&ndash; 查询区域-END &ndash;&gt;-->
+    <!-- 查询区域 -->
+    <!--    <div class="table-page-search-wrapper">-->
+    <!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
+    <!--        <a-row :gutter="24">-->
+    <!--        </a-row>-->
+    <!--      </a-form>-->
+    <!--    </div>-->
+    <!-- 查询区域-END -->
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :sm="5">
+            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="id">
+              <a-input v-model="queryParam.id" placeholder="请输入设备编号"></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :sm="5">
+            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="queryParam.name" placeholder="请输入设备名称"></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
 
     <!-- 操作按钮区域 -->
-<!--    <div class="table-operator">-->
-<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
-<!--    </div>-->
+    <!--    <div class="table-operator">-->
+    <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+    <!--    </div>-->
 
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
 
@@ -36,244 +61,244 @@
         :customRow="clickThenSelect"
         @change="handleTableChange">
 
-<!--        <template slot="htmlSlot" slot-scope="text">-->
-<!--          <div v-html="text"></div>-->
-<!--        </template>-->
-<!--        <template slot="imgSlot" slot-scope="text">-->
-<!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>-->
-<!--          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
-<!--        </template>-->
-<!--        <template slot="imgeSlot" slot-scope="text">-->
-<!--          <img  :src="text" height="" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
-<!--        </template>-->
-<!--        <template slot="fileSlot" slot-scope="text">-->
-<!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
-<!--          <a-button-->
-<!--            v-else-->
-<!--            :ghost="true"-->
-<!--            type="primary"-->
-<!--            icon="download"-->
-<!--            size="small"-->
-<!--            @click="downloadFile(text)">-->
-<!--            下载-->
-<!--          </a-button>-->
-<!--        </template>-->
+        <!--        <template slot="htmlSlot" slot-scope="text">-->
+        <!--          <div v-html="text"></div>-->
+        <!--        </template>-->
+        <!--        <template slot="imgSlot" slot-scope="text">-->
+        <!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>-->
+        <!--          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
+        <!--        </template>-->
+        <!--        <template slot="imgeSlot" slot-scope="text">-->
+        <!--          <img  :src="text" height="" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
+        <!--        </template>-->
+        <!--        <template slot="fileSlot" slot-scope="text">-->
+        <!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
+        <!--          <a-button-->
+        <!--            v-else-->
+        <!--            :ghost="true"-->
+        <!--            type="primary"-->
+        <!--            icon="download"-->
+        <!--            size="small"-->
+        <!--            @click="downloadFile(text)">-->
+        <!--            下载-->
+        <!--          </a-button>-->
+        <!--        </template>-->
 
-<!--        <span slot="action" slot-scope="text, record">-->
-<!--          <a @click="handleEdit(record)">编辑</a>-->
+        <!--        <span slot="action" slot-scope="text, record">-->
+        <!--          <a @click="handleEdit(record)">编辑</a>-->
 
-<!--          <a-divider type="vertical" />-->
-<!--          <a-dropdown>-->
-<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
-<!--            <a-menu slot="overlay">-->
-<!--              <a-menu-item>-->
-<!--                <a @click="openDetail(record.id)">详情</a>-->
-<!--              </a-menu-item>-->
-<!--              <a-menu-item>-->
-<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
-<!--                  <a>删除</a>-->
-<!--                </a-popconfirm>-->
-<!--              </a-menu-item>-->
-<!--            </a-menu>-->
-<!--          </a-dropdown>-->
-<!--        </span>-->
+        <!--          <a-divider type="vertical" />-->
+        <!--          <a-dropdown>-->
+        <!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
+        <!--            <a-menu slot="overlay">-->
+        <!--              <a-menu-item>-->
+        <!--                <a @click="openDetail(record.id)">详情</a>-->
+        <!--              </a-menu-item>-->
+        <!--              <a-menu-item>-->
+        <!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+        <!--                  <a>删除</a>-->
+        <!--                </a-popconfirm>-->
+        <!--              </a-menu-item>-->
+        <!--            </a-menu>-->
+        <!--          </a-dropdown>-->
+        <!--        </span>-->
 
       </a-table>
     </div>
 
-<!--    <a-tabs defaultActiveKey="1">-->
-<!--      <a-tab-pane tab="类型参数" key="1" >-->
-<!--        <ZyTypeparametersList :mainId="selectedMainId" />-->
-<!--      </a-tab-pane>-->
-<!--      <a-tab-pane tab="运行参数" key="2" forceRender>-->
-<!--        <ZyOperationparametersList :mainId="selectedMainId" />-->
-<!--      </a-tab-pane>-->
-<!--    </a-tabs>-->
-<!--    <ZyDevicetypeDetail ref="ZyDevicetypeDetail"></ZyDevicetypeDetail>-->
-<!--    <zyDevicetype-modal ref="modalForm" @ok="modalFormOk"></zyDevicetype-modal>-->
+    <!--    <a-tabs defaultActiveKey="1">-->
+    <!--      <a-tab-pane tab="类型参数" key="1" >-->
+    <!--        <ZyTypeparametersList :mainId="selectedMainId" />-->
+    <!--      </a-tab-pane>-->
+    <!--      <a-tab-pane tab="运行参数" key="2" forceRender>-->
+    <!--        <ZyOperationparametersList :mainId="selectedMainId" />-->
+    <!--      </a-tab-pane>-->
+    <!--    </a-tabs>-->
+    <!--    <ZyDevicetypeDetail ref="ZyDevicetypeDetail"></ZyDevicetypeDetail>-->
+    <!--    <zyDevicetype-modal ref="modalForm" @ok="modalFormOk"></zyDevicetype-modal>-->
   </a-card>
 </template>
 
 <script>
 
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ZyDevicetypeModal from './modules/ZyDevicetypeModal'
-  import { getAction } from '@/api/manage'
-  import ZyTypeparametersList from './ZyTypeparametersList'
-  import ZyOperationparametersList from './ZyOperationparametersList'
-  import '@/assets/less/TableExpand.less'
-  import  ZyDevicetypeDetail from './modules/ZyDevicetypeDetail'
-  export default {
-    name: "ZyDevicetypeList",
-    mixins:[JeecgListMixin],
-    components: {
-      ZyTypeparametersList,
-      ZyOperationparametersList,
-      ZyDevicetypeModal,
-      ZyDevicetypeDetail
-    },
-    data () {
-      return {
-        description: '设备类型管理页面',
-        // 表头
-        columns: [
-          // {
-          //   title:'类型编号',
-          //   align:"center",
-          //   dataIndex: 'code'
-          // },
-          {
-            title:'名称',
-            align:"center",
-            dataIndex: 'name'
-          },
-          // {
-          //   title:'类型图片',
-          //   align:"center",
-          //   dataIndex: 'img',
-          //   scopedSlots: {customRender: 'imgSlot'}
-          // },
-          // {
-          //   title:"二维码",
-          //   align:"center",
-          //   dataIndex: 'erweima',
-          //   scopedSlots: {customRender: 'imgeSlot'}
-          // },
-          {
-            title:'类型品牌',
-            align:"center",
-            dataIndex: 'brand'
-          },
-          // {
-          //   title:'型号',
-          //   align:"center",
-          //   dataIndex: 'model'
-          // },
-          {
-            title:'生产厂商',
-            align:"center",
-            dataIndex: 'manufacturer'
-          },
-          {
-            title:'供货商',
-            align:"center",
-            dataIndex: 'supplier'
-          },
-          // {
-          //   title:'联系人',
-          //   align:"center",
-          //   dataIndex: 'contact'
-          // },
-          // {
-          //   title:'产地',
-          //   align:"center",
-          //   dataIndex: 'place'
-          // },
-        ],
-        url: {
-          list: "/devicetype/zyDevicetype/list",
-          delete: "/devicetype/zyDevicetype/delete",
-          deleteBatch: "/devicetype/zyDevicetype/deleteBatch",
-          exportXlsUrl: "/devicetype/zyDevicetype/exportXls",
-          importExcelUrl: "devicetype/zyDevicetype/importExcel",
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import ZyDevicetypeModal from './modules/ZyDevicetypeModal'
+import {getAction} from '@/api/manage'
+import ZyTypeparametersList from './ZyTypeparametersList'
+import ZyOperationparametersList from './ZyOperationparametersList'
+import '@/assets/less/TableExpand.less'
+import ZyDevicetypeDetail from './modules/ZyDevicetypeDetail'
+
+export default {
+  name: "ZyDevicetypeList",
+  mixins: [JeecgListMixin],
+  components: {
+    // ZyTypeparametersList,
+    // ZyOperationparametersList,
+    // ZyDevicetypeModal,
+    // ZyDevicetypeDetail
+  },
+  data() {
+    return {
+      description: '设备类型管理页面',
+      // 表头
+      columns: [
+        {
+          title: '设备编号',
+          align: "center",
+          dataIndex: 'id'
         },
-        dictOptions:{
+        {
+          title: '名称',
+          align: "center",
+          dataIndex: 'name'
         },
-        /* 分页参数 */
-        ipagination:{
-          current: 1,
-          pageSize: 5,
-          pageSizeOptions: ['5', '10', '50'],
-          showTotal: (total, range) => {
-            return range[0] + "-" + range[1] + " 共" + total + "条"
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
+        // {
+        //   title:'类型图片',
+        //   align:"center",
+        //   dataIndex: 'img',
+        //   scopedSlots: {customRender: 'imgSlot'}
+        // },
+        // {
+        //   title:"二维码",
+        //   align:"center",
+        //   dataIndex: 'erweima',
+        //   scopedSlots: {customRender: 'imgeSlot'}
+        // },
+        {
+          title: '类型品牌',
+          align: "center",
+          dataIndex: 'brand'
         },
-        selectedMainId:'',
-        superFieldList:[],
-        selectedRowKeys: [],
-      }
-    },
-    created() {
-      this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
-    },
-    methods: {
-      onSelectChange(selectedRowKeys){
-        console.log('selectedRowKeys changed: ', selectedRowKeys);
-        this.selectedRowKeys = selectedRowKeys;
+        // {
+        //   title:'型号',
+        //   align:"center",
+        //   dataIndex: 'model'
+        // },
+        {
+          title: '生产厂商',
+          align: "center",
+          dataIndex: 'manufacturer'
+        },
+        // {
+        //   title:'供货商',
+        //   align:"center",
+        //   dataIndex: 'supplier'
+        // },
+        // {
+        //   title:'联系人',
+        //   align:"center",
+        //   dataIndex: 'contact'
+        // },
+        // {
+        //   title:'产地',
+        //   align:"center",
+        //   dataIndex: 'place'
+        // },
+      ],
+      url: {
+        list: "/devicetype/zyDevicetype/list",
+        delete: "/devicetype/zyDevicetype/delete",
+        deleteBatch: "/devicetype/zyDevicetype/deleteBatch",
+        exportXlsUrl: "/devicetype/zyDevicetype/exportXls",
+        importExcelUrl: "devicetype/zyDevicetype/importExcel",
       },
-      initDictConfig(){
+      dictOptions: {},
+      /* 分页参数 */
+      ipagination: {
+        current: 1,
+        pageSize: 5,
+        pageSizeOptions: ['5', '10', '50'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
       },
-      clickThenSelect(record) {
-        return {
-          on: {
-            click: () => {
-              this.onSelectChange(record.id.split(","), [record]);
-            }
+      selectedMainId: '',
+      superFieldList: [],
+      selectedRowKeys: [],
+    }
+  },
+  created() {
+    this.getSuperFieldList();
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+  methods: {
+    onSelectChange(selectedRowKeys) {
+      console.log('selectedRowKeys changed: ', selectedRowKeys);
+      this.selectedRowKeys = selectedRowKeys;
+    },
+    initDictConfig() {
+    },
+    clickThenSelect(record) {
+      return {
+        on: {
+          click: () => {
+            this.onSelectChange(record.id.split(","), [record]);
           }
         }
-      },
-      onClearSelected() {
-        this.selectedRowKeys = [];
-        this.selectionRows = [];
-        this.selectedMainId=''
-      },
-      // onSelectChange(selectedRowKeys, selectionRows) {
-      //   this.selectedMainId=selectedRowKeys[0]
-      //   this.selectedRowKeys = selectedRowKeys;
-      //   this.selectionRows = selectionRows;
-      // },
-      loadData(arg) {
-        if(!this.url.list){
-          this.$message.error("请设置url.list属性!")
-          return
+      }
+    },
+    onClearSelected() {
+      this.selectedRowKeys = [];
+      this.selectionRows = [];
+      this.selectedMainId = ''
+    },
+    // onSelectChange(selectedRowKeys, selectionRows) {
+    //   this.selectedMainId=selectedRowKeys[0]
+    //   this.selectedRowKeys = selectedRowKeys;
+    //   this.selectionRows = selectionRows;
+    // },
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      this.onClearSelected()
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records;
+          this.ipagination.total = res.result.total;
         }
-        //加载数据 若传入参数1则加载第一页的内容
-        if (arg === 1) {
-          this.ipagination.current = 1;
+        if (res.code === 510) {
+          this.$message.warning(res.message)
         }
-        this.onClearSelected()
-        var params = this.getQueryParams();//查询条件
-        this.loading = true;
-        getAction(this.url.list, params).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result.records;
-            this.ipagination.total = res.result.total;
-          }
-          if(res.code===510){
-            this.$message.warning(res.message)
-          }
-          this.loading = false;
-        })
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'pid',text:'父级节点',dictCode:''})
-        fieldList.push({type:'string',value:'code',text:'类型编号',dictCode:''})
-        fieldList.push({type:'string',value:'name',text:'类型名称',dictCode:''})
-        fieldList.push({type:'string',value:'img',text:'类型图片',dictCode:''})
-        fieldList.push({type:'string',value:'brand',text:'类型品牌',dictCode:''})
-        fieldList.push({type:'string',value:'model',text:'型号',dictCode:''})
-        fieldList.push({type:'string',value:'manufacturer',text:'生产厂商',dictCode:''})
-        fieldList.push({type:'string',value:'supplier',text:'供货商',dictCode:''})
-        fieldList.push({type:'string',value:'contact',text:'联系人',dictCode:''})
-        fieldList.push({type:'string',value:'place',text:'产地',dictCode:''})
-        this.superFieldList = fieldList
-      },
-      openDetail(id){
-        this.$refs.ZyDevicetypeDetail.showModal(id)
+        this.loading = false;
+      })
+    },
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({type: 'string', value: 'pid', text: '父级节点', dictCode: ''})
+      fieldList.push({type: 'string', value: 'code', text: '类型编号', dictCode: ''})
+      fieldList.push({type: 'string', value: 'name', text: '类型名称', dictCode: ''})
+      fieldList.push({type: 'string', value: 'img', text: '类型图片', dictCode: ''})
+      fieldList.push({type: 'string', value: 'brand', text: '类型品牌', dictCode: ''})
+      fieldList.push({type: 'string', value: 'model', text: '型号', dictCode: ''})
+      fieldList.push({type: 'string', value: 'manufacturer', text: '生产厂商', dictCode: ''})
+      fieldList.push({type: 'string', value: 'supplier', text: '供货商', dictCode: ''})
+      fieldList.push({type: 'string', value: 'contact', text: '联系人', dictCode: ''})
+      fieldList.push({type: 'string', value: 'place', text: '产地', dictCode: ''})
+      this.superFieldList = fieldList
+    },
+    openDetail(id) {
+      this.$refs.ZyDevicetypeDetail.showModal(id)
 
-      }
     }
   }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+@import '~@assets/less/common.less'
 </style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue b/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
index c660ea12..e1fdaddf 100644
--- a/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
+++ b/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
@@ -1,13 +1,28 @@
 <template>
   <a-card :bordered="false">
     <!-- 查询区域 -->
-    <!--    <div class="table-page-search-wrapper">-->
-    <!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
-    <!--        <a-row :gutter="24">-->
-    <!--        </a-row>-->
-    <!--      </a-form>-->
-    <!--    </div>-->
-    <!--    &lt;!&ndash; 查询区域-END &ndash;&gt;-->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :sm="5">
+            <a-form-model-item label="工具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="id">
+              <a-input v-model="queryParam.id" placeholder="请输入工具编号"></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :sm="5">
+            <a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="queryParam.name" placeholder="请输入工具名称"></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
 
     <!-- 操作按钮区域 -->
 <!--    <div class="table-operator">-->
@@ -116,7 +131,7 @@ export default {
         {
           title: '工具编号',
           align: "center",
-          dataIndex: 'nums'
+          dataIndex: 'id'
         },
         {
           title: '工具名称',
diff --git a/ant-design-vue-jeecg/src/views/team/StationList.vue b/ant-design-vue-jeecg/src/views/team/StationList.vue
index 5d09a1e9..e2b50faa 100644
--- a/ant-design-vue-jeecg/src/views/team/StationList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationList.vue
@@ -84,7 +84,9 @@
           <template slot="content">
             <p>{{ text }}</p>
           </template>
-          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a>
+          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{
+              text
+            }}</a>
         </a-popover>
         </span>
         <span slot="machineIds_dictText" slot-scope="text, record">
@@ -92,12 +94,13 @@
           <template slot="content">
             <p>{{ text }}</p>
           </template>
-          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{ text }}</a>
+          <a style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 100px">{{
+              text
+            }}</a>
         </a-popover>
         </span>
 
 
-
         <span slot="action1" slot-scope="text, record">
            <a @click="jumpPage1(record)">管理</a>
         </span>
@@ -112,6 +115,10 @@
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)">
             <a>删除</a>
           </a-popconfirm>
+           <a-divider type="vertical"/>
+                    <a @click="up(record.id)">升序</a>
+           <a-divider type="vertical"/>
+           <a @click="down(record.id)">降序</a>
         </span>
       </a-table>
     </div>
@@ -214,6 +221,8 @@ export default {
       url: {
         list: "/team/station/list",
         queryIsCanDelete: "/team/station/queryIsCanDelete",
+        up: "/team/station/up",
+        down: "/team/station/down",
         delete: "/team/station/delete",
         deleteBatch: "/team/station/deleteBatch",
         exportXlsUrl: "/team/station/exportXls",
@@ -279,9 +288,30 @@ export default {
         }
       })
     },
+
+    up(id) {
+      getAction(this.url.up, {id: id}).then((res) => {
+        if (res.success) {
+          this.loadData();
+          this.$message.success(res.message);
+        } else {
+          this.$message.warning(res.message);
+        }
+      })
+    },
+    down(id) {
+      getAction(this.url.down, {id: id}).then((res) => {
+        if (res.success) {
+          this.loadData();
+          this.$message.success(res.message);
+        } else {
+          this.$message.warning(res.message);
+        }
+      })
+    },
   }
 }
 </script>
-<style scoped>
-@import '~@assets/less/common.less';
-</style>
\ No newline at end of file
+<!--<style scoped>-->
+<!--@import '~@assets/less/common.less';-->
+<!--</style>-->
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
index 70a4aeee..8bff2842 100644
--- a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
@@ -146,11 +146,11 @@ export default {
           align: "center",
           dataIndex: 'stationName',
         },
-        // {
-        //   title: '设备ID',
-        //   align: "center",
-        //   dataIndex: 'machineId'
-        // },
+        {
+          title: '设备编号',
+          align: "center",
+          dataIndex: 'machineId'
+        },
         {
           title: '设备名称',
           align: "center",
diff --git a/ant-design-vue-jeecg/src/views/team/StationToolList.vue b/ant-design-vue-jeecg/src/views/team/StationToolList.vue
index bb576a5a..7aa6b5fb 100644
--- a/ant-design-vue-jeecg/src/views/team/StationToolList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationToolList.vue
@@ -144,11 +144,11 @@ export default {
           align: "center",
           dataIndex: 'stationName',
         },
-        // {
-        //   title: '工具ID',
-        //   align: "center",
-        //   dataIndex: 'toolsId'
-        // },
+        {
+          title: '工具编号',
+          align: "center",
+          dataIndex: 'toolsId'
+        },
         {
           title: '工具名称',
           align: "center",
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/tool/controller/ZyToolController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/tool/controller/ZyToolController.java
index 721a5422..d2d60e4e 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/tool/controller/ZyToolController.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/tool/controller/ZyToolController.java
@@ -66,8 +66,8 @@ public class ZyToolController extends JeecgController<ZyTool, IZyToolService> {
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		//QueryWrapper<ZyTool> queryWrapper = QueryGenerator.initQueryWrapper(zyTool, req.getParameterMap());
-		QueryWrapper queryWrapper = new QueryWrapper();
+		QueryWrapper<ZyTool> queryWrapper = QueryGenerator.initQueryWrapper(zyTool, req.getParameterMap());
+//		QueryWrapper queryWrapper = new QueryWrapper();
 		Page<ZyTool> page = new Page<ZyTool>(pageNo, pageSize);
 		IPage<ZyTool> pageList = zyToolService.page(page, queryWrapper);
 		return Result.OK(pageList);
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java
index 937e20a4..c0fe44ff 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java
@@ -7,12 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.activiti.entity.ActBusiness;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.team.entity.Station;
@@ -28,9 +26,11 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @Description: 车间工位管理
@@ -197,4 +197,19 @@ public class StationController extends JeecgController<Station, IStationService>
         return super.importExcel(request, response, Station.class);
     }
 
+    @ApiOperation(value = "排序", notes = "排序")
+    @GetMapping(value = "/up")
+    public Result<?> up(@RequestParam(name = "id", required = true) String id) {
+        stationService.up(id);
+        return Result.OK();
+    }
+
+    @AutoLog(value = "排序")
+    @ApiOperation(value = "排序", notes = "排序")
+    @GetMapping(value = "/down")
+    public Result<?> down(@RequestParam(name = "id", required = true) String id) {
+        stationService.down(id);
+        return Result.OK();
+    }
+
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IStationService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IStationService.java
index b610b3f7..d5d5e240 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IStationService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IStationService.java
@@ -13,4 +13,8 @@ import org.jeecg.modules.team.entity.Station;
 public interface IStationService extends IService<Station> {
 
     int queryIsCanDelete(Station station);
+
+    void up(String id);
+
+    void down(String id);
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
index 4976de9e..ec60d37c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.team.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.team.entity.Station;
 import org.jeecg.modules.team.entity.StationMachine;
@@ -13,6 +14,7 @@ import org.jeecg.modules.team.service.IStationService;
 import org.jeecg.modules.team.service.IStationToolService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 /**
  * @Description: 车间工位管理
@@ -36,4 +38,30 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
         }
         return count;
     }
+
+    @Override
+    public void up(String id) {
+        Station entity = this.getById(id);
+        if (ObjectUtils.isEmpty(entity)) {
+            throw new JeecgBootException(id + "不存在");
+        }
+        Station station = new Station();
+        station.setId(id);
+        station.setStationNum(entity.getStationNum() + 1);
+        this.updateById(station);
+    }
+
+    @Override
+    public void down(String id) {
+        Station entity = this.getById(id);
+        if (ObjectUtils.isEmpty(entity)) {
+            throw new JeecgBootException(id + "不存在");
+        }
+        if (entity.getStationNum() > 1) {
+            Station station = new Station();
+            station.setId(id);
+            station.setStationNum(entity.getStationNum() - 1);
+            this.updateById(station);
+        }
+    }
 }