From 71b2501eddad79dffe65db98959b5a6bce347c1a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 19 六月 2024 14:55:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java | 12
src/main/java/wrkMastFourWarVehicle.sql | 18
src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml | 24
src/main/webapp/views/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.html | 164 ++
src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java | 125 ++
src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js | 276 ++++
src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java | 12
src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java | 125 ++
src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml | 24
src/main/resources/mapper/WrkMastExecuteMapper.xml | 27
src/main/webapp/static/js/wrkMastFourWarVehicle/wrkMastFourWarVehicle.js | 273 ++++
src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java | 12
src/main/java/wrkMastExecute.sql | 18
src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java | 178 +++
src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java | 125 ++
src/main/webapp/static/js/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.js | 273 ++++
src/main/java/com/zy/asrs/service/WrkMastExecuteService.java | 8
src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java | 8
src/main/webapp/views/wrkMastExecute/wrkMastExecute.html | 206 +++
src/main/java/com/zy/common/service/CommonService.java | 5
src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java | 241 ++++
src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java | 8
src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java | 12
src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js | 276 ++++
src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java | 8
src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html | 206 +++
src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java | 178 +++
src/main/resources/mapper/WrkMastExecuteLogMapper.xml | 27
src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java | 12
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/asrs/entity/WrkMastExecute.java | 244 ++++
src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java | 12
src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java | 12
src/main/webapp/views/locMast/locMast_detail.html | 6
src/main/java/wrkMastFourWarVehicleLog.sql | 18
src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java | 12
src/main/webapp/views/wrkMastFourWarVehicle/wrkMastFourWarVehicle.html | 164 ++
src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java | 125 ++
src/main/java/wrkMastExecuteLog.sql | 18
src/main/webapp/static/js/locMast/locMast.js | 1
40 files changed, 3,491 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
new file mode 100644
index 0000000..5b15e25
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
@@ -0,0 +1,125 @@
+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
new file mode 100644
index 0000000..cbaa129
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
@@ -0,0 +1,125 @@
+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
new file mode 100644
index 0000000..e4a946c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java
@@ -0,0 +1,125 @@
+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
new file mode 100644
index 0000000..739e028
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java
@@ -0,0 +1,125 @@
+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/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
new file mode 100644
index 0000000..80451ba
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -0,0 +1,244 @@
+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
new file mode 100644
index 0000000..c80d1ae
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
@@ -0,0 +1,241 @@
+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
new file mode 100644
index 0000000..c4b1632
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java
@@ -0,0 +1,178 @@
+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 Integer 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,Integer 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
new file mode 100644
index 0000000..c1b60ec
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java
@@ -0,0 +1,178 @@
+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 Integer 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,Integer 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/WrkMastExecuteLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java
new file mode 100644
index 0000000..d0e1f05
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..53d39fc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..c2138eb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..2309cc2
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java
@@ -0,0 +1,12 @@
+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/WrkMastExecuteLogService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java
new file mode 100644
index 0000000..e191114
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000..bca4c26
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000..0f5533c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000..19c99d0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java
@@ -0,0 +1,8 @@
+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/WrkMastExecuteLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java
new file mode 100644
index 0000000..abbd9e1
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..06f9976
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..39e8ea5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..3c0bacd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java
@@ -0,0 +1,12 @@
+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/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 47f63a4..8b6805a 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
generator.url="192.168.4.15:1433;databasename=source";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_row_lastno_type";
+ generator.table="asr_wrk_mast_four_war_vehicle_log";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fac69f8..fcaf695 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -141,8 +141,7 @@
case 4:
return getLocNoRun2(whsType,staDescId,sourceStaNo,matnr,batch,grade,3,locTypeDto,0);
case 5:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- break;
+ return getLocNoRun2(whsType,staDescId,sourceStaNo,matnr,batch,grade,3,locTypeDto,0);
default:
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
break;
@@ -633,7 +632,7 @@
if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
if (!Cools.isEmpty(matnr) && staDescId == 1){
- signRule1 = true;
+// signRule1 = true;
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
if (!Cools.isEmpty(matnr) && staDescId == 1) {
diff --git a/src/main/java/wrkMastExecute.sql b/src/main/java/wrkMastExecute.sql
new file mode 100644
index 0000000..910ba79
--- /dev/null
+++ b/src/main/java/wrkMastExecute.sql
@@ -0,0 +1,18 @@
+-- save wrkMastExecute record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute/wrkMastExecute.html', 'wrkMastExecute绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute/wrkMastExecute.html', N'wrkMastExecute绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/wrkMastExecuteLog.sql b/src/main/java/wrkMastExecuteLog.sql
new file mode 100644
index 0000000..cdd548f
--- /dev/null
+++ b/src/main/java/wrkMastExecuteLog.sql
@@ -0,0 +1,18 @@
+-- save wrkMastExecuteLog record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog/wrkMastExecuteLog.html', 'wrkMastExecuteLog绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog/wrkMastExecuteLog.html', N'wrkMastExecuteLog绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/wrkMastFourWarVehicle.sql b/src/main/java/wrkMastFourWarVehicle.sql
new file mode 100644
index 0000000..7e39d7a
--- /dev/null
+++ b/src/main/java/wrkMastFourWarVehicle.sql
@@ -0,0 +1,18 @@
+-- save wrkMastFourWarVehicle record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicle/wrkMastFourWarVehicle.html', 'wrkMastFourWarVehicle绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicle#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicle#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicle#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicle#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicle#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicle/wrkMastFourWarVehicle.html', N'wrkMastFourWarVehicle绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicle#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicle#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicle#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicle#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicle#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/wrkMastFourWarVehicleLog.sql b/src/main/java/wrkMastFourWarVehicleLog.sql
new file mode 100644
index 0000000..5f94b75
--- /dev/null
+++ b/src/main/java/wrkMastFourWarVehicleLog.sql
@@ -0,0 +1,18 @@
+-- save wrkMastFourWarVehicleLog record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.html', 'wrkMastFourWarVehicleLog绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicleLog#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicleLog#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicleLog#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicleLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastFourWarVehicleLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.html', N'wrkMastFourWarVehicleLog绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicleLog#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicleLog#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicleLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicleLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastFourWarVehicleLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/mapper/WrkMastExecuteLogMapper.xml b/src/main/resources/mapper/WrkMastExecuteLogMapper.xml
new file mode 100644
index 0000000..4fb4474
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastExecuteLogMapper.xml
@@ -0,0 +1,27 @@
+<?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
new file mode 100644
index 0000000..b2117ef
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastExecuteMapper.xml
@@ -0,0 +1,27 @@
+<?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
new file mode 100644
index 0000000..2d788ff
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml
@@ -0,0 +1,24 @@
+<?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
new file mode 100644
index 0000000..0ee494b
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml
@@ -0,0 +1,24 @@
+<?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>
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 6f25367..20e5195 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -442,6 +442,7 @@
row1: $('#row1').val(),
bay1: $('#bay1').val(),
lev1: $('#lev1').val(),
+ gro1: $('#gro1').val(),
fullPlt: $('#fullPlt').val(),
locType: $('#locType').val(),
outEnable: $('#outEnable').val(),
diff --git a/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js b/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
new file mode 100644
index 0000000..853a29c
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
@@ -0,0 +1,276 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#wrkMastExecute',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/wrkMastExecute/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'souLocNo', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'endLocNo', align: 'center',title: '鐩爣搴撲綅'}
+ ,{field: 'souFloor', align: 'center',title: '鍘熸ゼ灞�'}
+ ,{field: 'endFloor', align: 'center',title: '鐩爣妤煎眰'}
+ ,{field: 'souStaNo', align: 'center',title: '婧愮珯鐐�'}
+ ,{field: 'endStaNo', align: 'center',title: '鐩爣绔欑偣'}
+ ,{field: 'nowPosition', align: 'center',title: '褰撳墠鑺傜偣'}
+ ,{field: 'endPosition', align: 'center',title: '鐩爣鑺傜偣'}
+ ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷'}
+ ,{field: 'wrkSts', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
+ ,{field: 'status', align: 'center',title: '浠诲姟鐘舵��'}
+ ,{field: 'wrkNo', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(wrkMastExecute)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(wrkMastExecute)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.wrkNo;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'wrkMastExecute': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/wrkMastExecute/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(wrkMastExecute)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.wrkNo]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkMastExecute/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkMastExecute/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['ioTime\\$']:null
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['modiTime\\$']:null
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['appeTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js b/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
new file mode 100644
index 0000000..7d18f82
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
@@ -0,0 +1,276 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#wrkMastExecuteLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/wrkMastExecuteLog/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'souLocNo', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'endLocNo', align: 'center',title: '鐩爣搴撲綅'}
+ ,{field: 'souFloor', align: 'center',title: '鍘熸ゼ灞�'}
+ ,{field: 'endFloor', align: 'center',title: '鐩爣妤煎眰'}
+ ,{field: 'souStaNo', align: 'center',title: '婧愮珯鐐�'}
+ ,{field: 'endStaNo', align: 'center',title: '鐩爣绔欑偣'}
+ ,{field: 'nowPosition', align: 'center',title: '褰撳墠鑺傜偣'}
+ ,{field: 'endPosition', align: 'center',title: '鐩爣鑺傜偣'}
+ ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷'}
+ ,{field: 'wrkSts', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
+ ,{field: 'status', align: 'center',title: '浠诲姟鐘舵��'}
+ ,{field: 'wrkNo', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(wrkMastExecuteLog)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(wrkMastExecuteLog)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'wrkMastExecuteLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/wrkMastExecuteLog/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(wrkMastExecuteLog)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkMastExecuteLog/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkMastExecuteLog/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['ioTime\\$']:null
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['modiTime\\$']:null
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['appeTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/wrkMastFourWarVehicle/wrkMastFourWarVehicle.js b/src/main/webapp/static/js/wrkMastFourWarVehicle/wrkMastFourWarVehicle.js
new file mode 100644
index 0000000..03c1ee9
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastFourWarVehicle/wrkMastFourWarVehicle.js
@@ -0,0 +1,273 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#wrkMastFourWarVehicle',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/wrkMastFourWarVehicle/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'wrkStart', align: 'center',title: '宸ヤ綔妗ｅ紑濮嬩綅缃�'}
+ ,{field: 'wrkEnd', align: 'center',title: '宸ヤ綔妗ｇ粨鏉熶綅缃�'}
+ ,{field: 'staStart', align: 'center',title: '鍥涘悜杞︽帴璐т綅缃�'}
+ ,{field: 'staEnd', align: 'center',title: '鍥涘悜杞︽斁璐т綅缃�'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'type', align: 'center',title: '绫诲瀷 0:婊＄増 1:绌烘澘'}
+ ,{field: 'wrkSts', align: 'center',title: '宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�'}
+ ,{field: 'lineNumber', align: 'center',title: '琛屽彿'}
+ ,{field: 'wrkType', align: 'center',title: '宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�'}
+ ,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿'}
+ ,{field: 'wrkCrn', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(wrkMastFourWarVehicle)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(wrkMastFourWarVehicle)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'wrkMastFourWarVehicle': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/wrkMastFourWarVehicle/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(wrkMastFourWarVehicle)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkMastFourWarVehicle/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkMastFourWarVehicle/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+ layDate.render({
+ elem: '#bignTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['bignTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.js b/src/main/webapp/static/js/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.js
new file mode 100644
index 0000000..d5dc3f4
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.js
@@ -0,0 +1,273 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#wrkMastFourWarVehicleLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/wrkMastFourWarVehicleLog/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'wrkStart', align: 'center',title: '宸ヤ綔妗ｅ紑濮嬩綅缃�'}
+ ,{field: 'wrkEnd', align: 'center',title: '宸ヤ綔妗ｇ粨鏉熶綅缃�'}
+ ,{field: 'staStart', align: 'center',title: '鍥涘悜杞︽帴璐т綅缃�'}
+ ,{field: 'staEnd', align: 'center',title: '鍥涘悜杞︽斁璐т綅缃�'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'type', align: 'center',title: '绫诲瀷 0:婊＄増 1:绌烘澘'}
+ ,{field: 'wrkSts', align: 'center',title: '宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�'}
+ ,{field: 'lineNumber', align: 'center',title: '琛屽彿'}
+ ,{field: 'wrkType', align: 'center',title: '宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�'}
+ ,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿'}
+ ,{field: 'wrkCrn', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(wrkMastFourWarVehicleLog)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(wrkMastFourWarVehicleLog)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'wrkMastFourWarVehicleLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/wrkMastFourWarVehicleLog/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(wrkMastFourWarVehicleLog)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkMastFourWarVehicleLog/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkMastFourWarVehicleLog/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+ layDate.render({
+ elem: '#bignTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['bignTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 7331715..27fff5a 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -101,6 +101,12 @@
<input id="lev1" class="layui-input" type="text" autocomplete="off" disabled="disabled">
</div>
</div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">缁勶細</label>
+ <div class="layui-input-inline">
+ <input id="gro1" class="layui-input" type="text" autocomplete="off" disabled="disabled">
+ </div>
+ </div>
<div class="layui-inline" style="width:80%;display: none">
<label class="layui-form-label">婊°��銆�鏉匡細</label>
<div class="layui-input-inline" style="text-align: left">
diff --git a/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html b/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html
new file mode 100644
index 0000000..9033dab
--- /dev/null
+++ b/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="wrkMastExecute" lay-filter="wrkMastExecute"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMastExecute/wrkMastExecute.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愬簱浣�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="souLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣搴撲綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endLocNo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍘熸ゼ灞�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="souFloor" placeholder="璇疯緭鍏ュ師妤煎眰">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣妤煎眰: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endFloor" placeholder="璇疯緭鍏ョ洰鏍囨ゼ灞�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯鐐�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="souStaNo" placeholder="璇疯緭鍏ユ簮绔欑偣">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣绔欑偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endStaNo" placeholder="璇疯緭鍏ョ洰鏍囩珯鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">褰撳墠鑺傜偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="nowPosition" placeholder="璇疯緭鍏ュ綋鍓嶈妭鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣鑺傜偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endPosition" placeholder="璇疯緭鍏ョ洰鏍囪妭鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浠诲姟绫诲瀷: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="ioType" placeholder="璇疯緭鍏ヤ换鍔＄被鍨�" style="display: none">
+ <input id="ioType$" name="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ换鍔＄被鍨�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鐘舵��: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ioTime" id="ioTime$" placeholder="璇疯緭鍏ュ伐浣滄椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼浜哄憳: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒涘缓鑰�: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��" style="display: none">
+ <input id="appeUser$" name="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ垱寤鸿��" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浠诲姟鐘舵��: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="status" placeholder="璇疯緭鍏ヤ换鍔＄姸鎬�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html b/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
new file mode 100644
index 0000000..dbc9179
--- /dev/null
+++ b/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="wrkMastExecuteLog" lay-filter="wrkMastExecuteLog"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMastExecuteLog/wrkMastExecuteLog.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愬簱浣�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="souLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣搴撲綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endLocNo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍘熸ゼ灞�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="souFloor" placeholder="璇疯緭鍏ュ師妤煎眰">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣妤煎眰: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endFloor" placeholder="璇疯緭鍏ョ洰鏍囨ゼ灞�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯鐐�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="souStaNo" placeholder="璇疯緭鍏ユ簮绔欑偣">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣绔欑偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endStaNo" placeholder="璇疯緭鍏ョ洰鏍囩珯鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">褰撳墠鑺傜偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="nowPosition" placeholder="璇疯緭鍏ュ綋鍓嶈妭鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣鑺傜偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endPosition" placeholder="璇疯緭鍏ョ洰鏍囪妭鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浠诲姟绫诲瀷: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="ioType" placeholder="璇疯緭鍏ヤ换鍔＄被鍨�" style="display: none">
+ <input id="ioType$" name="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ换鍔＄被鍨�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鐘舵��: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ioTime" id="ioTime$" placeholder="璇疯緭鍏ュ伐浣滄椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼浜哄憳: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒涘缓鑰�: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��" style="display: none">
+ <input id="appeUser$" name="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ垱寤鸿��" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浠诲姟鐘舵��: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="status" placeholder="璇疯緭鍏ヤ换鍔＄姸鎬�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/wrkMastFourWarVehicle/wrkMastFourWarVehicle.html b/src/main/webapp/views/wrkMastFourWarVehicle/wrkMastFourWarVehicle.html
new file mode 100644
index 0000000..0273322
--- /dev/null
+++ b/src/main/webapp/views/wrkMastFourWarVehicle/wrkMastFourWarVehicle.html
@@ -0,0 +1,164 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="wrkMastFourWarVehicle" lay-filter="wrkMastFourWarVehicle"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMastFourWarVehicle/wrkMastFourWarVehicle.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔妗ｅ紑濮嬩綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkStart" placeholder="璇疯緭鍏ュ伐浣滄。寮�濮嬩綅缃�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔妗ｇ粨鏉熶綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkEnd" placeholder="璇疯緭鍏ュ伐浣滄。缁撴潫浣嶇疆" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍥涘悜杞︽帴璐т綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staStart" placeholder="璇疯緭鍏ュ洓鍚戣溅鎺ヨ揣浣嶇疆" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍥涘悜杞︽斁璐т綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staEnd" placeholder="璇疯緭鍏ュ洓鍚戣溅鏀捐揣浣嶇疆" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">绫诲瀷 0:婊＄増 1:绌烘澘: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ョ被鍨� 0:婊＄増 1:绌烘澘" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">琛屽彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏ヨ鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkType" placeholder="璇疯緭鍏ュ伐浣滅被鍨� 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏍囪鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="bignTime" id="bignTime$" placeholder="璇疯緭鍏ユ爣璁版椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkCrn" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.html b/src/main/webapp/views/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.html
new file mode 100644
index 0000000..1dbd071
--- /dev/null
+++ b/src/main/webapp/views/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.html
@@ -0,0 +1,164 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="wrkMastFourWarVehicleLog" lay-filter="wrkMastFourWarVehicleLog"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMastFourWarVehicleLog/wrkMastFourWarVehicleLog.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔妗ｅ紑濮嬩綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkStart" placeholder="璇疯緭鍏ュ伐浣滄。寮�濮嬩綅缃�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔妗ｇ粨鏉熶綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkEnd" placeholder="璇疯緭鍏ュ伐浣滄。缁撴潫浣嶇疆" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍥涘悜杞︽帴璐т綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staStart" placeholder="璇疯緭鍏ュ洓鍚戣溅鎺ヨ揣浣嶇疆" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍥涘悜杞︽斁璐т綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staEnd" placeholder="璇疯緭鍏ュ洓鍚戣溅鏀捐揣浣嶇疆" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">绫诲瀷 0:婊＄増 1:绌烘澘: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ョ被鍨� 0:婊＄増 1:绌烘澘" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">琛屽彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏ヨ鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkType" placeholder="璇疯緭鍏ュ伐浣滅被鍨� 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏍囪鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="bignTime" id="bignTime$" placeholder="璇疯緭鍏ユ爣璁版椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkCrn" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1