From 16e06d9830bb2c6a3a4ca24baec724e99d6614af Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 05 六月 2024 15:07:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinLogMapper.java | 12
src/main/webapp/views/wrkMastSplitTwinLog/wrkMastSplitTwinLog.html | 213 ++++++
src/main/java/wrkMastSplitTwin.sql | 18
src/main/resources/mapper/WrkMastSplitTwinMapper.xml | 29
src/main/java/com/zy/asrs/service/WrkMastSplitTwinService.java | 8
src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinLogServiceImpl.java | 12
src/main/java/com/zy/asrs/controller/WrkMastSplitTwinLogController.java | 125 +++
src/main/resources/mapper/WrkMastSplitTwinLogMapper.xml | 29
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/webapp/views/deviceOperate/jarOperate.html | 86 --
src/main/java/com/zy/asrs/entity/WrkMastSplitTwinLog.java | 276 ++++++++
src/main/webapp/static/js/wrkMastSplitTwin/wrkMastSplitTwin.js | 278 ++++++++
src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinMapper.java | 12
src/main/java/com/zy/asrs/controller/WrkMastSplitTwinController.java | 125 +++
src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java | 276 ++++++++
src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinServiceImpl.java | 12
src/main/webapp/static/js/wrkMastSplitTwinLog/wrkMastSplitTwinLog.js | 278 ++++++++
src/main/webapp/views/wrkMastSplitTwin/wrkMastSplitTwin.html | 213 ++++++
src/main/java/com/zy/asrs/service/WrkMastSplitTwinLogService.java | 8
src/main/java/wrkMastSplitTwinLog.sql | 18
20 files changed, 1,946 insertions(+), 84 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinController.java b/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinController.java
new file mode 100644
index 0000000..9cf236d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinController.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.WrkMastSplitTwin;
+import com.zy.asrs.service.WrkMastSplitTwinService;
+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 WrkMastSplitTwinController extends BaseController {
+
+ @Autowired
+ private WrkMastSplitTwinService wrkMastSplitTwinService;
+
+ @RequestMapping(value = "/wrkMastSplitTwin/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(wrkMastSplitTwinService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwin/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<WrkMastSplitTwin> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(WrkMastSplitTwin.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(wrkMastSplitTwinService.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 = "/wrkMastSplitTwin/add/auth")
+ @ManagerAuth
+ public R add(WrkMastSplitTwin wrkMastSplitTwin) {
+ wrkMastSplitTwinService.insert(wrkMastSplitTwin);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwin/update/auth")
+ @ManagerAuth
+ public R update(WrkMastSplitTwin wrkMastSplitTwin){
+ if (Cools.isEmpty(wrkMastSplitTwin) || null==wrkMastSplitTwin.getId()){
+ return R.error();
+ }
+ wrkMastSplitTwinService.updateById(wrkMastSplitTwin);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwin/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ wrkMastSplitTwinService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwin/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<WrkMastSplitTwin> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastSplitTwin"));
+ convert(map, wrapper);
+ List<WrkMastSplitTwin> list = wrkMastSplitTwinService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwinQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WrkMastSplitTwin> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WrkMastSplitTwin> page = wrkMastSplitTwinService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WrkMastSplitTwin wrkMastSplitTwin : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkMastSplitTwin.getId());
+ map.put("value", wrkMastSplitTwin.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwin/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WrkMastSplitTwin> wrapper = new EntityWrapper<WrkMastSplitTwin>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkMastSplitTwinService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(WrkMastSplitTwin.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinLogController.java
new file mode 100644
index 0000000..9db2f10
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinLogController.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.WrkMastSplitTwinLog;
+import com.zy.asrs.service.WrkMastSplitTwinLogService;
+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 WrkMastSplitTwinLogController extends BaseController {
+
+ @Autowired
+ private WrkMastSplitTwinLogService wrkMastSplitTwinLogService;
+
+ @RequestMapping(value = "/wrkMastSplitTwinLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(wrkMastSplitTwinLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwinLog/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<WrkMastSplitTwinLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(WrkMastSplitTwinLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(wrkMastSplitTwinLogService.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 = "/wrkMastSplitTwinLog/add/auth")
+ @ManagerAuth
+ public R add(WrkMastSplitTwinLog wrkMastSplitTwinLog) {
+ wrkMastSplitTwinLogService.insert(wrkMastSplitTwinLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwinLog/update/auth")
+ @ManagerAuth
+ public R update(WrkMastSplitTwinLog wrkMastSplitTwinLog){
+ if (Cools.isEmpty(wrkMastSplitTwinLog) || null==wrkMastSplitTwinLog.getId()){
+ return R.error();
+ }
+ wrkMastSplitTwinLogService.updateById(wrkMastSplitTwinLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwinLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ wrkMastSplitTwinLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwinLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<WrkMastSplitTwinLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastSplitTwinLog"));
+ convert(map, wrapper);
+ List<WrkMastSplitTwinLog> list = wrkMastSplitTwinLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwinLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WrkMastSplitTwinLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WrkMastSplitTwinLog> page = wrkMastSplitTwinLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WrkMastSplitTwinLog wrkMastSplitTwinLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkMastSplitTwinLog.getId());
+ map.put("value", wrkMastSplitTwinLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/wrkMastSplitTwinLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WrkMastSplitTwinLog> wrapper = new EntityWrapper<WrkMastSplitTwinLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkMastSplitTwinLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(WrkMastSplitTwinLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java b/src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java
new file mode 100644
index 0000000..ec0a4d7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java
@@ -0,0 +1,276 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_wrk_mast_split_twin")
+public class WrkMastSplitTwin implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("wrk_no")
+ private Long wrkNo;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 宸ヤ綅
+ */
+ @ApiModelProperty(value= "宸ヤ綅")
+ private Integer type;
+
+ /**
+ * 宸ヤ綔鐘舵�� 0: 鍒濆 1: 绛夊緟鍙栬揣瀹屾垚 2: 鍙栬揣瀹屾垚寰呬綔涓� 3: 绛夊緟鏀捐揣瀹屾垚 4: 瀹屾垚
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0: 鍒濆 1: 绛夊緟鍙栬揣瀹屾垚 2: 鍙栬揣瀹屾垚寰呬綔涓� 3: 绛夊緟鏀捐揣瀹屾垚 4: 瀹屾垚 ")
+ @TableField("wrk_sts")
+ private Integer wrkSts;
+
+ /**
+ * 琛屽彿
+ */
+ @ApiModelProperty(value= "琛屽彿")
+ @TableField("line_number")
+ private Integer lineNumber;
+
+ /**
+ * 宸ヤ綔绫诲瀷 0: 鏈煡 1: 鍙� 2: 鏀� 3: 鍙栨斁 4: 瀹屾垚
+ */
+ @ApiModelProperty(value= "宸ヤ綔绫诲瀷 0: 鏈煡 1: 鍙� 2: 鏀� 3: 鍙栨斁 4: 瀹屾垚 ")
+ @TableField("wrk_type")
+ private Integer wrkType;
+
+ /**
+ * 鏍囪鏃堕棿
+ */
+ @ApiModelProperty(value= "鏍囪鏃堕棿")
+ @TableField("bign_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date bignTime;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ /**
+ * 璧风偣
+ */
+ @ApiModelProperty(value= "璧风偣")
+ @TableField("wrk_start")
+ private String wrkStart;
+
+ /**
+ * 缁堢偣
+ */
+ @ApiModelProperty(value= "缁堢偣")
+ @TableField("wrk_end")
+ private String wrkEnd;
+
+ /**
+ * 璧风偣鎺�
+ */
+ @ApiModelProperty(value= "璧风偣鎺�")
+ @TableField("start_row")
+ private Integer startRow;
+
+ /**
+ * 璧风偣鍒�
+ */
+ @ApiModelProperty(value= "璧风偣鍒�")
+ @TableField("start_bay")
+ private Integer startBay;
+
+ /**
+ * 璧风偣灞�
+ */
+ @ApiModelProperty(value= "璧风偣灞�")
+ @TableField("start_lev")
+ private Integer startLev;
+
+ /**
+ * 缁堢偣鎺�
+ */
+ @ApiModelProperty(value= "缁堢偣鎺�")
+ @TableField("end_row")
+ private Integer endRow;
+
+ /**
+ * 缁堢偣鍒�
+ */
+ @ApiModelProperty(value= "缁堢偣鍒�")
+ @TableField("end_bay")
+ private Integer endBay;
+
+ /**
+ * 缁堢偣灞�
+ */
+ @ApiModelProperty(value= "缁堢偣灞�")
+ @TableField("end_lev")
+ private Integer endLev;
+
+ /**
+ * 浠诲姟绫诲瀷 0: 鏈煡 1: 鍏ュ簱 2: 鍑哄簱
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 鍏ュ簱 2: 鍑哄簱 ")
+ @TableField("io_type")
+ private Integer ioType;
+
+ public WrkMastSplitTwin() {}
+
+ public WrkMastSplitTwin(Long wrkNo,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer crnNo,String wrkStart,String wrkEnd,Integer startRow,Integer startBay,Integer startLev,Integer endRow,Integer endBay,Integer endLev,Integer ioType) {
+ this.wrkNo = wrkNo;
+ this.createTime = createTime;
+ this.updateTime = updateTime;
+ this.type = type;
+ this.wrkSts = wrkSts;
+ this.lineNumber = lineNumber;
+ this.wrkType = wrkType;
+ this.bignTime = bignTime;
+ this.crnNo = crnNo;
+ this.wrkStart = wrkStart;
+ this.wrkEnd = wrkEnd;
+ this.startRow = startRow;
+ this.startBay = startBay;
+ this.startLev = startLev;
+ this.endRow = endRow;
+ this.endBay = endBay;
+ this.endLev = endLev;
+ this.ioType = ioType;
+ }
+
+// WrkMastSplitTwin wrkMastSplitTwin = new WrkMastSplitTwin(
+// null, // 宸ヤ綔鍙穂闈炵┖]
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼鏃堕棿
+// null, // 宸ヤ綅[闈炵┖]
+// null, // 宸ヤ綔鐘舵�乕闈炵┖]
+// null, // 琛屽彿[闈炵┖]
+// null, // 宸ヤ綔绫诲瀷[闈炵┖]
+// null, // 鏍囪鏃堕棿
+// null, // 鍫嗗灈鏈哄彿[闈炵┖]
+// null, // 璧风偣[闈炵┖]
+// null, // 缁堢偣[闈炵┖]
+// null, // 璧风偣鎺抂闈炵┖]
+// null, // 璧风偣鍒梉闈炵┖]
+// null, // 璧风偣灞俒闈炵┖]
+// null, // 缁堢偣鎺抂闈炵┖]
+// null, // 缁堢偣鍒梉闈炵┖]
+// null, // 缁堢偣灞俒闈炵┖]
+// null // 浠诲姟绫诲瀷[闈炵┖]
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getWrkSts$(){
+ if (null == this.wrkSts){ return null; }
+ switch (this.wrkSts){
+ case 0:
+ return "鍒濆";
+ case 1:
+ return "绛夊緟鍙栬揣瀹屾垚";
+ case 2:
+ return "鍙栬揣瀹屾垚寰呬綔涓�";
+ case 3:
+ return "绛夊緟鏀捐揣瀹屾垚";
+ case 4:
+ return "瀹屾垚";
+ default:
+ return String.valueOf(this.wrkSts);
+ }
+ }
+
+ public String getWrkType$(){
+ if (null == this.wrkType){ return null; }
+ switch (this.wrkType){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "鍙�";
+ case 2:
+ return "鏀�";
+ case 3:
+ return "鍙栨斁";
+ case 4:
+ return "瀹屾垚";
+ default:
+ return String.valueOf(this.wrkType);
+ }
+ }
+
+ public String getBignTime$(){
+ if (Cools.isEmpty(this.bignTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
+ }
+
+ public String getIoType$(){
+ if (null == this.ioType){ return null; }
+ switch (this.ioType){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "鍏ュ簱";
+ case 2:
+ return "鍑哄簱";
+ default:
+ return String.valueOf(this.ioType);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSplitTwinLog.java b/src/main/java/com/zy/asrs/entity/WrkMastSplitTwinLog.java
new file mode 100644
index 0000000..6b5545b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSplitTwinLog.java
@@ -0,0 +1,276 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_wrk_mast_split_twin_log")
+public class WrkMastSplitTwinLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("wrk_no")
+ private Long wrkNo;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 宸ヤ綅
+ */
+ @ApiModelProperty(value= "宸ヤ綅")
+ private Integer type;
+
+ /**
+ * 宸ヤ綔鐘舵�� 0: 鍒濆 1: 绛夊緟鍙栬揣瀹屾垚 2: 鍙栬揣瀹屾垚寰呬綔涓� 3: 绛夊緟鏀捐揣瀹屾垚 4: 瀹屾垚
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0: 鍒濆 1: 绛夊緟鍙栬揣瀹屾垚 2: 鍙栬揣瀹屾垚寰呬綔涓� 3: 绛夊緟鏀捐揣瀹屾垚 4: 瀹屾垚 ")
+ @TableField("wrk_sts")
+ private Integer wrkSts;
+
+ /**
+ * 琛屽彿
+ */
+ @ApiModelProperty(value= "琛屽彿")
+ @TableField("line_number")
+ private Integer lineNumber;
+
+ /**
+ * 宸ヤ綔绫诲瀷 0: 鏈煡 1: 鍙� 2: 鏀� 3: 鍙栨斁 4: 瀹屾垚
+ */
+ @ApiModelProperty(value= "宸ヤ綔绫诲瀷 0: 鏈煡 1: 鍙� 2: 鏀� 3: 鍙栨斁 4: 瀹屾垚 ")
+ @TableField("wrk_type")
+ private Integer wrkType;
+
+ /**
+ * 鏍囪鏃堕棿
+ */
+ @ApiModelProperty(value= "鏍囪鏃堕棿")
+ @TableField("bign_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date bignTime;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ /**
+ * 璧风偣
+ */
+ @ApiModelProperty(value= "璧风偣")
+ @TableField("wrk_start")
+ private String wrkStart;
+
+ /**
+ * 缁堢偣
+ */
+ @ApiModelProperty(value= "缁堢偣")
+ @TableField("wrk_end")
+ private String wrkEnd;
+
+ /**
+ * 璧风偣鎺�
+ */
+ @ApiModelProperty(value= "璧风偣鎺�")
+ @TableField("start_row")
+ private Integer startRow;
+
+ /**
+ * 璧风偣鍒�
+ */
+ @ApiModelProperty(value= "璧风偣鍒�")
+ @TableField("start_bay")
+ private Integer startBay;
+
+ /**
+ * 璧风偣灞�
+ */
+ @ApiModelProperty(value= "璧风偣灞�")
+ @TableField("start_lev")
+ private Integer startLev;
+
+ /**
+ * 缁堢偣鎺�
+ */
+ @ApiModelProperty(value= "缁堢偣鎺�")
+ @TableField("end_row")
+ private Integer endRow;
+
+ /**
+ * 缁堢偣鍒�
+ */
+ @ApiModelProperty(value= "缁堢偣鍒�")
+ @TableField("end_bay")
+ private Integer endBay;
+
+ /**
+ * 缁堢偣灞�
+ */
+ @ApiModelProperty(value= "缁堢偣灞�")
+ @TableField("end_lev")
+ private Integer endLev;
+
+ /**
+ * 浠诲姟绫诲瀷 0: 鏈煡 1: 鍏ュ簱 2: 鍑哄簱
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 鍏ュ簱 2: 鍑哄簱 ")
+ @TableField("io_type")
+ private Integer ioType;
+
+ public WrkMastSplitTwinLog() {}
+
+ public WrkMastSplitTwinLog(Long wrkNo,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer crnNo,String wrkStart,String wrkEnd,Integer startRow,Integer startBay,Integer startLev,Integer endRow,Integer endBay,Integer endLev,Integer ioType) {
+ this.wrkNo = wrkNo;
+ this.createTime = createTime;
+ this.updateTime = updateTime;
+ this.type = type;
+ this.wrkSts = wrkSts;
+ this.lineNumber = lineNumber;
+ this.wrkType = wrkType;
+ this.bignTime = bignTime;
+ this.crnNo = crnNo;
+ this.wrkStart = wrkStart;
+ this.wrkEnd = wrkEnd;
+ this.startRow = startRow;
+ this.startBay = startBay;
+ this.startLev = startLev;
+ this.endRow = endRow;
+ this.endBay = endBay;
+ this.endLev = endLev;
+ this.ioType = ioType;
+ }
+
+// WrkMastSplitTwinLog wrkMastSplitTwinLog = new WrkMastSplitTwinLog(
+// null, // 宸ヤ綔鍙穂闈炵┖]
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼鏃堕棿
+// null, // 宸ヤ綅[闈炵┖]
+// null, // 宸ヤ綔鐘舵�乕闈炵┖]
+// null, // 琛屽彿[闈炵┖]
+// null, // 宸ヤ綔绫诲瀷[闈炵┖]
+// null, // 鏍囪鏃堕棿
+// null, // 鍫嗗灈鏈哄彿[闈炵┖]
+// null, // 璧风偣[闈炵┖]
+// null, // 缁堢偣[闈炵┖]
+// null, // 璧风偣鎺抂闈炵┖]
+// null, // 璧风偣鍒梉闈炵┖]
+// null, // 璧风偣灞俒闈炵┖]
+// null, // 缁堢偣鎺抂闈炵┖]
+// null, // 缁堢偣鍒梉闈炵┖]
+// null, // 缁堢偣灞俒闈炵┖]
+// null // 浠诲姟绫诲瀷[闈炵┖]
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getWrkSts$(){
+ if (null == this.wrkSts){ return null; }
+ switch (this.wrkSts){
+ case 0:
+ return "鍒濆";
+ case 1:
+ return "绛夊緟鍙栬揣瀹屾垚";
+ case 2:
+ return "鍙栬揣瀹屾垚寰呬綔涓�";
+ case 3:
+ return "绛夊緟鏀捐揣瀹屾垚";
+ case 4:
+ return "瀹屾垚";
+ default:
+ return String.valueOf(this.wrkSts);
+ }
+ }
+
+ public String getWrkType$(){
+ if (null == this.wrkType){ return null; }
+ switch (this.wrkType){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "鍙�";
+ case 2:
+ return "鏀�";
+ case 3:
+ return "鍙栨斁";
+ case 4:
+ return "瀹屾垚";
+ default:
+ return String.valueOf(this.wrkType);
+ }
+ }
+
+ public String getBignTime$(){
+ if (Cools.isEmpty(this.bignTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
+ }
+
+ public String getIoType$(){
+ if (null == this.ioType){ return null; }
+ switch (this.ioType){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "鍏ュ簱";
+ case 2:
+ return "鍑哄簱";
+ default:
+ return String.valueOf(this.ioType);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinLogMapper.java
new file mode 100644
index 0000000..c13704a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.WrkMastSplitTwinLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WrkMastSplitTwinLogMapper extends BaseMapper<WrkMastSplitTwinLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinMapper.java
new file mode 100644
index 0000000..2b7cfc5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastSplitTwinMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.WrkMastSplitTwin;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WrkMastSplitTwinMapper extends BaseMapper<WrkMastSplitTwin> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastSplitTwinLogService.java b/src/main/java/com/zy/asrs/service/WrkMastSplitTwinLogService.java
new file mode 100644
index 0000000..98ff7c3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastSplitTwinLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.WrkMastSplitTwinLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WrkMastSplitTwinLogService extends IService<WrkMastSplitTwinLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastSplitTwinService.java b/src/main/java/com/zy/asrs/service/WrkMastSplitTwinService.java
new file mode 100644
index 0000000..7f1d735
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastSplitTwinService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.WrkMastSplitTwin;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WrkMastSplitTwinService extends IService<WrkMastSplitTwin> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinLogServiceImpl.java
new file mode 100644
index 0000000..dbc488d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.WrkMastSplitTwinLogMapper;
+import com.zy.asrs.entity.WrkMastSplitTwinLog;
+import com.zy.asrs.service.WrkMastSplitTwinLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("wrkMastSplitTwinLogService")
+public class WrkMastSplitTwinLogServiceImpl extends ServiceImpl<WrkMastSplitTwinLogMapper, WrkMastSplitTwinLog> implements WrkMastSplitTwinLogService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinServiceImpl.java
new file mode 100644
index 0000000..f0b7c4d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastSplitTwinServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.WrkMastSplitTwinMapper;
+import com.zy.asrs.entity.WrkMastSplitTwin;
+import com.zy.asrs.service.WrkMastSplitTwinService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("wrkMastSplitTwinService")
+public class WrkMastSplitTwinServiceImpl extends ServiceImpl<WrkMastSplitTwinMapper, WrkMastSplitTwin> implements WrkMastSplitTwinService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 86bd0de..09e6dd3 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
generator.url="192.168.4.15:1433;databasename=ahyxasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_bas_jar";
+ generator.table="asr_wrk_mast_split_twin_log";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/wrkMastSplitTwin.sql b/src/main/java/wrkMastSplitTwin.sql
new file mode 100644
index 0000000..8338b44
--- /dev/null
+++ b/src/main/java/wrkMastSplitTwin.sql
@@ -0,0 +1,18 @@
+-- save wrkMastSplitTwin record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwin/wrkMastSplitTwin.html', 'wrkMastSplitTwin绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwin#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwin#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwin#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwin#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwin#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwin/wrkMastSplitTwin.html', N'wrkMastSplitTwin绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwin#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwin#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwin#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwin#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwin#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/wrkMastSplitTwinLog.sql b/src/main/java/wrkMastSplitTwinLog.sql
new file mode 100644
index 0000000..574c97a
--- /dev/null
+++ b/src/main/java/wrkMastSplitTwinLog.sql
@@ -0,0 +1,18 @@
+-- save wrkMastSplitTwinLog record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwinLog/wrkMastSplitTwinLog.html', 'wrkMastSplitTwinLog绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwinLog#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwinLog#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwinLog#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwinLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSplitTwinLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwinLog/wrkMastSplitTwinLog.html', N'wrkMastSplitTwinLog绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwinLog#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwinLog#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwinLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwinLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSplitTwinLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/mapper/WrkMastSplitTwinLogMapper.xml b/src/main/resources/mapper/WrkMastSplitTwinLogMapper.xml
new file mode 100644
index 0000000..754102f
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastSplitTwinLogMapper.xml
@@ -0,0 +1,29 @@
+<?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.WrkMastSplitTwinLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastSplitTwinLog">
+ <id column="id" property="id" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="type" property="type" />
+ <result column="wrk_sts" property="wrkSts" />
+ <result column="line_number" property="lineNumber" />
+ <result column="wrk_type" property="wrkType" />
+ <result column="bign_time" property="bignTime" />
+ <result column="crn_no" property="crnNo" />
+ <result column="wrk_start" property="wrkStart" />
+ <result column="wrk_end" property="wrkEnd" />
+ <result column="start_row" property="startRow" />
+ <result column="start_bay" property="startBay" />
+ <result column="start_lev" property="startLev" />
+ <result column="end_row" property="endRow" />
+ <result column="end_bay" property="endBay" />
+ <result column="end_lev" property="endLev" />
+ <result column="io_type" property="ioType" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/WrkMastSplitTwinMapper.xml b/src/main/resources/mapper/WrkMastSplitTwinMapper.xml
new file mode 100644
index 0000000..f409abe
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastSplitTwinMapper.xml
@@ -0,0 +1,29 @@
+<?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.WrkMastSplitTwinMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastSplitTwin">
+ <id column="id" property="id" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="type" property="type" />
+ <result column="wrk_sts" property="wrkSts" />
+ <result column="line_number" property="lineNumber" />
+ <result column="wrk_type" property="wrkType" />
+ <result column="bign_time" property="bignTime" />
+ <result column="crn_no" property="crnNo" />
+ <result column="wrk_start" property="wrkStart" />
+ <result column="wrk_end" property="wrkEnd" />
+ <result column="start_row" property="startRow" />
+ <result column="start_bay" property="startBay" />
+ <result column="start_lev" property="startLev" />
+ <result column="end_row" property="endRow" />
+ <result column="end_bay" property="endBay" />
+ <result column="end_lev" property="endLev" />
+ <result column="io_type" property="ioType" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/wrkMastSplitTwin/wrkMastSplitTwin.js b/src/main/webapp/static/js/wrkMastSplitTwin/wrkMastSplitTwin.js
new file mode 100644
index 0000000..3f640ed
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastSplitTwin/wrkMastSplitTwin.js
@@ -0,0 +1,278 @@
+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: '#wrkMastSplitTwin',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/wrkMastSplitTwin/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'type', align: 'center',title: '宸ヤ綅'}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'lineNumber', align: 'center',title: '琛屽彿'}
+ ,{field: 'wrkType$', align: 'center',title: '宸ヤ綔绫诲瀷'}
+ ,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿'}
+ ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ ,{field: 'wrkStart', align: 'center',title: '璧风偣'}
+ ,{field: 'wrkEnd', align: 'center',title: '缁堢偣'}
+ ,{field: 'startRow', align: 'center',title: '璧风偣鎺�'}
+ ,{field: 'startBay', align: 'center',title: '璧风偣鍒�'}
+ ,{field: 'startLev', align: 'center',title: '璧风偣灞�'}
+ ,{field: 'endRow', align: 'center',title: '缁堢偣鎺�'}
+ ,{field: 'endBay', align: 'center',title: '缁堢偣鍒�'}
+ ,{field: 'endLev', align: 'center',title: '缁堢偣灞�'}
+ ,{field: 'ioType$', 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(wrkMastSplitTwin)', 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(wrkMastSplitTwin)', 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 = {
+ 'wrkMastSplitTwin': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/wrkMastSplitTwin/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(wrkMastSplitTwin)', 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+"/wrkMastSplitTwin/"+(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+"/wrkMastSplitTwin/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+ layDate.render({
+ elem: '#bignTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['bignTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/wrkMastSplitTwinLog/wrkMastSplitTwinLog.js b/src/main/webapp/static/js/wrkMastSplitTwinLog/wrkMastSplitTwinLog.js
new file mode 100644
index 0000000..1e7a3d6
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastSplitTwinLog/wrkMastSplitTwinLog.js
@@ -0,0 +1,278 @@
+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: '#wrkMastSplitTwinLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/wrkMastSplitTwinLog/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'type', align: 'center',title: '宸ヤ綅'}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'lineNumber', align: 'center',title: '琛屽彿'}
+ ,{field: 'wrkType$', align: 'center',title: '宸ヤ綔绫诲瀷'}
+ ,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿'}
+ ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ ,{field: 'wrkStart', align: 'center',title: '璧风偣'}
+ ,{field: 'wrkEnd', align: 'center',title: '缁堢偣'}
+ ,{field: 'startRow', align: 'center',title: '璧风偣鎺�'}
+ ,{field: 'startBay', align: 'center',title: '璧风偣鍒�'}
+ ,{field: 'startLev', align: 'center',title: '璧风偣灞�'}
+ ,{field: 'endRow', align: 'center',title: '缁堢偣鎺�'}
+ ,{field: 'endBay', align: 'center',title: '缁堢偣鍒�'}
+ ,{field: 'endLev', align: 'center',title: '缁堢偣灞�'}
+ ,{field: 'ioType$', 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(wrkMastSplitTwinLog)', 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(wrkMastSplitTwinLog)', 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 = {
+ 'wrkMastSplitTwinLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/wrkMastSplitTwinLog/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(wrkMastSplitTwinLog)', 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+"/wrkMastSplitTwinLog/"+(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+"/wrkMastSplitTwinLog/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+ layDate.render({
+ elem: '#bignTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['bignTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index 60d1fa0..c56105b 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -18,8 +18,8 @@
max-height="350" style="width: 100%">
<el-table-column property="jarNo" label="纭寲缃�">
</el-table-column>
- <el-table-column property="workNo" label="宸ヤ綔鍙�">
- </el-table-column>
+<!-- <el-table-column property="workNo" label="宸ヤ綔鍙�">-->
+<!-- </el-table-column>-->
<el-table-column property="jarStatus" label="鐘舵��">
</el-table-column>
<el-table-column property="jarMode" label="妯″紡">
@@ -37,89 +37,9 @@
<div style="width: 55%;margin-right: 10px;">
<el-card class="box-card">
<div slot="header" class="clearfix">
- <span>璁惧璋冭瘯</span>
+ <span>纭寲搴撲綅</span>
</div>
- <div>
- <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline" v-if="rgvMode !== 2 && rgvMode !== 1 ">
-<!-- <el-form-item label="婧愮珯/婧愬簱浣�">-->
-<!-- <el-input v-model="formParam.sourceStaNo" placeholder="婧愮珯/婧愬簱浣�"></el-input>-->
-<!-- </el-form-item>-->
- <el-form-item label="璧峰绔�">
- <el-input v-model="formParam.sourceRow" placeholder="璧峰绔�"></el-input>
- </el-form-item>
- <el-form-item label="鐩爣绔�">
- <el-input v-model="formParam.sourceBay" placeholder="鐩爣绔�"></el-input>
- </el-form-item>
- <el-form-item label="鍚姩">
- <el-button @click="initiate" type="warning">鎵ц浠诲姟</el-button>
- </el-form-item>
- </el-form>
- <div v-if="rgvMode === 2 ">
- <el-form :model="formParamD" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="璧峰绔�">
- <el-input v-model="formParamD.sourceRow" placeholder="璧峰绔�"></el-input>
- </el-form-item>
- <el-form-item label="鐩爣绔�">
- <el-input v-model="formParamD.sourceBay" placeholder="鐩爣绔�"></el-input>
- </el-form-item>
- <el-form-item label="鍚姩">
- <el-button @click="initiateD(1)" type="warning">鍙栬揣</el-button>
- <el-button @click="initiateD(2)" type="warning">鏀捐揣</el-button>
- <el-button @click="initiateD(3)" type="warning">XY绉诲姩</el-button>
- </el-form-item>
- </el-form>
- </div>
- <div v-if="demo === 'N' ">
- <el-button v-if="rgvMode === 0 " type="danger">鏈煡</el-button>
- <el-button v-if="rgvMode === -1 " type="danger">鏈煡</el-button>
- <el-button v-if="rgvMode === 3 " type="primary">鑱旀満</el-button>
- <el-button v-if="rgvMode === 2 " type="primary">鍗曟満</el-button>
- <el-button v-if="rgvMode === 1 " type="warning">鎵嬪姩</el-button>
- </div>
- <div v-if="rgvMode !== 0 ">
- <div style="margin: 10px auto 10px auto">
- <el-button v-if="demo === 'N' " @click="demos('true')" type="info">婕旂ず</el-button>
- <el-button v-if="demo === 'Y' " @click="demos('false')" type="info">鍙栨秷婕旂ず</el-button>
- </div>
- <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
- <el-button v-if="rgvMode !== 3 " @click="rgvStatus(15)" type="primary">鑱旀満</el-button>
- <el-button v-if="rgvMode !== 2 " @click="rgvStatus(14)" type="primary">鍗曟満</el-button>
- <el-button v-if="rgvMode !== 1 " @click="rgvStatus(12)" type="warning">鎵嬪姩</el-button>
- </div>
- <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
- <el-button @click="rgvStatus(8)" type="primary">鍚姩</el-button>
- <el-button @click="rgvStatus(9)" type="primary">鍋滄</el-button>
- <el-button @click="rgvStatus(11)" type="primary">澶嶄綅鎸夐挳</el-button>
- </div>
- <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
- <el-button @click="rgvStatus(7)" type="warning">鎶ヨ娑堥煶</el-button>
- <el-button v-if="rgvMode === 1 " @click="rgvStatus(13)" type="warning">鎵嬪姩瀹氫綅</el-button>
- </div>
- <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
- <el-button :style="" @click="rgvStatus(5)" type="danger">寮哄埗鍚姩</el-button>
- <el-button @click="rgvStatus(10)" type="danger">鎬ュ仠</el-button>
- <el-button @click="rgvStatus(16)" type="danger">璐у弶瀹氫綅鍥炰腑</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(2,1)" type="warning">杈撻��-缃崲1</el-button>
- <el-button @click="staTova(2,3)" type="warning">杈撻��-缃崲2</el-button>
- <el-button @click="staTova(2,5)" type="warning">杈撻��-缃崲3</el-button>
- <el-button @click="staTova(2,7)" type="warning">杈撻��-缃崲4</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(2,4)" type="warning">杈撻��-鐏岃1</el-button>
- <el-button @click="staTova(2,6)" type="warning">杈撻��-鐏岃2</el-button>
- <el-button @click="staTova(2,8)" type="warning">杈撻��-鐏岃3</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(1,10)" type="warning">缃崲1-鏀捐揣</el-button>
- <el-button @click="staTova(2,10)" type="warning">缃崲2-鏀捐揣</el-button>
- <el-button @click="staTova(3,10)" type="warning">缃崲3-鏀捐揣</el-button>
- <el-button @click="staTova(4,10)" type="warning">缃崲4-鏀捐揣</el-button>
- </div>
- </div>
- </div>
</el-card>
</div>
<div style="width: 45%;">
diff --git a/src/main/webapp/views/wrkMastSplitTwin/wrkMastSplitTwin.html b/src/main/webapp/views/wrkMastSplitTwin/wrkMastSplitTwin.html
new file mode 100644
index 0000000..e432dc6
--- /dev/null
+++ b/src/main/webapp/views/wrkMastSplitTwin/wrkMastSplitTwin.html
@@ -0,0 +1,213 @@
+<!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="wrkMastSplitTwin" lay-filter="wrkMastSplitTwin"></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/wrkMastSplitTwin/wrkMastSplitTwin.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ュ伐浣�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="wrkSts" lay-vertype="tips" lay-verify="required">
+ <option value="">璇烽�夋嫨宸ヤ綔鐘舵��</option>
+ <option value="0">鍒濆</option>
+ <option value="1">绛夊緟鍙栬揣瀹屾垚</option>
+ <option value="2">鍙栬揣瀹屾垚寰呬綔涓�</option>
+ <option value="3">绛夊緟鏀捐揣瀹屾垚</option>
+ <option value="4">瀹屾垚</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">琛屽彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏ヨ鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="wrkType" lay-vertype="tips" lay-verify="required">
+ <option value="">璇烽�夋嫨宸ヤ綔绫诲瀷</option>
+ <option value="0">鏈煡</option>
+ <option value="1">鍙�</option>
+ <option value="2">鏀�</option>
+ <option value="3">鍙栨斁</option>
+ <option value="4">瀹屾垚</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="bignTime" id="bignTime$" placeholder="璇疯緭鍏ユ爣璁版椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍫嗗灈鏈哄彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="crnNo" placeholder="璇疯緭鍏ュ爢鍨涙満鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璧风偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkStart" placeholder="璇疯緭鍏ヨ捣鐐�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁堢偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkEnd" placeholder="璇疯緭鍏ョ粓鐐�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璧风偣鎺�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startRow" placeholder="璇疯緭鍏ヨ捣鐐规帓" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璧风偣鍒�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startBay" placeholder="璇疯緭鍏ヨ捣鐐瑰垪" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璧风偣灞�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startLev" placeholder="璇疯緭鍏ヨ捣鐐瑰眰" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁堢偣鎺�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endRow" placeholder="璇疯緭鍏ョ粓鐐规帓" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁堢偣鍒�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endBay" placeholder="璇疯緭鍏ョ粓鐐瑰垪" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁堢偣灞�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endLev" placeholder="璇疯緭鍏ョ粓鐐瑰眰" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">浠诲姟绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="ioType" lay-vertype="tips" lay-verify="required">
+ <option value="">璇烽�夋嫨浠诲姟绫诲瀷</option>
+ <option value="0">鏈煡</option>
+ <option value="1">鍏ュ簱</option>
+ <option value="2">鍑哄簱</option>
+ </select>
+ </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/wrkMastSplitTwinLog/wrkMastSplitTwinLog.html b/src/main/webapp/views/wrkMastSplitTwinLog/wrkMastSplitTwinLog.html
new file mode 100644
index 0000000..f539abf
--- /dev/null
+++ b/src/main/webapp/views/wrkMastSplitTwinLog/wrkMastSplitTwinLog.html
@@ -0,0 +1,213 @@
+<!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="wrkMastSplitTwinLog" lay-filter="wrkMastSplitTwinLog"></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/wrkMastSplitTwinLog/wrkMastSplitTwinLog.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ュ伐浣�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="wrkSts" lay-vertype="tips" lay-verify="required">
+ <option value="">璇烽�夋嫨宸ヤ綔鐘舵��</option>
+ <option value="0">鍒濆</option>
+ <option value="1">绛夊緟鍙栬揣瀹屾垚</option>
+ <option value="2">鍙栬揣瀹屾垚寰呬綔涓�</option>
+ <option value="3">绛夊緟鏀捐揣瀹屾垚</option>
+ <option value="4">瀹屾垚</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">琛屽彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏ヨ鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="wrkType" lay-vertype="tips" lay-verify="required">
+ <option value="">璇烽�夋嫨宸ヤ綔绫诲瀷</option>
+ <option value="0">鏈煡</option>
+ <option value="1">鍙�</option>
+ <option value="2">鏀�</option>
+ <option value="3">鍙栨斁</option>
+ <option value="4">瀹屾垚</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="bignTime" id="bignTime$" placeholder="璇疯緭鍏ユ爣璁版椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍫嗗灈鏈哄彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="crnNo" placeholder="璇疯緭鍏ュ爢鍨涙満鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璧风偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkStart" placeholder="璇疯緭鍏ヨ捣鐐�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁堢偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkEnd" placeholder="璇疯緭鍏ョ粓鐐�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璧风偣鎺�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startRow" placeholder="璇疯緭鍏ヨ捣鐐规帓" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璧风偣鍒�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startBay" placeholder="璇疯緭鍏ヨ捣鐐瑰垪" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璧风偣灞�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startLev" placeholder="璇疯緭鍏ヨ捣鐐瑰眰" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁堢偣鎺�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endRow" placeholder="璇疯緭鍏ョ粓鐐规帓" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁堢偣鍒�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endBay" placeholder="璇疯緭鍏ョ粓鐐瑰垪" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁堢偣灞�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endLev" placeholder="璇疯緭鍏ョ粓鐐瑰眰" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">浠诲姟绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="ioType" lay-vertype="tips" lay-verify="required">
+ <option value="">璇烽�夋嫨浠诲姟绫诲瀷</option>
+ <option value="0">鏈煡</option>
+ <option value="1">鍏ュ簱</option>
+ <option value="2">鍑哄簱</option>
+ </select>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1