From ceed56137f8165ff9ac3ce473385572d4c9c80d2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 十一月 2023 14:37:56 +0800
Subject: [PATCH] #平库上架
---
src/main/java/com/zy/asrs/service/impl/OriginRuleServiceImpl.java | 18 +
src/main/webapp/views/originRule/originRule.html | 135 +++++++++
src/main/java/com/zy/asrs/controller/OriginRuleController.java | 143 ++++++++++
src/main/java/com/zy/asrs/entity/param/DetlOriginDTO.java | 10
src/main/webapp/static/js/originRule/originRule.js | 261 ++++++++++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 10
src/main/java/com/zy/common/CodeBuilder.java | 4
src/main/java/com/zy/asrs/service/OriginRuleService.java | 11
/dev/null | 18 -
src/main/java/com/zy/asrs/entity/OriginRule.java | 120 ++++++++
src/main/resources/mapper/OriginRuleMapper.xml | 25 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 63 ++++
src/main/java/com/zy/asrs/mapper/OriginRuleMapper.java | 15 +
src/main/java/com/zy/asrs/service/MobileService.java | 2
14 files changed, 815 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index c6feda8..d264284 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -385,4 +385,14 @@
return mobileService.manDetlInBarcode(json,getUser());
}
+ @RequestMapping("/manDetl/in/origin")
+ @ManagerAuth(memo = "璁㈠崟涓婃灦(鎵樼洏鐮�)")
+ public R manDetlin(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.manDetlOrigin(json,getUser());
+ }
+
+
}
diff --git a/src/main/java/com/zy/asrs/controller/OriginRuleController.java b/src/main/java/com/zy/asrs/controller/OriginRuleController.java
new file mode 100644
index 0000000..0e3af6a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/OriginRuleController.java
@@ -0,0 +1,143 @@
+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.OriginRule;
+import com.zy.asrs.service.OriginRuleService;
+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 OriginRuleController extends BaseController {
+
+ @Autowired
+ private OriginRuleService originRuleService;
+
+ @RequestMapping(value = "/originRule/list/all")
+ public R orderList() {
+
+ return R.ok(originRuleService.selectAllOrigin());
+ }
+
+ @RequestMapping(value = "/originRule/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(originRuleService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/originRule/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<OriginRule> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(originRuleService.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 = "/originRule/add/auth")
+ @ManagerAuth
+ public R add(OriginRule originRule) {
+ Date now = new Date();
+ originRule.setCreateTime(now);
+ String username = null;
+ try{
+ username = getUser().getUsername();
+ }catch (Exception e){
+ username = "super";
+ }
+ originRule.setCreateBy(username);
+ originRule.setUpdateTime(now);
+ originRule.setUpdateBy(username);
+ originRuleService.insert(originRule);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/originRule/update/auth")
+ @ManagerAuth
+ public R update(OriginRule originRule){
+ if (Cools.isEmpty(originRule) || null==originRule.getId()){
+ return R.error();
+ }
+ Date now = new Date();
+ originRule.setUpdateTime(now);
+ originRule.setUpdateBy(getUser().getUsername());
+ originRuleService.updateById(originRule);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/originRule/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ originRuleService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/originRule/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<OriginRule> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("originRule"));
+ convert(map, wrapper);
+ List<OriginRule> list = originRuleService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/originRuleQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<OriginRule> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<OriginRule> page = originRuleService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (OriginRule originRule : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", originRule.getId());
+ map.put("value", originRule.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/originRule/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<OriginRule> wrapper = new EntityWrapper<OriginRule>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != originRuleService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(OriginRule.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/OriginRule.java b/src/main/java/com/zy/asrs/entity/OriginRule.java
new file mode 100644
index 0000000..562f7df
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/OriginRule.java
@@ -0,0 +1,120 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_origin_rule")
+public class OriginRule implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value= "鏉ユ簮鍦�")
+ @TableField("origin_address")
+ private String originAddress;
+
+ @ApiModelProperty(value= "缂栫爜寮�濮嬩綅缃�")
+ @TableField("start_code")
+ private Integer startCode;
+
+ @ApiModelProperty(value= "缂栫爜缁撴潫浣嶇疆")
+ @TableField("end_code")
+ private Integer endCode;
+
+ @ApiModelProperty(value= "閲嶉噺寮�濮嬩綅缃�")
+ @TableField("start_weight")
+ private Integer startWeight;
+
+ @ApiModelProperty(value= "閲嶉噺缁撴潫浣嶇疆")
+ @TableField("end_weight")
+ private Integer endWeight;
+
+ @ApiModelProperty(value= "鏃ユ湡寮�濮嬩綅缃�")
+ @TableField("start_date")
+ private Integer startDate;
+
+ @ApiModelProperty(value= "鏃ユ湡缁撴潫浣嶇疆")
+ @TableField("end_date")
+ private Integer endDate;
+
+ @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value= "鍒涘缓浜�")
+ @TableField("create_by")
+ private String createBy;
+
+ @ApiModelProperty(value= "鏇存柊鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ @ApiModelProperty(value= "鏇存柊浜�")
+ @TableField("update_by")
+ private String updateBy;
+
+ public OriginRule() {}
+
+ public OriginRule(Integer id,String originAddress,Integer startCode,Integer endCode,Integer startWeight,Integer endWeight,Integer startDate,Integer endDate,Date createTime,String createBy,Date updateTime,String updateBy) {
+ this.id = id;
+ this.originAddress = originAddress;
+ this.startCode = startCode;
+ this.endCode = endCode;
+ this.startWeight = startWeight;
+ this.endWeight = endWeight;
+ this.startDate = startDate;
+ this.endDate = endDate;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ }
+
+// OriginRule originRule = new OriginRule(
+// 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);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/DetlOriginDTO.java b/src/main/java/com/zy/asrs/entity/param/DetlOriginDTO.java
new file mode 100644
index 0000000..b50d9a7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/DetlOriginDTO.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class DetlOriginDTO {
+ private String matnr;
+ private String origin;
+ private Double anfme;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OriginRuleMapper.java b/src/main/java/com/zy/asrs/mapper/OriginRuleMapper.java
new file mode 100644
index 0000000..ab3e240
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OriginRuleMapper.java
@@ -0,0 +1,15 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.OriginRule;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface OriginRuleMapper extends BaseMapper<OriginRule> {
+
+ List<String> selectAllOrigin();
+}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 5cb73b9..a41d694 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -48,4 +48,6 @@
R manDetlInBarcode(JSONObject json ,User user);
R adjustNew(MobileAdjustNewParam combParam, Long userId);
+
+ R manDetlOrigin(JSONObject json, User user);
}
diff --git a/src/main/java/com/zy/asrs/service/OriginRuleService.java b/src/main/java/com/zy/asrs/service/OriginRuleService.java
new file mode 100644
index 0000000..263388e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/OriginRuleService.java
@@ -0,0 +1,11 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.OriginRule;
+import com.baomidou.mybatisplus.service.IService;
+
+import java.util.List;
+
+public interface OriginRuleService extends IService<OriginRule> {
+
+ List<String> selectAllOrigin();
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 56587e3..26928ec 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -86,6 +86,9 @@
@Autowired
private OrderCheckService orderCheckService;
+ @Autowired
+ private OriginRuleService originRuleService;
+
@Override
@@ -951,4 +954,64 @@
return R.ok("鐩樼偣鎴愬姛");
}
+
+ @Override
+ public R manDetlOrigin(JSONObject json, User user) {
+ String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+
+ JSONArray combMats = json.getJSONArray("combMats");
+ for (int i = 0; i < combMats.size(); i++) {
+ DetlOriginDTO jsonOriginDetl = combMats.getObject(i, DetlOriginDTO.class);
+ OriginRule originRule = originRuleService.selectOne(new EntityWrapper<OriginRule>()
+ .eq("origin_address", jsonOriginDetl.getOrigin()));
+ String code = "0";
+ String weight = "0";
+ String date = "0";
+ try{
+ if (originRule.getStartCode() != 0 && originRule.getEndCode() !=0){
+ code = jsonOriginDetl.getMatnr().substring(originRule.getStartCode() - 1, originRule.getEndCode());
+ }
+ if (originRule.getStartWeight() != 0 && originRule.getEndWeight() !=0){
+ weight = jsonOriginDetl.getMatnr().substring(originRule.getStartWeight() - 1, originRule.getEndWeight());
+ }
+ if (originRule.getStartDate() != 0 && originRule.getEndDate() !=0){
+ date = jsonOriginDetl.getMatnr().substring(originRule.getStartDate() - 1, originRule.getEndDate());
+ }
+ }catch (Exception e){
+ return R.error("鏉＄爜浣嶇疆鏈夎");
+ }
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
+ if (Cools.isEmpty(node)){
+ return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
+ }
+ Date now = new Date();
+ ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
+ manLocDetl.setLocNo(node.getName());
+ manLocDetl.setNodeId(node.getId());
+// manLocDetl.setZpallet(waitPakin.getZpallet());
+ manLocDetl.setAnfme(jsonOriginDetl.getAnfme());
+ manLocDetl.setMatnr(jsonOriginDetl.getMatnr());
+ manLocDetl.setMaktx(code);
+ manLocDetl.setWeight(Double.valueOf( weight));
+ manLocDetl.setUnit(date);
+ manLocDetl.setStatus(1);
+ manLocDetl.setCreateBy(user.getId());
+ manLocDetl.setCreateTime(now);
+ manLocDetl.setUpdateBy(user.getId());
+ manLocDetl.setModiTime(now);
+ // manLocDetl.setOrderNo(waitPakin.getOrderNo());
+ manLocDetl.setStockFreeze(1);
+
+ if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
+ return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
+ }
+
+
+
+
+
+
+ }
+ return R.ok();
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OriginRuleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OriginRuleServiceImpl.java
new file mode 100644
index 0000000..b1cecb8
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/OriginRuleServiceImpl.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.OriginRuleMapper;
+import com.zy.asrs.entity.OriginRule;
+import com.zy.asrs.service.OriginRuleService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("originRuleService")
+public class OriginRuleServiceImpl extends ServiceImpl<OriginRuleMapper, OriginRule> implements OriginRuleService {
+
+ @Override
+ public List<String> selectAllOrigin() {
+ return this.baseMapper.selectAllOrigin();
+ }
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 0a8b5f3..ea55d7a 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="192.168.4.15:1433;databasename=hzjzasrs";
+ generator.url="192.168.4.22:1433;databasename=hzjzasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_loc_rule";
+ generator.table="man_origin_rule";
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/locRule.sql b/src/main/java/locRule.sql
deleted file mode 100644
index 4590e55..0000000
--- a/src/main/java/locRule.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- 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/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/resources/mapper/OriginRuleMapper.xml b/src/main/resources/mapper/OriginRuleMapper.xml
new file mode 100644
index 0000000..c03843b
--- /dev/null
+++ b/src/main/resources/mapper/OriginRuleMapper.xml
@@ -0,0 +1,25 @@
+<?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.OriginRuleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.OriginRule">
+ <result column="id" property="id" />
+ <result column="origin_address" property="originAddress" />
+ <result column="start_code" property="startCode" />
+ <result column="end_code" property="endCode" />
+ <result column="start_weight" property="startWeight" />
+ <result column="end_weight" property="endWeight" />
+ <result column="start_date" property="startDate" />
+ <result column="end_date" property="endDate" />
+ <result column="create_time" property="createTime" />
+ <result column="create_by" property="createBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_by" property="updateBy" />
+
+ </resultMap>
+ <select id="selectAllOrigin" resultType="java.lang.String">
+ select origin_address from man_origin_rule
+ </select>
+
+</mapper>
diff --git a/src/main/webapp/static/js/originRule/originRule.js b/src/main/webapp/static/js/originRule/originRule.js
new file mode 100644
index 0000000..b96c2a3
--- /dev/null
+++ b/src/main/webapp/static/js/originRule/originRule.js
@@ -0,0 +1,261 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#originRule',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/originRule/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: 'originAddress', align: 'center',title: '鏉ユ簮鍦�'}
+ ,{field: 'startCode', align: 'center',title: '缂栫爜寮�濮�'}
+ ,{field: 'endCode', align: 'center',title: '缂栫爜缁撴潫'}
+ ,{field: 'startWeight', align: 'center',title: '閲嶉噺寮�濮�'}
+ ,{field: 'endWeight', align: 'center',title: '閲嶉噺缁撴潫'}
+ ,{field: 'startDate', align: 'center',title: '鏃ユ湡寮�濮�'}
+ ,{field: 'endDate', align: 'center',title: '鏃ユ湡缁撴潫'}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+ ,{field: 'createBy', align: 'center',title: '鍒涘缓浜�'}
+ // ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
+ // ,{field: 'updateBy', 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(originRule)', 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(originRule)', 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 = {
+ 'originRule': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/originRule/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(originRule)', 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+"/originRule/"+(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+"/originRule/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
+ });
+
+ }, 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/originRule/originRule.html b/src/main/webapp/views/originRule/originRule.html
new file mode 100644
index 0000000..095f3b6
--- /dev/null
+++ b/src/main/webapp/views/originRule/originRule.html
@@ -0,0 +1,135 @@
+<!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="originRule" lay-filter="originRule"></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/originRule/originRule.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="originAddress" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缂栫爜寮�濮�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startCode" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">閲嶉噺寮�濮�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startWeight" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏃ユ湡寮�濮�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startDate" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
+ <label class="layui-form-label"> </label>
+ <div class="layui-input-block">
+
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缂栫爜缁撴潫: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endCode" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">閲嶉噺缁撴潫: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endWeight" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏃ユ湡缁撴潫: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endDate" 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>
+
--
Gitblit v1.9.1