From 14ad2eb8cf48f2a60c31026bf649502fd15c4449 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 15:26:10 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkIotypeController.java | 2
/dev/null | 129 -------------------------------------------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasLocStsController.java | 2
6 files changed, 5 insertions(+), 134 deletions(-)
diff --git a/zy-asrs-common/src/main/java/basCrnError.sql b/zy-asrs-common/src/main/java/basCrnError.sql
deleted file mode 100644
index 6359d7a..0000000
--- a/zy-asrs-common/src/main/java/basCrnError.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save basCrnError record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnError/basCrnError.html', 'basCrnError绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnError#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnError#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnError#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnError#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnError#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnError/basCrnError.html', N'basCrnError绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnError#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnError#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnError#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnError#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnError#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/basCrnStatus.sql b/zy-asrs-common/src/main/java/basCrnStatus.sql
deleted file mode 100644
index 15dccfc..0000000
--- a/zy-asrs-common/src/main/java/basCrnStatus.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save basCrnStatus record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnStatus/basCrnStatus.html', 'basCrnStatus绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnStatus#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnStatus#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnStatus#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnStatus#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basCrnStatus#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnStatus/basCrnStatus.html', N'basCrnStatus绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnStatus#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnStatus#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnStatus#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnStatus#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnStatus#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/basLocSts.sql b/zy-asrs-common/src/main/java/basLocSts.sql
deleted file mode 100644
index 75e5334..0000000
--- a/zy-asrs-common/src/main/java/basLocSts.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save basLocSts record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basLocSts/basLocSts.html', 'basLocSts绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basLocSts#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basLocSts#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basLocSts#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basLocSts#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basLocSts#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basLocSts/basLocSts.html', N'basLocSts绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basLocSts#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basLocSts#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basLocSts#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basLocSts#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basLocSts#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/basPlcerror.sql b/zy-asrs-common/src/main/java/basPlcerror.sql
deleted file mode 100644
index df798ab..0000000
--- a/zy-asrs-common/src/main/java/basPlcerror.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save basPlcerror record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror/basPlcerror.html', 'basPlcerror绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basPlcerror#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror/basPlcerror.html', N'basPlcerror绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basPlcerror#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/basWhs.sql b/zy-asrs-common/src/main/java/basWhs.sql
deleted file mode 100644
index cec8ada..0000000
--- a/zy-asrs-common/src/main/java/basWhs.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save basWhs record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWhs/basWhs.html', 'basWhs绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWhs#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWhs#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWhs#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWhs#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWhs#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWhs/basWhs.html', N'basWhs绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWhs#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWhs#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWhs#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWhs#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWhs#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/basWrkIotype.sql b/zy-asrs-common/src/main/java/basWrkIotype.sql
deleted file mode 100644
index 8199a0f..0000000
--- a/zy-asrs-common/src/main/java/basWrkIotype.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save basWrkIotype record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkIotype/basWrkIotype.html', 'basWrkIotype绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkIotype#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkIotype#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkIotype#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkIotype#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkIotype#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkIotype/basWrkIotype.html', N'basWrkIotype绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkIotype#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkIotype#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkIotype#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkIotype#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkIotype#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/basWrkStatus.sql b/zy-asrs-common/src/main/java/basWrkStatus.sql
deleted file mode 100644
index 2b49db9..0000000
--- a/zy-asrs-common/src/main/java/basWrkStatus.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save basWrkStatus record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkStatus/basWrkStatus.html', 'basWrkStatus绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkStatus#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkStatus#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkStatus#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkStatus#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basWrkStatus#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkStatus/basWrkStatus.html', N'basWrkStatus绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkStatus#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkStatus#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkStatus#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkStatus#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basWrkStatus#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasCrnErrorController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasCrnErrorController.java
deleted file mode 100644
index 8e6435d..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasCrnErrorController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.common.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.BasCrnError;
-import com.zy.asrs.common.wms.service.BasCrnErrorService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasCrnErrorController extends BaseController {
-
- @Autowired
- private BasCrnErrorService basCrnErrorService;
-
- @RequestMapping(value = "/basCrnError/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basCrnErrorService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basCrnError/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<BasCrnError> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasCrnError::getErrName, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(BasCrnError::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(BasCrnError::getAppeTime, DateUtils.convert(range[1]));
- }
- return R.ok(basCrnErrorService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/basCrnError/add/auth")
- @ManagerAuth
- public R add(BasCrnError basCrnError) {
- basCrnErrorService.save(basCrnError);
- return R.ok();
- }
-
- @RequestMapping(value = "/basCrnError/update/auth")
- @ManagerAuth
- public R update(BasCrnError basCrnError){
- if (Cools.isEmpty(basCrnError) || null==basCrnError.getErrorCode()){
- return R.error();
- }
- basCrnErrorService.updateById(basCrnError);
- return R.ok();
- }
-
- @RequestMapping(value = "/basCrnError/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- basCrnErrorService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basCrnErrorQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<BasCrnError> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(BasCrnError::getErrName, condition);
- Page<BasCrnError> page = basCrnErrorService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnError basCrnError : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basCrnError.getErrorCode());
- map.put("value", basCrnError.getErrName());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/basCrnError/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<BasCrnError> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasCrnError::getErrName, condition);
- }
- basCrnErrorService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getErrName()), item.getErrorCode())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasCrnStatusController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasCrnStatusController.java
deleted file mode 100644
index ca61202..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasCrnStatusController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.common.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.BasCrnStatus;
-import com.zy.asrs.common.wms.service.BasCrnStatusService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasCrnStatusController extends BaseController {
-
- @Autowired
- private BasCrnStatusService basCrnStatusService;
-
- @RequestMapping(value = "/basCrnStatus/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basCrnStatusService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basCrnStatus/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<BasCrnStatus> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasCrnStatus::getStsDesc, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(BasCrnStatus::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(BasCrnStatus::getAppeTime, DateUtils.convert(range[1]));
- }
- return R.ok(basCrnStatusService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/basCrnStatus/add/auth")
- @ManagerAuth
- public R add(BasCrnStatus basCrnStatus) {
- basCrnStatusService.save(basCrnStatus);
- return R.ok();
- }
-
- @RequestMapping(value = "/basCrnStatus/update/auth")
- @ManagerAuth
- public R update(BasCrnStatus basCrnStatus){
- if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){
- return R.error();
- }
- basCrnStatusService.updateById(basCrnStatus);
- return R.ok();
- }
-
- @RequestMapping(value = "/basCrnStatus/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- basCrnStatusService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basCrnStatusQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<BasCrnStatus> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(BasCrnStatus::getStsDesc, condition);
- Page<BasCrnStatus> page = basCrnStatusService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnStatus basCrnStatus : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basCrnStatus.getStsNo());
- map.put("value", basCrnStatus.getStsDesc());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/basCrnStatus/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<BasCrnStatus> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasCrnStatus::getStsDesc, condition);
- }
- basCrnStatusService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getStsDesc()), Long.parseLong(item.getStsNo()))));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasPlcerrorController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasPlcerrorController.java
deleted file mode 100644
index 15d67e2..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasPlcerrorController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.common.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.BasPlcerror;
-import com.zy.asrs.common.wms.service.BasPlcerrorService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasPlcerrorController extends BaseController {
-
- @Autowired
- private BasPlcerrorService basPlcerrorService;
-
- @RequestMapping(value = "/basPlcerror/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basPlcerrorService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basPlcerror/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<BasPlcerror> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasPlcerror::getErrorDesc, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(BasPlcerror::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(BasPlcerror::getAppeTime, DateUtils.convert(range[1]));
- }
- return R.ok(basPlcerrorService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/basPlcerror/add/auth")
- @ManagerAuth
- public R add(BasPlcerror basPlcerror) {
- basPlcerrorService.save(basPlcerror);
- return R.ok();
- }
-
- @RequestMapping(value = "/basPlcerror/update/auth")
- @ManagerAuth
- public R update(BasPlcerror basPlcerror){
- if (Cools.isEmpty(basPlcerror) || null==basPlcerror.getErrorCode()){
- return R.error();
- }
- basPlcerrorService.updateById(basPlcerror);
- return R.ok();
- }
-
- @RequestMapping(value = "/basPlcerror/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- basPlcerrorService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basPlcerrorQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<BasPlcerror> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(BasPlcerror::getErrorDesc, condition);
- Page<BasPlcerror> page = basPlcerrorService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasPlcerror basPlcerror : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basPlcerror.getErrorCode());
- map.put("value", basPlcerror.getErrorDesc());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/basPlcerror/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<BasPlcerror> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(BasPlcerror::getErrorDesc, condition);
- }
- basPlcerrorService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getErrorDesc()), item.getErrorCode().longValue())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasCrnError.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasCrnError.java
deleted file mode 100644
index 12eb489..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasCrnError.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_bas_crn_error")
-public class BasCrnError implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 寮傚父浠ｅ彿
- */
- @ApiModelProperty(value= "寮傚父浠ｅ彿")
- @TableId(value = "error_code", type = IdType.INPUT)
- private Long errorCode;
-
- /**
- * 寮傚父鎻忚堪
- */
- @ApiModelProperty(value= "寮傚父鎻忚堪")
- private String errName;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- public BasCrnError() {}
-
- public BasCrnError(Long errorCode,String errName,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
- this.errorCode = errorCode;
- this.errName = errName;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- }
-
-// BasCrnError basCrnError = new BasCrnError(
-// null, // 寮傚父浠ｅ彿[闈炵┖]
-// null, // 寮傚父鎻忚堪
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null // 娣诲姞鏃堕棿
-// );
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.appeUser);
- 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);
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasCrnStatus.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasCrnStatus.java
deleted file mode 100644
index a0ef7ee..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasCrnStatus.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_bas_crn_status")
-public class BasCrnStatus implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 宸ヤ綔浠ｅ彿
- */
- @ApiModelProperty(value= "宸ヤ綔浠ｅ彿")
- @TableId(value = "sts_no", type = IdType.INPUT)
- private String stsNo;
-
- /**
- * 鐘舵�佹弿杩�
- */
- @ApiModelProperty(value= "鐘舵�佹弿杩�")
- private String stsDesc;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- public BasCrnStatus() {}
-
- public BasCrnStatus(String stsNo,String stsDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
- this.stsNo = stsNo;
- this.stsDesc = stsDesc;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- }
-
-// BasCrnStatus basCrnStatus = new BasCrnStatus(
-// null, // 宸ヤ綔浠ｅ彿[闈炵┖]
-// null, // 鐘舵�佹弿杩�
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null // 娣诲姞鏃堕棿
-// );
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.appeUser);
- 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);
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasPlcerror.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasPlcerror.java
deleted file mode 100644
index 0e3ccdc..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasPlcerror.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_bas_plcerror")
-public class BasPlcerror implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 寮傚父缂栧彿
- */
- @ApiModelProperty(value= "寮傚父缂栧彿")
- @TableId(value = "error_code", type = IdType.INPUT)
- private Integer errorCode;
-
- /**
- * 寮傚父鎻忚堪
- */
- @ApiModelProperty(value= "寮傚父鎻忚堪")
- private String errorDesc;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- public BasPlcerror() {}
-
- public BasPlcerror(Integer errorCode,String errorDesc,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
- this.errorCode = errorCode;
- this.errorDesc = errorDesc;
- this.modiTime = modiTime;
- this.modiUser = modiUser;
- this.appeTime = appeTime;
- this.appeUser = appeUser;
- }
-
-// BasPlcerror basPlcerror = new BasPlcerror(
-// null, // 寮傚父缂栧彿[闈炵┖]
-// null, // 寮傚父鎻忚堪
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null // 鍒涘缓鑰�
-// );
-
- 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.getById(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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasCrnErrorMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasCrnErrorMapper.java
deleted file mode 100644
index 96bfaf0..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasCrnErrorMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.BasCrnError;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasCrnErrorMapper extends BaseMapper<BasCrnError> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasCrnStatusMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasCrnStatusMapper.java
deleted file mode 100644
index 3380df9..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasCrnStatusMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.BasCrnStatus;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasCrnStatusMapper extends BaseMapper<BasCrnStatus> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasPlcerrorMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasPlcerrorMapper.java
deleted file mode 100644
index 455f04a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasPlcerrorMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.BasPlcerror;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasPlcerrorMapper extends BaseMapper<BasPlcerror> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasCrnErrorService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasCrnErrorService.java
deleted file mode 100644
index 356d488..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasCrnErrorService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.BasCrnError;
-
-public interface BasCrnErrorService extends IService<BasCrnError> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasCrnStatusService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasCrnStatusService.java
deleted file mode 100644
index 3b5f2c5..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasCrnStatusService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.BasCrnStatus;
-
-public interface BasCrnStatusService extends IService<BasCrnStatus> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasPlcerrorService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasPlcerrorService.java
deleted file mode 100644
index c59a7e7..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasPlcerrorService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.BasPlcerror;
-
-public interface BasPlcerrorService extends IService<BasPlcerror> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasCrnErrorServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasCrnErrorServiceImpl.java
deleted file mode 100644
index ca8f1c6..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasCrnErrorServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.BasCrnErrorMapper;
-import com.zy.asrs.common.wms.entity.BasCrnError;
-import com.zy.asrs.common.wms.service.BasCrnErrorService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basCrnErrorService")
-public class BasCrnErrorServiceImpl extends ServiceImpl<BasCrnErrorMapper, BasCrnError> implements BasCrnErrorService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasCrnStatusServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasCrnStatusServiceImpl.java
deleted file mode 100644
index f966745..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasCrnStatusServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.BasCrnStatusMapper;
-import com.zy.asrs.common.wms.entity.BasCrnStatus;
-import com.zy.asrs.common.wms.service.BasCrnStatusService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basCrnStatusService")
-public class BasCrnStatusServiceImpl extends ServiceImpl<BasCrnStatusMapper, BasCrnStatus> implements BasCrnStatusService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasPlcerrorServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasPlcerrorServiceImpl.java
deleted file mode 100644
index 2447819..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasPlcerrorServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.BasPlcerrorMapper;
-import com.zy.asrs.common.wms.entity.BasPlcerror;
-import com.zy.asrs.common.wms.service.BasPlcerrorService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basPlcerrorService")
-public class BasPlcerrorServiceImpl extends ServiceImpl<BasPlcerrorMapper, BasPlcerror> implements BasPlcerrorService {
-
-}
diff --git a/zy-asrs-common/src/main/java/manMat.sql b/zy-asrs-common/src/main/java/manMat.sql
deleted file mode 100644
index 4228b48..0000000
--- a/zy-asrs-common/src/main/java/manMat.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save mat record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat/mat.html', 'manMat绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat/mat.html', N'manMat绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/manTag.sql b/zy-asrs-common/src/main/java/manTag.sql
deleted file mode 100644
index 541fdcd..0000000
--- a/zy-asrs-common/src/main/java/manTag.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save tag record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag/tag.html', 'manTag绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag/tag.html', N'manTag绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/rowLastno.sql b/zy-asrs-common/src/main/java/rowLastno.sql
deleted file mode 100644
index c095c0c..0000000
--- a/zy-asrs-common/src/main/java/rowLastno.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save rowLastno record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rowLastno/rowLastno.html', 'rowLastno绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rowLastno#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rowLastno#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rowLastno#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rowLastno#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'rowLastno#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rowLastno/rowLastno.html', N'rowLastno绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rowLastno#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rowLastno#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rowLastno#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rowLastno#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'rowLastno#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/wrkLastno.sql b/zy-asrs-common/src/main/java/wrkLastno.sql
deleted file mode 100644
index 7f46243..0000000
--- a/zy-asrs-common/src/main/java/wrkLastno.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save wrkLastno record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkLastno/wrkLastno.html', 'wrkLastno绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkLastno#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkLastno#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkLastno#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkLastno#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkLastno#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkLastno/wrkLastno.html', N'wrkLastno绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkLastno#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkLastno#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkLastno#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkLastno#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkLastno#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasCrnErrorMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasCrnErrorMapper.xml
deleted file mode 100644
index c1a8b32..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasCrnErrorMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.common.wms.mapper.BasCrnErrorMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasCrnStatusMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasCrnStatusMapper.xml
deleted file mode 100644
index ade28ed..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasCrnStatusMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.common.wms.mapper.BasCrnStatusMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasLocStsController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasLocStsController.java
similarity index 98%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasLocStsController.java
rename to zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasLocStsController.java
index 0a7bdea..0e5d3ca 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasLocStsController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasLocStsController.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.wms.controller;
+package com.zy.asrs.wms.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWhsController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java
similarity index 98%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWhsController.java
rename to zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java
index b28c350..cf6cdc7 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWhsController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.wms.controller;
+package com.zy.asrs.wms.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWrkIotypeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkIotypeController.java
similarity index 98%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWrkIotypeController.java
rename to zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkIotypeController.java
index a147eca..1e45ecf 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWrkIotypeController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkIotypeController.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.wms.controller;
+package com.zy.asrs.wms.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/RowLastnoController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java
similarity index 98%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/RowLastnoController.java
rename to zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java
index c21837c..0f4cf10 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/RowLastnoController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.wms.controller;
+package com.zy.asrs.wms.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/WrkLastnoController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
similarity index 98%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/WrkLastnoController.java
rename to zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
index 6ba40ac..a8a554b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/WrkLastnoController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.wms.controller;
+package com.zy.asrs.wms.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
diff --git a/zy-asrs-wms/src/main/webapp/static/js/basCrnError/basCrnError.js b/zy-asrs-wms/src/main/webapp/static/js/basCrnError/basCrnError.js
deleted file mode 100644
index f238400..0000000
--- a/zy-asrs-wms/src/main/webapp/static/js/basCrnError/basCrnError.js
+++ /dev/null
@@ -1,324 +0,0 @@
-var pageCurr;
-var pageCount = 0;
-layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin', 'xmSelect'], function(){
- var table = layui.table;
- var $ = layui.jquery;
- var layer = layui.layer;
- var layDate = layui.laydate;
- var form = layui.form;
- var admin = layui.admin;
- var xmSelect = layui.xmSelect;
-
- // 鏁版嵁娓叉煋
- tableIns = table.render({
- elem: '#basCrnError',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/basCrnError/page/auth',
- page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
- toolbar: '#toolbar',
- cellMinWidth: 50,
- height: 'full-120',
- cols: [[
- {type: 'checkbox'}
- ,{field: 'errorCode', align: 'center',title: '寮傚父浠ｅ彿'}
- ,{field: 'errName', align: 'center',title: '寮傚父鎻忚堪'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
- ,{field: 'appeTime$', 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;pageCount=count;
- limit();
- }
- });
-
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(basCrnError)', 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(basCrnError)', 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.errorCode;
- }));
- 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 = {
- 'basCrnError': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/basCrnError/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(basCrnError)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'edit':
- showEditModel(data);
- break;
- case "del":
- del([data.errorCode]);
- break;
- }
- });
-
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- form.val('detail', mData);
- layDateRender(mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/basCrnError/"+(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+"/basCrnError/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(true);
- });
-
- // 閲嶇疆
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
- tableReload(true);
- });
-
- // 鏃堕棿閫夋嫨鍣�
- function layDateRender(data) {
- setTimeout(function () {
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
- layDate.render({
- elem: '#modiTime\\$',
- type: 'datetime',
- value: data!==undefined?data['modiTime$']:null
- });
- layDate.render({
- elem: '#appeTime\\$',
- type: 'datetime',
- value: data!==undefined?data['appeTime$']:null
- });
-
- }, 100);
- }
- layDateRender();
-
- window.loadUserSel = function () {
- return xmSelect.render({
- el: '#userXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/user/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
- window.loadUserSel = function () {
- return xmSelect.render({
- el: '#userXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/user/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
-
-
-});
-
-// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
- parent.layer.closeAll();
-});
-
-function tableReload(search) {
- if (pageCount === 0 || search) {
- let searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- tableIns.reload({
- where: searchData,
- page: {curr: pageCurr}
- });
- } else {
- $(".layui-laypage-btn")[0].click();
- }
-}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js b/zy-asrs-wms/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js
deleted file mode 100644
index 6c00cf2..0000000
--- a/zy-asrs-wms/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js
+++ /dev/null
@@ -1,324 +0,0 @@
-var pageCurr;
-var pageCount = 0;
-layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin', 'xmSelect'], function(){
- var table = layui.table;
- var $ = layui.jquery;
- var layer = layui.layer;
- var layDate = layui.laydate;
- var form = layui.form;
- var admin = layui.admin;
- var xmSelect = layui.xmSelect;
-
- // 鏁版嵁娓叉煋
- tableIns = table.render({
- elem: '#basCrnStatus',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/basCrnStatus/page/auth',
- page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
- toolbar: '#toolbar',
- cellMinWidth: 50,
- height: 'full-120',
- cols: [[
- {type: 'checkbox'}
- ,{field: 'stsNo', align: 'center',title: '宸ヤ綔浠ｅ彿'}
- ,{field: 'stsDesc', align: 'center',title: '鐘舵�佹弿杩�'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
- ,{field: 'appeTime$', 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;pageCount=count;
- limit();
- }
- });
-
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(basCrnStatus)', 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(basCrnStatus)', 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.stsNo;
- }));
- 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 = {
- 'basCrnStatus': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/basCrnStatus/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(basCrnStatus)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'edit':
- showEditModel(data);
- break;
- case "del":
- del([data.stsNo]);
- break;
- }
- });
-
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- form.val('detail', mData);
- layDateRender(mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/basCrnStatus/"+(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+"/basCrnStatus/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(true);
- });
-
- // 閲嶇疆
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
- tableReload(true);
- });
-
- // 鏃堕棿閫夋嫨鍣�
- function layDateRender(data) {
- setTimeout(function () {
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
- layDate.render({
- elem: '#modiTime\\$',
- type: 'datetime',
- value: data!==undefined?data['modiTime$']:null
- });
- layDate.render({
- elem: '#appeTime\\$',
- type: 'datetime',
- value: data!==undefined?data['appeTime$']:null
- });
-
- }, 100);
- }
- layDateRender();
-
- window.loadUserSel = function () {
- return xmSelect.render({
- el: '#userXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/user/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
- window.loadUserSel = function () {
- return xmSelect.render({
- el: '#userXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/user/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
-
-
-});
-
-// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
- parent.layer.closeAll();
-});
-
-function tableReload(search) {
- if (pageCount === 0 || search) {
- let searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- tableIns.reload({
- where: searchData,
- page: {curr: pageCurr}
- });
- } else {
- $(".layui-laypage-btn")[0].click();
- }
-}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/basPlcerror/basPlcerror.js b/zy-asrs-wms/src/main/webapp/static/js/basPlcerror/basPlcerror.js
deleted file mode 100644
index bed76e6..0000000
--- a/zy-asrs-wms/src/main/webapp/static/js/basPlcerror/basPlcerror.js
+++ /dev/null
@@ -1,324 +0,0 @@
-var pageCurr;
-var pageCount = 0;
-layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin', 'xmSelect'], function(){
- var table = layui.table;
- var $ = layui.jquery;
- var layer = layui.layer;
- var layDate = layui.laydate;
- var form = layui.form;
- var admin = layui.admin;
- var xmSelect = layui.xmSelect;
-
- // 鏁版嵁娓叉煋
- tableIns = table.render({
- elem: '#basPlcerror',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/basPlcerror/page/auth',
- page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
- toolbar: '#toolbar',
- cellMinWidth: 50,
- height: 'full-120',
- cols: [[
- {type: 'checkbox'}
- ,{field: 'errorCode', align: 'center',title: '寮傚父缂栧彿'}
- ,{field: 'errorDesc', align: 'center',title: '寮傚父鎻忚堪'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'appeUser$', 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;pageCount=count;
- limit();
- }
- });
-
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(basPlcerror)', 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(basPlcerror)', 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.errorCode;
- }));
- 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 = {
- 'basPlcerror': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/basPlcerror/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(basPlcerror)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'edit':
- showEditModel(data);
- break;
- case "del":
- del([data.errorCode]);
- break;
- }
- });
-
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- form.val('detail', mData);
- layDateRender(mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/basPlcerror/"+(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+"/basPlcerror/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(true);
- });
-
- // 閲嶇疆
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
- tableReload(true);
- });
-
- // 鏃堕棿閫夋嫨鍣�
- function layDateRender(data) {
- setTimeout(function () {
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
- layDate.render({
- elem: '#modiTime\\$',
- type: 'datetime',
- value: data!==undefined?data['modiTime$']:null
- });
- layDate.render({
- elem: '#appeTime\\$',
- type: 'datetime',
- value: data!==undefined?data['appeTime$']:null
- });
-
- }, 100);
- }
- layDateRender();
-
- window.loadUserSel = function () {
- return xmSelect.render({
- el: '#userXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/user/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
- window.loadUserSel = function () {
- return xmSelect.render({
- el: '#userXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/user/all/get/kv",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
-
-
-
-});
-
-// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
- parent.layer.closeAll();
-});
-
-function tableReload(search) {
- if (pageCount === 0 || search) {
- let searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- tableIns.reload({
- where: searchData,
- page: {curr: pageCurr}
- });
- } else {
- $(".layui-laypage-btn")[0].click();
- }
-}
diff --git a/zy-asrs-wms/src/main/webapp/views/basCrnError/basCrnError.html b/zy-asrs-wms/src/main/webapp/views/basCrnError/basCrnError.html
deleted file mode 100644
index d6105ff..0000000
--- a/zy-asrs-wms/src/main/webapp/views/basCrnError/basCrnError.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!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="condition" 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="timeRange" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </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="basCrnError" lay-filter="basCrnError"></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/basCrnError/basCrnError.js" charset="utf-8"></script>
-</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <div 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="errorCode" 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="errName" 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="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="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="appeTime" id="appeTime$" 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>
- </div>
-</script>
-</html>
-
diff --git a/zy-asrs-wms/src/main/webapp/views/basCrnStatus/basCrnStatus.html b/zy-asrs-wms/src/main/webapp/views/basCrnStatus/basCrnStatus.html
deleted file mode 100644
index a3f501a..0000000
--- a/zy-asrs-wms/src/main/webapp/views/basCrnStatus/basCrnStatus.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!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="condition" 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="timeRange" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </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="basCrnStatus" lay-filter="basCrnStatus"></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/basCrnStatus/basCrnStatus.js" charset="utf-8"></script>
-</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <div 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="stsNo" 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="stsDesc" 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="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="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="appeTime" id="appeTime$" 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>
- </div>
-</script>
-</html>
-
diff --git a/zy-asrs-wms/src/main/webapp/views/basPlcerror/basPlcerror.html b/zy-asrs-wms/src/main/webapp/views/basPlcerror/basPlcerror.html
deleted file mode 100644
index 5afb8fe..0000000
--- a/zy-asrs-wms/src/main/webapp/views/basPlcerror/basPlcerror.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!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="condition" 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="timeRange" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </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="basPlcerror" lay-filter="basPlcerror"></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/basPlcerror/basPlcerror.js" charset="utf-8"></script>
-</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <div 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="errorCode" 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="errorDesc" 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>
- </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>
- </div>
-</script>
-</html>
-
--
Gitblit v1.9.1