From 9bd955804174cd26cfe275d672a33220ae5a199f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 16 五月 2023 14:31:18 +0800
Subject: [PATCH] 堆垛机管理
---
src/main/java/com/zy/asrs/service/BasCrnStatusService.java | 8
src/main/webapp/views/basCrnp/basCrnp.html | 120 ++++++++
src/main/java/com/zy/asrs/service/impl/BasCrnStatusServiceImpl.java | 12
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 135 +++++++++
src/main/java/com/zy/asrs/mapper/BasCrnStatusMapper.java | 12
src/main/webapp/views/basCrnp/basCrnp_detail.html | 222 +++++++++++++++
src/main/resources/mapper/BasCrnStatusMapper.xml | 16 +
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 133 +++++++++
src/main/java/com/zy/asrs/entity/BasCrnStatus.java | 164 +++++++++++
9 files changed, 822 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
new file mode 100644
index 0000000..c9eec6d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -0,0 +1,135 @@
+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.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.BasCrnStatus;
+import com.zy.asrs.service.BasCrnStatusService;
+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 BasCrnStatusController extends BaseController {
+
+ @Autowired
+ private BasCrnStatusService basCrnStatusService;
+
+ @RequestMapping(value = "/basCrnStatus/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basCrnStatusService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basCrnStatus/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false, defaultValue = "stsNo")String orderByField,
+ @RequestParam(required = false, defaultValue = "asc")String orderByType,
+ @RequestParam Map<String, Object> param){
+ excludeTrash(param);
+ EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("sts_no", true);
+ }
+ return R.ok(basCrnStatusService.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 = "/basCrnStatus/add/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佹坊鍔�")
+ public R add(BasCrnStatus basCrnStatus) {
+ basCrnStatus.setModiUser(getUserId());
+ basCrnStatus.setModiTime(new Date());
+ basCrnStatus.setAppeUser(getUserId());
+ basCrnStatus.setAppeTime(new Date());
+ basCrnStatusService.insert(basCrnStatus);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basCrnStatus/update/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
+ public R update(BasCrnStatus basCrnStatus){
+ if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){
+ return R.error();
+ }
+ basCrnStatus.setModiUser(getUserId());
+ basCrnStatus.setModiTime(new Date());
+ basCrnStatusService.updateById(basCrnStatus);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basCrnStatus/delete/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸垹闄�")
+ public R delete(@RequestParam String param){
+ List<BasCrnStatus> list = JSONArray.parseArray(param, BasCrnStatus.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ for (BasCrnStatus entity : list){
+ basCrnStatusService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basCrnStatus/export/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸鍑�")
+ public R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnStatus"));
+ convert(map, wrapper);
+ List<BasCrnStatus> list = basCrnStatusService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basCrnStatusQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
+ wrapper.like("sts_desc", condition);
+ Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasCrnStatus basCrnStatus : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basCrnStatus.getStsNo());
+ map.put("value", basCrnStatus.getStsDesc());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basCrnStatus/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasCrnStatus> wrapper = new EntityWrapper<BasCrnStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basCrnStatusService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasCrnStatus.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
new file mode 100644
index 0000000..e95f0b7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -0,0 +1,133 @@
+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.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.service.BasCrnpService;
+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 BasCrnpController extends BaseController {
+
+ @Autowired
+ private BasCrnpService basCrnpService;
+
+ @RequestMapping(value = "/basCrnp/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basCrnpService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basCrnp/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){
+ excludeTrash(param);
+ EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basCrnpService.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 = "/basCrnp/add/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈烘坊鍔�")
+ public R add(BasCrnp basCrnp) {
+ basCrnp.setModiUser(getUserId());
+ basCrnp.setModiTime(new Date());
+ basCrnp.setAppeUser(getUserId());
+ basCrnp.setAppeTime(new Date());
+ basCrnpService.insert(basCrnp);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basCrnp/update/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈轰慨鏀�")
+ public R update(BasCrnp basCrnp){
+ if (Cools.isEmpty(basCrnp) || null==basCrnp.getCrnNo()){
+ return R.error();
+ }
+ basCrnp.setModiUser(getUserId());
+ basCrnp.setModiTime(new Date());
+ basCrnpService.updateById(basCrnp);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basCrnp/delete/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈哄垹闄�")
+ public R delete(@RequestParam String param){
+ List<BasCrnp> list = JSONArray.parseArray(param, BasCrnp.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ for (BasCrnp entity : list){
+ basCrnpService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basCrnp/export/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈哄鍑�")
+ public R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnp"));
+ convert(map, wrapper);
+ List<BasCrnp> list = basCrnpService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basCrnpQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
+ wrapper.like("crn_no", condition);
+ Page<BasCrnp> page = basCrnpService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasCrnp basCrnp : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basCrnp.getCrnNo());
+ map.put("value", basCrnp.getCrnNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basCrnp/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasCrnp> wrapper = new EntityWrapper<BasCrnp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basCrnpService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasCrnp.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
new file mode 100644
index 0000000..a0d44cf
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -0,0 +1,164 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@TableName("asr_bas_crn_status")
+public class BasCrnStatus implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 宸ヤ綔浠ｅ彿
+ */
+ @ApiModelProperty(value= "鐘舵�佷唬鍙�")
+ @TableId(value = "sts_no", type = IdType.INPUT)
+ @TableField("sts_no")
+ private String stsNo;
+
+ /**
+ * 鐘舵�佹弿杩�
+ */
+ @ApiModelProperty(value= "鐘舵�佹弿杩�")
+ @TableField("sts_desc")
+ private String stsDesc;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ private Date modiTime;
+
+ /**
+ * 鍒涘缓鑰�
+ */
+ @ApiModelProperty(value= "鍒涘缓鑰�")
+ @TableField("appe_user")
+ private Long appeUser;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("appe_time")
+ private Date appeTime;
+
+ public BasCrnStatus() {}
+
+ public BasCrnStatus(String stsDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
+ this.stsDesc = stsDesc;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.appeUser = appeUser;
+ this.appeTime = appeTime;
+ }
+
+// BasCrnStatus basCrnStatus = new BasCrnStatus(
+// null, // 鐘舵�佹弿杩�
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 鍒涘缓鑰�
+// null // 娣诲姞鏃堕棿
+// );
+
+ public String getStsNo() {
+ return stsNo;
+ }
+
+ public void setStsNo(String stsNo) {
+ this.stsNo = stsNo;
+ }
+
+ public String getStsDesc() {
+ return stsDesc;
+ }
+
+ public void setStsDesc(String stsDesc) {
+ this.stsDesc = stsDesc;
+ }
+
+ public Long getModiUser() {
+ return modiUser;
+ }
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public Date getModiTime() {
+ return modiTime;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public Long getAppeUser() {
+ return appeUser;
+ }
+
+ public String getAppeUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public Date getAppeTime() {
+ return appeTime;
+ }
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnStatusMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnStatusMapper.java
new file mode 100644
index 0000000..87ec704
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnStatusMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasCrnStatus;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasCrnStatusMapper extends BaseMapper<BasCrnStatus> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasCrnStatusService.java b/src/main/java/com/zy/asrs/service/BasCrnStatusService.java
new file mode 100644
index 0000000..e183b34
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasCrnStatusService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasCrnStatus;
+
+public interface BasCrnStatusService extends IService<BasCrnStatus> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnStatusServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnStatusServiceImpl.java
new file mode 100644
index 0000000..66f4599
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnStatusServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasCrnStatus;
+import com.zy.asrs.mapper.BasCrnStatusMapper;
+import com.zy.asrs.service.BasCrnStatusService;
+import org.springframework.stereotype.Service;
+
+@Service("basCrnStatusService")
+public class BasCrnStatusServiceImpl extends ServiceImpl<BasCrnStatusMapper, BasCrnStatus> implements BasCrnStatusService {
+
+}
diff --git a/src/main/resources/mapper/BasCrnStatusMapper.xml b/src/main/resources/mapper/BasCrnStatusMapper.xml
new file mode 100644
index 0000000..bfcfc3f
--- /dev/null
+++ b/src/main/resources/mapper/BasCrnStatusMapper.xml
@@ -0,0 +1,16 @@
+<?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.BasCrnStatusMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnStatus">
+ <id column="sts_no" property="stsNo" />
+ <result column="sts_desc" property="stsDesc" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="appe_user" property="appeUser" />
+ <result column="appe_time" property="appeTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/views/basCrnp/basCrnp.html b/src/main/webapp/views/basCrnp/basCrnp.html
new file mode 100644
index 0000000..502afcc
--- /dev/null
+++ b/src/main/webapp/views/basCrnp/basCrnp.html
@@ -0,0 +1,120 @@
+<!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/wms/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+ <!--<div class="layui-inline">-->
+ <!--<label class="layui-form-label">鐘躲��銆�鎬侊細</label>-->
+ <!--<div class="layui-input-inline cool-auto-complete">-->
+ <!--<input id="crnSts" class="layui-input" name="crn_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+ <!--<input id="crnSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�" onfocus=this.blur()>-->
+ <!--<div class="cool-auto-complete-window">-->
+ <!--<input class="cool-auto-complete-window-input" data-key="basCrnStatusQueryBycrnSts" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+ <!--<select class="cool-auto-complete-window-select" data-key="basCrnStatusQueryBycrnStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+ <!--</select>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="layui-inline">-->
+ <!--<label class="layui-form-label">寮� 甯� 鐮侊細</label>-->
+ <!--<div class="layui-input-inline cool-auto-complete">-->
+ <!--<input id="crnErr" class="layui-input" name="crn_err" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+ <!--<input id="crnErr$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�" onfocus=this.blur()>-->
+ <!--<div class="cool-auto-complete-window">-->
+ <!--<input class="cool-auto-complete-window-input" data-key="basCrnErrorQueryBycrnErr" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+ <!--<select class="cool-auto-complete-window-select" data-key="basCrnErrorQueryBycrnErrSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+ <!--</select>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="frmLocno" class="layui-input" name="frm_locno" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="frmLocno$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="婧愬簱浣�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="locMastQueryByfrmLocno" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="locMastQueryByfrmLocnoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="frmSta" class="layui-input" name="frm_sta" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="frmSta$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="婧愮珯" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basDevpQueryByfrmSta" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basDevpQueryByfrmStaSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="toSta" class="layui-input" name="to_sta" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="toSta$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鐩爣绔�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basDevpQueryBytoSta" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basDevpQueryBytoStaSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="toLocno" class="layui-input" name="to_locno" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="toLocno$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鐩爣搴撲綅" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="locMastQueryBytoLocno" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="locMastQueryBytoLocnoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="basCrnp" lay-filter="basCrnp"></table>
+</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" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+</script>
+
+<script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/basCrnp/basCrnp.js" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/basCrnp/basCrnp_detail.html b/src/main/webapp/views/basCrnp/basCrnp_detail.html
new file mode 100644
index 0000000..3027491
--- /dev/null
+++ b/src/main/webapp/views/basCrnp/basCrnp_detail.html
@@ -0,0 +1,222 @@
+<!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/wms/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form" style="text-align: center;">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="crnNo" class="layui-input" type="text" onkeyup="check(this.id, 'basCrnp')" lay-verify="required|number">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">鍙��銆�鍏ワ細</label>
+ <div class="layui-input-inline" style="text-align: left">
+ <input id="inEnable" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">鍙��銆�鍑猴細</label>
+ <div class="layui-input-inline" style="text-align: left">
+ <input id="outEnable" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">鐘躲��銆�鎬侊細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="crnSts" class="layui-input" type="text" style="display: none">
+ <input id="crnSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basCrnStatusQueryBycrnSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basCrnStatusQueryBycrnStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="wrkNo" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">寮� 甯� 鐮侊細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="crnErr" class="layui-input" type="text" style="display: none">
+ <input id="crnErr$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basCrnErrorQueryBycrnErr" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basCrnErrorQueryBycrnErrSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">婧� 搴� 浣嶏細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="frmLocno" class="layui-input" type="text" style="display: none">
+ <input id="frmLocno$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="locMastQueryByfrmLocno" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="locMastQueryByfrmLocnoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">婧愩��銆�绔欙細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="frmSta" class="layui-input" type="text" style="display: none">
+ <input id="frmSta$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basDevpQueryByfrmSta" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basDevpQueryByfrmStaSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐩� 鏍� 绔欙細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="toSta" class="layui-input" type="text" style="display: none">
+ <input id="toSta$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basDevpQueryBytoSta" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basDevpQueryBytoStaSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐩爣搴撲綅锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="toLocno" class="layui-input" type="text" style="display: none">
+ <input id="toLocno$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="locMastQueryBytoLocno" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="locMastQueryBytoLocnoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">鍒� 寤� 鑰咃細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="appeUser" class="layui-input" type="text" style="display: none">
+ <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">鍒涘缓鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">淇敼浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" type="text" style="display: none">
+ <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">淇敼鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="hpMk" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="retrieveMk" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="ctlHp" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="ctlRest" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="empIn" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="tankQty" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="tankQty1" class="layui-input" type="text">
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>
+<script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/basCrnp/basCrnp.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1