From 96cfc17f191fee0a05070ec8e7bb6fb099f0231c Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 24 十二月 2025 14:28:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasDualCrnpErrLog.java | 311 +++
src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java | 125 +
src/main/java/com/zy/asrs/service/impl/BasDualCrnpServiceImpl.java | 12
src/main/webapp/static/js/basDualCrnpErrLog/basDualCrnpErrLog.js | 285 +++
src/main/java/com/zy/asrs/controller/BasDualCrnpController.java | 125 +
src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java | 242 ++
src/main/webapp/static/js/basDualCrnpOpt/basDualCrnpOpt.js | 268 ++
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 3
src/main/resources/mapper/BasDualCrnpOptMapper.xml | 24
src/main/java/com/zy/asrs/service/BasDualCrnpErrLogService.java | 8
src/main/java/com/zy/core/network/entity/ZyDualCrnStatusEntity.java | 141 +
src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java | 191 ++
src/main/webapp/static/js/basDualCrnp/basDualCrnp.js | 270 ++
src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java | 351 +++
src/main/java/com/zy/asrs/controller/BasDualCrnpErrController.java | 125 +
src/main/java/com/zy/core/network/fake/ZyDualCrnFakeConnect.java | 222 ++
src/main/java/com/zy/asrs/entity/BasDualCrnp.java | 201 ++
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java | 252 ++
src/main/java/com/zy/core/ServerBootstrap.java | 112
src/main/webapp/views/basDualCrnp/basDualCrnp.html | 180 +
src/main/java/com/zy/core/network/ZyDualCrnConnectDriver.java | 101 +
src/main/webapp/views/basDualCrnpErr/basDualCrnpErr_detail.html | 102 +
src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrLogServiceImpl.java | 12
src/main/resources/mapper/BasDualCrnpErrLogMapper.xml | 31
src/main/java/com/zy/asrs/service/impl/BasDualCrnpOptServiceImpl.java | 12
src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt.html | 174 +
src/main/java/com/zy/asrs/service/BasDualCrnpOptService.java | 8
src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog.html | 234 ++
src/main/webapp/static/js/basDualCrnpErr/basDualCrnpErr.js | 261 ++
src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt_detail.html | 142 +
src/main/java/com/zy/core/network/api/ZyDualCrnConnectApi.java | 17
src/main/java/com/zy/core/enums/SlaveType.java | 1
src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog_detail.html | 202 ++
src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrServiceImpl.java | 12
src/main/java/com/zy/core/cache/OutputQueue.java | 2
src/main/java/com/zy/asrs/service/BasDualCrnpErrService.java | 8
src/main/java/com/zy/asrs/mapper/BasDualCrnpMapper.java | 12
src/main/webapp/views/basDualCrnp/basDualCrnp_detail.html | 148 +
src/main/java/com/zy/asrs/mapper/BasDualCrnpOptMapper.java | 12
src/main/java/com/zy/core/model/command/DualCrnCommand.java | 59
src/main/java/com/zy/asrs/controller/BasDualCrnpErrLogController.java | 125 +
src/main/java/com/zy/asrs/entity/BasDualCrnpErr.java | 133 +
src/main/java/com/zy/core/thread/DualCrnThread.java | 20
src/main/java/com/zy/asrs/service/BasDualCrnpService.java | 8
src/main/resources/mapper/BasDualCrnpMapper.xml | 26
src/main/java/com/zy/asrs/mapper/BasDualCrnpErrLogMapper.java | 12
src/main/java/com/zy/asrs/mapper/BasDualCrnpErrMapper.java | 12
src/main/resources/mapper/BasDualCrnpErrMapper.xml | 17
src/main/webapp/views/basDualCrnpErr/basDualCrnpErr.html | 134 +
50 files changed, 5,443 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasDualCrnpController.java b/src/main/java/com/zy/asrs/controller/BasDualCrnpController.java
new file mode 100644
index 0000000..bff3d1f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasDualCrnpController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasDualCrnp;
+import com.zy.asrs.service.BasDualCrnpService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasDualCrnpController extends BaseController {
+
+ @Autowired
+ private BasDualCrnpService basDualCrnpService;
+
+ @RequestMapping(value = "/basDualCrnp/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basDualCrnpService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basDualCrnp/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasDualCrnp> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasDualCrnp.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basDualCrnpService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/basDualCrnp/add/auth")
+ @ManagerAuth
+ public R add(BasDualCrnp basDualCrnp) {
+ basDualCrnpService.insert(basDualCrnp);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnp/update/auth")
+ @ManagerAuth
+ public R update(BasDualCrnp basDualCrnp){
+ if (Cools.isEmpty(basDualCrnp) || null==basDualCrnp.getCrnNo()){
+ return R.error();
+ }
+ basDualCrnpService.updateById(basDualCrnp);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnp/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basDualCrnpService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnp/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasDualCrnp> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basDualCrnp"));
+ convert(map, wrapper);
+ List<BasDualCrnp> list = basDualCrnpService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basDualCrnpQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasDualCrnp> wrapper = new EntityWrapper<>();
+ wrapper.like("crn_no", condition);
+ Page<BasDualCrnp> page = basDualCrnpService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasDualCrnp basDualCrnp : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basDualCrnp.getCrnNo());
+ map.put("value", basDualCrnp.getCrnNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basDualCrnp/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasDualCrnp> wrapper = new EntityWrapper<BasDualCrnp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDualCrnpService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasDualCrnp.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/BasDualCrnpErrController.java b/src/main/java/com/zy/asrs/controller/BasDualCrnpErrController.java
new file mode 100644
index 0000000..a8859b6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasDualCrnpErrController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasDualCrnpErr;
+import com.zy.asrs.service.BasDualCrnpErrService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasDualCrnpErrController extends BaseController {
+
+ @Autowired
+ private BasDualCrnpErrService basDualCrnpErrService;
+
+ @RequestMapping(value = "/basDualCrnpErr/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basDualCrnpErrService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basDualCrnpErr/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasDualCrnpErr> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasDualCrnpErr.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basDualCrnpErrService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/basDualCrnpErr/add/auth")
+ @ManagerAuth
+ public R add(BasDualCrnpErr basDualCrnpErr) {
+ basDualCrnpErrService.insert(basDualCrnpErr);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnpErr/update/auth")
+ @ManagerAuth
+ public R update(BasDualCrnpErr basDualCrnpErr){
+ if (Cools.isEmpty(basDualCrnpErr) || null==basDualCrnpErr.getId()){
+ return R.error();
+ }
+ basDualCrnpErrService.updateById(basDualCrnpErr);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnpErr/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basDualCrnpErrService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnpErr/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasDualCrnpErr> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basDualCrnpErr"));
+ convert(map, wrapper);
+ List<BasDualCrnpErr> list = basDualCrnpErrService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basDualCrnpErrQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasDualCrnpErr> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasDualCrnpErr> page = basDualCrnpErrService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasDualCrnpErr basDualCrnpErr : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basDualCrnpErr.getId());
+ map.put("value", basDualCrnpErr.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basDualCrnpErr/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasDualCrnpErr> wrapper = new EntityWrapper<BasDualCrnpErr>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDualCrnpErrService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasDualCrnpErr.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/BasDualCrnpErrLogController.java b/src/main/java/com/zy/asrs/controller/BasDualCrnpErrLogController.java
new file mode 100644
index 0000000..47bd580
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasDualCrnpErrLogController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasDualCrnpErrLog;
+import com.zy.asrs.service.BasDualCrnpErrLogService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasDualCrnpErrLogController extends BaseController {
+
+ @Autowired
+ private BasDualCrnpErrLogService basDualCrnpErrLogService;
+
+ @RequestMapping(value = "/basDualCrnpErrLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basDualCrnpErrLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basDualCrnpErrLog/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasDualCrnpErrLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasDualCrnpErrLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basDualCrnpErrLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/basDualCrnpErrLog/add/auth")
+ @ManagerAuth
+ public R add(BasDualCrnpErrLog basDualCrnpErrLog) {
+ basDualCrnpErrLogService.insert(basDualCrnpErrLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnpErrLog/update/auth")
+ @ManagerAuth
+ public R update(BasDualCrnpErrLog basDualCrnpErrLog){
+ if (Cools.isEmpty(basDualCrnpErrLog) || null==basDualCrnpErrLog.getId()){
+ return R.error();
+ }
+ basDualCrnpErrLogService.updateById(basDualCrnpErrLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnpErrLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basDualCrnpErrLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnpErrLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasDualCrnpErrLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basDualCrnpErrLog"));
+ convert(map, wrapper);
+ List<BasDualCrnpErrLog> list = basDualCrnpErrLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basDualCrnpErrLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasDualCrnpErrLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasDualCrnpErrLog> page = basDualCrnpErrLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasDualCrnpErrLog basDualCrnpErrLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basDualCrnpErrLog.getId());
+ map.put("value", basDualCrnpErrLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basDualCrnpErrLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasDualCrnpErrLog> wrapper = new EntityWrapper<BasDualCrnpErrLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDualCrnpErrLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasDualCrnpErrLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java b/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java
new file mode 100644
index 0000000..406dcdc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasDualCrnpOpt;
+import com.zy.asrs.service.BasDualCrnpOptService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasDualCrnpOptController extends BaseController {
+
+ @Autowired
+ private BasDualCrnpOptService basDualCrnpOptService;
+
+ @RequestMapping(value = "/basDualCrnpOpt/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basDualCrnpOptService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basDualCrnpOpt/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasDualCrnpOpt.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basDualCrnpOptService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/basDualCrnpOpt/add/auth")
+ @ManagerAuth
+ public R add(BasDualCrnpOpt basDualCrnpOpt) {
+ basDualCrnpOptService.insert(basDualCrnpOpt);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnpOpt/update/auth")
+ @ManagerAuth
+ public R update(BasDualCrnpOpt basDualCrnpOpt){
+ if (Cools.isEmpty(basDualCrnpOpt) || null==basDualCrnpOpt.getId()){
+ return R.error();
+ }
+ basDualCrnpOptService.updateById(basDualCrnpOpt);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnpOpt/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basDualCrnpOptService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDualCrnpOpt/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basDualCrnpOpt"));
+ convert(map, wrapper);
+ List<BasDualCrnpOpt> list = basDualCrnpOptService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basDualCrnpOptQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasDualCrnpOpt> page = basDualCrnpOptService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasDualCrnpOpt basDualCrnpOpt : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basDualCrnpOpt.getId());
+ map.put("value", basDualCrnpOpt.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basDualCrnpOpt/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<BasDualCrnpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDualCrnpOptService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasDualCrnpOpt.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnp.java b/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
new file mode 100644
index 0000000..aa3345a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
@@ -0,0 +1,201 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_dual_crnp")
+public class BasDualCrnp implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ @TableId(value = "crn_no", type = IdType.INPUT)
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 鍙叆(checkBox)
+ */
+ @ApiModelProperty(value= "鍙叆(checkBox)")
+ @TableField("in_enable")
+ private String inEnable;
+
+ /**
+ * 鍙嚭(checkBox)
+ */
+ @ApiModelProperty(value= "鍙嚭(checkBox)")
+ @TableField("out_enable")
+ private String outEnable;
+
+ /**
+ * 鍒涘缓浜哄憳
+ */
+ @ApiModelProperty(value= "鍒涘缓浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 鎺у埗搴撲綅鎺掑彿
+ */
+ @ApiModelProperty(value= "鎺у埗搴撲綅鎺掑彿")
+ @TableField("control_rows")
+ private String controlRows;
+
+ /**
+ * 娣卞簱浣嶆帓鍙�
+ */
+ @ApiModelProperty(value= "娣卞簱浣嶆帓鍙�")
+ @TableField("deep_rows")
+ private String deepRows;
+
+ /**
+ * 鍏ュ簱绔欑偣
+ */
+ @ApiModelProperty(value= "鍏ュ簱绔欑偣")
+ @TableField("in_station_list")
+ private String inStationList;
+
+ /**
+ * 鍑哄簱绔欑偣
+ */
+ @ApiModelProperty(value= "鍑哄簱绔欑偣")
+ @TableField("out_station_list")
+ private String outStationList;
+
+ /**
+ * 鏈�澶у叆搴撲换鍔℃暟
+ */
+ @ApiModelProperty(value= "鏈�澶у叆搴撲换鍔℃暟")
+ @TableField("max_in_task")
+ private Integer maxInTask;
+
+ /**
+ * 鏈�澶у嚭搴撲换鍔℃暟
+ */
+ @ApiModelProperty(value= "鏈�澶у嚭搴撲换鍔℃暟")
+ @TableField("max_out_task")
+ private Integer maxOutTask;
+
+ public BasDualCrnp() {}
+
+ public BasDualCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String controlRows,String deepRows,String inStationList,String outStationList,Integer maxInTask,Integer maxOutTask) {
+ this.status = status;
+ this.wrkNo = wrkNo;
+ this.inEnable = inEnable;
+ this.outEnable = outEnable;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.controlRows = controlRows;
+ this.deepRows = deepRows;
+ this.inStationList = inStationList;
+ this.outStationList = outStationList;
+ this.maxInTask = maxInTask;
+ this.maxOutTask = maxOutTask;
+ }
+
+// BasDualCrnp basDualCrnp = new BasDualCrnp(
+// null, // 鐘舵��
+// null, // 宸ヤ綔鍙�
+// null, // 鍙叆(checkBox)
+// null, // 鍙嚭(checkBox)
+// null, // 鍒涘缓浜哄憳
+// null, // 鍒涘缓鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 澶囨敞
+// null, // 鎺у埗搴撲綅鎺掑彿
+// null, // 娣卞簱浣嶆帓鍙�
+// null, // 鍏ュ簱绔欑偣
+// null, // 鍑哄簱绔欑偣
+// null, // 鏈�澶у叆搴撲换鍔℃暟
+// null // 鏈�澶у嚭搴撲换鍔℃暟
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnpErr.java b/src/main/java/com/zy/asrs/entity/BasDualCrnpErr.java
new file mode 100644
index 0000000..d67e0f3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnpErr.java
@@ -0,0 +1,133 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_dual_crnp_err")
+public class BasDualCrnpErr implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 寮傚父鐮�
+ */
+ @ApiModelProperty(value= "寮傚父鐮�")
+ @TableField("error_code")
+ private Long errorCode;
+
+ /**
+ * 寮傚父
+ */
+ @ApiModelProperty(value= "寮傚父")
+ @TableField("err_name")
+ private String errName;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("appe_user")
+ private Long appeUser;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date appeTime;
+
+ public BasDualCrnpErr() {}
+
+ public BasDualCrnpErr(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;
+ }
+
+// BasDualCrnpErr basDualCrnpErr = new BasDualCrnpErr(
+// null, // 寮傚父鐮�
+// null, // 寮傚父
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null // 娣诲姞鏃堕棿
+// );
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getId());
+ }
+ 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.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getId());
+ }
+ 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/src/main/java/com/zy/asrs/entity/BasDualCrnpErrLog.java b/src/main/java/com/zy/asrs/entity/BasDualCrnpErrLog.java
new file mode 100644
index 0000000..6f99150
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnpErrLog.java
@@ -0,0 +1,311 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkStatusService;
+import com.zy.asrs.entity.BasWrkStatus;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkIotypeService;
+import com.zy.asrs.entity.BasWrkIotype;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_dual_crnp_err_log")
+public class BasDualCrnpErrLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 鍙戠敓鏃堕棿
+ */
+ @ApiModelProperty(value= "鍙戠敓鏃堕棿")
+ @TableField("start_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @TableField("end_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @TableField("wrk_sts")
+ private Long wrkSts;
+
+ /**
+ * 鍏ュ嚭搴撶被鍨�
+ */
+ @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @TableField("io_type")
+ private Integer ioType;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅")
+ @TableField("loc_no")
+ private String locNo;
+
+ /**
+ * 鐩爣绔�
+ */
+ @ApiModelProperty(value= "鐩爣绔�")
+ @TableField("sta_no")
+ private Integer staNo;
+
+ /**
+ * 婧愮珯
+ */
+ @ApiModelProperty(value= "婧愮珯")
+ @TableField("source_sta_no")
+ private Integer sourceStaNo;
+
+ /**
+ * 婧愬簱浣�
+ */
+ @ApiModelProperty(value= "婧愬簱浣�")
+ @TableField("source_loc_no")
+ private String sourceLocNo;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 寮傚父鐮�
+ */
+ @ApiModelProperty(value= "寮傚父鐮�")
+ @TableField("err_code")
+ private Integer errCode;
+
+ /**
+ * 寮傚父
+ */
+ @ApiModelProperty(value= "寮傚父")
+ private String error;
+
+ /**
+ * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
+ */
+ @ApiModelProperty(value= "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
+ private Integer status;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 绯荤粺鐘舵�佹暟鎹�
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵�佹暟鎹�")
+ @TableField("system_status")
+ private String systemStatus;
+
+ public BasDualCrnpErrLog() {}
+
+ public BasDualCrnpErrLog(Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer crnNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String systemStatus) {
+ this.wrkNo = wrkNo;
+ this.startTime = startTime;
+ this.endTime = endTime;
+ this.wrkSts = wrkSts;
+ this.ioType = ioType;
+ this.crnNo = crnNo;
+ this.locNo = locNo;
+ this.staNo = staNo;
+ this.sourceStaNo = sourceStaNo;
+ this.sourceLocNo = sourceLocNo;
+ this.barcode = barcode;
+ this.errCode = errCode;
+ this.error = error;
+ this.status = status;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ this.systemStatus = systemStatus;
+ }
+
+// BasDualCrnpErrLog basDualCrnpErrLog = new BasDualCrnpErrLog(
+// null, // 宸ヤ綔鍙�
+// null, // 鍙戠敓鏃堕棿
+// null, // 缁撴潫鏃堕棿
+// null, // 宸ヤ綔鐘舵��
+// null, // 鍏ュ嚭搴撶被鍨�
+// null, // 鍫嗗灈鏈哄彿
+// null, // 鐩爣搴撲綅
+// null, // 鐩爣绔�
+// null, // 婧愮珯
+// null, // 婧愬簱浣�
+// null, // 鏉＄爜
+// null, // 寮傚父鐮�
+// null, // 寮傚父
+// null, // 寮傚父鎯呭喌
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 澶囨敞
+// null // 绯荤粺鐘舵�佹暟鎹�
+// );
+
+ public String getStartTime$(){
+ if (Cools.isEmpty(this.startTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
+ }
+
+ public String getEndTime$(){
+ if (Cools.isEmpty(this.endTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ }
+
+ public String getWrkSts$(){
+ BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
+ BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ if (!Cools.isEmpty(basWrkStatus)){
+ return String.valueOf(basWrkStatus.getWrkDesc());
+ }
+ return null;
+ }
+
+ public String getIoType$(){
+ BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
+ BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ if (!Cools.isEmpty(basWrkIotype)){
+ return String.valueOf(basWrkIotype.getIoDesc());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "鏈鐞�";
+ case 2:
+ return "宸蹭慨澶�";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getId());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getId());
+ }
+ return null;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java b/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java
new file mode 100644
index 0000000..0b9f642
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java
@@ -0,0 +1,191 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_dual_crnp_opt")
+public class BasDualCrnpOpt implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ /**
+ * 涓嬪彂鏃堕棿
+ */
+ @ApiModelProperty(value= "涓嬪彂鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 浣滀笟
+ */
+ @ApiModelProperty(value= "浣滀笟")
+ private String mode;
+
+ /**
+ * 璧风偣搴撲綅
+ */
+ @ApiModelProperty(value= "璧风偣搴撲綅")
+ @TableField("source_loc_no")
+ private String sourceLocNo;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅")
+ @TableField("target_loc_no")
+ private String targetLocNo;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 鍛戒护
+ */
+ @ApiModelProperty(value= "鍛戒护")
+ private String command;
+
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
+ /**
+ * 涓嬪彂鐘舵�� 0: 鏈笅鍙� 1: 宸蹭笅鍙�
+ */
+ @ApiModelProperty(value= "涓嬪彂鐘舵�� 0: 鏈笅鍙� 1: 宸蹭笅鍙� ")
+ private Integer send;
+
+ /**
+ * 璇锋眰鍝嶅簲
+ */
+ @ApiModelProperty(value= "璇锋眰鍝嶅簲")
+ private String response;
+
+ public BasDualCrnpOpt() {}
+
+ public BasDualCrnpOpt(Integer wrkNo,Integer crnNo,Date sendTime,String mode,String sourceLocNo,String targetLocNo,Date updateTime,Long updateBy,String memo,String command,String systemStatus,Integer send,String response) {
+ this.wrkNo = wrkNo;
+ this.crnNo = crnNo;
+ this.sendTime = sendTime;
+ this.mode = mode;
+ this.sourceLocNo = sourceLocNo;
+ this.targetLocNo = targetLocNo;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ this.command = command;
+ this.systemStatus = systemStatus;
+ this.send = send;
+ this.response = response;
+ }
+
+// BasDualCrnpOpt basDualCrnpOpt = new BasDualCrnpOpt(
+// null, // 宸ヤ綔鍙�
+// null, // 鍫嗗灈鏈哄彿
+// null, // 涓嬪彂鏃堕棿
+// null, // 浣滀笟
+// null, // 璧风偣搴撲綅
+// null, // 鐩爣搴撲綅
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 澶囨敞
+// null, // 鍛戒护
+// null, // 绯荤粺鐘舵��
+// null, // 涓嬪彂鐘舵��
+// null // 璇锋眰鍝嶅簲
+// );
+
+ public String getSendTime$(){
+ if (Cools.isEmpty(this.sendTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getId());
+ }
+ return null;
+ }
+
+ public String getSend$(){
+ if (null == this.send){ return null; }
+ switch (this.send){
+ case 0:
+ return "鏈笅鍙�";
+ case 1:
+ return "宸蹭笅鍙�";
+ default:
+ return String.valueOf(this.send);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrLogMapper.java
new file mode 100644
index 0000000..0a82366
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasDualCrnpErrLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasDualCrnpErrLogMapper extends BaseMapper<BasDualCrnpErrLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrMapper.java b/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrMapper.java
new file mode 100644
index 0000000..8920c86
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasDualCrnpErr;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasDualCrnpErrMapper extends BaseMapper<BasDualCrnpErr> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasDualCrnpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDualCrnpMapper.java
new file mode 100644
index 0000000..5966820
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasDualCrnpMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasDualCrnp;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasDualCrnpMapper extends BaseMapper<BasDualCrnp> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasDualCrnpOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasDualCrnpOptMapper.java
new file mode 100644
index 0000000..8fad86d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasDualCrnpOptMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasDualCrnpOpt;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasDualCrnpOptMapper extends BaseMapper<BasDualCrnpOpt> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasDualCrnpErrLogService.java b/src/main/java/com/zy/asrs/service/BasDualCrnpErrLogService.java
new file mode 100644
index 0000000..138065b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasDualCrnpErrLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasDualCrnpErrLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasDualCrnpErrLogService extends IService<BasDualCrnpErrLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasDualCrnpErrService.java b/src/main/java/com/zy/asrs/service/BasDualCrnpErrService.java
new file mode 100644
index 0000000..445bca4
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasDualCrnpErrService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasDualCrnpErr;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasDualCrnpErrService extends IService<BasDualCrnpErr> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasDualCrnpOptService.java b/src/main/java/com/zy/asrs/service/BasDualCrnpOptService.java
new file mode 100644
index 0000000..893813a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasDualCrnpOptService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasDualCrnpOpt;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasDualCrnpOptService extends IService<BasDualCrnpOpt> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasDualCrnpService.java b/src/main/java/com/zy/asrs/service/BasDualCrnpService.java
new file mode 100644
index 0000000..5f378a8
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasDualCrnpService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasDualCrnp;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasDualCrnpService extends IService<BasDualCrnp> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrLogServiceImpl.java
new file mode 100644
index 0000000..0abf97a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasDualCrnpErrLogMapper;
+import com.zy.asrs.entity.BasDualCrnpErrLog;
+import com.zy.asrs.service.BasDualCrnpErrLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basDualCrnpErrLogService")
+public class BasDualCrnpErrLogServiceImpl extends ServiceImpl<BasDualCrnpErrLogMapper, BasDualCrnpErrLog> implements BasDualCrnpErrLogService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrServiceImpl.java
new file mode 100644
index 0000000..bd3c27c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasDualCrnpErrMapper;
+import com.zy.asrs.entity.BasDualCrnpErr;
+import com.zy.asrs.service.BasDualCrnpErrService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basDualCrnpErrService")
+public class BasDualCrnpErrServiceImpl extends ServiceImpl<BasDualCrnpErrMapper, BasDualCrnpErr> implements BasDualCrnpErrService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpOptServiceImpl.java
new file mode 100644
index 0000000..2d13b09
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpOptServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasDualCrnpOptMapper;
+import com.zy.asrs.entity.BasDualCrnpOpt;
+import com.zy.asrs.service.BasDualCrnpOptService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basDualCrnpOptService")
+public class BasDualCrnpOptServiceImpl extends ServiceImpl<BasDualCrnpOptMapper, BasDualCrnpOpt> implements BasDualCrnpOptService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpServiceImpl.java
new file mode 100644
index 0000000..98c4bcb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasDualCrnpMapper;
+import com.zy.asrs.entity.BasDualCrnp;
+import com.zy.asrs.service.BasDualCrnpService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basDualCrnpService")
+public class BasDualCrnpServiceImpl extends ServiceImpl<BasDualCrnpMapper, BasDualCrnp> implements BasDualCrnpService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index e83eab4..b670cfa 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -15,7 +15,7 @@
generator.url="127.0.0.1:3306/wcs";
generator.username="root";
generator.password="root";
- generator.table="asr_bas_station";
+ generator.table="asr_bas_dual_crnp_opt";
// sqlserver
// generator.sqlOsType = SqlOsType.SQL_SERVER;
// generator.url="127.0.0.1:1433;databasename=tzskasrs";
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 549e663..4912e40 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -9,6 +9,7 @@
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.thread.impl.ZySiemensCrnThread;
+import com.zy.core.thread.impl.ZySiemensDualCrnThread;
import com.zy.core.thread.impl.ZyStationThread;
import com.zy.core.thread.impl.ZyRgvThread;
@@ -36,7 +37,6 @@
@Async
public void init() throws InterruptedException {
News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
- Thread.sleep(2000);
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
// 鍒濆鍖栦笅浣嶆満绾跨▼
@@ -52,6 +52,12 @@
.eq("device_type", String.valueOf(SlaveType.Crn)));
for (DeviceConfig crn : crnList) {
MessageQueue.init(SlaveType.Crn, crn.getDeviceNo());
+ }
+ // 鍒濆鍖栧弻宸ヤ綅鍫嗗灈鏈簃q
+ List<DeviceConfig> dualCrnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.DualCrn)));
+ for (DeviceConfig crn : dualCrnList) {
+ MessageQueue.init(SlaveType.DualCrn, crn.getDeviceNo());
}
// 鍒濆鍖朢gv灏忚溅mq
List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
@@ -80,58 +86,84 @@
}
private void initThread(){
- News.info("鍒濆鍖栧爢鍨涙満........................................................");
List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Crn)));
- for (DeviceConfig deviceConfig : crnList) {
- ThreadHandler thread = null;
- if (deviceConfig.getThreadImpl().equals("ZySiemensCrnThread")) {
- thread = new ZySiemensCrnThread(deviceConfig, redisUtil);
- } else {
- throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
- }
+ if(!crnList.isEmpty()) {
+ News.info("鍒濆鍖栧爢鍨涙満........................................................");
+ for (DeviceConfig deviceConfig : crnList) {
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("ZySiemensCrnThread")) {
+ thread = new ZySiemensCrnThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
- Thread t = new Thread(thread);
- t.setName("CrnThread-" + deviceConfig.getDeviceNo());
- t.setDaemon(true);
- t.start();
- SlaveConnection.put(SlaveType.Crn, deviceConfig.getDeviceNo(), thread);
+ Thread t = new Thread(thread);
+ t.setName("CrnThread-" + deviceConfig.getDeviceNo());
+ t.setDaemon(true);
+ t.start();
+ SlaveConnection.put(SlaveType.Crn, deviceConfig.getDeviceNo(), thread);
+ }
}
- News.info("鍒濆鍖栬緭閫佺珯........................................................");
+ List<DeviceConfig> dualCrnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.DualCrn)));
+ if(!dualCrnList.isEmpty()) {
+ News.info("鍒濆鍖栧弻宸ヤ綅鍫嗗灈鏈�........................................................");
+ for (DeviceConfig deviceConfig : dualCrnList) {
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("ZySiemensDualCrnThread")) {
+ thread = new ZySiemensDualCrnThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ Thread t = new Thread(thread);
+ t.setName("DualCrnThread-" + deviceConfig.getDeviceNo());
+ t.setDaemon(true);
+ t.start();
+ SlaveConnection.put(SlaveType.DualCrn, deviceConfig.getDeviceNo(), thread);
+ }
+ }
+
List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
- for (DeviceConfig deviceConfig : devpList) {
- ThreadHandler thread = null;
- if (deviceConfig.getThreadImpl().equals("ZyStationThread")) {
- thread = new ZyStationThread(deviceConfig, redisUtil);
- } else {
- throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
- }
+ if(!devpList.isEmpty()) {
+ News.info("鍒濆鍖栬緭閫佺珯........................................................");
+ for (DeviceConfig deviceConfig : devpList) {
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("ZyStationThread")) {
+ thread = new ZyStationThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
- Thread t = new Thread(thread);
- t.setName("DevpThread-" + deviceConfig.getDeviceNo());
- t.setDaemon(true);
- t.start();
- SlaveConnection.put(SlaveType.Devp, deviceConfig.getDeviceNo(), thread);
+ Thread t = new Thread(thread);
+ t.setName("DevpThread-" + deviceConfig.getDeviceNo());
+ t.setDaemon(true);
+ t.start();
+ SlaveConnection.put(SlaveType.Devp, deviceConfig.getDeviceNo(), thread);
+ }
}
- News.info("鍒濆鍖朢GV........................................................");
List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Rgv)));
- for (DeviceConfig deviceConfig : rgvList) {
- ThreadHandler thread = null;
- if (deviceConfig.getThreadImpl().equals("ZyRgvThread")) {
- thread = new ZyRgvThread(deviceConfig, redisUtil);
- } else {
- throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
- }
+ if(!rgvList.isEmpty()) {
+ News.info("鍒濆鍖朢GV........................................................");
+ for (DeviceConfig deviceConfig : rgvList) {
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("ZyRgvThread")) {
+ thread = new ZyRgvThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
- Thread t = new Thread(thread);
- t.setName("RgvThread-" + deviceConfig.getDeviceNo());
- t.setDaemon(true);
- t.start();
- SlaveConnection.put(SlaveType.Rgv, deviceConfig.getDeviceNo(), thread);
+ Thread t = new Thread(thread);
+ t.setName("RgvThread-" + deviceConfig.getDeviceNo());
+ t.setDaemon(true);
+ t.start();
+ SlaveConnection.put(SlaveType.Rgv, deviceConfig.getDeviceNo(), thread);
+ }
}
}
diff --git a/src/main/java/com/zy/core/cache/OutputQueue.java b/src/main/java/com/zy/core/cache/OutputQueue.java
index 7e08c3c..c9e42b0 100644
--- a/src/main/java/com/zy/core/cache/OutputQueue.java
+++ b/src/main/java/com/zy/core/cache/OutputQueue.java
@@ -11,6 +11,8 @@
// 鍫嗗灈鏈鸿緭鍑烘棩蹇�
public static ArrayBlockingQueue<String> CRN = new ArrayBlockingQueue<>(32);
+ // 鍙屽伐浣嶅爢鍨涙満杈撳嚭鏃ュ織
+ public static ArrayBlockingQueue<String> DUAL_CRN = new ArrayBlockingQueue<>(32);
// 杈撻�佺嚎杈撳嚭鏃ュ織
public static ArrayBlockingQueue<String> DEVP = new ArrayBlockingQueue<>(32);
// 鏉＄爜鍣ㄨ緭鍑烘棩蹇�
diff --git a/src/main/java/com/zy/core/enums/SlaveType.java b/src/main/java/com/zy/core/enums/SlaveType.java
index 7313e86..5810024 100644
--- a/src/main/java/com/zy/core/enums/SlaveType.java
+++ b/src/main/java/com/zy/core/enums/SlaveType.java
@@ -3,6 +3,7 @@
public enum SlaveType {
Crn,
+ DualCrn,
Devp,
Barcode,
Led,
diff --git a/src/main/java/com/zy/core/model/command/DualCrnCommand.java b/src/main/java/com/zy/core/model/command/DualCrnCommand.java
new file mode 100644
index 0000000..379ed38
--- /dev/null
+++ b/src/main/java/com/zy/core/model/command/DualCrnCommand.java
@@ -0,0 +1,59 @@
+package com.zy.core.model.command;
+
+import lombok.Data;
+
+/**
+ * 鍙屽伐浣嶅爢鍨涙満鍛戒护鎶ユ枃
+ */
+@Data
+public class DualCrnCommand {
+
+ // 鍫嗗灈鏈哄彿
+ private Integer crnNo = 0;
+
+ // 浠诲姟瀹屾垚纭浣�
+ private Short ackFinish = 0;
+
+ // 浠诲姟鍙�
+ private Short taskNo = 0;
+
+ /**
+ * 浠诲姟妯″紡锛�
+ * 0 = 鏃�
+ * 1 = 鍏ュ簱 婧愬拰鐩爣閮藉彂
+ * 2 = 鍑哄簱 婧愬拰鐩爣閮藉彂
+ * 3 = 搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂
+ * 4 = 绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
+ * 5 = 鍥炲師鐐� 涓嶇敤鍙�
+ * 6 = 鍘诲弽鍘熺偣 鐩爣鍙�
+ * 7 = 鍧愭爣绉昏 鍙栬揣鍙�
+ * 90 = 璁剧疆鏃堕棿
+ * 99 = 鍙栨秷褰撳墠浠诲姟
+ */
+ private Short taskMode = 0;
+
+ // 婧愪綅缃帓鍙�
+ private Short sourcePosX = 0;
+
+ // 婧愪綅缃垪鍙�
+ private Short sourcePosY = 0;
+
+ // 婧愪綅缃眰鍙�
+ private Short sourcePosZ = 0;
+
+ // 鐩爣浣嶇疆鎺掑彿
+ private Short destinationPosX = 0;
+
+ // 鐩爣浣嶇疆鍒楀彿
+ private Short destinationPosY = 0;
+
+ // 鐩爣浣嶇疆灞傚彿
+ private Short destinationPosZ = 0;
+
+ // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
+ private Short command = 0;
+
+ //宸ヤ綅
+ private Short station;
+
+}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 0ce9df7..d7f7a86 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -6,9 +6,6 @@
import com.zy.core.enums.CrnStatusType;
import lombok.Data;
-/**
- * Created by vincent on 2020/8/7
- */
@Data
public class CrnProtocol {
diff --git a/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java b/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java
new file mode 100644
index 0000000..a13ee7a
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java
@@ -0,0 +1,242 @@
+package com.zy.core.model.protocol;
+
+import com.zy.core.enums.CrnForkPosType;
+import com.zy.core.enums.CrnLiftPosType;
+import com.zy.core.enums.CrnModeType;
+import com.zy.core.enums.CrnStatusType;
+import lombok.Data;
+
+@Data
+public class DualCrnProtocol {
+
+ private Integer crnNo;
+
+ /**
+ * 1 = 鎵嬪姩妯″紡
+ * 2 = 鑷姩妯″紡
+ * 3 = 鐢佃剳妯″紡
+ */
+ public Integer mode;
+
+ public CrnModeType modeType;
+
+ /**
+ * 寮傚父鐮�
+ */
+ public Integer alarm;
+
+ /**
+ * 宸ヤ綅1浠诲姟鍙�
+ */
+ public Integer taskNo = 0;
+
+ /**
+ * 宸ヤ綅2浠诲姟鍙�
+ */
+ public Integer taskNoTwo = 0;
+
+ /**
+ * 宸ヤ綅1褰撳墠鐘舵��
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 1锛氬彇璐у畾浣嶄腑
+ * 2锛氬彇璐т腑
+ * 3锛氬彇璐у畬鎴愶紝鏀捐揣瀹氫綅涓�
+ * 4锛氭斁璐т腑
+ * 5锛氬洖鍘熺偣涓�
+ * 6锛氬弽鍘熺偣
+ * 7锛氬簱浣嶇Щ浣�
+ * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
+ * 99锛氭姤璀�
+ */
+ public Integer status;
+
+ /**
+ * 宸ヤ綅2褰撳墠鐘舵��
+ */
+ public Integer statusTwo;
+
+ /**
+ * 宸ヤ綅1鐘舵�佹灇涓�
+ */
+ public CrnStatusType statusType;
+
+ /**
+ * 宸ヤ綅2鐘舵�佹灇涓�
+ */
+ public CrnStatusType statusTypeTwo;
+
+ /**
+ * 宸ヤ綅1鍫嗗灈鏈哄綋鍓嶅垪鍙�
+ */
+ public Integer bay;
+
+ /**
+ * 宸ヤ綅2鍫嗗灈鏈哄綋鍓嶅垪鍙�
+ */
+ public Integer bayTwo;
+
+ /**
+ * 宸ヤ綅1鍫嗗灈鏈哄綋鍓嶅眰鍙�
+ */
+ public Integer level;
+
+ /**
+ * 宸ヤ綅2鍫嗗灈鏈哄綋鍓嶅眰鍙�
+ */
+ public Integer levelTwo;
+
+ /**
+ * 宸ヤ綅1褰撳墠璐у弶浣嶇疆
+ * 0 = 璐у弶鍘熶綅
+ * 1 = 璐у弶鍦ㄥ乏渚�
+ * 2 = 璐у弶鍦ㄥ彸渚�
+ */
+ public Integer forkPos;
+
+ /**
+ * 宸ヤ綅2褰撳墠璐у弶浣嶇疆
+ * 0 = 璐у弶鍘熶綅
+ * 1 = 璐у弶鍦ㄥ乏渚�
+ * 2 = 璐у弶鍦ㄥ彸渚�
+ */
+ public Integer forkPosTwo;
+
+ public CrnForkPosType forkPosType;
+
+ public CrnForkPosType forkPosTypeTwo;
+
+ /**
+ * 褰撳墠杞借揣鍙颁綅缃�
+ * 0 = 涓嬪畾浣�
+ * 1 = 涓婂畾浣�
+ */
+ public Integer liftPos;
+
+ public Integer liftPosTwo;
+
+ public CrnLiftPosType liftPosType;
+
+ public CrnLiftPosType liftPosTypeTwo;
+
+ /**
+ * 璧拌鍦ㄥ畾浣�
+ * 0 = 鍦ㄥ畾浣�
+ * 1 = 涓嶅湪瀹氫綅
+ */
+ public Integer walkPos;
+
+ public Integer walkPosTwo;
+
+ /**
+ * 杞借揣鍙版湁鐗�
+ */
+ public Integer loaded;
+
+ public Integer loadedTwo;
+
+ private Integer temp1;
+
+ private Integer temp2;
+
+ private Integer temp3;
+
+ private Integer temp4;
+
+ /**
+ * X琛岃蛋绾块�熷害m/min
+ */
+ private Integer xSpeed;
+
+ /**
+ * Y琛岃蛋绾块�熷害m/min
+ */
+ private Integer ySpeed;
+
+ /**
+ * Z琛岃蛋绾块�熷害m/min
+ */
+ private Integer zSpeed;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
+ */
+ public Integer xDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
+ */
+ public Integer yDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
+ */
+ public Integer xDuration;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
+ */
+ public Integer yDuration;
+
+ /**
+ * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
+ * I:鍏ュ簱
+ * O:鍑哄簱
+ */
+ private String lastIo = "I";
+
+ /**
+ * 鍫嗗灈鏈烘墍鍦ㄥ贩閬�
+ */
+ private Integer crnLane = 1;
+
+ /**
+ * 鏃ュ織閲囬泦鏃堕棿
+ */
+ private Long deviceDataLog = System.currentTimeMillis();
+
+ /**
+ * 涓婁竴娆℃寚浠や笅鍙戞椂闂�
+ */
+ private Long lastCommandTime = System.currentTimeMillis();
+
+ public void setMode(Integer mode) {
+ this.mode = mode;
+ this.modeType = CrnModeType.get(mode);
+ }
+
+ public void setMode(CrnModeType type) {
+ this.modeType = type;
+ this.mode = CrnModeType.get(type).id;
+ }
+
+ public void setForkPos(Integer forkPos) {
+ this.forkPos = forkPos;
+ this.forkPosType = CrnForkPosType.get(forkPos);
+ }
+
+ public void setForkPos(CrnForkPosType type) {
+ this.forkPosType = type;
+ this.forkPos = CrnForkPosType.get(type).id;
+ }
+
+ public void setLiftPos(Integer liftPos) {
+ this.liftPos = liftPos;
+ this.liftPosType = CrnLiftPosType.get(liftPos);
+ }
+
+ public void setLiftPos(CrnLiftPosType type) {
+ this.liftPosType = type;
+ this.liftPos = CrnLiftPosType.get(type).id;
+ }
+
+ public void setStatus(Integer status){
+ this.status = status;
+ this.statusType = CrnStatusType.get(status);
+ }
+
+ public void setStatus(CrnStatusType type){
+ this.statusType = type;
+ this.status = CrnStatusType.get(type).id;
+ }
+
+}
diff --git a/src/main/java/com/zy/core/network/ZyDualCrnConnectDriver.java b/src/main/java/com/zy/core/network/ZyDualCrnConnectDriver.java
new file mode 100644
index 0000000..88608f1
--- /dev/null
+++ b/src/main/java/com/zy/core/network/ZyDualCrnConnectDriver.java
@@ -0,0 +1,101 @@
+package com.zy.core.network;
+
+import com.zy.asrs.entity.DeviceConfig;
+import com.zy.core.ThreadHandler;
+import com.zy.core.model.CommandResponse;
+import com.zy.core.model.command.DualCrnCommand;
+import com.zy.core.network.api.ZyDualCrnConnectApi;
+import com.zy.core.network.entity.ZyDualCrnStatusEntity;
+import com.zy.core.network.fake.ZyDualCrnFakeConnect;
+import com.zy.core.network.real.ZyDualCrnRealConnect;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 杩炴帴椹卞姩
+ */
+@Slf4j
+public class ZyDualCrnConnectDriver implements ThreadHandler{
+
+ private boolean connected = false;
+ private DeviceConfig deviceConfig;
+ private ZyDualCrnConnectApi zyDualCrnConnectApi;
+ private volatile boolean closed = false;
+ private ScheduledExecutorService executor;
+
+ public ZyDualCrnConnectDriver(DeviceConfig deviceConfig) {
+ this.deviceConfig = deviceConfig;
+ }
+
+ @Override
+ public void run() {
+
+ }
+
+ @Override
+ public boolean connect() {
+ if (deviceConfig.getFake() == 0) {
+ zyDualCrnConnectApi = new ZyDualCrnRealConnect(deviceConfig);
+ }else {
+ zyDualCrnConnectApi = new ZyDualCrnFakeConnect(deviceConfig);
+ }
+
+ boolean connect = zyDualCrnConnectApi.connect();
+ connected = connect;
+ return connect;
+ }
+
+ @Override
+ public void close() {
+ closed = true;
+ ScheduledExecutorService ex = executor;
+ if (ex != null) {
+ try { ex.shutdownNow(); } catch (Exception ignore) {}
+ }
+ if (zyDualCrnConnectApi != null) {
+ zyDualCrnConnectApi.disconnect();
+ zyDualCrnConnectApi = null;
+ }
+ connected = false;
+ }
+
+ public void start() {
+ executor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+ @Override
+ public Thread newThread(Runnable r) {
+ Thread t = new Thread(r);
+ t.setName("CrnConnect-" + deviceConfig.getDeviceNo());
+ t.setDaemon(true);
+ return t;
+ }
+ });
+ executor.scheduleAtFixedRate(() -> {
+ if (closed || Thread.currentThread().isInterrupted()) {
+ return;
+ }
+ try {
+ if (!connected) {
+ connect();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }, 0, 1000, TimeUnit.MILLISECONDS);
+ }
+
+ public ZyDualCrnStatusEntity getStatus() {
+ if (zyDualCrnConnectApi == null) {
+ return null;
+ }
+ return zyDualCrnConnectApi.getStatus();
+ }
+
+ public CommandResponse sendCommand(DualCrnCommand command) {
+ return zyDualCrnConnectApi.sendCommand(command);
+ }
+
+}
diff --git a/src/main/java/com/zy/core/network/api/ZyDualCrnConnectApi.java b/src/main/java/com/zy/core/network/api/ZyDualCrnConnectApi.java
new file mode 100644
index 0000000..5251f10
--- /dev/null
+++ b/src/main/java/com/zy/core/network/api/ZyDualCrnConnectApi.java
@@ -0,0 +1,17 @@
+package com.zy.core.network.api;
+
+import com.zy.core.model.CommandResponse;
+import com.zy.core.model.command.DualCrnCommand;
+import com.zy.core.network.entity.ZyDualCrnStatusEntity;
+
+public interface ZyDualCrnConnectApi {
+
+ boolean connect();
+
+ boolean disconnect();
+
+ ZyDualCrnStatusEntity getStatus();//璁惧鐘舵��
+
+ CommandResponse sendCommand(DualCrnCommand command);//涓嬪彂鍛戒护
+
+}
diff --git a/src/main/java/com/zy/core/network/entity/ZyDualCrnStatusEntity.java b/src/main/java/com/zy/core/network/entity/ZyDualCrnStatusEntity.java
new file mode 100644
index 0000000..9c26fef
--- /dev/null
+++ b/src/main/java/com/zy/core/network/entity/ZyDualCrnStatusEntity.java
@@ -0,0 +1,141 @@
+package com.zy.core.network.entity;
+
+import lombok.Data;
+
+@Data
+public class ZyDualCrnStatusEntity {
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ private Integer crnNo;
+
+ /**
+ * 1 = 鎵嬪姩妯″紡
+ * 2 = 鑷姩妯″紡
+ * 3 = 鐢佃剳妯″紡
+ */
+ public Integer mode;
+
+ /**
+ * 寮傚父鐮�
+ */
+ public Integer alarm;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ public Integer taskNo = 0;
+
+ public Integer taskNoTwo = 0;
+
+ /**
+ * 鍫嗗灈鏈哄綋鍓嶇姸鎬�
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 1锛氬彇璐у畾浣嶄腑
+ * 2锛氬彇璐т腑
+ * 3锛氬彇璐у畬鎴愶紝鏀捐揣瀹氫綅涓�
+ * 4锛氭斁璐т腑
+ * 5锛氬洖鍘熺偣涓�
+ * 6锛氬弽鍘熺偣
+ * 7锛氬簱浣嶇Щ浣�
+ * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
+ * 99锛氭姤璀�
+ */
+ public Integer status;
+
+ public Integer statusTwo;
+
+ /**
+ * 鍫嗗灈鏈哄綋鍓嶅垪鍙�
+ */
+ public Integer bay;
+
+ public Integer bayTwo;
+
+ /**
+ * 鍫嗗灈鏈哄綋鍓嶅眰鍙�
+ */
+ public Integer level;
+
+ public Integer levelTwo;
+
+ /**
+ * 褰撳墠璐у弶浣嶇疆
+ * 0 = 璐у弶鍘熶綅
+ * 1 = 璐у弶鍦ㄥ乏渚�
+ * 2 = 璐у弶鍦ㄥ彸渚�
+ */
+ public Integer forkPos;
+
+ public Integer forkPosTwo;
+
+ /**
+ * 褰撳墠杞借揣鍙颁綅缃�
+ * 0 = 涓嬪畾浣�
+ * 1 = 涓婂畾浣�
+ */
+ public Integer liftPos;
+
+ public Integer liftPosTwo;
+
+ /**
+ * 璧拌鍦ㄥ畾浣�
+ * 0 = 鍦ㄥ畾浣�
+ * 1 = 涓嶅湪瀹氫綅
+ */
+ public Integer walkPos;
+
+ public Integer walkPosTwo;
+
+ /**
+ * 杞借揣鍙版湁鐗�
+ */
+ public Integer loaded;
+
+ public Integer loadedTwo;
+
+ /**
+ * X琛岃蛋绾块�熷害m/min
+ */
+ private Integer xSpeed;
+
+ /**
+ * Y琛岃蛋绾块�熷害m/min
+ */
+ private Integer ySpeed;
+
+ /**
+ * Z琛岃蛋绾块�熷害m/min
+ */
+ private Integer zSpeed;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
+ */
+ public Integer xDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
+ */
+ public Integer yDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
+ */
+ public Integer xDuration;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
+ */
+ public Integer yDuration;
+
+ private Integer temp1;
+
+ private Integer temp2;
+
+ private Integer temp3;
+
+ private Integer temp4;
+
+}
diff --git a/src/main/java/com/zy/core/network/fake/ZyDualCrnFakeConnect.java b/src/main/java/com/zy/core/network/fake/ZyDualCrnFakeConnect.java
new file mode 100644
index 0000000..11fa99e
--- /dev/null
+++ b/src/main/java/com/zy/core/network/fake/ZyDualCrnFakeConnect.java
@@ -0,0 +1,222 @@
+package com.zy.core.network.fake;
+
+import com.alibaba.fastjson.JSON;
+import com.zy.asrs.entity.DeviceConfig;
+import com.zy.core.enums.CrnStatusType;
+import com.zy.core.enums.CrnTaskModeType;
+import com.zy.core.model.CommandResponse;
+import com.zy.core.model.command.DualCrnCommand;
+import com.zy.core.network.api.ZyDualCrnConnectApi;
+import com.zy.core.network.entity.ZyDualCrnStatusEntity;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class ZyDualCrnFakeConnect implements ZyDualCrnConnectApi {
+
+ private ZyDualCrnStatusEntity crnStatus;
+ private DeviceConfig deviceConfig;
+ private final ExecutorService executor = Executors.newSingleThreadExecutor();
+
+ public ZyDualCrnFakeConnect(DeviceConfig deviceConfig) {
+ this.deviceConfig = deviceConfig;
+ this.crnStatus = JSON.parseObject(deviceConfig.getFakeInitStatus(), ZyDualCrnStatusEntity.class);
+ }
+
+ @Override
+ public boolean connect() {
+ return true;
+ }
+
+ @Override
+ public boolean disconnect() {
+ try { executor.shutdownNow(); } catch (Exception ignore) {}
+ return true;
+ }
+
+ @Override
+ public ZyDualCrnStatusEntity getStatus() {
+ return this.crnStatus;
+ }
+
+ @Override
+ public CommandResponse sendCommand(DualCrnCommand command) {
+ CommandResponse response = new CommandResponse(false);
+ if (command.getTaskMode().intValue() == CrnTaskModeType.LOC_MOVE.id) {
+ //鍙栨斁璐�
+ executor.submit(() -> commandTake(command));
+ } else if (command.getTaskMode().intValue() == CrnTaskModeType.CRN_MOVE.id) {
+ //绉诲姩
+ executor.submit(() -> commandMove(command));
+ } else if (command.getTaskMode().intValue() == CrnTaskModeType.NONE.id) {
+ //澶嶄綅
+ executor.submit(() -> commandTaskComplete(command));
+ }
+ response.setResult(true);
+ return response;
+ }
+
+ private void commandTaskComplete(DualCrnCommand command) {
+ this.crnStatus.setTaskNo(0);
+ this.crnStatus.setStatus(CrnStatusType.IDLE.id);
+ }
+
+ private void commandMove(DualCrnCommand command) {
+ int destinationPosX = command.getDestinationPosX().intValue();
+ int destinationPosY = command.getDestinationPosY().intValue();
+ int destinationPosZ = command.getDestinationPosZ().intValue();
+ int taskMode = command.getTaskMode().intValue();
+ int taskNo = command.getTaskNo().intValue();
+
+ if(command.getStation() == 1) {
+ this.crnStatus.setTaskNo(taskNo);
+ this.crnStatus.setStatus(CrnStatusType.MOVING.id);
+ moveY(this.crnStatus.getBay(), destinationPosY, command.getStation().intValue());
+ moveZ(this.crnStatus.getLevel(), destinationPosZ, command.getStation().intValue());
+ this.crnStatus.setStatus(CrnStatusType.WAITING.id);
+ }else {
+ this.crnStatus.setTaskNoTwo(taskNo);
+ this.crnStatus.setStatusTwo(CrnStatusType.MOVING.id);
+ moveY(this.crnStatus.getBayTwo(), destinationPosY, command.getStation().intValue());
+ moveZ(this.crnStatus.getLevelTwo(), destinationPosZ, command.getStation().intValue());
+ this.crnStatus.setStatusTwo(CrnStatusType.WAITING.id);
+ }
+ }
+
+ private void commandTake(DualCrnCommand command) {
+ int sourcePosX = command.getSourcePosX().intValue();
+ int sourcePosY = command.getSourcePosY().intValue();
+ int sourcePosZ = command.getSourcePosZ().intValue();
+ int destinationPosX = command.getDestinationPosX().intValue();
+ int destinationPosY = command.getDestinationPosY().intValue();
+ int destinationPosZ = command.getDestinationPosZ().intValue();
+ int taskMode = command.getTaskMode().intValue();
+ int taskNo = command.getTaskNo().intValue();
+
+ this.crnStatus.setMode(taskMode);
+ if(command.getStation() == 1) {
+ this.crnStatus.setTaskNo(taskNo);
+ this.crnStatus.setStatus(CrnStatusType.FETCH_MOVING.id);
+
+ moveY(this.crnStatus.getBay(), sourcePosY, command.getStation().intValue());
+ moveZ(this.crnStatus.getLevel(), sourcePosZ, command.getStation().intValue());
+ this.crnStatus.setStatus(CrnStatusType.FETCHING.id);
+ sleep(2000);
+ if (Thread.currentThread().isInterrupted()) {
+ return;
+ }
+
+ this.crnStatus.setLoaded(1);
+ this.crnStatus.setStatus(CrnStatusType.PUT_MOVING.id);
+ moveY(this.crnStatus.getBay(), destinationPosY, command.getStation().intValue());
+ moveZ(this.crnStatus.getLevel(), destinationPosZ, command.getStation().intValue());
+ this.crnStatus.setStatus(CrnStatusType.PUTTING.id);
+ sleep(2000);
+ if (Thread.currentThread().isInterrupted()) {
+ return;
+ }
+ this.crnStatus.setLoaded(0);
+ this.crnStatus.setStatus(CrnStatusType.WAITING.id);
+ }else {
+ this.crnStatus.setTaskNoTwo(taskNo);
+ this.crnStatus.setStatusTwo(CrnStatusType.FETCH_MOVING.id);
+
+ moveY(this.crnStatus.getBayTwo(), sourcePosY, command.getStation().intValue());
+ moveZ(this.crnStatus.getLevelTwo(), sourcePosZ, command.getStation().intValue());
+ this.crnStatus.setStatusTwo(CrnStatusType.FETCHING.id);
+ sleep(2000);
+ if (Thread.currentThread().isInterrupted()) {
+ return;
+ }
+
+ this.crnStatus.setLoadedTwo(1);
+ this.crnStatus.setStatusTwo(CrnStatusType.PUT_MOVING.id);
+ moveY(this.crnStatus.getBayTwo(), destinationPosY, command.getStation().intValue());
+ moveZ(this.crnStatus.getLevelTwo(), destinationPosZ, command.getStation().intValue());
+ this.crnStatus.setStatusTwo(CrnStatusType.PUTTING.id);
+ sleep(2000);
+ if (Thread.currentThread().isInterrupted()) {
+ return;
+ }
+ this.crnStatus.setLoadedTwo(0);
+ this.crnStatus.setStatusTwo(CrnStatusType.WAITING.id);
+ }
+ }
+
+ private void moveZ(int sourcePosZ, int destinationPosZ, int station) {
+ if(destinationPosZ - sourcePosZ > 0) {
+ int moveLength = destinationPosZ - sourcePosZ;
+ int initSourcePosZ = sourcePosZ;
+ for(int i = 0; i < moveLength; i++) {
+ initSourcePosZ++;
+ if(station == 1) {
+ this.crnStatus.setLevel(initSourcePosZ);
+ }else {
+ this.crnStatus.setLevelTwo(initSourcePosZ);
+ }
+ sleep(1000);
+ if (Thread.currentThread().isInterrupted()) {
+ return;
+ }
+ }
+ }else {
+ int moveLength = sourcePosZ - destinationPosZ;
+ int initSourcePosZ = sourcePosZ;
+ for(int i = 0; i < moveLength; i++) {
+ initSourcePosZ--;
+ if(station == 1) {
+ this.crnStatus.setLevel(initSourcePosZ);
+ }else {
+ this.crnStatus.setLevelTwo(initSourcePosZ);
+ }
+ this.crnStatus.setLevel(initSourcePosZ);
+ sleep(1000);
+ if (Thread.currentThread().isInterrupted()) {
+ return;
+ }
+ }
+ }
+ }
+
+ private void moveY(int sourcePosY, int destinationPosY, int station) {
+ if(destinationPosY - sourcePosY > 0) {
+ int moveLength = destinationPosY - sourcePosY;
+ int initSourcePosY = sourcePosY;
+ for(int i = 0; i < moveLength; i++) {
+ initSourcePosY++;
+ if(station == 1) {
+ this.crnStatus.setBay(initSourcePosY);
+ }else {
+ this.crnStatus.setBayTwo(initSourcePosY);
+ }
+ sleep(1000);
+ if (Thread.currentThread().isInterrupted()) {
+ return;
+ }
+ }
+ }else {
+ int moveLength = sourcePosY - destinationPosY;
+ int initSourcePosY = sourcePosY;
+ for(int i = 0; i < moveLength; i++) {
+ initSourcePosY--;
+ if(station == 1) {
+ this.crnStatus.setBay(initSourcePosY);
+ }else {
+ this.crnStatus.setBayTwo(initSourcePosY);
+ }
+ sleep(1000);
+ if (Thread.currentThread().isInterrupted()) {
+ return;
+ }
+ }
+ }
+ }
+
+ private void sleep(long ms) {
+ try {
+ Thread.sleep(ms);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ }
+}
diff --git a/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
new file mode 100644
index 0000000..c5d2b06
--- /dev/null
+++ b/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
@@ -0,0 +1,252 @@
+package com.zy.core.network.real;
+
+import HslCommunication.Core.Types.OperateResult;
+import HslCommunication.Core.Types.OperateResultExOne;
+import HslCommunication.Profinet.Siemens.SiemensPLCS;
+import HslCommunication.Profinet.Siemens.SiemensS7Net;
+import com.alibaba.fastjson.JSON;
+import com.core.common.DateUtils;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasCrnpOpt;
+import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.service.BasCrnpOptService;
+import com.zy.asrs.utils.Utils;
+import com.zy.core.News;
+import com.zy.core.cache.OutputQueue;
+import com.zy.core.model.CommandResponse;
+import com.zy.core.model.command.DualCrnCommand;
+import com.zy.core.network.api.ZyDualCrnConnectApi;
+import com.zy.core.network.entity.ZyDualCrnStatusEntity;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+public class ZyDualCrnRealConnect implements ZyDualCrnConnectApi {
+
+ private SiemensS7Net siemensNet;
+ private DeviceConfig deviceConfig;
+
+ public ZyDualCrnRealConnect(DeviceConfig deviceConfig) {
+ this.deviceConfig = deviceConfig;
+ }
+
+ public boolean connect() {
+ boolean connected = false;
+ siemensNet = new SiemensS7Net(SiemensPLCS.S1200, deviceConfig.getIp());
+ OperateResult connect = siemensNet.ConnectServer();
+ if(connect.IsSuccess){
+ connected = true;
+ OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}鍙屽伐浣嶅爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
+ News.info("SiemensDualCrn 鍙屽伐浣嶅爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}鍙屽伐浣嶅爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
+ News.error("SiemensDualCrn 鍙屽伐浣嶅爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+ }
+// siemensNet.ConnectClose();
+ return connected;
+ }
+
+ @Override
+ public boolean disconnect() {
+ siemensNet.ConnectClose();
+ return true;
+ }
+
+ @Override
+ public ZyDualCrnStatusEntity getStatus() {
+ try {
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 66);
+ if (result.IsSuccess) {
+ ZyDualCrnStatusEntity crnStatus = new ZyDualCrnStatusEntity();
+ crnStatus.setCrnNo(deviceConfig.getDeviceNo());
+ crnStatus.setMode((int) siemensNet.getByteTransform().TransInt16(result.Content, 0));
+
+ //宸ヤ綅1
+ crnStatus.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result.Content, 2));
+ crnStatus.setStatus((int) siemensNet.getByteTransform().TransInt16(result.Content, 4));
+ crnStatus.setBay((int) siemensNet.getByteTransform().TransInt16(result.Content, 6));
+ crnStatus.setLevel((int) siemensNet.getByteTransform().TransInt16(result.Content, 8));
+ crnStatus.setForkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 10));
+ crnStatus.setLoaded((int) siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ crnStatus.setWalkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
+
+ //宸ヤ綅2
+ crnStatus.setTaskNoTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
+ crnStatus.setStatusTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 16));
+ crnStatus.setBayTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 18));
+ crnStatus.setLevelTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 20));
+ crnStatus.setForkPosTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
+ crnStatus.setLoadedTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
+ crnStatus.setWalkPosTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 28));
+
+ crnStatus.setAlarm((int) siemensNet.getByteTransform().TransInt16(result.Content, 18));
+ crnStatus.setTemp1((int) siemensNet.getByteTransform().TransInt16(result.Content, 20));
+ crnStatus.setTemp2((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
+ crnStatus.setTemp3((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
+ crnStatus.setTemp4((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
+ crnStatus.setXSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 28));
+ crnStatus.setYSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 32));
+ crnStatus.setZSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 36));
+ crnStatus.setXDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 40));
+ crnStatus.setYDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 44));
+ crnStatus.setXDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 48));
+ crnStatus.setYDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 52));
+
+ return crnStatus;
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧弻宸ヤ綅鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
+ News.error("SiemensCrn 璇诲彇鍙屽伐浣嶅爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧弻宸ヤ綅鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
+ News.error("SiemensCrn 璇诲彇鍙屽伐浣嶅爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
+ }
+ return null;
+ }
+
+ @Override
+ public CommandResponse sendCommand(DualCrnCommand command) {
+ CommandResponse response = new CommandResponse(false);
+ try {
+ if (null == command) {
+ News.error("鍙屽伐浣嶅爢鍨涙満鍐欏叆鍛戒护涓虹┖");
+ response.setMessage("鍙屽伐浣嶅爢鍨涙満鍐欏叆鍛戒护涓虹┖");
+ return response;
+ }
+
+ String address = "DB100.0";
+ if (command.getStation() == 1) {
+ //宸ヤ綅1
+ address = "DB100.0";
+ }else {
+ //宸ヤ綅2
+ address = "DB100.20";
+ }
+
+ int writeAck = 0;
+ boolean ackResult = false;
+ do {
+ OperateResult resultAck = siemensNet.Write(address, (short) 0);
+ if (resultAck.IsSuccess) {
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read(address, (short) 2);
+ short ack = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
+ if (ack != 0) {
+ writeAck++;
+ } else {
+ News.info("鍙屽伐浣嶅爢鍨涙満鍛戒护涓嬪彂[id:{}] >>>>> {}", command.getCrnNo(), "ack澶嶄綅瀹屾垚");
+ ackResult = true;
+ break;
+ }
+ }
+ } while (writeAck < 5);
+
+ if (!ackResult) {
+ response.setMessage("鍙屽伐浣嶅爢鍨涙満鍛戒护涓嬪彂[id:{}] >>>>> {}" + command.getCrnNo() + "ack澶嶄綅澶辫触");
+ return response;
+ }
+
+ short[] array = new short[10];
+ array[0] = command.getAckFinish();
+ array[1] = command.getTaskNo();
+ array[2] = command.getTaskMode();
+ array[3] = command.getSourcePosX();
+ array[4] = command.getSourcePosY();
+ array[5] = command.getSourcePosZ();
+ array[6] = command.getDestinationPosX();
+ array[7] = command.getDestinationPosY();
+ array[8] = command.getDestinationPosZ();
+ array[9] = command.getCommand();
+
+ OperateResult result = null;
+ int idx = 0;
+ do {
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read(address, (short) 20);
+ if (resultRead.IsSuccess) {
+ if (command.getAckFinish() == 0) {
+ short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
+ short taskMode = siemensNet.getByteTransform().TransInt16(resultRead.Content, 4);
+ short sourcePosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 6);
+ short sourcePosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 8);
+ short sourcePosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 10);
+ short destinationPosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 12);
+ short destinationPosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 14);
+ short destinationPosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 16);
+ if (taskNo == 0 || taskMode == 0 || sourcePosX == 0 || sourcePosY == 0 || sourcePosZ == 0 || destinationPosX == 0 || destinationPosY == 0 || destinationPosZ == 0) {
+ result = siemensNet.Write(address, array);
+ } else {
+ break;
+ }
+ } else {
+ short ackFinish = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
+ if (ackFinish != command.getAckFinish()) {
+ result = siemensNet.Write(address, array);
+ } else {
+ break;
+ }
+ }
+ }
+ idx++;
+ Thread.sleep(500);
+ } while (idx < 5);
+
+ if (command.getAckFinish() == 0) {
+ short commandFinish = 1;
+ int i = 0;
+ do {
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read(address, (short) 4);
+ OperateResultExOne<byte[]> resultReadConfirm = siemensNet.Read(address + 18, (short) 2);
+ if (resultRead.IsSuccess && resultReadConfirm.IsSuccess) {
+ short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
+ short confirm = siemensNet.getByteTransform().TransInt16(resultReadConfirm.Content, 0);
+ if (taskNo != 0 && confirm == 0) {
+ result = siemensNet.Write(address + 18, commandFinish);
+ }
+ }
+ i++;
+ Thread.sleep(500);
+ } while (i < 5);
+ }
+
+ if (result != null && result.IsSuccess) {
+ News.info("SiemensDualCrn 鍙屽伐浣嶅爢鍨涙満鍛戒护涓嬪彂[id:{}] >>>>> {}", command.getCrnNo(), JSON.toJSON(command));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), command.getCrnNo(), JSON.toJSON(command)));
+ response.setResult(true);
+ response.setMessage("鍛戒护涓嬪彂鎴愬姛");
+ } else {
+ News.error("SiemensDualCrn 鍙屽伐浣嶅爢鍨涙満鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}]", command.getCrnNo());
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}]", DateUtils.convert(new Date()), command.getCrnNo()));
+ response.setResult(false);
+ response.setMessage("鍛戒护涓嬪彂澶辫触");
+ }
+
+ return response;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }finally {
+ String sourceLocNo = Utils.getLocNo(command.getSourcePosX(), command.getSourcePosY(), command.getSourcePosZ());
+ String targetLocNo = Utils.getLocNo(command.getDestinationPosX(), command.getDestinationPosY(), command.getDestinationPosZ());
+
+ // 鏃ュ織璁板綍
+ BasCrnpOptService bean = SpringUtils.getBean(BasCrnpOptService.class);
+ BasCrnpOpt basCrnpOpt = new BasCrnpOpt(
+ command.getTaskNo().intValue(), // 浠诲姟鍙�
+ command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
+ new Date(), // 涓嬪彂鏃堕棿
+ String.valueOf(command.getTaskMode()), // 妯″紡
+ sourceLocNo, //婧愬簱浣�
+ targetLocNo, //鐩爣搴撲綅
+ null, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null, // 澶囨敞
+ JSON.toJSONString(command), // 鎸囦护
+ JSON.toJSONString(getStatus()), // 绯荤粺鐘舵��
+ 1, // 涓嬪彂鐘舵�亄0:鏈笅鍙�,1:宸蹭笅鍙憓
+ JSON.toJSONString(response) // 鍝嶅簲
+ );
+ bean.insert(basCrnpOpt);
+ }
+ return response;
+ }
+}
diff --git a/src/main/java/com/zy/core/thread/DualCrnThread.java b/src/main/java/com/zy/core/thread/DualCrnThread.java
new file mode 100644
index 0000000..cd40f95
--- /dev/null
+++ b/src/main/java/com/zy/core/thread/DualCrnThread.java
@@ -0,0 +1,20 @@
+package com.zy.core.thread;
+
+import com.zy.core.ThreadHandler;
+import com.zy.core.model.CommandResponse;
+import com.zy.core.model.command.DualCrnCommand;
+import com.zy.core.model.protocol.DualCrnProtocol;
+
+public interface DualCrnThread extends ThreadHandler {
+
+ DualCrnProtocol getStatus();
+
+ DualCrnCommand getPickAndPutCommand(String sourceLocNo, String targetLocNo, Integer taskNo, Integer crnNo, Integer station);//鍙栨斁璐�
+
+ DualCrnCommand getMoveCommand(String targetLocNo, Integer taskNo, Integer crnNo);//绉诲姩
+
+ DualCrnCommand getResetCommand(Integer crnNo, Integer station);//澶嶄綅
+
+ CommandResponse sendCommand(DualCrnCommand command);//涓嬪彂鍛戒护
+
+}
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
new file mode 100644
index 0000000..2df5438
--- /dev/null
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
@@ -0,0 +1,351 @@
+package com.zy.core.thread.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.DateUtils;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasDualCrnp;
+import com.zy.asrs.entity.BasDualCrnpOpt;
+import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.entity.DeviceDataLog;
+import com.zy.asrs.service.BasDualCrnpOptService;
+import com.zy.asrs.service.BasDualCrnpService;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.utils.RedisUtil;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.CrnTaskModeType;
+import com.zy.core.enums.RedisKeyType;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.CommandResponse;
+import com.zy.core.model.Task;
+import com.zy.core.model.command.DualCrnCommand;
+import com.zy.core.model.protocol.DualCrnProtocol;
+import com.zy.core.network.DeviceConnectPool;
+import com.zy.core.network.ZyDualCrnConnectDriver;
+import com.zy.core.network.entity.ZyDualCrnStatusEntity;
+import com.zy.core.thread.DualCrnThread;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 鍙屽伐浣嶅爢鍨涙満绾跨▼
+ */
+@Data
+@Slf4j
+public class ZySiemensDualCrnThread implements Runnable, DualCrnThread {
+
+ private DeviceConfig deviceConfig;
+ private RedisUtil redisUtil;
+ private ZyDualCrnConnectDriver zyDualCrnConnectDriver;
+ private DualCrnProtocol crnProtocol;
+ private int deviceLogCollectTime = 200;
+ private boolean resetFlag = false;
+ private volatile boolean closed = false;
+ private ScheduledExecutorService readExecutor;
+ private ScheduledExecutorService processExecutor;
+
+ public ZySiemensDualCrnThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
+ this.deviceConfig = deviceConfig;
+ this.redisUtil = redisUtil;
+ }
+
+ @Override
+ @SuppressWarnings("InfiniteLoopStatement")
+ public void run() {
+ this.connect();
+ this.initCrn();
+ readExecutor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+ @Override
+ public Thread newThread(Runnable r) {
+ Thread t = new Thread(r);
+ t.setName("DualCrnReader-" + deviceConfig.getDeviceNo());
+ t.setDaemon(true);
+ return t;
+ }
+ });
+ readExecutor.scheduleAtFixedRate(() -> {
+ if (closed || Thread.currentThread().isInterrupted()) {
+ return;
+ }
+ try {
+ deviceLogCollectTime = Utils.getDeviceLogCollectTime();
+ readStatus();
+ } catch (Exception e) {
+ log.error("DualCrnThread Fail", e);
+ }
+ }, 0, 200, TimeUnit.MILLISECONDS);
+
+ processExecutor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+ @Override
+ public Thread newThread(Runnable r) {
+ Thread t = new Thread(r);
+ t.setName("DualCrnWriter-" + deviceConfig.getDeviceNo());
+ t.setDaemon(true);
+ return t;
+ }
+ });
+ processExecutor.scheduleAtFixedRate(() -> {
+ if (closed || Thread.currentThread().isInterrupted()) {
+ return;
+ }
+ try {
+ int step = 1;
+ Task task = MessageQueue.poll(SlaveType.DualCrn, deviceConfig.getDeviceNo());
+ if (task != null) {
+ step = task.getStep();
+ }
+ if (step == 2 && task != null) {
+ sendCommand((DualCrnCommand) task.getData());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }, 0, 200, TimeUnit.MILLISECONDS);
+ }
+
+ /**
+ * 鍒濆鍖栧爢鍨涙満鐘舵��
+ */
+ private void initCrn() {
+ if (null == crnProtocol) {
+ crnProtocol = new DualCrnProtocol();
+ crnProtocol.setCrnNo(deviceConfig.getDeviceNo());
+ }
+ crnProtocol.setMode(-1);
+
+ //宸ヤ綅1
+ crnProtocol.setTaskNo(0);
+ crnProtocol.setStatus(-1);
+ crnProtocol.setBay(0);
+ crnProtocol.setLevel(0);
+ crnProtocol.setForkPos(-1);
+ crnProtocol.setLoaded(0);
+ crnProtocol.setWalkPos(0);
+
+ //宸ヤ綅2
+ crnProtocol.setTaskNoTwo(0);
+ crnProtocol.setStatusTwo(-1);
+ crnProtocol.setBayTwo(0);
+ crnProtocol.setLevelTwo(0);
+ crnProtocol.setForkPosTwo(-1);
+ crnProtocol.setLoadedTwo(0);
+ crnProtocol.setWalkPosTwo(0);
+
+ crnProtocol.setAlarm(0);
+ crnProtocol.setXSpeed(0);
+ crnProtocol.setYSpeed(0);
+ crnProtocol.setZSpeed(0);
+ crnProtocol.setXDistance(0);
+ crnProtocol.setYDistance(0);
+ crnProtocol.setXDuration(0);
+ crnProtocol.setYDuration(0);
+ }
+
+ @Override
+ public boolean connect() {
+ zyDualCrnConnectDriver = new ZyDualCrnConnectDriver(deviceConfig);
+ zyDualCrnConnectDriver.start();
+ DeviceConnectPool.put(SlaveType.Crn, deviceConfig.getDeviceNo(), zyDualCrnConnectDriver);
+ return true;
+ }
+
+ /**
+ * 璇诲彇鐘舵��
+ */
+ private void readStatus(){
+ ZyDualCrnStatusEntity crnStatus = zyDualCrnConnectDriver.getStatus();
+ if (crnStatus == null) {
+ OutputQueue.DUAL_CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧弻宸ヤ綅鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
+ return;
+ }
+
+ crnProtocol.setMode(crnStatus.getMode());
+
+ //宸ヤ綅1
+ crnProtocol.setTaskNo(crnStatus.getTaskNo());
+ crnProtocol.setStatus(crnStatus.getStatus());
+ crnProtocol.setBay(crnStatus.getBay());
+ crnProtocol.setLevel(crnStatus.getLevel());
+ crnProtocol.setForkPos(crnStatus.getForkPos());
+ crnProtocol.setLoaded(crnStatus.getLoaded());
+ crnProtocol.setWalkPos(crnStatus.getWalkPos());
+
+ //宸ヤ綅2
+ crnProtocol.setTaskNoTwo(crnStatus.getTaskNoTwo());
+ crnProtocol.setStatusTwo(crnStatus.getStatusTwo());
+ crnProtocol.setBayTwo(crnStatus.getBayTwo());
+ crnProtocol.setLevelTwo(crnStatus.getLevelTwo());
+ crnProtocol.setForkPosTwo(crnStatus.getForkPosTwo());
+ crnProtocol.setLoadedTwo(crnStatus.getLoadedTwo());
+ crnProtocol.setWalkPosTwo(crnStatus.getWalkPosTwo());
+
+ crnProtocol.setAlarm(crnStatus.getAlarm());
+ crnProtocol.setTemp1(crnStatus.getTemp1());
+ crnProtocol.setTemp2(crnStatus.getTemp2());
+ crnProtocol.setTemp3(crnStatus.getTemp3());
+ crnProtocol.setTemp4(crnStatus.getTemp4());
+ crnProtocol.setXSpeed(crnStatus.getXSpeed());
+ crnProtocol.setYSpeed(crnStatus.getYSpeed());
+ crnProtocol.setZSpeed(crnStatus.getZSpeed());
+ crnProtocol.setXDistance(crnStatus.getXDistance());
+ crnProtocol.setYDistance(crnStatus.getYDistance());
+ crnProtocol.setXDuration(crnStatus.getXDuration());
+ crnProtocol.setYDuration(crnStatus.getYDuration());
+
+ OutputQueue.DUAL_CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), deviceConfig.getDeviceNo()));
+
+ if (crnProtocol.getAlarm() > 0) {
+ crnProtocol.setLastCommandTime(-1L);
+ }
+
+ if (crnProtocol.getAlarm() == 0 && crnProtocol.getLastCommandTime() == -1) {
+ crnProtocol.setLastCommandTime(System.currentTimeMillis());
+ }
+
+ if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > deviceLogCollectTime) {
+ //淇濆瓨鏁版嵁璁板綍
+ DeviceDataLog deviceDataLog = new DeviceDataLog();
+ deviceDataLog.setOriginData(JSON.toJSONString(crnStatus));
+ deviceDataLog.setWcsData(JSON.toJSONString(crnProtocol));
+ deviceDataLog.setType(String.valueOf(SlaveType.DualCrn));
+ deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
+ deviceDataLog.setCreateTime(new Date());
+
+ redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
+ //鏇存柊閲囬泦鏃堕棿
+ crnProtocol.setDeviceDataLog(System.currentTimeMillis());
+ }
+
+ BasDualCrnpService basDualCrnpService = null;
+ try {
+ basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.class);
+ }catch (Exception e){
+
+ }
+ if (basDualCrnpService != null) {
+ BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+ if(basDualCrnp == null) {
+ basDualCrnp = new BasDualCrnp();
+ basDualCrnp.setCrnNo(deviceConfig.getDeviceNo());
+ basDualCrnp.setStatus(1);
+ basDualCrnp.setInEnable("N");
+ basDualCrnp.setOutEnable("N");
+ basDualCrnp.setMaxInTask(5);
+ basDualCrnp.setMaxOutTask(5);
+ basDualCrnp.setCreateTime(new Date());
+ basDualCrnpService.insert(basDualCrnp);
+ }
+ }
+ }
+
+ @Override
+ public void close() {
+ closed = true;
+ ScheduledExecutorService ex = readExecutor;
+ if (ex != null) {
+ try { ex.shutdownNow(); } catch (Exception ignore) {}
+ }
+ ScheduledExecutorService px = processExecutor;
+ if (px != null) {
+ try { px.shutdownNow(); } catch (Exception ignore) {}
+ }
+ if (zyDualCrnConnectDriver != null) {
+ zyDualCrnConnectDriver.close();
+ }
+ }
+
+ @Override
+ public DualCrnProtocol getStatus() {
+ return this.crnProtocol;
+ }
+
+ @Override
+ public DualCrnCommand getPickAndPutCommand(String sourceLocNo, String targetLocNo, Integer taskNo, Integer crnNo, Integer station) {
+ DualCrnCommand crnCommand = new DualCrnCommand();
+ crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(taskNo.shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE.id.shortValue()); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX((short) Utils.getRow(sourceLocNo)); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY((short) Utils.getBay(sourceLocNo)); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ((short) Utils.getLev(sourceLocNo)); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX((short) Utils.getRow(targetLocNo)); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short) Utils.getBay(targetLocNo)); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short) Utils.getLev(targetLocNo)); // 鐩爣搴撲綅灞�
+ crnCommand.setStation(station.shortValue());//宸ヤ綅
+ crnCommand.setCommand((short) 1); // 浠诲姟纭
+ return crnCommand;
+ }
+
+ @Override
+ public DualCrnCommand getMoveCommand(String targetLocNo, Integer taskNo, Integer crnNo) {
+ DualCrnCommand crnCommand = new DualCrnCommand();
+ crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(taskNo.shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.CRN_MOVE.id.shortValue()); // 浠诲姟妯″紡: 鍫嗗灈鏈虹Щ鍔�
+ crnCommand.setDestinationPosX((short) Utils.getRow(targetLocNo)); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short) Utils.getBay(targetLocNo)); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short) Utils.getLev(targetLocNo)); // 鐩爣搴撲綅灞�
+ crnCommand.setCommand((short) 1); // 浠诲姟纭
+ return crnCommand;
+ }
+
+ @Override
+ public DualCrnCommand getResetCommand(Integer crnNo, Integer station) {
+ DualCrnCommand crnCommand = new DualCrnCommand();
+ crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.NONE.id.shortValue()); // 浠诲姟妯″紡
+ crnCommand.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
+ crnCommand.setStation(station.shortValue());//宸ヤ綅
+ crnCommand.setCommand((short) 1); // 浠诲姟纭
+ return crnCommand;
+ }
+
+ @Override
+ public synchronized CommandResponse sendCommand(DualCrnCommand command) {
+ this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
+ CommandResponse response = null;
+ try {
+ response = zyDualCrnConnectDriver.sendCommand(command);
+ return response;
+ } finally {
+ String sourceLocNo = Utils.getLocNo(command.getSourcePosX(), command.getSourcePosY(), command.getSourcePosZ());
+ String targetLocNo = Utils.getLocNo(command.getDestinationPosX(), command.getDestinationPosY(), command.getDestinationPosZ());
+ BasDualCrnpOptService bean = SpringUtils.getBean(BasDualCrnpOptService.class);
+ ZyDualCrnStatusEntity statusEntity = zyDualCrnConnectDriver.getStatus();
+ BasDualCrnpOpt basDualCrnpOpt = new BasDualCrnpOpt(
+ command.getTaskNo().intValue(),
+ command.getCrnNo(),
+ new Date(),
+ String.valueOf(command.getTaskMode()),
+ sourceLocNo,
+ targetLocNo,
+ null,
+ null,
+ null,
+ JSON.toJSONString(command),
+ JSON.toJSONString(statusEntity),
+ 1,
+ JSON.toJSONString(response)
+ );
+ if (bean != null) {
+ bean.insert(basDualCrnpOpt);
+ }
+ }
+ }
+}
diff --git a/src/main/resources/mapper/BasDualCrnpErrLogMapper.xml b/src/main/resources/mapper/BasDualCrnpErrLogMapper.xml
new file mode 100644
index 0000000..a8d00ab
--- /dev/null
+++ b/src/main/resources/mapper/BasDualCrnpErrLogMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasDualCrnpErrLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDualCrnpErrLog">
+ <id column="id" property="id" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="wrk_sts" property="wrkSts" />
+ <result column="io_type" property="ioType" />
+ <result column="crn_no" property="crnNo" />
+ <result column="loc_no" property="locNo" />
+ <result column="sta_no" property="staNo" />
+ <result column="source_sta_no" property="sourceStaNo" />
+ <result column="source_loc_no" property="sourceLocNo" />
+ <result column="barcode" property="barcode" />
+ <result column="err_code" property="errCode" />
+ <result column="error" property="error" />
+ <result column="status" property="status" />
+ <result column="create_time" property="createTime" />
+ <result column="create_by" property="createBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="memo" property="memo" />
+ <result column="system_status" property="systemStatus" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/BasDualCrnpErrMapper.xml b/src/main/resources/mapper/BasDualCrnpErrMapper.xml
new file mode 100644
index 0000000..3c178cc
--- /dev/null
+++ b/src/main/resources/mapper/BasDualCrnpErrMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasDualCrnpErrMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDualCrnpErr">
+ <id column="id" property="id" />
+ <result column="error_code" property="errorCode" />
+ <result column="err_name" property="errName" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="appe_user" property="appeUser" />
+ <result column="appe_time" property="appeTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/BasDualCrnpMapper.xml b/src/main/resources/mapper/BasDualCrnpMapper.xml
new file mode 100644
index 0000000..c94c105
--- /dev/null
+++ b/src/main/resources/mapper/BasDualCrnpMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasDualCrnpMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDualCrnp">
+ <id column="crn_no" property="crnNo" />
+ <result column="status" property="status" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="in_enable" property="inEnable" />
+ <result column="out_enable" property="outEnable" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+ <result column="control_rows" property="controlRows" />
+ <result column="deep_rows" property="deepRows" />
+ <result column="in_station_list" property="inStationList" />
+ <result column="out_station_list" property="outStationList" />
+ <result column="max_in_task" property="maxInTask" />
+ <result column="max_out_task" property="maxOutTask" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/BasDualCrnpOptMapper.xml b/src/main/resources/mapper/BasDualCrnpOptMapper.xml
new file mode 100644
index 0000000..bccae04
--- /dev/null
+++ b/src/main/resources/mapper/BasDualCrnpOptMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasDualCrnpOptMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDualCrnpOpt">
+ <id column="id" property="id" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="crn_no" property="crnNo" />
+ <result column="send_time" property="sendTime" />
+ <result column="mode" property="mode" />
+ <result column="source_loc_no" property="sourceLocNo" />
+ <result column="target_loc_no" property="targetLocNo" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="memo" property="memo" />
+ <result column="command" property="command" />
+ <result column="system_status" property="systemStatus" />
+ <result column="send" property="send" />
+ <result column="response" property="response" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basDualCrnp/basDualCrnp.js b/src/main/webapp/static/js/basDualCrnp/basDualCrnp.js
new file mode 100644
index 0000000..13b93c6
--- /dev/null
+++ b/src/main/webapp/static/js/basDualCrnp/basDualCrnp.js
@@ -0,0 +1,270 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basDualCrnp',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basDualCrnp/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'crnNo', align: 'center',title: '缂栧彿'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'inEnable', align: 'center',title: '鍙叆(checkBox)'}
+ ,{field: 'outEnable', align: 'center',title: '鍙嚭(checkBox)'}
+ // ,{field: 'createBy', align: 'center',title: '鍒涘缓浜哄憳'}
+ // ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+ // ,{field: 'updateBy', align: 'center',title: '淇敼浜哄憳'}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'controlRows', align: 'center',title: '鎺у埗搴撲綅鎺掑彿'}
+ ,{field: 'deepRows', align: 'center',title: '娣卞簱浣嶆帓鍙�'}
+ ,{field: 'inStationList', align: 'center',title: '鍏ュ簱绔欑偣'}
+ ,{field: 'outStationList', align: 'center',title: '鍑哄簱绔欑偣'}
+ ,{field: 'maxInTask', align: 'center',title: '鏈�澶у叆搴撲换鍔℃暟'}
+ ,{field: 'maxOutTask', align: 'center',title: '鏈�澶у嚭搴撲换鍔℃暟'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basDualCrnp)', 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(basDualCrnp)', 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.crnNo;
+ }));
+ 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 = {
+ 'basDualCrnp': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basDualCrnp/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(basDualCrnp)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.crnNo]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basDualCrnp/"+(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+"/basDualCrnp/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/basDualCrnpErr/basDualCrnpErr.js b/src/main/webapp/static/js/basDualCrnpErr/basDualCrnpErr.js
new file mode 100644
index 0000000..80f4079
--- /dev/null
+++ b/src/main/webapp/static/js/basDualCrnpErr/basDualCrnpErr.js
@@ -0,0 +1,261 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basDualCrnpErr',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basDualCrnpErr/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: '缂栧彿'}
+ ,{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;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basDualCrnpErr)', 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(basDualCrnpErr)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'basDualCrnpErr': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basDualCrnpErr/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(basDualCrnpErr)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basDualCrnpErr/"+(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+"/basDualCrnpErr/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['modiTime\\$']:null
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['appeTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/basDualCrnpErrLog/basDualCrnpErrLog.js b/src/main/webapp/static/js/basDualCrnpErrLog/basDualCrnpErrLog.js
new file mode 100644
index 0000000..255c913
--- /dev/null
+++ b/src/main/webapp/static/js/basDualCrnpErrLog/basDualCrnpErrLog.js
@@ -0,0 +1,285 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basDualCrnpErrLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basDualCrnpErrLog/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: '缂栧彿'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'startTime$', align: 'center',title: '鍙戠敓鏃堕棿'}
+ ,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿'}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
+ ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
+ ,{field: 'staNo', align: 'center',title: '鐩爣绔�'}
+ ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯'}
+ ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
+ ,{field: 'error', align: 'center',title: '寮傚父'}
+ ,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵�佹暟鎹�'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basDualCrnpErrLog)', 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(basDualCrnpErrLog)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'basDualCrnpErrLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basDualCrnpErrLog/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(basDualCrnpErrLog)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basDualCrnpErrLog/"+(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+"/basDualCrnpErrLog/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#startTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['startTime\\$']:null
+ });
+ layDate.render({
+ elem: '#endTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['endTime\\$']:null
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/basDualCrnpOpt/basDualCrnpOpt.js b/src/main/webapp/static/js/basDualCrnpOpt/basDualCrnpOpt.js
new file mode 100644
index 0000000..d81383f
--- /dev/null
+++ b/src/main/webapp/static/js/basDualCrnpOpt/basDualCrnpOpt.js
@@ -0,0 +1,268 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basDualCrnpOpt',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basDualCrnpOpt/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: '缂栧彿'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ ,{field: 'sendTime$', align: 'center',title: '涓嬪彂鏃堕棿'}
+ ,{field: 'mode', align: 'center',title: '浣滀笟'}
+ ,{field: 'sourceLocNo', align: 'center',title: '璧风偣搴撲綅'}
+ ,{field: 'targetLocNo', align: 'center',title: '鐩爣搴撲綅'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'command', align: 'center',title: '鍛戒护'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
+ ,{field: 'send$', align: 'center',title: '涓嬪彂鐘舵��'}
+ ,{field: 'response', align: 'center',title: '璇锋眰鍝嶅簲'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basDualCrnpOpt)', 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(basDualCrnpOpt)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'basDualCrnpOpt': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basDualCrnpOpt/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(basDualCrnpOpt)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basDualCrnpOpt/"+(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+"/basDualCrnpOpt/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#sendTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['sendTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/basDualCrnp/basDualCrnp.html b/src/main/webapp/views/basDualCrnp/basDualCrnp.html
new file mode 100644
index 0000000..d4eee1f
--- /dev/null
+++ b/src/main/webapp/views/basDualCrnp/basDualCrnp.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basDualCrnp" lay-filter="basDualCrnp"></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/basDualCrnp/basDualCrnp.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="1">姝ｅ父</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍙叆(checkBox): </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="inEnable" placeholder="璇疯緭鍏ュ彲鍏�(checkBox)">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍙嚭(checkBox): </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="outEnable" placeholder="璇疯緭鍏ュ彲鍑�(checkBox)">
+ </div>
+ </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鍒涘缓浜哄憳: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ュ垱寤轰汉鍛�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鍒涘缓鏃堕棿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ュ垱寤烘椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">淇敼浜哄憳: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">淇敼鏃堕棿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎺у埗搴撲綅鎺掑彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="controlRows" placeholder="璇疯緭鍏ユ帶鍒跺簱浣嶆帓鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣卞簱浣嶆帓鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="deepRows" placeholder="璇疯緭鍏ユ繁搴撲綅鎺掑彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏ュ簱绔欑偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="inStationList" placeholder="璇疯緭鍏ュ叆搴撶珯鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑哄簱绔欑偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="outStationList" placeholder="璇疯緭鍏ュ嚭搴撶珯鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏈�澶у叆搴撲换鍔℃暟: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="maxInTask" placeholder="璇疯緭鍏ユ渶澶у叆搴撲换鍔℃暟">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏈�澶у嚭搴撲换鍔℃暟: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="maxOutTask" placeholder="璇疯緭鍏ユ渶澶у嚭搴撲换鍔℃暟">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/basDualCrnp/basDualCrnp_detail.html b/src/main/webapp/views/basDualCrnp/basDualCrnp_detail.html
new file mode 100644
index 0000000..578aadd
--- /dev/null
+++ b/src/main/webapp/views/basDualCrnp/basDualCrnp_detail.html
@@ -0,0 +1,148 @@
+<!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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="crnNo" class="layui-input" type="text" onkeyup="check(this.id, 'basDualCrnp')" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐘躲��銆�鎬侊細</label>
+ <div class="layui-input-inline">
+ <select id="status">
+ <option value="" style="display: none"></option>
+ <option value="1">姝ｅ父</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="wrkNo" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">鍙叆(checkBox)锛�</label>
+ <div class="layui-input-inline">
+ <input id="inEnable" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">鍙嚭(checkBox)锛�</label>
+ <div class="layui-input-inline">
+ <input id="outEnable" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍒涘缓浜哄憳锛�</label>
+ <div class="layui-input-inline">
+ <input id="createBy" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍒涘缓鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="createTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼浜哄憳锛�</label>
+ <div class="layui-input-inline">
+ <input id="updateBy" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="updateTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">澶囥��銆�娉細</label>
+ <div class="layui-input-inline">
+ <input id="memo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">鎺у埗搴撲綅鎺掑彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="controlRows" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">娣卞簱浣嶆帓鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="deepRows" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍏ュ簱绔欑偣锛�</label>
+ <div class="layui-input-inline">
+ <input id="inStationList" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍑哄簱绔欑偣锛�</label>
+ <div class="layui-input-inline">
+ <input id="outStationList" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">鏈�澶у叆搴撲换鍔℃暟锛�</label>
+ <div class="layui-input-inline">
+ <input id="maxInTask" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">鏈�澶у嚭搴撲换鍔℃暟锛�</label>
+ <div class="layui-input-inline">
+ <input id="maxOutTask" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>
+<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/basDualCrnp/basDualCrnp.js" charset="utf-8"></script>
+</html>
+
diff --git a/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr.html b/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr.html
new file mode 100644
index 0000000..d7e4cc5
--- /dev/null
+++ b/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basDualCrnpErr" lay-filter="basDualCrnpErr"></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/basDualCrnpErr/basDualCrnpErr.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮傚父鐮�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="errorCode" placeholder="璇疯緭鍏ュ紓甯哥爜">
+ </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>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr_detail.html b/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr_detail.html
new file mode 100644
index 0000000..d49f768
--- /dev/null
+++ b/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr_detail.html
@@ -0,0 +1,102 @@
+<!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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basDualCrnpErr')" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">寮� 甯� 鐮侊細</label>
+ <div class="layui-input-inline">
+ <input id="errorCode" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">寮傘��銆�甯革細</label>
+ <div class="layui-input-inline">
+ <input id="errName" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="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-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">娣诲姞浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="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-inline" style="width:31%;">
+ <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>
+<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/basDualCrnpErr/basDualCrnpErr.js" charset="utf-8"></script>
+</html>
+
diff --git a/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog.html b/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog.html
new file mode 100644
index 0000000..7392c29
--- /dev/null
+++ b/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog.html
@@ -0,0 +1,234 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basDualCrnpErrLog" lay-filter="basDualCrnpErrLog"></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/basDualCrnpErrLog/basDualCrnpErrLog.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍙戠敓鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startTime" id="startTime$" placeholder="璇疯緭鍏ュ彂鐢熸椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缁撴潫鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endTime" id="endTime$" 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="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�" style="display: none">
+ <input id="wrkSts$" name="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" 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 cool-auto-complete">
+ <input class="layui-input" name="ioType" placeholder="璇疯緭鍏ュ叆鍑哄簱绫诲瀷" style="display: none">
+ <input id="ioType$" name="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ叆鍑哄簱绫诲瀷" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍫嗗灈鏈哄彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="crnNo" placeholder="璇疯緭鍏ュ爢鍨涙満鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣搴撲綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="locNo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣绔�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ洰鏍囩珯">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceStaNo" placeholder="璇疯緭鍏ユ簮绔�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愬簱浣�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏉＄爜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮傚父鐮�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="errCode" placeholder="璇疯緭鍏ュ紓甯哥爜">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮傚父: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="error" placeholder="璇疯緭鍏ュ紓甯�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮傚父鎯呭喌: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨寮傚父鎯呭喌</option>
+ <option value="1">鏈鐞�</option>
+ <option value="2">宸蹭慨澶�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞浜哄憳: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
+ <input id="createBy$" name="createBy$" 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="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" 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="updateTime" id="updateTime$" 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="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="updateBy$" name="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" 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="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绯荤粺鐘舵�佹暟鎹�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="systemStatus" placeholder="璇疯緭鍏ョ郴缁熺姸鎬佹暟鎹�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog_detail.html b/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog_detail.html
new file mode 100644
index 0000000..58862d2
--- /dev/null
+++ b/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog_detail.html
@@ -0,0 +1,202 @@
+<!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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basDualCrnpErrLog')" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="wrkNo" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍙戠敓鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="startTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">缁撴潫鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="endTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸ヤ綔鐘舵�侊細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="wrkSts" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍏ュ嚭搴撶被鍨嬶細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="ioType" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="crnNo" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐩爣搴撲綅锛�</label>
+ <div class="layui-input-inline">
+ <input id="locNo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐩� 鏍� 绔欙細</label>
+ <div class="layui-input-inline">
+ <input id="staNo" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">婧愩��銆�绔欙細</label>
+ <div class="layui-input-inline">
+ <input id="sourceStaNo" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">婧� 搴� 浣嶏細</label>
+ <div class="layui-input-inline">
+ <input id="sourceLocNo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏉°��銆�鐮侊細</label>
+ <div class="layui-input-inline">
+ <input id="barcode" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">寮� 甯� 鐮侊細</label>
+ <div class="layui-input-inline">
+ <input id="errCode" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">寮傘��銆�甯革細</label>
+ <div class="layui-input-inline">
+ <input id="error" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">寮傚父鎯呭喌锛�</label>
+ <div class="layui-input-inline">
+ <select id="status">
+ <option value="" style="display: none"></option>
+ <option value="1">鏈鐞�</option>
+ <option value="2">宸蹭慨澶�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="createTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">娣诲姞浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="createBy" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="createBy$" 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="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="updateTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="updateBy" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">澶囥��銆�娉細</label>
+ <div class="layui-input-inline">
+ <input id="memo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">绯荤粺鐘舵�佹暟鎹細</label>
+ <div class="layui-input-inline">
+ <input id="systemStatus" class="layui-input" type="text">
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>
+<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/basDualCrnpErrLog/basDualCrnpErrLog.js" charset="utf-8"></script>
+</html>
+
diff --git a/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt.html b/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt.html
new file mode 100644
index 0000000..b26ca70
--- /dev/null
+++ b/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basDualCrnpOpt" lay-filter="basDualCrnpOpt"></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/basDualCrnpOpt/basDualCrnpOpt.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍫嗗灈鏈哄彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="crnNo" placeholder="璇疯緭鍏ュ爢鍨涙満鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓嬪彂鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sendTime" id="sendTime$" placeholder="璇疯緭鍏ヤ笅鍙戞椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浣滀笟: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="mode" placeholder="璇疯緭鍏ヤ綔涓�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璧风偣搴撲綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceLocNo" placeholder="璇疯緭鍏ヨ捣鐐瑰簱浣�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣搴撲綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="targetLocNo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼浜哄憳: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="updateBy$" name="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" 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="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍛戒护: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="command" placeholder="璇疯緭鍏ュ懡浠�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绯荤粺鐘舵��: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="systemStatus" placeholder="璇疯緭鍏ョ郴缁熺姸鎬�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓嬪彂鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="send">
+ <option value="">璇烽�夋嫨涓嬪彂鐘舵��</option>
+ <option value="0">鏈笅鍙�</option>
+ <option value="1">宸蹭笅鍙�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璇锋眰鍝嶅簲: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="response" placeholder="璇疯緭鍏ヨ姹傚搷搴�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt_detail.html b/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt_detail.html
new file mode 100644
index 0000000..cb5ee7a
--- /dev/null
+++ b/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt_detail.html
@@ -0,0 +1,142 @@
+<!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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basDualCrnpOpt')" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="wrkNo" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="crnNo" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">涓嬪彂鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="sendTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">浣溿��銆�涓氾細</label>
+ <div class="layui-input-inline">
+ <input id="mode" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">璧风偣搴撲綅锛�</label>
+ <div class="layui-input-inline">
+ <input id="sourceLocNo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐩爣搴撲綅锛�</label>
+ <div class="layui-input-inline">
+ <input id="targetLocNo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="updateTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="updateBy" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">澶囥��銆�娉細</label>
+ <div class="layui-input-inline">
+ <input id="memo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍛姐��銆�浠わ細</label>
+ <div class="layui-input-inline">
+ <input id="command" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">绯荤粺鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <input id="systemStatus" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">涓嬪彂鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select id="send">
+ <option value="" style="display: none"></option>
+ <option value="0">鏈笅鍙�</option>
+ <option value="1">宸蹭笅鍙�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">璇锋眰鍝嶅簲锛�</label>
+ <div class="layui-input-inline">
+ <input id="response" class="layui-input" type="text">
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>
+<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/basDualCrnpOpt/basDualCrnpOpt.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1