From 3bcbf7e0bc53dea03ad7a267dd0dfec7262b96ce Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 28 十二月 2023 14:07:05 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/locRule.sql | 18 +
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocRuleController.java | 110 +++++++
zy-asrs-wms/src/main/webapp/static/js/locRule/locRule.js | 278 ++++++++++++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocRuleService.java | 8
zy-asrs-wms/src/main/webapp/views/locRule/locRule.html | 203 +++++++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocRuleMapper.java | 12
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocRuleServiceImpl.java | 12
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocRule.java | 202 +++++++++++++
zy-asrs-common/src/main/resources/mapper/wms/LocRuleMapper.xml | 5
9 files changed, 848 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocRuleController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocRuleController.java
new file mode 100644
index 0000000..a5d6420
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocRuleController.java
@@ -0,0 +1,110 @@
+package com.zy.asrs.common.wms.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.wms.entity.LocRule;
+import com.zy.asrs.common.wms.service.LocRuleService;
+import com.zy.asrs.framework.annotations.ManagerAuth;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.domain.KeyValueVo;
+import com.zy.asrs.framework.common.DateUtils;
+import com.zy.asrs.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class LocRuleController extends BaseController {
+
+ @Autowired
+ private LocRuleService locRuleService;
+
+ @RequestMapping(value = "/locRule/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(locRuleService.getById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/locRule/page/auth")
+ @ManagerAuth
+ public R page(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String condition,
+ @RequestParam(required = false) String timeRange,
+ @RequestParam Map<String, Object> param) {
+ LambdaQueryWrapper<LocRule> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LocRule::getHostId, getHostId());
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(LocRule::getId, condition);
+ }
+ if (!Cools.isEmpty(timeRange)) {
+ String[] range = timeRange.split(RANGE_TIME_LINK);
+ wrapper.ge(LocRule::getCreateTime, DateUtils.convert(range[0]));
+ wrapper.le(LocRule::getCreateTime, DateUtils.convert(range[1]));
+ }
+ return R.ok(locRuleService.page(new Page<>(curr, limit), wrapper));
+ }
+
+
+ @RequestMapping(value = "/locRule/add/auth")
+ @ManagerAuth
+ public R add(LocRule locRule) {
+ locRule.setHostId(getHostId());
+ locRuleService.save(locRule);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/locRule/update/auth")
+ @ManagerAuth
+ public R update(LocRule locRule){
+ if (Cools.isEmpty(locRule) || null==locRule.getId()){
+ return R.error();
+ }
+ locRuleService.updateById(locRule);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/locRule/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ locRuleService.removeById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/locRuleQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ LambdaQueryWrapper<LocRule> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LocRule::getHostId, getHostId());
+ wrapper.like(LocRule::getId, condition);
+ Page<LocRule> page = locRuleService.page(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (LocRule locRule : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", locRule.getId());
+ map.put("value", locRule.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping("/locRule/all/get/kv")
+ @ManagerAuth
+ public R getDataKV(@RequestParam(required = false) String condition) {
+ List<KeyValueVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<LocRule> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LocRule::getHostId, getHostId());
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(LocRule::getId, condition);
+ }
+ locRuleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
+ return R.ok().add(vos);
+ }
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocRule.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocRule.java
new file mode 100644
index 0000000..0d41962
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocRule.java
@@ -0,0 +1,202 @@
+package com.zy.asrs.common.wms.entity;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.common.sys.entity.User;
+import com.zy.asrs.common.sys.entity.Host;
+import com.zy.asrs.common.sys.service.UserService;
+import com.zy.asrs.common.sys.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("wms_loc_rule")
+public class LocRule implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value= "")
+ private String matnr;
+
+ @ApiModelProperty(value= "")
+ private String specs;
+
+ @ApiModelProperty(value= "")
+ private String model;
+
+ @ApiModelProperty(value= "")
+ private String cstmr;
+
+ @ApiModelProperty(value= "")
+ private String batch;
+
+ @ApiModelProperty(value= "")
+ private String other;
+
+ @ApiModelProperty(value= "")
+ private Integer rowBeg;
+
+ @ApiModelProperty(value= "")
+ private Integer rowEnd;
+
+ @ApiModelProperty(value= "")
+ private Integer bayBeg;
+
+ @ApiModelProperty(value= "")
+ private Integer bayEnd;
+
+ @ApiModelProperty(value= "")
+ private Integer levBeg;
+
+ @ApiModelProperty(value= "")
+ private Integer levEnd;
+
+ @ApiModelProperty(value= "")
+ private Integer limit;
+
+ @ApiModelProperty(value= "")
+ private Integer status;
+
+ @ApiModelProperty(value= "")
+ private Long createBy;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value= "")
+ private Long updateBy;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ @ApiModelProperty(value= "")
+ private String memo;
+
+ /**
+ * 鏄惁鏀寔娣疯浇 0: 涓嶆敮鎸� 1: 鏀寔
+ */
+ @ApiModelProperty(value= "鏄惁鏀寔娣疯浇 0: 涓嶆敮鎸� 1: 鏀寔 ")
+ private Short mixed;
+
+ /**
+ * 鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵� 0: 鍚� 1: 鏄�
+ */
+ @ApiModelProperty(value= "鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵� 0: 鍚� 1: 鏄� ")
+ private Short keepGo;
+
+ /**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty(value= "浠撳簱ID")
+ private Long hostId;
+
+ public LocRule() {}
+
+ public LocRule(String matnr,String specs,String model,String cstmr,String batch,String other,Integer rowBeg,Integer rowEnd,Integer bayBeg,Integer bayEnd,Integer levBeg,Integer levEnd,Integer limit,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Short mixed,Short keepGo) {
+ this.matnr = matnr;
+ this.specs = specs;
+ this.model = model;
+ this.cstmr = cstmr;
+ this.batch = batch;
+ this.other = other;
+ this.rowBeg = rowBeg;
+ this.rowEnd = rowEnd;
+ this.bayBeg = bayBeg;
+ this.bayEnd = bayEnd;
+ this.levBeg = levBeg;
+ this.levEnd = levEnd;
+ this.limit = limit;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.mixed = mixed;
+ this.keepGo = keepGo;
+ }
+
+// LocRule locRule = new LocRule(
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, // 鏄惁鏀寔娣疯浇
+// null // 鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵�
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getMixed$(){
+ if (null == this.mixed){ return null; }
+ switch (this.mixed){
+ case 0:
+ return "涓嶆敮鎸�";
+ case 1:
+ return "鏀寔";
+ default:
+ return String.valueOf(this.mixed);
+ }
+ }
+
+ public String getKeepGo$(){
+ if (null == this.keepGo){ return null; }
+ switch (this.keepGo){
+ case 0:
+ return "鍚�";
+ case 1:
+ return "鏄�";
+ default:
+ return String.valueOf(this.keepGo);
+ }
+ }
+
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocRuleMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocRuleMapper.java
new file mode 100644
index 0000000..1afd995
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocRuleMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.common.wms.mapper;
+
+import com.zy.asrs.common.wms.entity.LocRule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface LocRuleMapper extends BaseMapper<LocRule> {
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocRuleService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocRuleService.java
new file mode 100644
index 0000000..79cc6cd
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocRuleService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.common.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.common.wms.entity.LocRule;
+
+public interface LocRuleService extends IService<LocRule> {
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocRuleServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocRuleServiceImpl.java
new file mode 100644
index 0000000..388ce99
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocRuleServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.common.wms.service.impl;
+
+import com.zy.asrs.common.wms.mapper.LocRuleMapper;
+import com.zy.asrs.common.wms.entity.LocRule;
+import com.zy.asrs.common.wms.service.LocRuleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("locRuleService")
+public class LocRuleServiceImpl extends ServiceImpl<LocRuleMapper, LocRule> implements LocRuleService {
+
+}
diff --git a/zy-asrs-common/src/main/java/locRule.sql b/zy-asrs-common/src/main/java/locRule.sql
new file mode 100644
index 0000000..4590e55
--- /dev/null
+++ b/zy-asrs-common/src/main/java/locRule.sql
@@ -0,0 +1,18 @@
+-- save locRule record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule/locRule.html', 'locRule绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locRule#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule/locRule.html', N'locRule绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locRule#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/LocRuleMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/LocRuleMapper.xml
new file mode 100644
index 0000000..92583a9
--- /dev/null
+++ b/zy-asrs-common/src/main/resources/mapper/wms/LocRuleMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.common.wms.mapper.LocRuleMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locRule/locRule.js b/zy-asrs-wms/src/main/webapp/static/js/locRule/locRule.js
new file mode 100644
index 0000000..5362118
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/static/js/locRule/locRule.js
@@ -0,0 +1,278 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#locRule',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/locRule/page/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ where:{cstmr : 0},
+ cols: [[
+ {type: 'checkbox'}
+ // ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
+ ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}
+ ,{field: 'cstmr', align: 'center',title: '瀹㈡埛', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ // ,{field: 'other', align: 'center',title: '搴撳尯'}
+ ,{field: 'rowBeg', align: 'center',title: '寮�濮嬫帓'}
+ ,{field: 'rowEnd', align: 'center',title: '缁撴潫鎺�'}
+ ,{field: 'bayBeg', align: 'center',title: '寮�濮嬪垪'}
+ ,{field: 'bayEnd', align: 'center',title: '缁撴潫鍒�'}
+ ,{field: 'levBeg', align: 'center',title: '寮�濮嬪眰'}
+ ,{field: 'levEnd', align: 'center',title: '缁撴潫灞�'}
+ ,{field: 'limit', align: 'center',title: '涓婇檺', hide: true}
+ ,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
+ ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳', hide: true}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿', hide: true}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ // ,{field: 'mixed$', align: 'center',title: '娣疯浇'}
+ // ,{field: 'keepGo$', 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(locRule)', 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(locRule)', 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 = {
+ 'locRule': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/locRule/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(locRule)', 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: '1000px',
+ title: (mData ? '淇敼' : '娣诲姞') + '搴撳尯瑙勫垯',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ data.field.cstmr = 0;
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/locRule/"+(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+"/locRule/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/zy-asrs-wms/src/main/webapp/views/locRule/locRule.html b/zy-asrs-wms/src/main/webapp/views/locRule/locRule.html
new file mode 100644
index 0000000..76f0742
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/views/locRule/locRule.html
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="locRule" lay-filter="locRule"></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/locRule/locRule.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-md6">
+ <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 class="layui-form-item">-->
+ <!-- <label class="layui-form-label">瑙勬牸: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="specs" placeholder="璇疯緭鍏ヨ鏍�">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鍨嬪彿: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="model" placeholder="璇疯緭鍏ュ瀷鍙�">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">瀹㈡埛: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="cstmr" placeholder="璇疯緭鍏ュ鎴�">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵瑰彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="batch" placeholder="璇疯緭鍏ユ壒鍙�">
+ </div>
+ </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">搴撳尯: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="other" placeholder="璇疯緭鍏ュ簱鍖猴紝涓嶅～鍒欓粯璁や负鍥涢」搴撳簱浣嶈鍒�">-->
+<!-- </div>-->
+<!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鍏朵粬: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="other" placeholder="璇疯緭鍏ュ叾浠�">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">涓婇檺: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="limit" placeholder="璇疯緭鍏ヤ笂闄�">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣疯浇: </label>
+ <div class="layui-input-block">
+ <select name="mixed">
+ <option value="1">鏄�</option>
+ <option value="0" selected>鍚�</option>
+ </select>
+ </div>
+ </div>
+ <!-- <div class="layui-form-item">
+ <label class="layui-form-label">娣疯浇鏈壘鍒板簱浣嶇户缁悳绱�: </label>
+ <div class="layui-input-block">
+ <select name="keepGo">
+ <option value="1">鏄�</option>
+ <option value="0" selected>鍚�</option>
+ </select>
+ </div>
+ </div>-->
+
+ </div>
+
+ <div class="layui-col-md6">
+ <!-- <div class="layui-inline">-->
+ <!-- <label class="layui-form-label">鎺掕寖鍥�</label>-->
+ <!-- <div class="layui-input-inline" style="width: 100px;">-->
+ <!-- <input type="text" name="price_min" placeholder="锟�" autocomplete="off" class="layui-input">-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-mid">-</div>-->
+ <!-- <div class="layui-input-inline" style="width: 100px;">-->
+ <!-- <input type="text" name="price_max" placeholder="锟�" autocomplete="off" class="layui-input">-->
+ <!-- </div>-->
+ <!-- </div>-->
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">寮�濮嬫帓: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="rowBeg" placeholder="璇疯緭鍏ュ紑濮嬫帓" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁撴潫鎺�: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="rowEnd" placeholder="璇疯緭鍏ョ粨鏉熸帓" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">寮�濮嬪垪: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="bayBeg" placeholder="璇疯緭鍏ュ紑濮嬪垪" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁撴潫鍒�: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="bayEnd" placeholder="璇疯緭鍏ョ粨鏉熷垪" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">寮�濮嬪眰: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="levBeg" placeholder="璇疯緭鍏ュ紑濮嬪眰" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁撴潫灞�: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="levEnd" placeholder="璇疯緭鍏ョ粨鏉熷眰" lay-vertype="tips" lay-verify="required" required="">
+ </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