From 1c581cee9a7847b9c8cf0ab36a85c6b614395e32 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 13 五月 2024 19:55:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java | 12
src/main/java/com/zy/asrs/service/impl/MatnrCodeServiceImpl.java | 12
src/main/java/wrkMastStaLog.sql | 18
src/main/java/com/zy/asrs/entity/WrkMastStaLog.java | 256 ++++++
src/main/java/com/zy/asrs/service/WrkMastStaService.java | 8
src/main/java/com/zy/asrs/mapper/WrkMastStaLogMapper.java | 12
src/main/java/com/zy/asrs/mapper/MatnrCodeMapper.java | 12
src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html | 185 ++++
src/main/java/wrkMastSta.sql | 18
src/main/webapp/views/matnrCode/matnrCode.html | 89 ++
src/main/java/com/zy/asrs/controller/WrkMastStaLogController.java | 123 +++
src/main/resources/mapper/WrkMastStaLogMapper.xml | 28
src/main/webapp/views/index.html | 4
src/main/java/com/zy/asrs/service/impl/WrkMastStaLogServiceImpl.java | 12
src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java | 12
src/main/webapp/static/image/RMLogo.png | 0
src/main/webapp/static/js/wrkMastStaLog/wrkMastStaLog.js | 271 ++++++
src/main/java/matnrCode.sql | 18
src/main/webapp/static/js/wrkMastSta/wrkMastSta.js | 271 ++++++
src/main/resources/mapper/MatnrCodeMapper.xml | 13
src/main/webapp/views/wrkMastSta/wrkMastSta.html | 179 ++++
src/main/java/com/zy/asrs/service/MatnrCodeService.java | 8
src/main/java/com/zy/asrs/service/WrkMastStaLogService.java | 8
src/main/java/com/zy/asrs/entity/MatnrCode.java | 40
src/main/java/com/zy/asrs/controller/MobileController.java | 4
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/resources/mapper/WrkMastStaMapper.xml | 28
/dev/null | 18
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 265 ++++++
src/main/webapp/static/js/matnrCode/matnrCode.js | 242 +++++
src/main/java/com/zy/asrs/controller/WrkMastStaController.java | 123 +++
src/main/webapp/views/login.html | 4
src/main/resources/application.yml | 4
src/main/java/com/zy/asrs/controller/MatnrCodeController.java | 123 +++
34 files changed, 2,395 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatnrCodeController.java b/src/main/java/com/zy/asrs/controller/MatnrCodeController.java
new file mode 100644
index 0000000..ea5c631
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/MatnrCodeController.java
@@ -0,0 +1,123 @@
+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.MatnrCode;
+import com.zy.asrs.service.MatnrCodeService;
+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 MatnrCodeController extends BaseController {
+
+ @Autowired
+ private MatnrCodeService matnrCodeService;
+
+ @RequestMapping(value = "/matnrCode/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(matnrCodeService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/matnrCode/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 Map<String, Object> param){
+ EntityWrapper<MatnrCode> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(matnrCodeService.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 = "/matnrCode/add/auth")
+ @ManagerAuth
+ public R add(MatnrCode matnrCode) {
+ matnrCodeService.insert(matnrCode);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/matnrCode/update/auth")
+ @ManagerAuth
+ public R update(MatnrCode matnrCode){
+ if (Cools.isEmpty(matnrCode) || null==matnrCode.getId()){
+ return R.error();
+ }
+ matnrCodeService.updateById(matnrCode);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/matnrCode/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ matnrCodeService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/matnrCode/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<MatnrCode> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("matnrCode"));
+ convert(map, wrapper);
+ List<MatnrCode> list = matnrCodeService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/matnrCodeQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<MatnrCode> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<MatnrCode> page = matnrCodeService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (MatnrCode matnrCode : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", matnrCode.getId());
+ map.put("value", matnrCode.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/matnrCode/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<MatnrCode> wrapper = new EntityWrapper<MatnrCode>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != matnrCodeService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(MatnrCode.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index bbb9f32..39d95af 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -110,9 +110,9 @@
}
@RequestMapping("/comb/auth")
- @ManagerAuth(memo = "缁勬墭")
+// @ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
+ mobileService.comb(combParam, 9527L);
return R.ok("缁勬墭鎴愬姛");
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastStaController.java b/src/main/java/com/zy/asrs/controller/WrkMastStaController.java
new file mode 100644
index 0000000..4544ced
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastStaController.java
@@ -0,0 +1,123 @@
+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.WrkMastSta;
+import com.zy.asrs.service.WrkMastStaService;
+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 WrkMastStaController extends BaseController {
+
+ @Autowired
+ private WrkMastStaService wrkMastStaService;
+
+ @RequestMapping(value = "/wrkMastSta/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(wrkMastStaService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/wrkMastSta/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 Map<String, Object> param){
+ EntityWrapper<WrkMastSta> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(wrkMastStaService.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 = "/wrkMastSta/add/auth")
+ @ManagerAuth
+ public R add(WrkMastSta wrkMastSta) {
+ wrkMastStaService.insert(wrkMastSta);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastSta/update/auth")
+ @ManagerAuth
+ public R update(WrkMastSta wrkMastSta){
+ if (Cools.isEmpty(wrkMastSta) || null==wrkMastSta.getId()){
+ return R.error();
+ }
+ wrkMastStaService.updateById(wrkMastSta);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastSta/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ wrkMastStaService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastSta/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<WrkMastSta> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastSta"));
+ convert(map, wrapper);
+ List<WrkMastSta> list = wrkMastStaService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/wrkMastStaQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WrkMastSta> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WrkMastSta> page = wrkMastStaService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WrkMastSta wrkMastSta : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkMastSta.getId());
+ map.put("value", wrkMastSta.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/wrkMastSta/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WrkMastSta> wrapper = new EntityWrapper<WrkMastSta>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkMastStaService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(WrkMastSta.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastStaLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastStaLogController.java
new file mode 100644
index 0000000..c095f75
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/WrkMastStaLogController.java
@@ -0,0 +1,123 @@
+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.WrkMastStaLog;
+import com.zy.asrs.service.WrkMastStaLogService;
+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 WrkMastStaLogController extends BaseController {
+
+ @Autowired
+ private WrkMastStaLogService wrkMastStaLogService;
+
+ @RequestMapping(value = "/wrkMastStaLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(wrkMastStaLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/wrkMastStaLog/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 Map<String, Object> param){
+ EntityWrapper<WrkMastStaLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(wrkMastStaLogService.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 = "/wrkMastStaLog/add/auth")
+ @ManagerAuth
+ public R add(WrkMastStaLog wrkMastStaLog) {
+ wrkMastStaLogService.insert(wrkMastStaLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastStaLog/update/auth")
+ @ManagerAuth
+ public R update(WrkMastStaLog wrkMastStaLog){
+ if (Cools.isEmpty(wrkMastStaLog) || null==wrkMastStaLog.getId()){
+ return R.error();
+ }
+ wrkMastStaLogService.updateById(wrkMastStaLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastStaLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ wrkMastStaLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMastStaLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<WrkMastStaLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastStaLog"));
+ convert(map, wrapper);
+ List<WrkMastStaLog> list = wrkMastStaLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/wrkMastStaLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WrkMastStaLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WrkMastStaLog> page = wrkMastStaLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WrkMastStaLog wrkMastStaLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkMastStaLog.getId());
+ map.put("value", wrkMastStaLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/wrkMastStaLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WrkMastStaLog> wrapper = new EntityWrapper<WrkMastStaLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkMastStaLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(WrkMastStaLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/MatnrCode.java b/src/main/java/com/zy/asrs/entity/MatnrCode.java
new file mode 100644
index 0000000..180ef29
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/MatnrCode.java
@@ -0,0 +1,40 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_matnr_code")
+public class MatnrCode implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value= "")
+ private Integer code;
+
+ @ApiModelProperty(value= "")
+ private String matnr;
+
+ public MatnrCode() {}
+
+ public MatnrCode(Integer code,String matnr) {
+ this.code = code;
+ this.matnr = matnr;
+ }
+
+// MatnrCode matnrCode = new MatnrCode(
+// null, //
+// null //
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
new file mode 100644
index 0000000..d0eddbe
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -0,0 +1,265 @@
+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_sta")
+public class WrkMastSta implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("wrk_no")
+ private Long wrkNo;
+
+ /**
+ * 宸ヤ綔妗ｅ紑濮嬩綅缃�
+ */
+ @ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
+ @TableField("wrk_start")
+ private Integer wrkStart;
+
+ /**
+ * 宸ヤ綔妗ｇ粨鏉熶綅缃�
+ */
+ @ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
+ @TableField("wrk_end")
+ private Integer wrkEnd;
+
+ /**
+ * 灏忚溅鎺ヨ揣浣嶇疆
+ */
+ @ApiModelProperty(value= "灏忚溅鎺ヨ揣浣嶇疆")
+ @TableField("sta_start")
+ private Integer staStart;
+
+ /**
+ * 灏忚溅鏀捐揣浣嶇疆
+ */
+ @ApiModelProperty(value= "灏忚溅鏀捐揣浣嶇疆")
+ @TableField("sta_end")
+ private Integer staEnd;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 绫诲瀷 0:婊＄増 1:绌烘澘
+ */
+ @ApiModelProperty(value= "绫诲瀷 0:婊＄増 1:绌烘澘")
+ private Integer type;
+
+
+
+ /**
+ * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�")
+ @TableField("wrk_sts")
+ private Integer wrkSts;
+
+
+
+ /**
+ * 琛屽彿
+ */
+ @ApiModelProperty(value= "琛屽彿")
+ @TableField("line_number")
+ private Integer lineNumber;
+
+ /**
+ * 宸ヤ綔绫诲瀷 绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�
+ */
+ @ApiModelProperty(value= "宸ヤ綔绫诲瀷 绫诲瀷 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("wrk_crn")
+ private Integer wrkCrn;
+
+ /**
+ * 宸ヤ綅浜屽伐浣滃彿
+ */
+ @ApiModelProperty(value= "宸ヤ綅浜屽伐浣滃彿")
+ @TableField("wrk_no2")
+ private Long wrkNo2;
+
+ /**
+ * 宸ヤ綅涓�鐗╂枡鐮�
+ */
+ @ApiModelProperty(value= "宸ヤ綅涓�鐗╂枡鐮�")
+ private Integer matnr1;
+
+ /**
+ * 宸ヤ綅浜岀墿鏂欑爜
+ */
+ @ApiModelProperty(value= "宸ヤ綅浜岀墿鏂欑爜")
+ private Integer matnr2;
+
+ /**
+ * 宸ヤ綅2绫诲瀷
+ */
+ @ApiModelProperty(value= "宸ヤ綅2绫诲瀷")
+ private Integer type2;
+
+ public String getType2$(){
+ if (Cools.isEmpty(type2)){
+ return "";
+ }
+ switch (type2){
+ case 0: return "婊＄増";
+ case 1: return "绌烘澘";
+ default: return "";
+ }
+ }
+
+ public String getType$(){
+ if (Cools.isEmpty(type)){
+ return "";
+ }
+ switch (type){
+ case 0: return "婊＄増";
+ case 1: return "绌烘澘";
+ default: return "";
+ }
+ }
+
+ public String getWrkType$(){
+ if (Cools.isEmpty(wrkType)){
+ return "";
+ }
+ switch (wrkType){
+ case 8: return "宸ヤ綅涓�浠诲姟";
+ case 1: return "鍙屽伐浣嶄换鍔�";
+ case 9: return "宸ヤ綅浜屼换鍔�";
+ default: return "";
+ }
+ }
+
+ public String getWrkSts$(){
+ if (Cools.isEmpty(wrkSts)){
+ return "";
+ }
+ switch (wrkSts){
+ case 0: return "鍒濆";
+ case 1: return "宸ヤ綔涓�";
+ case 3: return "瀹屾垚";
+ default: return "";
+ }
+ }
+
+
+
+ public WrkMastSta() {}
+
+ public WrkMastSta(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer wrkCrn,Long wrkNo2,Integer matnr1,Integer matnr2,Integer type2) {
+ this.wrkNo = wrkNo;
+ this.wrkStart = wrkStart;
+ this.wrkEnd = wrkEnd;
+ this.staStart = staStart;
+ this.staEnd = staEnd;
+ this.createTime = createTime;
+ this.updateTime = updateTime;
+ this.type = type;
+ this.wrkSts = wrkSts;
+ this.lineNumber = lineNumber;
+ this.wrkType = wrkType;
+ this.bignTime = bignTime;
+ this.wrkCrn = wrkCrn;
+ this.wrkNo2 = wrkNo2;
+ this.matnr1 = matnr1;
+ this.matnr2 = matnr2;
+ this.type2 = type2;
+ }
+
+// WrkMastSta wrkMastSta = new WrkMastSta(
+// null, // 宸ヤ綔鍙穂闈炵┖]
+// null, // 宸ヤ綔妗ｅ紑濮嬩綅缃甗闈炵┖]
+// null, // 宸ヤ綔妗ｇ粨鏉熶綅缃甗闈炵┖]
+// null, // 灏忚溅鎺ヨ揣浣嶇疆[闈炵┖]
+// null, // 灏忚溅鏀捐揣浣嶇疆[闈炵┖]
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼鏃堕棿
+// null, // 绫诲瀷 0:婊＄増 1:绌烘澘[闈炵┖]
+// null, // 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴怺闈炵┖]
+// null, // 琛屽彿[闈炵┖]
+// null, // 宸ヤ綔绫诲瀷 绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩榌闈炵┖]
+// null, // 鏍囪鏃堕棿
+// null, //
+// null, // 宸ヤ綅浜屽伐浣滃彿
+// null, // 宸ヤ綅涓�鐗╂枡鐮�
+// null, // 宸ヤ綅浜岀墿鏂欑爜
+// null // 宸ヤ綅2绫诲瀷
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getBignTime$(){
+ if (Cools.isEmpty(this.bignTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java b/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java
new file mode 100644
index 0000000..23b69b9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java
@@ -0,0 +1,256 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;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_sta_log")
+public class WrkMastStaLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("wrk_no")
+ private Long wrkNo;
+
+ /**
+ * 宸ヤ綔妗ｅ紑濮嬩綅缃�
+ */
+ @ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
+ @TableField("wrk_start")
+ private Integer wrkStart;
+
+ /**
+ * 宸ヤ綔妗ｇ粨鏉熶綅缃�
+ */
+ @ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
+ @TableField("wrk_end")
+ private Integer wrkEnd;
+
+ /**
+ * 灏忚溅鎺ヨ揣浣嶇疆
+ */
+ @ApiModelProperty(value= "灏忚溅鎺ヨ揣浣嶇疆")
+ @TableField("sta_start")
+ private Integer staStart;
+
+ /**
+ * 灏忚溅鏀捐揣浣嶇疆
+ */
+ @ApiModelProperty(value= "灏忚溅鏀捐揣浣嶇疆")
+ @TableField("sta_end")
+ private Integer staEnd;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 绫诲瀷 0:婊＄増 1:绌烘澘
+ */
+ @ApiModelProperty(value= "绫诲瀷 0:婊＄増 1:绌烘澘")
+ private Integer type;
+
+ /**
+ * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�")
+ @TableField("wrk_sts")
+ private Integer wrkSts;
+
+ /**
+ * 琛屽彿
+ */
+ @ApiModelProperty(value= "琛屽彿")
+ @TableField("line_number")
+ private Integer lineNumber;
+
+ /**
+ * 宸ヤ綔绫诲瀷 绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�
+ */
+ @ApiModelProperty(value= "宸ヤ綔绫诲瀷 绫诲瀷 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("wrk_crn")
+ private Integer wrkCrn;
+
+ /**
+ * 宸ヤ綅浜屽伐浣滃彿
+ */
+ @ApiModelProperty(value= "宸ヤ綅浜屽伐浣滃彿")
+ @TableField("wrk_no2")
+ private Long wrkNo2;
+
+ /**
+ * 宸ヤ綅涓�鐗╂枡鐮�
+ */
+ @ApiModelProperty(value= "宸ヤ綅涓�鐗╂枡鐮�")
+ private Integer matnr1;
+
+ /**
+ * 宸ヤ綅浜岀墿鏂欑爜
+ */
+ @ApiModelProperty(value= "宸ヤ綅浜岀墿鏂欑爜")
+ private Integer matnr2;
+
+ /**
+ * 宸ヤ綅2绫诲瀷
+ */
+ @ApiModelProperty(value= "宸ヤ綅2绫诲瀷")
+ private Integer type2;
+
+ public String getType2$(){
+ if (Cools.isEmpty(type2)){
+ return "";
+ }
+ switch (type2){
+ case 0: return "婊＄増";
+ case 1: return "绌烘澘";
+ default: return "";
+ }
+ }
+
+ public String getType$(){
+ if (Cools.isEmpty(type)){
+ return "";
+ }
+ switch (type){
+ case 0: return "婊＄増";
+ case 1: return "绌烘澘";
+ default: return "";
+ }
+ }
+
+ public String getWrkType$(){
+ if (Cools.isEmpty(wrkType)){
+ return "";
+ }
+ switch (wrkType){
+ case 8: return "宸ヤ綅涓�浠诲姟";
+ case 1: return "鍙屽伐浣嶄换鍔�";
+ case 9: return "宸ヤ綅浜屼换鍔�";
+ default: return "";
+ }
+ }
+
+ public String getWrkSts$(){
+ if (Cools.isEmpty(wrkSts)){
+ return "";
+ }
+ switch (wrkSts){
+ case 0: return "鍒濆";
+ case 1: return "宸ヤ綔涓�";
+ case 3: return "瀹屾垚";
+ default: return "";
+ }
+ }
+
+ public WrkMastStaLog() {}
+
+ public WrkMastStaLog(Long id,Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer wrkCrn,Long wrkNo2,Integer matnr1,Integer matnr2,Integer type2) {
+ this.id = id;
+ this.wrkNo = wrkNo;
+ this.wrkStart = wrkStart;
+ this.wrkEnd = wrkEnd;
+ this.staStart = staStart;
+ this.staEnd = staEnd;
+ this.createTime = createTime;
+ this.updateTime = updateTime;
+ this.type = type;
+ this.wrkSts = wrkSts;
+ this.lineNumber = lineNumber;
+ this.wrkType = wrkType;
+ this.bignTime = bignTime;
+ this.wrkCrn = wrkCrn;
+ this.wrkNo2 = wrkNo2;
+ this.matnr1 = matnr1;
+ this.matnr2 = matnr2;
+ this.type2 = type2;
+ }
+
+// WrkMastStaLog wrkMastStaLog = new WrkMastStaLog(
+// null, // ID[闈炵┖]
+// null, // 宸ヤ綔鍙穂闈炵┖]
+// null, // 宸ヤ綔妗ｅ紑濮嬩綅缃甗闈炵┖]
+// null, // 宸ヤ綔妗ｇ粨鏉熶綅缃甗闈炵┖]
+// null, // 灏忚溅鎺ヨ揣浣嶇疆[闈炵┖]
+// null, // 灏忚溅鏀捐揣浣嶇疆[闈炵┖]
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼鏃堕棿
+// null, // 绫诲瀷 0:婊＄増 1:绌烘澘[闈炵┖]
+// null, // 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴怺闈炵┖]
+// null, // 琛屽彿[闈炵┖]
+// null, // 宸ヤ綔绫诲瀷 绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩榌闈炵┖]
+// null, // 鏍囪鏃堕棿
+// null, //
+// null, // 宸ヤ綅浜屽伐浣滃彿
+// null, // 宸ヤ綅涓�鐗╂枡鐮�
+// null, // 宸ヤ綅浜岀墿鏂欑爜
+// null // 宸ヤ綅2绫诲瀷
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getBignTime$(){
+ if (Cools.isEmpty(this.bignTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/MatnrCodeMapper.java b/src/main/java/com/zy/asrs/mapper/MatnrCodeMapper.java
new file mode 100644
index 0000000..fab0e65
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/MatnrCodeMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.MatnrCode;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface MatnrCodeMapper extends BaseMapper<MatnrCode> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastStaLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastStaLogMapper.java
new file mode 100644
index 0000000..379fa33
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastStaLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.WrkMastStaLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WrkMastStaLogMapper extends BaseMapper<WrkMastStaLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
new file mode 100644
index 0000000..fef59fb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.WrkMastSta;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WrkMastStaMapper extends BaseMapper<WrkMastSta> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/MatnrCodeService.java b/src/main/java/com/zy/asrs/service/MatnrCodeService.java
new file mode 100644
index 0000000..d036091
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/MatnrCodeService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.MatnrCode;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface MatnrCodeService extends IService<MatnrCode> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastStaLogService.java b/src/main/java/com/zy/asrs/service/WrkMastStaLogService.java
new file mode 100644
index 0000000..9df7e30
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastStaLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.WrkMastStaLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WrkMastStaLogService extends IService<WrkMastStaLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastStaService.java b/src/main/java/com/zy/asrs/service/WrkMastStaService.java
new file mode 100644
index 0000000..9a08d24
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/WrkMastStaService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.WrkMastSta;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WrkMastStaService extends IService<WrkMastSta> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatnrCodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatnrCodeServiceImpl.java
new file mode 100644
index 0000000..ae5fd29
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/MatnrCodeServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.MatnrCodeMapper;
+import com.zy.asrs.entity.MatnrCode;
+import com.zy.asrs.service.MatnrCodeService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("matnrCodeService")
+public class MatnrCodeServiceImpl extends ServiceImpl<MatnrCodeMapper, MatnrCode> implements MatnrCodeService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastStaLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastStaLogServiceImpl.java
new file mode 100644
index 0000000..ebb5c26
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastStaLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.WrkMastStaLogMapper;
+import com.zy.asrs.entity.WrkMastStaLog;
+import com.zy.asrs.service.WrkMastStaLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("wrkMastStaLogService")
+public class WrkMastStaLogServiceImpl extends ServiceImpl<WrkMastStaLogMapper, WrkMastStaLog> implements WrkMastStaLogService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
new file mode 100644
index 0000000..5f9b639
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.WrkMastStaMapper;
+import com.zy.asrs.entity.WrkMastSta;
+import com.zy.asrs.service.WrkMastStaService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("wrkMastStaService")
+public class WrkMastStaServiceImpl extends ServiceImpl<WrkMastStaMapper, WrkMastSta> implements WrkMastStaService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 94acfe7..a5514fb 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="127.0.0.1:1433;databasename=mdqdasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="man_emptyBarrel_in";
+ generator.table="asr_wrk_mast_sta_log";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/locCheck.sql b/src/main/java/locCheck.sql
deleted file mode 100644
index 9ca7a15..0000000
--- a/src/main/java/locCheck.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save locCheck record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck/locCheck.html', 'locCheck绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheck#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck/locCheck.html', N'locCheck绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheck#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/locCheckLog.sql b/src/main/java/locCheckLog.sql
deleted file mode 100644
index 8dcaf43..0000000
--- a/src/main/java/locCheckLog.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save locCheckLog record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckLog/locCheckLog.html', 'locCheckLog绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckLog#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckLog#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckLog#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckLog/locCheckLog.html', N'locCheckLog绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckLog#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckLog#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/locCheckTrim.sql b/src/main/java/locCheckTrim.sql
deleted file mode 100644
index c02b332..0000000
--- a/src/main/java/locCheckTrim.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save locCheckTrim record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckTrim/locCheckTrim.html', 'locCheckTrim绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckTrim#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckTrim#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckTrim#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckTrim#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locCheckTrim#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckTrim/locCheckTrim.html', N'locCheckTrim绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckTrim#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckTrim#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckTrim#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckTrim#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locCheckTrim#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/locOwner.sql b/src/main/java/locOwner.sql
deleted file mode 100644
index b712636..0000000
--- a/src/main/java/locOwner.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save locOwner record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locOwner/locOwner.html', 'locOwner绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locOwner#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locOwner#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locOwner#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locOwner#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locOwner#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locOwner/locOwner.html', N'瀹㈡埛', 142, '2', 20, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locOwner#view', N'鏌ヨ', '60579', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locOwner#btn-add', N'鏂板', '60579', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locOwner#btn-edit', N'缂栬緫', '60579', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locOwner#btn-delete', N'鍒犻櫎', '60579', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locOwner#btn-export', N'瀵煎嚭', '60579', '3', '4', '1');
diff --git a/src/main/java/matnrCode.sql b/src/main/java/matnrCode.sql
new file mode 100644
index 0000000..6e72851
--- /dev/null
+++ b/src/main/java/matnrCode.sql
@@ -0,0 +1,18 @@
+-- save matnrCode record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'matnrCode/matnrCode.html', 'matnrCode绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'matnrCode#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'matnrCode#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'matnrCode#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'matnrCode#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'matnrCode#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'matnrCode/matnrCode.html', N'matnrCode绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'matnrCode#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'matnrCode#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'matnrCode#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'matnrCode#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'matnrCode#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/orderCheck.sql b/src/main/java/orderCheck.sql
deleted file mode 100644
index 29f42f1..0000000
--- a/src/main/java/orderCheck.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save orderCheck record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheck/orderCheck.html', 'orderCheck绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheck#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheck#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheck#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheck#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheck#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheck/orderCheck.html', N'orderCheck绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheck#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheck#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheck#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheck#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheck#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/orderCheckLog.sql b/src/main/java/orderCheckLog.sql
deleted file mode 100644
index f03f73c..0000000
--- a/src/main/java/orderCheckLog.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save orderCheckLog record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheckLog/orderCheckLog.html', 'orderCheckLog绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheckLog#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheckLog#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheckLog#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheckLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderCheckLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheckLog/orderCheckLog.html', N'orderCheckLog绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheckLog#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheckLog#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheckLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheckLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderCheckLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/orderLog.sql b/src/main/java/orderLog.sql
deleted file mode 100644
index 1eb94b5..0000000
--- a/src/main/java/orderLog.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save orderLog record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderLog/orderLog.html', 'orderLog绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderLog#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderLog#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderLog#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderLog/orderLog.html', N'orderLog绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderLog#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderLog#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/pakout.sql b/src/main/java/pakout.sql
deleted file mode 100644
index 5c59759..0000000
--- a/src/main/java/pakout.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save pakout record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pakout/pakout.html', 'pakout绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pakout#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pakout#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pakout#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pakout#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pakout#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pakout/pakout.html', N'pakout绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pakout#view', N'鏌ヨ', '60571', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pakout#btn-add', N'鏂板', '60571', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pakout#btn-edit', N'缂栬緫', '60571', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pakout#btn-delete', N'鍒犻櫎', '60571', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pakout#btn-export', N'瀵煎嚭', '60571', '3', '4', '1');
diff --git a/src/main/java/wrkMastSta.sql b/src/main/java/wrkMastSta.sql
new file mode 100644
index 0000000..586b3d1
--- /dev/null
+++ b/src/main/java/wrkMastSta.sql
@@ -0,0 +1,18 @@
+-- save wrkMastSta record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSta/wrkMastSta.html', 'wrkMastSta绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSta#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSta#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSta#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSta#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastSta#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSta/wrkMastSta.html', N'wrkMastSta绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSta#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSta#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSta#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSta#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastSta#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/wrkMastStaLog.sql b/src/main/java/wrkMastStaLog.sql
new file mode 100644
index 0000000..8a1a27b
--- /dev/null
+++ b/src/main/java/wrkMastStaLog.sql
@@ -0,0 +1,18 @@
+-- save wrkMastStaLog record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastStaLog/wrkMastStaLog.html', 'wrkMastStaLog绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastStaLog#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastStaLog#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastStaLog#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastStaLog#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastStaLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastStaLog/wrkMastStaLog.html', N'wrkMastStaLog绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastStaLog#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastStaLog#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastStaLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastStaLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastStaLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c82b271..561f51f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8082
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
compression:
@@ -17,7 +17,7 @@
# url: jdbc:sqlserver://10.10.10.100:1433;databasename=mdqdasrs
# username: sa
# password: Dtzhcy101+
- url: jdbc:sqlserver://10.10.10.212:1433;databasename=mdqdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqdasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/MatnrCodeMapper.xml b/src/main/resources/mapper/MatnrCodeMapper.xml
new file mode 100644
index 0000000..794d675
--- /dev/null
+++ b/src/main/resources/mapper/MatnrCodeMapper.xml
@@ -0,0 +1,13 @@
+<?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.MatnrCodeMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.MatnrCode">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="matnr" property="matnr" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/WrkMastStaLogMapper.xml b/src/main/resources/mapper/WrkMastStaLogMapper.xml
new file mode 100644
index 0000000..c98a4b3
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastStaLogMapper.xml
@@ -0,0 +1,28 @@
+<?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.WrkMastStaLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastStaLog">
+ <result column="id" property="id" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="wrk_start" property="wrkStart" />
+ <result column="wrk_end" property="wrkEnd" />
+ <result column="sta_start" property="staStart" />
+ <result column="sta_end" property="staEnd" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="type" property="type" />
+ <result column="wrk_sts" property="wrkSts" />
+ <result column="line_number" property="lineNumber" />
+ <result column="wrk_type" property="wrkType" />
+ <result column="bign_time" property="bignTime" />
+ <result column="wrk_crn" property="wrkCrn" />
+ <result column="wrk_no2" property="wrkNo2" />
+ <result column="matnr1" property="matnr1" />
+ <result column="matnr2" property="matnr2" />
+ <result column="type2" property="type2" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
new file mode 100644
index 0000000..9caba43
--- /dev/null
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -0,0 +1,28 @@
+<?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.WrkMastStaMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastSta">
+ <id column="id" property="id" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="wrk_start" property="wrkStart" />
+ <result column="wrk_end" property="wrkEnd" />
+ <result column="sta_start" property="staStart" />
+ <result column="sta_end" property="staEnd" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="type" property="type" />
+ <result column="wrk_sts" property="wrkSts" />
+ <result column="line_number" property="lineNumber" />
+ <result column="wrk_type" property="wrkType" />
+ <result column="bign_time" property="bignTime" />
+ <result column="wrk_crn" property="wrkCrn" />
+ <result column="wrk_no2" property="wrkNo2" />
+ <result column="matnr1" property="matnr1" />
+ <result column="matnr2" property="matnr2" />
+ <result column="type2" property="type2" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/image/RMLogo.png b/src/main/webapp/static/image/RMLogo.png
new file mode 100644
index 0000000..a295a8d
--- /dev/null
+++ b/src/main/webapp/static/image/RMLogo.png
Binary files differ
diff --git a/src/main/webapp/static/js/matnrCode/matnrCode.js b/src/main/webapp/static/js/matnrCode/matnrCode.js
new file mode 100644
index 0000000..062693a
--- /dev/null
+++ b/src/main/webapp/static/js/matnrCode/matnrCode.js
@@ -0,0 +1,242 @@
+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: '#matnrCode',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/matnrCode/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: 'code', align: 'center',title: ''}
+ ,{field: 'matnr', 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(matnrCode)', 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(matnrCode)', 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 = {
+ 'matnrCode': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/matnrCode/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(matnrCode)', 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+"/matnrCode/"+(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+"/matnrCode/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 () {
+
+ }, 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/wrkMastSta/wrkMastSta.js b/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
new file mode 100644
index 0000000..0b0d2a4
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
@@ -0,0 +1,271 @@
+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: '#wrkMastSta',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/wrkMastSta/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: '宸ヤ綅1宸ヤ綔鍙�'}
+ ,{field: 'wrkStart', align: 'center',title: '宸ヤ綅1婧愮珯'}
+ ,{field: 'wrkEnd', align: 'center',title: '宸ヤ綅1缁堢偣绔�'}
+ ,{field: 'type$', align: 'center',title: '宸ヤ綅1绫诲瀷'}
+ ,{field: 'wrkNo2', align: 'center',title: '宸ヤ綅2宸ヤ綔鍙�'}
+ ,{field: 'staStart', align: 'center',title: '宸ヤ綅2婧愮珯'}
+ ,{field: 'staEnd', align: 'center',title: '宸ヤ綅2缁堢偣绔�'}
+ ,{field: 'type2$', align: 'center',title: '宸ヤ綅2绫诲瀷'}
+ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'wrkType$', align: 'center',title: '宸ヤ綔绫诲瀷'}
+ ,{field: 'wrkCrn', align: 'center',title: 'RGV'}
+ ,{field: 'matnr1', align: 'center',title: '宸ヤ綅1鐗╂枡浠ｇ爜',hide:true}
+ ,{field: 'matnr2', align: 'center',title: '宸ヤ綅2鐗╂枡浠ｇ爜',hide:true}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
+ ]],
+ 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(wrkMastSta)', 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(wrkMastSta)', 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 = {
+ 'wrkMastSta': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/wrkMastSta/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(wrkMastSta)', 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+"/wrkMastSta/"+(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+"/wrkMastSta/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: '#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/wrkMastStaLog/wrkMastStaLog.js b/src/main/webapp/static/js/wrkMastStaLog/wrkMastStaLog.js
new file mode 100644
index 0000000..6d49276
--- /dev/null
+++ b/src/main/webapp/static/js/wrkMastStaLog/wrkMastStaLog.js
@@ -0,0 +1,271 @@
+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: '#wrkMastStaLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/wrkMastStaLog/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: '宸ヤ綅1宸ヤ綔鍙�'}
+ ,{field: 'wrkStart', align: 'center',title: '宸ヤ綅1婧愮珯'}
+ ,{field: 'wrkEnd', align: 'center',title: '宸ヤ綅1缁堢偣绔�'}
+ ,{field: 'type$', align: 'center',title: '宸ヤ綅1绫诲瀷'}
+ ,{field: 'wrkNo2', align: 'center',title: '宸ヤ綅2宸ヤ綔鍙�'}
+ ,{field: 'staStart', align: 'center',title: '宸ヤ綅2婧愮珯'}
+ ,{field: 'staEnd', align: 'center',title: '宸ヤ綅2缁堢偣绔�'}
+ ,{field: 'type2$', align: 'center',title: '宸ヤ綅2绫诲瀷'}
+ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
+ ,{field: 'wrkType$', align: 'center',title: '宸ヤ綔绫诲瀷'}
+ ,{field: 'wrkCrn', align: 'center',title: 'RGV'}
+ ,{field: 'matnr1', align: 'center',title: '宸ヤ綅1鐗╂枡浠ｇ爜',hide:true}
+ ,{field: 'matnr2', align: 'center',title: '宸ヤ綅2鐗╂枡浠ｇ爜',hide:true}
+
+ // ,{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(wrkMastStaLog)', 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(wrkMastStaLog)', 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 = {
+ 'wrkMastStaLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/wrkMastStaLog/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(wrkMastStaLog)', 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+"/wrkMastStaLog/"+(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+"/wrkMastStaLog/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: '#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/index.html b/src/main/webapp/views/index.html
index 828897e..c76f1c9 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>绫冲- 鑷姩鍖栫珛浣撲粨搴� - AS / RS</title>
+ <title>涓娑︾編- 鑷姩鍖栫珛浣撲粨搴� - AS / RS</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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -26,7 +26,7 @@
<!-- 澶撮儴 -->
<div class="layui-header">
<div class="layui-logo">
- <img src="../static/image/logo.png" style="display: inline-block; width: 40%;height: auto">
+ <img src="../static/image/RMLogo.png" style="display: inline-block; width: 40%;height: auto">
<!-- <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>-->
<!-- <img src="../static/image/logo.svg"/>-->
<!-- <cite>涓壃 - Zoneyung</cite>-->
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index a559d86..789950e 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -53,7 +53,7 @@
z-index: 100;
top: 22px;
left: 20px;">
- <img src="../static/image/logo.png" alt="" style="width: 20%">
+ <img src="../static/image/RMLogo.png" alt="" style="width: 50%">
</div>
<div class="p-sketch-outline">
<h2 class="p-sketch-outline__title">Automatic Storage and Retrieval System</h2>
@@ -67,7 +67,7 @@
<div id="sidebar">
<div class="login-contain">
<div class="login-box">
- <img src="../static/image/logo.png" alt="" style="width: 80%">
+ <img src="../static/image/RMLogo.png" alt="" style="width: 80%">
<!-- <span class="login100-form-title p-t-20 p-b-45">绫冲鏅鸿兘</span>-->
<span class="login100-form-title p-t-20 p-b-45" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>
<div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ョ敤鎴峰悕">
diff --git a/src/main/webapp/views/matnrCode/matnrCode.html b/src/main/webapp/views/matnrCode/matnrCode.html
new file mode 100644
index 0000000..c0c90c2
--- /dev/null
+++ b/src/main/webapp/views/matnrCode/matnrCode.html
@@ -0,0 +1,89 @@
+<!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">
+ <label class="layui-form-label">缂栧彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" 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="matnrCode" lay-filter="matnrCode"></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/matnrCode/matnrCode.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="code" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr" 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/wrkMastSta/wrkMastSta.html b/src/main/webapp/views/wrkMastSta/wrkMastSta.html
new file mode 100644
index 0000000..4ba4e9c
--- /dev/null
+++ b/src/main/webapp/views/wrkMastSta/wrkMastSta.html
@@ -0,0 +1,179 @@
+<!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">
+ <label class="layui-form-label">缂栧彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" 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="wrkMastSta" lay-filter="wrkMastSta"></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/wrkMastSta/wrkMastSta.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔妗ｅ紑濮嬩綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkStart" placeholder="璇疯緭鍏ュ伐浣滄。寮�濮嬩綅缃�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔妗ｇ粨鏉熶綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkEnd" placeholder="璇疯緭鍏ュ伐浣滄。缁撴潫浣嶇疆" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">灏忚溅鎺ヨ揣浣嶇疆: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staStart" placeholder="璇疯緭鍏ュ皬杞︽帴璐т綅缃�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">灏忚溅鏀捐揣浣嶇疆: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staEnd" placeholder="璇疯緭鍏ュ皬杞︽斁璐т綅缃�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">绫诲瀷 0:婊＄増 1:绌烘澘: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ョ被鍨� 0:婊＄増 1:绌烘澘" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">琛屽彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏ヨ鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷 绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkType" placeholder="璇疯緭鍏ュ伐浣滅被鍨� 绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏍囪鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="bignTime" id="bignTime$" placeholder="璇疯緭鍏ユ爣璁版椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkCrn" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綅浜屽伐浣滃彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo2" placeholder="璇疯緭鍏ュ伐浣嶄簩宸ヤ綔鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綅涓�鐗╂枡鐮�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr1" placeholder="璇疯緭鍏ュ伐浣嶄竴鐗╂枡鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綅浜岀墿鏂欑爜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr2" placeholder="璇疯緭鍏ュ伐浣嶄簩鐗╂枡鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綅2绫诲瀷: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="type2" placeholder="璇疯緭鍏ュ伐浣�2绫诲瀷">
+ </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/wrkMastStaLog/wrkMastStaLog.html b/src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html
new file mode 100644
index 0000000..1a76bfe
--- /dev/null
+++ b/src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html
@@ -0,0 +1,185 @@
+<!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">
+ <label class="layui-form-label">缂栧彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" 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="wrkMastStaLog" lay-filter="wrkMastStaLog"></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/wrkMastStaLog/wrkMastStaLog.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">ID: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="id" placeholder="璇疯緭鍏D" 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="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔妗ｅ紑濮嬩綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkStart" placeholder="璇疯緭鍏ュ伐浣滄。寮�濮嬩綅缃�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔妗ｇ粨鏉熶綅缃�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkEnd" placeholder="璇疯緭鍏ュ伐浣滄。缁撴潫浣嶇疆" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">灏忚溅鎺ヨ揣浣嶇疆: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staStart" placeholder="璇疯緭鍏ュ皬杞︽帴璐т綅缃�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">灏忚溅鏀捐揣浣嶇疆: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="staEnd" placeholder="璇疯緭鍏ュ皬杞︽斁璐т綅缃�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">绫诲瀷 0:婊＄増 1:绌烘澘: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ョ被鍨� 0:婊＄増 1:绌烘澘" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">琛屽彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="lineNumber" placeholder="璇疯緭鍏ヨ鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷 绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkType" placeholder="璇疯緭鍏ュ伐浣滅被鍨� 绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏍囪鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="bignTime" id="bignTime$" placeholder="璇疯緭鍏ユ爣璁版椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkCrn" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綅浜屽伐浣滃彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo2" placeholder="璇疯緭鍏ュ伐浣嶄簩宸ヤ綔鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綅涓�鐗╂枡鐮�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr1" placeholder="璇疯緭鍏ュ伐浣嶄竴鐗╂枡鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綅浜岀墿鏂欑爜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr2" placeholder="璇疯緭鍏ュ伐浣嶄簩鐗╂枡鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綅2绫诲瀷: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="type2" placeholder="璇疯緭鍏ュ伐浣�2绫诲瀷">
+ </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