rev：修改调度管理路径

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java

@@ -1,21 +1,97 @@
 package org.nl.wms.product_manage.controller.device;
 
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.anno.Log;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
+import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
+import org.nl.wms.product_manage.备份pdm.service.DeviceService;
+import org.nl.wms.product_manage.备份pdm.service.dto.DeviceDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import java.util.Map;
-
-import org.springframework.web.bind.annotation.RestController;
 
 /**
- * <p>
+ * @author lyd
- * 生产设备基础信息表 前端控制器
+ * @date 2023-03-15
- * </p>
+ **/
- *
- * @author generator
- * @since 2023-04-26
- */
 @RestController
-@RequestMapping("/pdmBiDevice")
+@Api(tags = "生产设备管理")
+@RequestMapping("/api/device")
+@Slf4j
 public class PdmBiDeviceController {
+    @Autowired
+    private  DeviceService deviceService;
+    @Autowired
+    private IPdmBiDeviceService iDeviceService;
+
+    @GetMapping
+    @Log("查询生产设备")
+    @ApiOperation("查询生产设备")
+    //@PreAuthorize("@el.check('device:list')")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
+        return new ResponseEntity<>(deviceService.queryAll(whereJson,page),HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增生产设备")
+    @ApiOperation("新增生产设备")
+    //@PreAuthorize("@el.check('device:add')")
+    public ResponseEntity<Object> create( @RequestBody JSONObject form){
+        PdmBiDevice device = form.toJavaObject(PdmBiDevice.class);
+        device.setCreate_id(SecurityUtils.getCurrentUserId());
+        device.setCreate_name(SecurityUtils.getCurrentNickName());
+        device.setCreate_time(DateUtil.now());
+        iDeviceService.save(device);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改生产设备")
+    @ApiOperation("修改生产设备")
+    //@PreAuthorize("@el.check('device:edit')")
+    public ResponseEntity<Object> update(@Validated @RequestBody JSONObject form){
+        PdmBiDevice device = form.toJavaObject(PdmBiDevice.class);
+        device.setUpdate_id(SecurityUtils.getCurrentUserId());
+        device.setUpdate_name(SecurityUtils.getCurrentNickName());
+        device.setUpdate_time(DateUtil.now());
+        iDeviceService.updateById(device);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @Log("删除生产设备")
+    @ApiOperation("删除生产设备")
+    //@PreAuthorize("@el.check('device:del')")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
+        deviceService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @GetMapping("/getWorkprocedure")
+    @Log("工序下拉")
+    @ApiOperation("工序下拉")
+    //@PreAuthorize("@el.check('device:list')")
+    public ResponseEntity<Object> getWorkprocedure(){
+        return new ResponseEntity<>(deviceService.getWorkprocedure(),HttpStatus.OK);
+    }
+
+    @GetMapping("/getDeviceList")
+    @Log("设备下拉框")
+    @ApiOperation("设备下拉框")
+    //@PreAuthorize("@el.check('device:list')")
+    public ResponseEntity<Object> getDeviceList(){
+        return new ResponseEntity<>(deviceService.getDeviceList(),HttpStatus.OK);
+    }
 
 }
-

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java

@@ -1,6 +1,8 @@
 package org.nl.wms.product_manage.service.device.dao;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import lombok.Data;
@@ -24,6 +26,7 @@ public class PdmBiDevice implements Serializable {
     /**
      * 设备编码
      */
+    @TableId(value = "device_code")
     private String device_code;
 
     /**

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceController.java

@@ -21,10 +21,8 @@ import java.util.Map;
  * @author lyd
  * @date 2023-03-15
  **/
-@RestController
 @RequiredArgsConstructor
 @Api(tags = "生产设备管理")
-@RequestMapping("/api/device")
 @Slf4j
 public class DeviceController {
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/dao/SysUser.java

@@ -37,7 +37,7 @@ public class SysUser implements Serializable {
      */
     private String username;
 
-    /**
+    /**fperson_name
      * 姓名
      */
     private String person_name;

mes/hd/nladmin-system/src/main/resources/config/application-dev.yml

@@ -9,25 +9,23 @@ spring:
       client:
         reactive:
           #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
-          #          endpoints: 47.96.133.178:8200 #外网
+          #          endpoints: 192.168.46.225:8200 #外网
-          endpoints: http://47.96.133.178:8200 #外网
+          endpoints: http://192.168.46.225:8200 #外网
   elasticsearch:
     rest:
       #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
-      #      uris: 47.96.133.178:8200 #外网
+      #      uris: 192.168.46.225:8200 #外网
-      uris: http://47.96.133.178:8200 #外网
+      uris: http://192.168.46.225:9200 #外网
-      username: elastic
+#      username: elastic
-      password: 123456
+#      password: 123456
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      #url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
-      password: ${DB_PWD:Root.123456}
+      password: ${DB_PWD:123456}
-#      username: ${DB_USER:root}
-#      password: ${DB_PWD:942464Yy}
 
       # 初始连接数
       initial-size: 5

mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml

@@ -9,13 +9,13 @@ spring:
       client:
         reactive:
           #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
-          #          endpoints: 47.96.133.178:8200 #外网
+          #          endpoints: 192.168.46.225:8200 #外网
-          endpoints: http://47.96.133.178:8200 #外网
+          endpoints: http://192.168.46.225:8200 #外网
   elasticsearch:
     rest:
       #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
-      #      uris: 47.96.133.178:8200 #外网
+      #      uris: 192.168.46.225:8200 #外网
-      uris: http://47.96.133.178:8200 #外网
+      uris: http://192.168.46.225:8200 #外网
       username: elastic
       password: 123456
   datasource:

mes/hd/nladmin-system/src/main/resources/config/application-prod.yml

@@ -9,13 +9,13 @@ spring:
       client:
         reactive:
           #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
-          #          endpoints: 47.96.133.178:8200 #外网
+          #          endpoints: 192.168.46.225:8200 #外网
-          endpoints: http://47.96.133.178:8200 #外网
+          endpoints: http://192.168.46.225:8200 #外网
   elasticsearch:
     rest:
       #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
-      #      uris: 47.96.133.178:8200 #外网
+      #      uris: 192.168.46.225:8200 #外网
-      uris: http://47.96.133.178:8200 #外网
+      uris: http://192.168.46.225:8200 #外网
       username: elastic
       password: 123456
   datasource:

mes/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -18,7 +18,7 @@ https://juejin.cn/post/6844903775631572999
     <!--引入默认的一些设置-->
 <!--    <include resource="log/AutoCreateInst.xml"/>-->
    <!-- <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-        <url>http://47.96.133.178:8200/_bulk</url>
+        <url>http://192.168.46.225:8200/_bulk</url>
         <index>${esIndex}</index>
         <type>mes_log</type>
         <loggerName>es-logger</loggerName> &lt;!&ndash; optional &ndash;&gt;

mes/qd/public/config.js

@@ -4,7 +4,6 @@ window.g = {
   },
   prod: {
     VUE_APP_BASE_API: 'http://192.168.46.5:8011'
-
   }
 
 }

mes/qd/src/views/wms/pub/StructDialog.vue

@@ -66,7 +66,7 @@
 import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
-import crudRegion from '@/api/wms/sch/region'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
 
 export default {
   name: 'StructDialog',

mes/qd/src/views/wms/scheduler_manage/point/index.vue

@@ -434,16 +434,16 @@
 
 <script>
 import crudDevice from '@/api/wms/pdm/device'
-import crudRegion from '@/api/wms/sch/region'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
-import crudPoint, { changeActive } from '@/api/wms/sch/point'
+import crudPoint, { changeActive } from '@/views/wms/scheduler_manage/point/point'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import ViewDialog from '@/views/wms/product_manage/sch/point/ViewDialog'
+import ViewDialog from '@/views/wms/scheduler_manage/point/ViewDialog'
-import MaterialDialog from '@/views/wms/product_manage/sch/point/MaterialDialog'
+import MaterialDialog from '@/views/wms/scheduler_manage/point/MaterialDialog'
-import WorkOrderDialog from '@/views/wms/product_manage/sch/point/WorkOrderDialog'
+import WorkOrderDialog from '@/views/wms/scheduler_manage/point/WorkOrderDialog'
 
 const defaultForm = {
   point_id: null,

mes/qd/src/views/wms/scheduler_manage/region/index.vue

@@ -137,7 +137,7 @@
 </template>
 
 <script>
-import crudRegion from '@/api/wms/sch/region'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'

mes/qd/src/views/wms/scheduler_manage/task/index.vue

@@ -233,7 +233,7 @@
 </template>
 
 <script>
-import crudTask from '@/api/wms/sch/task'
+import crudTask from '@/views/wms/scheduler_manage/task/task'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'

mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue

@@ -221,7 +221,7 @@
 import CRUD, { crud } from '@crud/crud'
 import StructDiv from '@/views/wms/pub/StructDialog'
 import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
-import crudPoint from '@/api/wms/sch/point'
+import crudPoint from '@/views/wms/scheduler_manage/point/point'
 import AddBox from '@/views/wms/storage_manage/product/productIn/AddBox'
 
 export default {

mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue

@@ -246,8 +246,8 @@
 import CRUD, { crud } from '@crud/crud'
 import productOut from '@/views/wms/storage_manage/product/productOut/productout'
 import StructIvt from '@/views/wms/storage_manage/product/productOut/StructIvt'
-import crudRegion from '@/api/wms/sch/region'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
-import crudPoint from '@/api/wms/sch/point'
+import crudPoint from '@/views/wms/scheduler_manage/point/point'
 
 export default {
   name: 'DivDialog',

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog.vue

@@ -202,8 +202,8 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
-import crudPoint from '@/api/wms/sch/point'
+import crudPoint from '@/views/wms/scheduler_manage/point/point'
-import crudRegion from '@/api/wms/sch/region'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
 
 export default {
   name: 'DivDialog',

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/DivDialog.vue

@@ -202,8 +202,8 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
-import crudPoint from '@/api/wms/sch/point'
+import crudPoint from '@/views/wms/scheduler_manage/point/point'
-import crudRegion from '@/api/wms/sch/region'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
 
 export default {
   name: 'DivDialog',