车间工位管理问题修复 1.3

ant-design-vue-jeecg/src/views/devicetype/ZyDevicetypeListRef.vue

@@ -1,13 +1,37 @@
 <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;-->
+    <!-- 查询区域-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">-->
@@ -17,7 +41,8 @@
     <!-- 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>
 
@@ -103,25 +128,26 @@
 import ZyOperationparametersList from './ZyOperationparametersList'
 import '@/assets/less/TableExpand.less'
 import ZyDevicetypeDetail from './modules/ZyDevicetypeDetail'
+
 export default {
   name: "ZyDevicetypeList",
   mixins: [JeecgListMixin],
   components: {
-      ZyTypeparametersList,
+    // ZyTypeparametersList,
-      ZyOperationparametersList,
+    // ZyOperationparametersList,
-      ZyDevicetypeModal,
+    // ZyDevicetypeModal,
-      ZyDevicetypeDetail
+    // ZyDevicetypeDetail
   },
   data() {
     return {
       description: '设备类型管理页面',
       // 表头
       columns: [
-          // {
+        {
-          //   title:'类型编号',
+          title: '设备编号',
-          //   align:"center",
+          align: "center",
-          //   dataIndex: 'code'
+          dataIndex: 'id'
-          // },
+        },
         {
           title: '名称',
           align: "center",
@@ -154,11 +180,11 @@
           align: "center",
           dataIndex: 'manufacturer'
         },
-          {
+        // {
-            title:'供货商',
+        //   title:'供货商',
-            align:"center",
+        //   align:"center",
-            dataIndex: 'supplier'
+        //   dataIndex: 'supplier'
-          },
+        // },
         // {
         //   title:'联系人',
         //   align:"center",
@@ -177,8 +203,7 @@
         exportXlsUrl: "/devicetype/zyDevicetype/exportXls",
         importExcelUrl: "devicetype/zyDevicetype/importExcel",
       },
-        dictOptions:{
+      dictOptions: {},
-        },
       /* 分页参数 */
       ipagination: {
         current: 1,

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">-->
+    <div class="table-page-search-wrapper">
-    <!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
-    <!--        <a-row :gutter="24">-->
+        <a-row :gutter="24">
-    <!--        </a-row>-->
+          <a-col :sm="5">
-    <!--      </a-form>-->
+            <a-form-model-item label="工具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="id">
-    <!--    </div>-->
+              <a-input v-model="queryParam.id" placeholder="请输入工具编号"></a-input>
-    <!--    &lt;!&ndash; 查询区域-END &ndash;&gt;-->
+            </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: '工具名称',

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>
+<!--<style scoped>-->
-@import '~@assets/less/common.less';
+<!--@import '~@assets/less/common.less';-->
-</style>
+<!--</style>-->

ant-design-vue-jeecg/src/views/team/StationMachineList.vue

@@ -146,11 +146,11 @@ export default {
           align: "center",
           dataIndex: 'stationName',
         },
-        // {
+        {
-        //   title: '设备ID',
+          title: '设备编号',
-        //   align: "center",
+          align: "center",
-        //   dataIndex: 'machineId'
+          dataIndex: 'machineId'
-        // },
+        },
         {
           title: '设备名称',
           align: "center",

ant-design-vue-jeecg/src/views/team/StationToolList.vue

@@ -144,11 +144,11 @@ export default {
           align: "center",
           dataIndex: 'stationName',
         },
-        // {
+        {
-        //   title: '工具ID',
+          title: '工具编号',
-        //   align: "center",
+          align: "center",
-        //   dataIndex: 'toolsId'
+          dataIndex: 'toolsId'
-        // },
+        },
         {
           title: '工具名称',
           align: "center",

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<ZyTool> queryWrapper = QueryGenerator.initQueryWrapper(zyTool, req.getParameterMap());
-		QueryWrapper queryWrapper = new QueryWrapper();
+//		QueryWrapper queryWrapper = new QueryWrapper();
 		Page<ZyTool> page = new Page<ZyTool>(pageNo, pageSize);
 		IPage<ZyTool> pageList = zyToolService.page(page, queryWrapper);
 		return Result.OK(pageList);

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();
+    }
+
 }

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);
 }

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);
+        }
+    }
 }