From e8f4c16b1bb2037c851fde2f4c6380082b513734 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 31 十月 2025 16:01:39 +0800
Subject: [PATCH] 1
---
/dev/null | 24 ------------------------
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 3 +--
src/main/resources/application-dev.yml | 2 +-
pom.xml | 2 +-
4 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/license.lic b/license.lic
deleted file mode 100644
index 22364dc..0000000
--- a/license.lic
+++ /dev/null
@@ -1 +0,0 @@
-�!�;蓧嚡页僶}>菥m熂l簝 �&蹻摜ズャDYw漛�<
烻-唖賳3鬕J 辴迟*疀専el龍魌�6�+�"徥H釛H|�観J_ �7 i瓋I%欑�"閑�'6_堜r%�9蠤奇A疡p�鎟�眙�/讧� 頺�)�hb@s蜉C_:4驦5嶥詥嬋Yd靪齐CJ澩g厛oV�#硫?�茞f滂k齠%跏#m 梲rD菰:�z啥炣蕶& 槺�$\嶋d閧'&昬7卶縎�p渓罷��cu3*崌U丫x窜鞓�3胅渆]K�&匤h烷a3GL�暼蠖伜堩{崸]r2羮�v�P湧|棖話g^�佾��?z 秚井7嬇!恀�!齤-F.玬{��+纁0齇xM胡S蟱tK錺�8-z(�;J贿@lvE8逯~xЬ糍�喎潵R虷覹q閧瑾I]熧鞲| 唼 D钥` 輂齱⒔嗢�2纐5鎸+�
�+vt姰�罹访!栿襁场済L殞搃��\LG誒峮_厸肭�f艟�nx� 硯咧w蘼唌�"]}簟5嗳o梋a� 処P�%檞l+� C绚v3鈔闞3�繎 飇�)粓篍屉蘻]綨/図gCbm�8��D/�浈豗舕酵羣�0胆臚〆�珪&ヒR弌�:@颶�兂誙綽R:g
DV3P偭U=嵆镣!�f隧�7àdrd舷[4烿凞 `F酞`I彫椱柤籒r郯嵑PqE霮?Y1/!�9陔k$0an哲也嵍樗妍5譛紁驭3圢�<�(揍鬞#�掺镧翄$眕V�<霄6�?I卬��悕x �:lLm鍭�9� 荳 ��
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4e61b50..9a4e10f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<relativePath/>
</parent>
<groupId>com.zy</groupId>
- <artifactId>asrs</artifactId>t
+ <artifactId>asrs</artifactId>
<version>1.1.1</version>
<packaging>war</packaging>
diff --git a/src/main/java/com/zy/asrs/controller/AutoMoveController.java b/src/main/java/com/zy/asrs/controller/AutoMoveController.java
deleted file mode 100644
index 1a9b6f7..0000000
--- a/src/main/java/com/zy/asrs/controller/AutoMoveController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.AutoMove;
-import com.zy.asrs.service.AutoMoveService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class AutoMoveController extends BaseController {
-
- @Autowired
- private AutoMoveService autoMoveService;
-
- @RequestMapping(value = "/autoMove/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(autoMoveService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/autoMove/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<AutoMove> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(AutoMove.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(autoMoveService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/autoMove/add/auth")
- @ManagerAuth
- public R add(AutoMove autoMove) {
- autoMoveService.insert(autoMove);
- return R.ok();
- }
-
- @RequestMapping(value = "/autoMove/update/auth")
- @ManagerAuth
- public R update(AutoMove autoMove){
- if (Cools.isEmpty(autoMove) || null==autoMove.getId()){
- return R.error();
- }
- autoMoveService.updateById(autoMove);
- return R.ok();
- }
-
- @RequestMapping(value = "/autoMove/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- autoMoveService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/autoMove/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<AutoMove> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("autoMove"));
- convert(map, wrapper);
- List<AutoMove> list = autoMoveService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/autoMoveQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<AutoMove> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<AutoMove> page = autoMoveService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (AutoMove autoMove : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", autoMove.getId());
- map.put("value", autoMove.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/autoMove/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<AutoMove> wrapper = new EntityWrapper<AutoMove>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != autoMoveService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(AutoMove.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
deleted file mode 100644
index 5b15e25..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.WrkMastExecute;
-import com.zy.asrs.service.WrkMastExecuteService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkMastExecuteController extends BaseController {
-
- @Autowired
- private WrkMastExecuteService wrkMastExecuteService;
-
- @RequestMapping(value = "/wrkMastExecute/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastExecuteService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastExecute/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastExecute.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastExecuteService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/wrkMastExecute/add/auth")
- @ManagerAuth
- public R add(WrkMastExecute wrkMastExecute) {
- wrkMastExecuteService.insert(wrkMastExecute);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecute/update/auth")
- @ManagerAuth
- public R update(WrkMastExecute wrkMastExecute){
- if (Cools.isEmpty(wrkMastExecute) || null==wrkMastExecute.getWrkNo()){
- return R.error();
- }
- wrkMastExecuteService.updateById(wrkMastExecute);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecute/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastExecuteService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecute/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastExecute"));
- convert(map, wrapper);
- List<WrkMastExecute> list = wrkMastExecuteService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastExecuteQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastExecute> page = wrkMastExecuteService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastExecute wrkMastExecute : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastExecute.getWrkNo());
- map.put("value", wrkMastExecute.getWrkNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastExecute/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastExecute> wrapper = new EntityWrapper<WrkMastExecute>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastExecuteService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastExecute.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
deleted file mode 100644
index cbaa129..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.WrkMastExecuteLog;
-import com.zy.asrs.service.WrkMastExecuteLogService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkMastExecuteLogController extends BaseController {
-
- @Autowired
- private WrkMastExecuteLogService wrkMastExecuteLogService;
-
- @RequestMapping(value = "/wrkMastExecuteLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastExecuteLogService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastExecuteLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastExecuteLogService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/add/auth")
- @ManagerAuth
- public R add(WrkMastExecuteLog wrkMastExecuteLog) {
- wrkMastExecuteLogService.insert(wrkMastExecuteLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/update/auth")
- @ManagerAuth
- public R update(WrkMastExecuteLog wrkMastExecuteLog){
- if (Cools.isEmpty(wrkMastExecuteLog) || null==wrkMastExecuteLog.getWrkNo()){
- return R.error();
- }
- wrkMastExecuteLogService.updateById(wrkMastExecuteLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastExecuteLogService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastExecuteLog"));
- convert(map, wrapper);
- List<WrkMastExecuteLog> list = wrkMastExecuteLogService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastExecuteLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastExecuteLog> page = wrkMastExecuteLogService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastExecuteLog wrkMastExecuteLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastExecuteLog.getWrkNo());
- map.put("value", wrkMastExecuteLog.getWrkNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<WrkMastExecuteLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastExecuteLogService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastExecuteLog.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java b/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java
deleted file mode 100644
index e4a946c..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.WrkMastFourWarVehicle;
-import com.zy.asrs.service.WrkMastFourWarVehicleService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkMastFourWarVehicleController extends BaseController {
-
- @Autowired
- private WrkMastFourWarVehicleService wrkMastFourWarVehicleService;
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastFourWarVehicleService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastFourWarVehicle.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastFourWarVehicleService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/add/auth")
- @ManagerAuth
- public R add(WrkMastFourWarVehicle wrkMastFourWarVehicle) {
- wrkMastFourWarVehicleService.insert(wrkMastFourWarVehicle);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/update/auth")
- @ManagerAuth
- public R update(WrkMastFourWarVehicle wrkMastFourWarVehicle){
- if (Cools.isEmpty(wrkMastFourWarVehicle) || null==wrkMastFourWarVehicle.getId()){
- return R.error();
- }
- wrkMastFourWarVehicleService.updateById(wrkMastFourWarVehicle);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastFourWarVehicleService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastFourWarVehicle"));
- convert(map, wrapper);
- List<WrkMastFourWarVehicle> list = wrkMastFourWarVehicleService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastFourWarVehicle> page = wrkMastFourWarVehicleService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastFourWarVehicle wrkMastFourWarVehicle : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastFourWarVehicle.getId());
- map.put("value", wrkMastFourWarVehicle.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<WrkMastFourWarVehicle>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastFourWarVehicleService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastFourWarVehicle.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java
deleted file mode 100644
index 739e028..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.WrkMastFourWarVehicleLog;
-import com.zy.asrs.service.WrkMastFourWarVehicleLogService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkMastFourWarVehicleLogController extends BaseController {
-
- @Autowired
- private WrkMastFourWarVehicleLogService wrkMastFourWarVehicleLogService;
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastFourWarVehicleLogService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastFourWarVehicleLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastFourWarVehicleLogService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/add/auth")
- @ManagerAuth
- public R add(WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog) {
- wrkMastFourWarVehicleLogService.insert(wrkMastFourWarVehicleLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/update/auth")
- @ManagerAuth
- public R update(WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog){
- if (Cools.isEmpty(wrkMastFourWarVehicleLog) || null==wrkMastFourWarVehicleLog.getId()){
- return R.error();
- }
- wrkMastFourWarVehicleLogService.updateById(wrkMastFourWarVehicleLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastFourWarVehicleLogService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastFourWarVehicleLog"));
- convert(map, wrapper);
- List<WrkMastFourWarVehicleLog> list = wrkMastFourWarVehicleLogService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastFourWarVehicleLog> page = wrkMastFourWarVehicleLogService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastFourWarVehicleLog.getId());
- map.put("value", wrkMastFourWarVehicleLog.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<WrkMastFourWarVehicleLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastFourWarVehicleLogService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastFourWarVehicleLog.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/AutoMove.java b/src/main/java/com/zy/asrs/entity/AutoMove.java
deleted file mode 100644
index bd8efbb..0000000
--- a/src/main/java/com/zy/asrs/entity/AutoMove.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("man_auto_move")
-public class AutoMove implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 缂栧彿
- */
- @ApiModelProperty(value= "缂栧彿")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Short status;
-
- @ApiModelProperty(value= "")
- @TableField("line_number")
- private Long lineNumber;
-
- @ApiModelProperty(value= "")
- @TableField("loc_no")
- private String locNo;
-
- @ApiModelProperty(value= "")
- @TableField("row_priority")
- private Integer rowPriority;
-
- @ApiModelProperty(value= "")
- @TableField("order_no")
- private String orderNo;
-
- @ApiModelProperty(value= "")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- @ApiModelProperty(value= "")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- @ApiModelProperty(value= "")
- private Integer uuid;
-
- public AutoMove() {}
-
- public AutoMove(Short status,Long lineNumber,String locNo,Integer rowPriority,String orderNo,Date createTime,Date updateTime,Integer uuid) {
- this.status = status;
- this.lineNumber = lineNumber;
- this.locNo = locNo;
- this.rowPriority = rowPriority;
- this.orderNo = orderNo;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.uuid = uuid;
- }
-
-// AutoMove autoMove = new AutoMove(
-// null, // 鐘舵��
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
deleted file mode 100644
index 80451ba..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_execute")
-public class WrkMastExecute implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("sou_loc_no")
- private String souLocNo;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("end_loc_no")
- private String endLocNo;
-
- /**
- * 鍘熸ゼ灞�
- */
- @ApiModelProperty(value= "鍘熸ゼ灞�")
- @TableField("sou_floor")
- private Integer souFloor;
-
- /**
- * 鐩爣妤煎眰
- */
- @ApiModelProperty(value= "鐩爣妤煎眰")
- @TableField("end_floor")
- private Integer endFloor;
-
- /**
- * 婧愮珯鐐�
- */
- @ApiModelProperty(value= "婧愮珯鐐�")
- @TableField("sou_sta_no")
- private String souStaNo;
-
- /**
- * 鐩爣绔欑偣
- */
- @ApiModelProperty(value= "鐩爣绔欑偣")
- @TableField("end_sta_no")
- private String endStaNo;
-
- /**
- * 褰撳墠鑺傜偣
- */
- @ApiModelProperty(value= "褰撳墠鑺傜偣")
- @TableField("now_position")
- private Integer nowPosition;
-
- /**
- * 鐩爣鑺傜偣
- */
- @ApiModelProperty(value= "鐩爣鑺傜偣")
- @TableField("end_position")
- private Integer endPosition;
-
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
- private Integer ioType;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
- private Long wrkSts;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private String modiUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private String appeUser;
-
- /**
- * 浠诲姟鐘舵��
- */
- @ApiModelProperty(value= "浠诲姟鐘舵��")
- private Integer status;
-
- @ApiModelProperty(value= "")
- @TableId(value = "wrk_no", type = IdType.INPUT)
- @TableField("wrk_no")
- private Long wrkNo;
-
- public WrkMastExecute() {}
-
- public WrkMastExecute(String souLocNo,String endLocNo,Integer souFloor,Integer endFloor,String souStaNo,String endStaNo,Integer nowPosition,Integer endPosition,Integer ioType,Long wrkSts,Date ioTime,Date modiTime,String modiUser,Date appeTime,String appeUser,Integer status,Long wrkNo) {
- this.souLocNo = souLocNo;
- this.endLocNo = endLocNo;
- this.souFloor = souFloor;
- this.endFloor = endFloor;
- this.souStaNo = souStaNo;
- this.endStaNo = endStaNo;
- this.nowPosition = nowPosition;
- this.endPosition = endPosition;
- this.ioType = ioType;
- this.wrkSts = wrkSts;
- this.ioTime = ioTime;
- this.modiTime = modiTime;
- this.modiUser = modiUser;
- this.appeTime = appeTime;
- this.appeUser = appeUser;
- this.status = status;
- this.wrkNo = wrkNo;
- }
-
-// WrkMastExecute wrkMastExecute = new WrkMastExecute(
-// null, // 婧愬簱浣�
-// null, // 鐩爣搴撲綅
-// null, // 鍘熸ゼ灞�
-// null, // 鐩爣妤煎眰
-// null, // 婧愮珯鐐�
-// null, // 鐩爣绔欑偣
-// null, // 褰撳墠鑺傜偣
-// null, // 鐩爣鑺傜偣
-// null, // 浠诲姟绫诲瀷
-// null, // 宸ヤ綔鐘舵��
-// null, // 宸ヤ綔鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 浠诲姟鐘舵��
-// null // [闈炵┖]
-// );
-
- public String getIoType$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
deleted file mode 100644
index c80d1ae..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_execute_log")
-public class WrkMastExecuteLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("sou_loc_no")
- private String souLocNo;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("end_loc_no")
- private String endLocNo;
-
- /**
- * 鍘熸ゼ灞�
- */
- @ApiModelProperty(value= "鍘熸ゼ灞�")
- @TableField("sou_floor")
- private Integer souFloor;
-
- /**
- * 鐩爣妤煎眰
- */
- @ApiModelProperty(value= "鐩爣妤煎眰")
- @TableField("end_floor")
- private Integer endFloor;
-
- /**
- * 婧愮珯鐐�
- */
- @ApiModelProperty(value= "婧愮珯鐐�")
- @TableField("sou_sta_no")
- private String souStaNo;
-
- /**
- * 鐩爣绔欑偣
- */
- @ApiModelProperty(value= "鐩爣绔欑偣")
- @TableField("end_sta_no")
- private String endStaNo;
-
- /**
- * 褰撳墠鑺傜偣
- */
- @ApiModelProperty(value= "褰撳墠鑺傜偣")
- @TableField("now_position")
- private Integer nowPosition;
-
- /**
- * 鐩爣鑺傜偣
- */
- @ApiModelProperty(value= "鐩爣鑺傜偣")
- @TableField("end_position")
- private Integer endPosition;
-
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
- private Integer ioType;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
- private Long wrkSts;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private String modiUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private String appeUser;
-
- /**
- * 浠诲姟鐘舵��
- */
- @ApiModelProperty(value= "浠诲姟鐘舵��")
- private Integer status;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_no")
- private Long wrkNo;
-
- public WrkMastExecuteLog() {}
-
- public WrkMastExecuteLog(String souLocNo,String endLocNo,Integer souFloor,Integer endFloor,String souStaNo,String endStaNo,Integer nowPosition,Integer endPosition,Integer ioType,Long wrkSts,Date ioTime,Date modiTime,String modiUser,Date appeTime,String appeUser,Integer status,Long wrkNo) {
- this.souLocNo = souLocNo;
- this.endLocNo = endLocNo;
- this.souFloor = souFloor;
- this.endFloor = endFloor;
- this.souStaNo = souStaNo;
- this.endStaNo = endStaNo;
- this.nowPosition = nowPosition;
- this.endPosition = endPosition;
- this.ioType = ioType;
- this.wrkSts = wrkSts;
- this.ioTime = ioTime;
- this.modiTime = modiTime;
- this.modiUser = modiUser;
- this.appeTime = appeTime;
- this.appeUser = appeUser;
- this.status = status;
- this.wrkNo = wrkNo;
- }
-
-// WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog(
-// null, // 婧愬簱浣�
-// null, // 鐩爣搴撲綅
-// null, // 鍘熸ゼ灞�
-// null, // 鐩爣妤煎眰
-// null, // 婧愮珯鐐�
-// null, // 鐩爣绔欑偣
-// null, // 褰撳墠鑺傜偣
-// null, // 鐩爣鑺傜偣
-// null, // 浠诲姟绫诲瀷
-// null, // 宸ヤ綔鐘舵��
-// null, // 宸ヤ綔鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 浠诲姟鐘舵��
-// null // [闈炵┖]
-// );
-
- public String getIoType$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java b/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java
deleted file mode 100644
index a4d26c3..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_four_war_vehicle")
-public class WrkMastFourWarVehicle implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 宸ヤ綔妗ｅ紑濮嬩綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
- @TableField("wrk_start")
- private Integer wrkStart;
-
- /**
- * 宸ヤ綔妗ｇ粨鏉熶綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
- @TableField("wrk_end")
- private Integer wrkEnd;
-
- /**
- * 鍥涘悜杞︽帴璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽帴璐т綅缃�")
- @TableField("sta_start")
- private Integer staStart;
-
- /**
- * 鍥涘悜杞︽斁璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽斁璐т綅缃�")
- @TableField("sta_end")
- private Integer staEnd;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 绫诲瀷 0:婊＄増 1:绌烘澘
- */
- @ApiModelProperty(value= "绫诲瀷 0:婊＄増 1:绌烘澘")
- private Integer type;
-
- /**
- * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�")
- @TableField("wrk_sts")
- private Integer wrkSts;
-
- /**
- * 琛屽彿
- */
- @ApiModelProperty(value= "琛屽彿")
- @TableField("line_number")
- private Long lineNumber;
-
- /**
- * 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�
- */
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�")
- @TableField("wrk_type")
- private Integer wrkType;
-
- /**
- * 鏍囪鏃堕棿
- */
- @ApiModelProperty(value= "鏍囪鏃堕棿")
- @TableField("bign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date bignTime;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_crn")
- private Integer wrkCrn;
-
- public WrkMastFourWarVehicle() {}
-
- public WrkMastFourWarVehicle(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Long lineNumber,Integer wrkType,Date bignTime,Integer wrkCrn) {
- this.wrkNo = wrkNo;
- this.wrkStart = wrkStart;
- this.wrkEnd = wrkEnd;
- this.staStart = staStart;
- this.staEnd = staEnd;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.type = type;
- this.wrkSts = wrkSts;
- this.lineNumber = lineNumber;
- this.wrkType = wrkType;
- this.bignTime = bignTime;
- this.wrkCrn = wrkCrn;
- }
-
-// WrkMastFourWarVehicle wrkMastFourWarVehicle = new WrkMastFourWarVehicle(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔妗ｅ紑濮嬩綅缃甗闈炵┖]
-// null, // 宸ヤ綔妗ｇ粨鏉熶綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽帴璐т綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽斁璐т綅缃甗闈炵┖]
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 绫诲瀷 0:婊＄増 1:绌烘澘[闈炵┖]
-// null, // 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴怺闈炵┖]
-// null, // 琛屽彿[闈炵┖]
-// null, // 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴揫闈炵┖]
-// null, // 鏍囪鏃堕棿
-// null //
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getBignTime$(){
- if (Cools.isEmpty(this.bignTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java b/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java
deleted file mode 100644
index 8584d59..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_four_war_vehicle_log")
-public class WrkMastFourWarVehicleLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 宸ヤ綔妗ｅ紑濮嬩綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
- @TableField("wrk_start")
- private Integer wrkStart;
-
- /**
- * 宸ヤ綔妗ｇ粨鏉熶綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
- @TableField("wrk_end")
- private Integer wrkEnd;
-
- /**
- * 鍥涘悜杞︽帴璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽帴璐т綅缃�")
- @TableField("sta_start")
- private Integer staStart;
-
- /**
- * 鍥涘悜杞︽斁璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽斁璐т綅缃�")
- @TableField("sta_end")
- private Integer staEnd;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 绫诲瀷 0:婊＄増 1:绌烘澘
- */
- @ApiModelProperty(value= "绫诲瀷 0:婊＄増 1:绌烘澘")
- private Integer type;
-
- /**
- * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�")
- @TableField("wrk_sts")
- private Integer wrkSts;
-
- /**
- * 琛屽彿
- */
- @ApiModelProperty(value= "琛屽彿")
- @TableField("line_number")
- private Long lineNumber;
-
- /**
- * 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�
- */
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�")
- @TableField("wrk_type")
- private Integer wrkType;
-
- /**
- * 鏍囪鏃堕棿
- */
- @ApiModelProperty(value= "鏍囪鏃堕棿")
- @TableField("bign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date bignTime;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_crn")
- private Integer wrkCrn;
-
- public WrkMastFourWarVehicleLog() {}
-
- public WrkMastFourWarVehicleLog(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Long lineNumber,Integer wrkType,Date bignTime,Integer wrkCrn) {
- this.wrkNo = wrkNo;
- this.wrkStart = wrkStart;
- this.wrkEnd = wrkEnd;
- this.staStart = staStart;
- this.staEnd = staEnd;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.type = type;
- this.wrkSts = wrkSts;
- this.lineNumber = lineNumber;
- this.wrkType = wrkType;
- this.bignTime = bignTime;
- this.wrkCrn = wrkCrn;
- }
-
-// WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog = new WrkMastFourWarVehicleLog(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔妗ｅ紑濮嬩綅缃甗闈炵┖]
-// null, // 宸ヤ綔妗ｇ粨鏉熶綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽帴璐т綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽斁璐т綅缃甗闈炵┖]
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 绫诲瀷 0:婊＄増 1:绌烘澘[闈炵┖]
-// null, // 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴怺闈炵┖]
-// null, // 琛屽彿[闈炵┖]
-// null, // 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴揫闈炵┖]
-// null, // 鏍囪鏃堕棿
-// null //
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getBignTime$(){
- if (Cools.isEmpty(this.bignTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/AutoMoveMapper.java b/src/main/java/com/zy/asrs/mapper/AutoMoveMapper.java
deleted file mode 100644
index 5831cc7..0000000
--- a/src/main/java/com/zy/asrs/mapper/AutoMoveMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.AutoMove;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface AutoMoveMapper extends BaseMapper<AutoMove> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java
deleted file mode 100644
index d0e1f05..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastExecuteLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastExecuteLogMapper extends BaseMapper<WrkMastExecuteLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
deleted file mode 100644
index 53d39fc..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastExecute;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastExecuteMapper extends BaseMapper<WrkMastExecute> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java
deleted file mode 100644
index c2138eb..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicleLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastFourWarVehicleLogMapper extends BaseMapper<WrkMastFourWarVehicleLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java
deleted file mode 100644
index 2309cc2..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicle;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastFourWarVehicleMapper extends BaseMapper<WrkMastFourWarVehicle> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/AutoMoveService.java b/src/main/java/com/zy/asrs/service/AutoMoveService.java
deleted file mode 100644
index 2891d4f..0000000
--- a/src/main/java/com/zy/asrs/service/AutoMoveService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.AutoMove;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface AutoMoveService extends IService<AutoMove> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java
deleted file mode 100644
index e191114..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastExecuteLog;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastExecuteLogService extends IService<WrkMastExecuteLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
deleted file mode 100644
index bca4c26..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastExecute;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastExecuteService extends IService<WrkMastExecute> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java b/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java
deleted file mode 100644
index 0f5533c..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicleLog;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastFourWarVehicleLogService extends IService<WrkMastFourWarVehicleLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java b/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java
deleted file mode 100644
index 19c99d0..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicle;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastFourWarVehicleService extends IService<WrkMastFourWarVehicle> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/AutoMoveServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AutoMoveServiceImpl.java
deleted file mode 100644
index 8df738a..0000000
--- a/src/main/java/com/zy/asrs/service/impl/AutoMoveServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.AutoMoveMapper;
-import com.zy.asrs.entity.AutoMove;
-import com.zy.asrs.service.AutoMoveService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("autoMoveService")
-public class AutoMoveServiceImpl extends ServiceImpl<AutoMoveMapper, AutoMove> implements AutoMoveService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java
deleted file mode 100644
index abbd9e1..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastExecuteLogMapper;
-import com.zy.asrs.entity.WrkMastExecuteLog;
-import com.zy.asrs.service.WrkMastExecuteLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastExecuteLogService")
-public class WrkMastExecuteLogServiceImpl extends ServiceImpl<WrkMastExecuteLogMapper, WrkMastExecuteLog> implements WrkMastExecuteLogService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
deleted file mode 100644
index 06f9976..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastExecuteMapper;
-import com.zy.asrs.entity.WrkMastExecute;
-import com.zy.asrs.service.WrkMastExecuteService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastExecuteService")
-public class WrkMastExecuteServiceImpl extends ServiceImpl<WrkMastExecuteMapper, WrkMastExecute> implements WrkMastExecuteService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java
deleted file mode 100644
index 39e8ea5..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastFourWarVehicleLogMapper;
-import com.zy.asrs.entity.WrkMastFourWarVehicleLog;
-import com.zy.asrs.service.WrkMastFourWarVehicleLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastFourWarVehicleLogService")
-public class WrkMastFourWarVehicleLogServiceImpl extends ServiceImpl<WrkMastFourWarVehicleLogMapper, WrkMastFourWarVehicleLog> implements WrkMastFourWarVehicleLogService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java
deleted file mode 100644
index 3c0bacd..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastFourWarVehicleMapper;
-import com.zy.asrs.entity.WrkMastFourWarVehicle;
-import com.zy.asrs.service.WrkMastFourWarVehicleService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastFourWarVehicleService")
-public class WrkMastFourWarVehicleServiceImpl extends ServiceImpl<WrkMastFourWarVehicleMapper, WrkMastFourWarVehicle> implements WrkMastFourWarVehicleService {
-
-}
diff --git a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
index 698e864..d45fce2 100644
--- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -37,8 +37,7 @@
private OrderPakoutService orderPakoutService;
@Autowired
private OrderDetlService orderDetlService;
- @Autowired
- private AutoMoveService autoMoveService;
+
//瀹氭椂鍑哄簱 缁忓吀鍙屼几
@Scheduled(cron = "0/3 * * * * ? ")
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ffa0b84..cd52cb2 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: sa
password: Skyouc#23
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
+ url: jdbc:sqlserver://192.168.4.24:1433;databasename=jsxswms
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
deleted file mode 100644
index 22364dc..0000000
--- a/src/main/resources/license.lic
+++ /dev/null
@@ -1 +0,0 @@
-�!�;蓧嚡页僶}>菥m熂l簝 �&蹻摜ズャDYw漛�<
烻-唖賳3鬕J 辴迟*疀専el龍魌�6�+�"徥H釛H|�観J_ �7 i瓋I%欑�"閑�'6_堜r%�9蠤奇A疡p�鎟�眙�/讧� 頺�)�hb@s蜉C_:4驦5嶥詥嬋Yd靪齐CJ澩g厛oV�#硫?�茞f滂k齠%跏#m 梲rD菰:�z啥炣蕶& 槺�$\嶋d閧'&昬7卶縎�p渓罷��cu3*崌U丫x窜鞓�3胅渆]K�&匤h烷a3GL�暼蠖伜堩{崸]r2羮�v�P湧|棖話g^�佾��?z 秚井7嬇!恀�!齤-F.玬{��+纁0齇xM胡S蟱tK錺�8-z(�;J贿@lvE8逯~xЬ糍�喎潵R虷覹q閧瑾I]熧鞲| 唼 D钥` 輂齱⒔嗢�2纐5鎸+�
�+vt姰�罹访!栿襁场済L殞搃��\LG誒峮_厸肭�f艟�nx� 硯咧w蘼唌�"]}簟5嗳o梋a� 処P�%檞l+� C绚v3鈔闞3�繎 飇�)粓篍屉蘻]綨/図gCbm�8��D/�浈豗舕酵羣�0胆臚〆�珪&ヒR弌�:@颶�兂誙綽R:g
DV3P偭U=嵆镣!�f隧�7àdrd舷[4烿凞 `F酞`I彫椱柤籒r郯嵑PqE霮?Y1/!�9陔k$0an哲也嵍樗妍5譛紁驭3圢�<�(揍鬞#�掺镧翄$眕V�<霄6�?I卬��悕x �:lLm鍭�9� 荳 ��
\ No newline at end of file
diff --git a/src/main/resources/mapper/AutoMoveMapper.xml b/src/main/resources/mapper/AutoMoveMapper.xml
deleted file mode 100644
index dfd6bb1..0000000
--- a/src/main/resources/mapper/AutoMoveMapper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.AutoMoveMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.AutoMove">
- <id column="id" property="id" />
- <result column="status" property="status" />
- <result column="line_number" property="lineNumber" />
- <result column="loc_no" property="locNo" />
- <result column="row_priority" property="rowPriority" />
- <result column="order_no" property="orderNo" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="uuid" property="uuid" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastExecuteLogMapper.xml b/src/main/resources/mapper/WrkMastExecuteLogMapper.xml
deleted file mode 100644
index 4fb4474..0000000
--- a/src/main/resources/mapper/WrkMastExecuteLogMapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.WrkMastExecuteLogMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecuteLog">
- <result column="sou_loc_no" property="souLocNo" />
- <result column="end_loc_no" property="endLocNo" />
- <result column="sou_floor" property="souFloor" />
- <result column="end_floor" property="endFloor" />
- <result column="sou_sta_no" property="souStaNo" />
- <result column="end_sta_no" property="endStaNo" />
- <result column="now_position" property="nowPosition" />
- <result column="end_position" property="endPosition" />
- <result column="io_type" property="ioType" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="io_time" property="ioTime" />
- <result column="modi_time" property="modiTime" />
- <result column="modi_user" property="modiUser" />
- <result column="appe_time" property="appeTime" />
- <result column="appe_user" property="appeUser" />
- <result column="status" property="status" />
- <result column="wrk_no" property="wrkNo" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/WrkMastExecuteMapper.xml
deleted file mode 100644
index b2117ef..0000000
--- a/src/main/resources/mapper/WrkMastExecuteMapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.WrkMastExecuteMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecute">
- <result column="sou_loc_no" property="souLocNo" />
- <result column="end_loc_no" property="endLocNo" />
- <result column="sou_floor" property="souFloor" />
- <result column="end_floor" property="endFloor" />
- <result column="sou_sta_no" property="souStaNo" />
- <result column="end_sta_no" property="endStaNo" />
- <result column="now_position" property="nowPosition" />
- <result column="end_position" property="endPosition" />
- <result column="io_type" property="ioType" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="io_time" property="ioTime" />
- <result column="modi_time" property="modiTime" />
- <result column="modi_user" property="modiUser" />
- <result column="appe_time" property="appeTime" />
- <result column="appe_user" property="appeUser" />
- <result column="status" property="status" />
- <result column="wrk_no" property="wrkNo" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml b/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml
deleted file mode 100644
index 2d788ff..0000000
--- a/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.WrkMastFourWarVehicleLogMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastFourWarVehicleLog">
- <id column="id" property="id" />
- <result column="wrk_no" property="wrkNo" />
- <result column="wrk_start" property="wrkStart" />
- <result column="wrk_end" property="wrkEnd" />
- <result column="sta_start" property="staStart" />
- <result column="sta_end" property="staEnd" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="type" property="type" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="line_number" property="lineNumber" />
- <result column="wrk_type" property="wrkType" />
- <result column="bign_time" property="bignTime" />
- <result column="wrk_crn" property="wrkCrn" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml b/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml
deleted file mode 100644
index 0ee494b..0000000
--- a/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.WrkMastFourWarVehicleMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastFourWarVehicle">
- <id column="id" property="id" />
- <result column="wrk_no" property="wrkNo" />
- <result column="wrk_start" property="wrkStart" />
- <result column="wrk_end" property="wrkEnd" />
- <result column="sta_start" property="staStart" />
- <result column="sta_end" property="staEnd" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="type" property="type" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="line_number" property="lineNumber" />
- <result column="wrk_type" property="wrkType" />
- <result column="bign_time" property="bignTime" />
- <result column="wrk_crn" property="wrkCrn" />
-
- </resultMap>
-
-</mapper>
--
Gitblit v1.9.1