From 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期一, 30 一月 2023 22:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java           |    2 
 src/main/webapp/views/home/console.html                         |   62 ++
 src/main/java/com/zy/asrs/service/LocRuleService.java           |   10 
 src/main/resources/mapper/LocDetlMapper.xml                     |    8 
 src/main/resources/mapper/LocMastMapper.xml                     |  111 ++++
 src/main/java/com/zy/asrs/entity/CheckRecord.java               |   42 +
 src/main/java/com/zy/asrs/mapper/LocRuleMapper.java             |   12 
 src/main/java/com/zy/asrs/mapper/LocMastMapper.java             |    6 
 src/main/resources/mapper/MatMapper.xml                         |    2 
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java   |   19 
 src/main/java/com/zy/common/model/DetlDto.java                  |    5 
 src/main/resources/mapper/CheckRecordMapper.xml                 |    1 
 src/main/resources/mapper/LocRuleMapper.xml                     |   30 +
 src/main/webapp/static/js/common.js                             |    4 
 src/main/java/com/zy/common/service/CommonService.java          |  119 +++
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java  |   14 
 src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java  |   50 +
 src/main/java/com/zy/asrs/task/MatScheduler.java                |   32 +
 src/main/resources/mapper/ViewStayTimeMapper.xml                |    3 
 src/main/resources/mapper/WrkMastMapper.xml                     |    2 
 src/main/java/com/zy/common/CodeBuilder.java                    |    4 
 src/main/webapp/static/js/checkRecord/checkRecord.js            |   29 +
 src/main/webapp/views/locRule/locRule.html                      |  179 ++++++
 src/main/webapp/views/waitPakinLog/waitPakinLog.html            |    5 
 /dev/null                                                       |   18 
 src/main/webapp/static/js/locRule/locRule.js                    |  274 ++++++++++
 src/main/java/com/zy/asrs/controller/CheckRecordController.java |   30 
 src/main/java/com/zy/asrs/controller/LocRuleController.java     |  150 +++++
 src/main/java/com/zy/asrs/entity/dto/MatnrCountDto.java         |   12 
 src/main/java/com/zy/asrs/task/handler/MatHandler.java          |   77 ++
 src/main/webapp/views/checkRecord/checkRecord.html              |   22 
 src/main/java/com/zy/asrs/entity/LocRule.java                   |  253 +++++++++
 src/main/java/com/zy/asrs/service/LocMastService.java           |    4 
 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js          |    2 
 src/main/resources/application.yml                              |    3 
 src/main/java/com/zy/asrs/controller/ReportQueryController.java |   15 
 36 files changed, 1,537 insertions(+), 74 deletions(-)

diff --git a/src/main/java/checkRecord.sql b/src/main/java/checkRecord.sql
deleted file mode 100644
index 5b2a76d..0000000
--- a/src/main/java/checkRecord.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save checkRecord record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord/checkRecord.html', 'checkRecord绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord/checkRecord.html', N'checkRecord绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#view', N'鏌ヨ', '60586', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-add', N'鏂板', '60586', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-edit', N'缂栬緫', '60586', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-delete', N'鍒犻櫎', '60586', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-export', N'瀵煎嚭', '60586', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/CheckRecordController.java b/src/main/java/com/zy/asrs/controller/CheckRecordController.java
index 3874c82..ff128ce 100644
--- a/src/main/java/com/zy/asrs/controller/CheckRecordController.java
+++ b/src/main/java/com/zy/asrs/controller/CheckRecordController.java
@@ -1,22 +1,24 @@
 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.CheckRecord;
-import com.zy.asrs.service.CheckRecordService;
 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.CheckRecord;
+import com.zy.asrs.service.CheckRecordService;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 public class CheckRecordController extends BaseController {
@@ -42,7 +44,9 @@
         excludeTrash(param);
         convert(param, wrapper);
         allLike(CheckRecord.class, param.keySet(), wrapper, condition);
-        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+            wrapper.orderBy("create_time", false);
+        }
         return R.ok(checkRecordService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
@@ -85,6 +89,20 @@
         return R.ok();
     }
 
+    @RequestMapping(value = "/checkRecord/auditing/auth")
+    @ManagerAuth
+    public R auditing(Long id){
+        CheckRecord checkRecord = checkRecordService.selectById(id);
+        if (Cools.isEmpty(checkRecord)) {
+            return R.error();
+        }
+        checkRecord.setStatus(1);
+        if (!checkRecordService.updateById(checkRecord)) {
+            return R.error();
+        }
+        return R.ok();
+    }
+
     @RequestMapping(value = "/checkRecord/export/auth")
     @ManagerAuth
     public R export(@RequestBody JSONObject param){
diff --git a/src/main/java/com/zy/asrs/controller/LocRuleController.java b/src/main/java/com/zy/asrs/controller/LocRuleController.java
new file mode 100644
index 0000000..89c28d6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/LocRuleController.java
@@ -0,0 +1,150 @@
+package com.zy.asrs.controller;
+
+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.LocRule;
+import com.zy.asrs.service.LocRuleService;
+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 LocRuleController extends BaseController {
+
+    @Autowired
+    private LocRuleService locRuleService;
+
+    @RequestMapping(value = "/locRule/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(locRuleService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/locRule/list/auth")
+    @ManagerAuth
+    public R list(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam(required = false)String condition,
+                  @RequestParam Map<String, Object> param){
+        EntityWrapper<LocRule> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(LocRule.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(locRuleService.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 = "/locRule/add/auth")
+    @ManagerAuth
+    public R add(LocRule locRule) {
+        if ((locRule.getRowBeg() < locRule.getRowEnd()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) {
+            return R.error("鎺掑尯闂撮敊璇�");
+        }
+        if ((locRule.getBayBeg() < locRule.getBayEnd()) || locRule.getBayBeg() <= 0 || locRule.getBayEnd() <= 0) {
+            return R.error("鍒楀尯闂撮敊璇�");
+        }
+        if ((locRule.getLevBeg() < locRule.getLevEnd()) || locRule.getLevBeg() <= 0 || locRule.getLevEnd() <= 0) {
+            return R.error("灞傚尯闂撮敊璇�");
+        }
+        Date now = new Date();
+        locRule.setStatus(1);
+        locRule.setCreateBy(getUserId());
+        locRule.setCreateTime(now);
+        locRule.setUpdateBy(getUserId());
+        locRule.setUpdateTime(now);
+        locRuleService.insert(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();
+        }
+        if ((locRule.getRowBeg() < locRule.getRowEnd()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) {
+            return R.error("鎺掑尯闂撮敊璇�");
+        }
+        if ((locRule.getBayBeg() < locRule.getBayEnd()) || locRule.getBayBeg() <= 0 || locRule.getBayEnd() <= 0) {
+            return R.error("鍒楀尯闂撮敊璇�");
+        }
+        if ((locRule.getLevBeg() < locRule.getLevEnd()) || locRule.getLevBeg() <= 0 || locRule.getLevEnd() <= 0) {
+            return R.error("灞傚尯闂撮敊璇�");
+        }
+        locRule.setUpdateBy(getUserId());
+        locRule.setUpdateTime(new Date());
+        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.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/locRule/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<LocRule> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("locRule"));
+        convert(map, wrapper);
+        List<LocRule> list = locRuleService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/locRuleQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<LocRule> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<LocRule> page = locRuleService.selectPage(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(value = "/locRule/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<LocRule> wrapper = new EntityWrapper<LocRule>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != locRuleService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(LocRule.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index b25238c..03433fc 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -68,6 +68,21 @@
 		ViewStayTimeBean bean = new ViewStayTimeBean();
 		bean.setPageSize(limit);
 		bean.setPageNumber(curr);
+		String matnr = String.valueOf(param.get("matnr"));
+		if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+			bean.setMatnr(matnr);
+		}
+
+		String maktx = String.valueOf(param.get("maktx"));
+		if (!Cools.isEmpty(maktx) && !maktx.equals("null")) {
+			bean.setMaktx(maktx);
+		}
+
+		String specs = String.valueOf(param.get("specs"));
+		if (!Cools.isEmpty(specs) && !specs.equals("null")) {
+			bean.setSpecs(specs);
+		}
+
 		String locNo = String.valueOf(param.get("loc_no"));
 		if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
 			bean.setLoc_no(locNo);
diff --git a/src/main/java/com/zy/asrs/entity/CheckRecord.java b/src/main/java/com/zy/asrs/entity/CheckRecord.java
index 06a8403..ed0a0ac 100644
--- a/src/main/java/com/zy/asrs/entity/CheckRecord.java
+++ b/src/main/java/com/zy/asrs/entity/CheckRecord.java
@@ -1,24 +1,31 @@
 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 com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
 import com.zy.common.utils.Synchro;
-import org.springframework.format.annotation.DateTimeFormat;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @Data
 @TableName("asr_check_record")
 public class CheckRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
 
     /**
      * 搴撲綅鍙�
@@ -83,6 +90,12 @@
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    /**
+     * 鐘舵�� 1: 宸插鏍�  0: 鏈鏍�
+     */
+    @ApiModelProperty(value= "鐘舵�� 1: 宸插鏍�  0: 鏈鏍�  ")
+    private Integer status;
+
     public CheckRecord() {}
 
     public CheckRecord(String locNo,String barcode,String matnr,String maktx,String specs,String batch,Double anfme,Double confirmQty,Date createTime) {
@@ -127,4 +140,17 @@
             return null;
         }
     }
+
+    public String getStatus$(){
+        if (null == this.status){ return null; }
+        switch (this.status){
+            case 1:
+                return "宸插鏍�";
+            case 0:
+                return "鏈鏍�";
+            default:
+                return String.valueOf(this.status);
+        }
+    }
+
 }
diff --git a/src/main/java/com/zy/asrs/entity/LocRule.java b/src/main/java/com/zy/asrs/entity/LocRule.java
new file mode 100644
index 0000000..12d5d00
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/LocRule.java
@@ -0,0 +1,253 @@
+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 com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_loc_rule")
+public class LocRule implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value= "ID")
+    @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= "寮�濮嬫帓")
+    @TableField("row_beg")
+    private Integer rowBeg;
+
+    /**
+     * 缁撴潫鎺�
+     */
+    @ApiModelProperty(value= "缁撴潫鎺�")
+    @TableField("row_end")
+    private Integer rowEnd;
+
+    /**
+     * 寮�濮嬪垪
+     */
+    @ApiModelProperty(value= "寮�濮嬪垪")
+    @TableField("bay_beg")
+    private Integer bayBeg;
+
+    /**
+     * 缁撴潫鍒�
+     */
+    @ApiModelProperty(value= "缁撴潫鍒�")
+    @TableField("bay_end")
+    private Integer bayEnd;
+
+    /**
+     * 寮�濮嬪眰
+     */
+    @ApiModelProperty(value= "寮�濮嬪眰")
+    @TableField("lev_beg")
+    private Integer levBeg;
+
+    /**
+     * 缁撴潫灞�
+     */
+    @ApiModelProperty(value= "缁撴潫灞�")
+    @TableField("lev_end")
+    private Integer levEnd;
+
+    /**
+     * 涓婇檺
+     */
+    @ApiModelProperty(value= "涓婇檺")
+    private Integer limit;
+
+    /**
+     * 鐘舵�� 1: 姝ｅ父  0: 绂佺敤  
+     */
+    @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 绂佺敤  ")
+    private Integer status;
+
+    /**
+     * 娣诲姞浜哄憳
+     */
+    @ApiModelProperty(value= "娣诲姞浜哄憳")
+    @TableField("create_by")
+    private Long createBy;
+
+    /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @TableField("create_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 淇敼浜哄憳
+     */
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("update_by")
+    private Long updateBy;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @TableField("update_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value= "澶囨敞")
+    private String memo;
+
+    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) {
+        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;
+    }
+
+//    LocRule locRule = new LocRule(
+//            null,    // 鍟嗗搧缂栧彿
+//            null,    // 瑙勬牸
+//            null,    // 鍨嬪彿
+//            null,    // 瀹㈡埛
+//            null,    // 鎵瑰彿
+//            null,    // 鍏朵粬
+//            null,    // 寮�濮嬫帓
+//            null,    // 缁撴潫鎺�
+//            null,    // 寮�濮嬪垪
+//            null,    // 缁撴潫鍒�
+//            null,    // 寮�濮嬪眰
+//            null,    // 缁撴潫灞�
+//            null,    // 涓婇檺
+//            null,    // 鐘舵��
+//            null,    // 娣诲姞浜哄憳
+//            null,    // 娣诲姞鏃堕棿
+//            null,    // 淇敼浜哄憳
+//            null,    // 淇敼鏃堕棿
+//            null    // 澶囨敞
+//    );
+
+    public String getStatus$(){
+        if (null == this.status){ return null; }
+        switch (this.status){
+            case 1:
+                return "姝ｅ父";
+            case 0:
+                return "绂佺敤";
+            default:
+                return String.valueOf(this.status);
+        }
+    }
+
+    public String getCreateBy$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.createBy);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getNickname());
+        }
+        return null;
+    }
+
+    public String getCreateTime$(){
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+    }
+
+    public String getUpdateBy$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.updateBy);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getNickname());
+        }
+        return null;
+    }
+
+    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/dto/MatnrCountDto.java b/src/main/java/com/zy/asrs/entity/dto/MatnrCountDto.java
new file mode 100644
index 0000000..5fc86d1
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/dto/MatnrCountDto.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class MatnrCountDto {
+
+    private String matnr;
+
+    private Integer count;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index b655332..277e87f 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -36,6 +36,8 @@
         // 澶囨敞
         private String memo;
 
+        private String cstmr;
+
     }
 
 }
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index e89c39f..3c9ec56 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -15,6 +15,12 @@
 
     List<LocMast> queryFreeLocMast(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1);
     List<LocMast> queryFreeLocMast0(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1, @Param("inoutEveryday") Boolean inoutEveryday);
+    List<LocMast> queryFreeLocMast1(@Param("rows") List<Integer> rows
+            , @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1, @Param("inoutEveryday") Boolean inoutEveryday
+            , @Param("rowBeg") Integer rowBeg, @Param("rowEnd") Integer rowEnd, @Param("bayBeg") Integer bayBeg
+            , @Param("bayEnd") Integer bayEnd, @Param("levBeg") Integer levBeg, @Param("levEnd") Integer levEnd);
+    List<LocMast> queryFreeLocMastEnd(@Param("row") Integer row);
+    List<LocMast> queryFreeLocMastEnd0(@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("row1") Integer row);
 
     @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
     List<String> queryGroupEmptyStock(Integer crnNo);
diff --git a/src/main/java/com/zy/asrs/mapper/LocRuleMapper.java b/src/main/java/com/zy/asrs/mapper/LocRuleMapper.java
new file mode 100644
index 0000000..b726edb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/LocRuleMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.LocRule;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface LocRuleMapper extends BaseMapper<LocRule> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 85a939a..e6c33e7 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -13,6 +13,10 @@
      */
     List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1);
     List<LocMast> queryFreeLocMast0(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday);
+    List<LocMast> queryFreeLocMast1(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday
+                                    , Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
+    List<LocMast> queryFreeLocMastEnd(Integer row);
+    List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row);
 
     /**
      * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
diff --git a/src/main/java/com/zy/asrs/service/LocRuleService.java b/src/main/java/com/zy/asrs/service/LocRuleService.java
new file mode 100644
index 0000000..3b669e8
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/LocRuleService.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.LocRule;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface LocRuleService extends IService<LocRule> {
+
+    LocRule find(String matnr, String batch);
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 46dda57..47c9f4c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -36,6 +36,20 @@
     }
 
     @Override
+    public List<LocMast> queryFreeLocMast1(List<Integer> rows, Integer rowsLen, Short locType1, Boolean inoutEveryday, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
+        return this.baseMapper.queryFreeLocMast1(rows, rowsLen, locType1,inoutEveryday, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
+    }
+
+    @Override
+    public List<LocMast> queryFreeLocMastEnd(Integer row){
+        return this.baseMapper.queryFreeLocMastEnd(row);
+    }
+    @Override
+    public List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row){
+        return this.baseMapper.queryFreeLocMastEnd0(bay,lev,row);
+    }
+
+    @Override
     public List<String> queryGroupEmptyStock(String sourceLocNo) {
         if (Cools.isEmpty(sourceLocNo)) {
             return null;
diff --git a/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java
new file mode 100644
index 0000000..0c3f3ef
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java
@@ -0,0 +1,50 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.mapper.LocRuleMapper;
+import com.zy.asrs.entity.LocRule;
+import com.zy.asrs.service.LocRuleService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.service.MatService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("locRuleService")
+public class LocRuleServiceImpl extends ServiceImpl<LocRuleMapper, LocRule> implements LocRuleService {
+
+    @Autowired
+    private MatService matService;
+
+    @Override
+    public LocRule find(String matnr, String batch) {
+        if (Cools.isEmpty(matnr)) {
+            return null;
+        }
+        Mat mat = matService.selectByMatnr(matnr);
+        if (Cools.isEmpty(mat)) {
+            return null;
+        }
+        LocRule locRule = null;
+        do {
+            locRule = this.selectOne(new EntityWrapper<LocRule>().eq("matnr", matnr).eq("status", 1));
+            if (null != locRule) {
+                break;
+            }
+            locRule = this.selectOne(new EntityWrapper<LocRule>().eq("specs", mat.getSpecs()).eq("status", 1));
+            if (null != locRule) {
+                break;
+            }
+            locRule = this.selectOne(new EntityWrapper<LocRule>().eq("model", mat.getModel()).eq("status", 1));
+            if (null != locRule) {
+                break;
+            }
+            locRule = this.selectOne(new EntityWrapper<LocRule>().eq("batch", batch).eq("status", 1));
+            if (null != locRule) {
+                break;
+            }
+        } while (false);
+        return locRule;
+    }
+}
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 b9b9617..2964fb0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -77,9 +77,13 @@
             throw new CoolException(BaseRes.PARAM);
         }
         // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+//        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+//                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+//            throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+//        }
         if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
-            throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+                eq("zpallet", param.getBarcode())) > 0) {
+            throw new CoolException(param.getBarcode() + "缁勬墭鏁版嵁宸插瓨鍦�");
         }
 
         // todo: 涓嶄笅绾块噸鏂板叆搴�
@@ -99,12 +103,12 @@
             // 鐢熸垚鍏ュ簱閫氱煡妗�
             List<DetlDto> detlDtos = new ArrayList<>();
             param.getCombMats().forEach(elem -> {
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo());
+                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr());
 
-                if (Cools.isEmpty(detlDto.getBatch())){
-                    String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
-                    detlDto.setBatch(batch);
-                }
+//                if (Cools.isEmpty(detlDto.getBatch())){
+//                    String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
+//                    detlDto.setBatch(batch);
+//                }
 
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
@@ -134,6 +138,7 @@
                 waitPakin.setModiTime(now);
                 waitPakin.setMemo(detlDto.getMemo());
                 waitPakin.setFrozen(param.getFrozen()); // 鏄惁鍐荤粨
+                waitPakin.setManu(detlDto.getCstmr());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
                 }
diff --git a/src/main/java/com/zy/asrs/task/MatScheduler.java b/src/main/java/com/zy/asrs/task/MatScheduler.java
new file mode 100644
index 0000000..13d496c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/MatScheduler.java
@@ -0,0 +1,32 @@
+package com.zy.asrs.task;
+
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.MatHandler;
+import com.zy.asrs.task.handler.PlcLogHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Slf4j
+@Component
+public class MatScheduler {
+
+    @Autowired
+    private MatHandler matHandler;
+
+//    @Scheduled(cron = "0/3 * * * * ? ")
+    @Scheduled(cron = "0 0 23 * * ? ")
+    private void execute(){
+        ReturnT<String> returnT = matHandler.start();
+        if (!returnT.isSuccess()) {
+            log.error(returnT.getMsg());
+        }
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/MatHandler.java b/src/main/java/com/zy/asrs/task/handler/MatHandler.java
new file mode 100644
index 0000000..cc85025
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/MatHandler.java
@@ -0,0 +1,77 @@
+package com.zy.asrs.task.handler;
+
+import com.core.common.Cools;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.dto.MatnrCountDto;
+import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Slf4j
+@Service
+public class MatHandler extends AbstractHandler<String> {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+    @Autowired
+    private MatService matService;
+    @Autowired
+    private WrkDetlService wrkDetlService;
+    @Autowired
+    private WrkMastService wrkMastService;
+
+    @Transactional
+    public ReturnT<String> start() {
+        try {
+            Date now = new Date();
+            List<Map<String, Object>> list = jdbcTemplate.queryForList("select\n" +
+                    "matnr,\n" +
+                    "count(1) as count\n" +
+                    "from (\n" +
+                    "\tselect\n" +
+                    "\tdistinct awd.*\n" +
+                    "\tfrom asr_wrk_mast_log awm\n" +
+                    "\tleft join asr_wrk_detl_log awd on awm.wrk_no = awd.wrk_no\n" +
+                    "\twhere 1=1\n" +
+                    "\tand datediff(day, getdate(), awm.io_time) = 0 \n" +
+                    "\tand io_type not in (103,104,107)\n" +
+                    "\tand (manu_type is null or manu_type != '鎵嬪姩鍙栨秷')\n" +
+                    ") a\n" +
+                    "group by matnr");
+            if (!Cools.isEmpty(list)) {
+                for (Map<String, Object> map : list) {
+                    MatnrCountDto dto = Cools.conver(map, MatnrCountDto.class);
+                    if (dto.getCount() >= 3) {
+                        Mat mat = matService.selectByMatnr(dto.getMatnr());
+                        mat.setInoutEveryday(Boolean.TRUE);
+                        mat.setUpdateTime(now);
+                        if (!matService.updateById(mat)) {
+                            log.error("{}鍟嗗搧淇敼涓洪珮棰戝睘鎬уけ璐ワ紒", dto.getMatnr());
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
+        }
+        return SUCCESS;
+    }
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 773f4e7..45b2313 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=bfasrs";
+        generator.url="localhost:1433;databasename=bfasrs";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="asr_check_record";
+        generator.table="asr_loc_rule";
         generator.packagePath="com.zy.asrs";
         generator.build();
     }
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 99aef08..1b936ad 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -23,6 +23,8 @@
 
     private String memo;
 
+    private String cstmr;
+
 
     public DetlDto() {
     }
@@ -51,11 +53,12 @@
         this.anfme = anfme;
     }
 
-    public DetlDto(String matnr, String batch, Double anfme, String memo) {
+    public DetlDto(String matnr, String batch, Double anfme, String memo, String cstmr) {
         this.matnr = matnr;
         this.batch = batch;
         this.anfme = anfme;
         this.memo = memo;
+        this.cstmr = cstmr;
     }
 
 
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 2809921..249584e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -57,6 +57,8 @@
     private SlaveProperties slaveProperties;
     @Autowired
     private MatService matService;
+    @Autowired
+    private LocRuleService locRuleService;
 
     /**
      * 鐢熸垚宸ヤ綔鍙�
@@ -121,19 +123,19 @@
                 whsType = 1;
                 start = 1;
                 end = 14;
-                if (null != wrkMastService.selectPakoutOfStaNo(104)) {
-                    start = 8;
-                    theCrnNo = 2;
-                }
+//                if (null != wrkMastService.selectPakoutOfStaNo(104)) {
+//                    start = 8;
+//                    theCrnNo = 2;
+//                }
                 break;
             case 203:
                 whsType = 2;
                 start = 8;
                 end = 21;
-                if (null != wrkMastService.selectPakoutOfStaNo(204)) {
-                    end = 14;
-                    theCrnNo = 2;
-                }
+//                if (null != wrkMastService.selectPakoutOfStaNo(204)) {
+//                    end = 14;
+//                    theCrnNo = 2;
+//                }
                 break;
             default:
                 throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
@@ -310,24 +312,83 @@
 
         // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
         if (locMast == null) {
-            List<Integer> rows = Utils.getGroupLoc(curRow);
-            List<LocMast> locMasts = locMastService.queryFreeLocMast0(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday);
-            if (!Cools.isEmpty(locMasts)) {
-                Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
-                for (LocMast one : locMasts) {
-                    if (one.getRow1().equals(innermostRow)) {
-                        locMast = one;
-                        break;
+
+            // 搴撳尯閿佸畾
+            LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null);
+            if (!Cools.isEmpty(locRule)) {
+                List<Integer> rows = Utils.getGroupLoc(locRule.getRowBeg());
+                List<LocMast> locMasts = locMastService.queryFreeLocMast1(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday
+                        , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
+                if (!Cools.isEmpty(locMasts)) {
+                    Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
+                    for (LocMast one : locMasts) {
+                        if (one.getRow1().equals(innermostRow)) {
+                            locMast = one;
+                            break;
+                        }
                     }
                 }
             }
+
+            if (locMast == null) {
+                List<Integer> rows = Utils.getGroupLoc(curRow);
+                List<LocMast> locMasts = locMastService.queryFreeLocMast0(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday);
+                if (!Cools.isEmpty(locMasts)) {
+                    Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
+                    for (LocMast one : locMasts) {
+                        if (one.getRow1().equals(innermostRow)) {
+                            locMast = one;
+                            break;
+                        }
+                    }
+                }
+            }
+//            LocMast locMast0 = locMastService.findOutMost(locMasts.stream().map(LocMast::getLocNo).distinct().collect(Collectors.toList()));
+//            if (!Cools.isEmpty(locMast0)) {
+//                locMast = locMast0;
+//            }
             // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� todo:luxiaotao
 //            if (!locMastService.checkEmptyCount(locMast)) {
 //                locMast = null;
 //            }
         }
 
-        // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+        // 2.鏃犲簱浣嶆椂锛屾棤瑙嗗尯鍩熼攣瀹氾紝閲嶆柊鏌ユ壘搴撲綅
+        if (Cools.isEmpty(locMast)){
+            List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow);
+            int sign=curRow;
+            while (true){
+                if (locMasts.size()==0){
+                    sign = getCurRow(sign);
+                    if (sign != 0){
+                        locMasts = locMastService.queryFreeLocMastEnd(sign);
+                    }else {
+                        break;
+                    }
+                }else {
+                    break;
+                }
+            }
+            for (LocMast locMast1 : locMasts){
+                List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1());
+                Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
+                for (LocMast locMast2:locMasts1){
+                    if (locMast2.getLocSts().equals("O")){
+                        if (locMast2.getRow1().equals(innermostRow)) {
+                            locMast = locMast2;
+                            break;
+                        }
+                    }else if (!locMast2.getLocSts().equals("F")){
+                        break;
+                    }
+                }
+                if (!Cools.isEmpty(locMast)){
+                    break;
+                }
+            }
+        }
+
+        // 3.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
         if (Cools.isEmpty(locMast)) {
             // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
             if (times < rowCount) {
@@ -369,4 +430,28 @@
         }
     }
 
+    public int getCurRow(int curRow){
+        switch (curRow){
+            case 1:
+            case 2:
+            case 8:
+            case 9:
+            case 10:
+            case 15:
+            case 16:
+            case 17:
+                return curRow+1;
+            case 5:
+            case 6:
+            case 7:
+            case 13:
+            case 14:
+            case 20:
+            case 21:
+                return curRow-1;
+            default:
+                return 0;
+        }
+    }
+
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7799f69..8b324a5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,9 +10,8 @@
     enabled: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
+    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
 #    url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
     username: sa
 #    password: Zoneyung@zy56$
     password: sa@123
diff --git a/src/main/resources/mapper/CheckRecordMapper.xml b/src/main/resources/mapper/CheckRecordMapper.xml
index b6aede8..dd878bf 100644
--- a/src/main/resources/mapper/CheckRecordMapper.xml
+++ b/src/main/resources/mapper/CheckRecordMapper.xml
@@ -4,6 +4,7 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.CheckRecord">
+        <id column="id" property="id" />
         <result column="loc_no" property="locNo" />
         <result column="barcode" property="barcode" />
         <result column="matnr" property="matnr" />
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index c2873be..f87ff1e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -125,7 +125,7 @@
         select * from
         (
             select
-            ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
+            ROW_NUMBER() over (order by a.loc_no,a.appe_time,a.matnr) as row,
             a.*
             from asr_loc_detl a
             left join asr_loc_mast b on a.loc_no = b.loc_no
@@ -241,6 +241,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 1
             and b.row1 &lt;= 3
@@ -255,6 +256,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 4
             and b.row1 &lt;= 7
@@ -269,6 +271,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 8
             and b.row1 &lt;= 11
@@ -283,6 +286,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 12
             and b.row1 &lt;= 14
@@ -297,6 +301,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 15
             and b.row1 &lt;= 18
@@ -311,6 +316,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F' and b.frozen != 1
+            and a.manu is null
             and a.matnr = #{matnr}
             and b.row1 >= 19
             and b.row1 &lt;= 21
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index d0e7a36..f68296b 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -107,10 +107,10 @@
                 </if>
                 <choose>
                     <when test="inoutEveryday != null and inoutEveryday">
-                        AND bay1 &lt; 11
+                        AND bay1 &lt; 11 and lev1 in (3,4)
                     </when>
                     <otherwise>
-                        AND bay1 > 10
+                        AND (bay1 >= 11 or (bay1 &lt; 11 and lev1 in (1,2)))
                     </otherwise>
                 </choose>
                 and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
@@ -121,4 +121,111 @@
         )
     </select>
 
+    <select id="queryFreeLocMast1" resultMap="BaseResultMap">
+        select
+        *
+        from asr_loc_mast
+        where 1=1
+        and row1 in
+        <foreach item="item" collection="rows" index="index"  separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and ctn_no =
+        (
+            select
+            top 1
+            ctn_no
+            from (
+                select
+                ctn_no,
+                count(1) as count
+                from asr_loc_mast
+                where 1=1
+                and row1 in
+                <foreach item="item" collection="rows" index="index"  separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+                and loc_sts = 'O'
+
+                <if test="rowBeg != null">
+                    and row1 >= #{rowBeg}
+                </if>
+                <if test="rowEnd != null">
+                    and row1 &lt;= #{rowEnd}
+                </if>
+                <if test="bayBeg != null">
+                    and bay1 >= #{bayBeg}
+                </if>
+                <if test="bayEnd != null">
+                    and bay1 &lt;= #{bayEnd}
+                </if>
+                <if test="levBeg != null">
+                    and lev1 >= #{levBeg}
+                </if>
+                <if test="levEnd != null">
+                    and lev1 &lt;= #{levEnd}
+                </if>
+
+                <if test="locType1 != null">
+                    and loc_type1 = #{locType1}
+                </if>
+
+                <choose>
+                    <when test="inoutEveryday != null and inoutEveryday">
+                        AND bay1 &lt; 11 and lev1 in (3,4)
+                    </when>
+                    <otherwise>
+                        AND (bay1 >= 11 or (bay1 &lt; 11 and lev1 in (1,2)))
+                    </otherwise>
+                </choose>
+                and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+                group by ctn_no
+            ) a
+            where count = #{rowsLen}
+            order by right(ctn_no, 2) + 0 asc, left(ctn_no, 3) + 0 asc
+        )
+    </select>
+
+    <select id="queryFreeLocMastEnd" resultMap="BaseResultMap">
+        select *
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+        order by loc_sts desc ,lev1 asc,bay1 asc
+    </select>
+
+    <select id="queryFreeLocMastEnd0" resultMap="BaseResultMap">
+        select *
+        from asr_loc_mast
+        where bay1=#{bay}
+        and lev1=#{lev}
+--         and loc_sts='O'
+        and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+        <if test="row1 >= 1 and row1 &lt;= 3">
+            and row1 >= 1 and row1 &lt;= 3
+            order by loc_sts desc ,row1 asc
+        </if>
+        <if test="row1 >= 4 and row1 &lt;= 7">
+            and row1 >= 4 and row1 &lt;= 7
+            order by loc_sts desc ,row1 desc
+        </if>
+        <if test="row1 >= 8 and row1 &lt;= 11">
+            and row1 >= 8 and row1 &lt;= 11
+            order by loc_sts desc ,row1 asc
+        </if>
+        <if test="row1 >= 12 and row1 &lt;= 14">
+            and row1 >= 12 and row1 &lt;= 14
+            order by loc_sts desc ,row1 desc
+        </if>
+        <if test="row1 >= 15 and row1 &lt;= 18">
+            and row1 >= 15 and row1 &lt;= 18
+            order by loc_sts desc ,row1 asc
+        </if>
+        <if test="row1 >= 19 and row1 &lt;= 21">
+            and row1 >= 19 and row1 &lt;= 21
+            order by loc_sts desc ,row1 desc
+        </if>
+    </select>
+
 </mapper>
diff --git a/src/main/resources/mapper/LocRuleMapper.xml b/src/main/resources/mapper/LocRuleMapper.xml
new file mode 100644
index 0000000..02d6fb5
--- /dev/null
+++ b/src/main/resources/mapper/LocRuleMapper.xml
@@ -0,0 +1,30 @@
+<?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.LocRuleMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocRule">
+        <id column="id" property="id" />
+        <result column="matnr" property="matnr" />
+        <result column="specs" property="specs" />
+        <result column="model" property="model" />
+        <result column="cstmr" property="cstmr" />
+        <result column="batch" property="batch" />
+        <result column="other" property="other" />
+        <result column="row_beg" property="rowBeg" />
+        <result column="row_end" property="rowEnd" />
+        <result column="bay_beg" property="bayBeg" />
+        <result column="bay_end" property="bayEnd" />
+        <result column="lev_beg" property="levBeg" />
+        <result column="lev_end" property="levEnd" />
+        <result column="limit" property="limit" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="memo" property="memo" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 6ec9eef..5cffd06 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -74,7 +74,7 @@
         <if test="specs != null and specs != ''">
             and mm.specs like concat('%',#{specs},'%')
         </if>
-        ORDER BY mm.create_time DESC
+        ORDER BY mm.inout_everyday desc, mm.create_time DESC
     </select>
 
     <select id="selectByMatnr" resultMap="BaseResultMap">
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index 8a23b69..7c9b42d 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -8,6 +8,9 @@
 		<if test="loc_no!=null and loc_no!='' ">
 			and asr_loc_mast.loc_no like '%' + #{loc_no} + '%'
 		</if>
+		<if test="specs!=null and specs!='' ">
+			and specs like '%' + #{specs} + '%'
+		</if>
 		<if test="matnr!=null and matnr!='' ">
 			and matnr like '%' + #{matnr} + '%'
 		</if>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index e12d484..a101e3e 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -104,7 +104,7 @@
         select top 1 * from (
             select top 1 * from asr_wrk_mast where 1=1
             and crn_no = 2
-            and wrk_sts in (11,12,13,14,15,16,17)
+            and wrk_sts in (12,13,14,15,16)
             and source_sta_no = #{staNo}
             and io_type in (101.103,104,107,110)
             union
diff --git a/src/main/webapp/static/js/checkRecord/checkRecord.js b/src/main/webapp/static/js/checkRecord/checkRecord.js
index 6eecd85..bd32afd 100644
--- a/src/main/webapp/static/js/checkRecord/checkRecord.js
+++ b/src/main/webapp/static/js/checkRecord/checkRecord.js
@@ -31,7 +31,8 @@
             ,{field: 'anfme', align: 'center',title: '鐩樼偣鍓嶆暟閲�'}
             ,{field: 'confirmQty', align: 'center',title: '鐩樼偣纭閲�'}
             ,{field: 'adjQty$', align: 'center',title: '鐩樼偣宸紓閲�'}
-            ,{field: 'createTime$', align: 'center',title: '璁板綍鏃堕棿'}
+            ,{field: 'createTime$', align: 'center',title: '璁板綍鏃堕棿', width: 180}
+            ,{field: 'type', align: 'center',title: '璐㈠姟瀹℃牳', templet: '#statusTpl', width: 100}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],
         request: {
@@ -139,6 +140,32 @@
             case "del":
                 del([data.locNo]);
                 break;
+            case "auditing":
+                layer.confirm('纭畾瀹℃牳閫氳繃锛�', {
+                    skin: 'layui-layer-admin',
+                    shade: .1
+                }, function (i) {
+                    layer.close(i);
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/checkRecord/auditing/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: {id: data.id},
+                        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});
+                            }
+                        }
+                    })
+                });
+                break
         }
     });
 
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 893387e..ff4c525 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -231,7 +231,7 @@
     ,{field: 'specs', align: 'center',title: '瑙勬牸'}
     ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
     ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
-    ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200, sort:true}
+    ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
     ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
     ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
 
@@ -244,7 +244,7 @@
     ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
     ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
     ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
-    ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+    ,{field: 'manu', align: 'center',title: '瀹㈡埛淇℃伅', hide: false}
     ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
     ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
     ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
diff --git a/src/main/webapp/static/js/locRule/locRule.js b/src/main/webapp/static/js/locRule/locRule.js
new file mode 100644
index 0000000..6234b7e
--- /dev/null
+++ b/src/main/webapp/static/js/locRule/locRule.js
@@ -0,0 +1,274 @@
+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/list/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            {type: 'checkbox'}
+            // ,{field: 'id', align: 'center',title: 'ID'}
+            ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+            ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+            ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+            ,{field: 'cstmr', align: 'center',title: '瀹㈡埛'}
+            ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+            ,{field: 'other', align: 'center',title: '鍏朵粬', hide: true}
+            ,{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: '涓婇檺'}
+            ,{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}
+
+            ,{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) {
+                    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/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 54fc129..018767f 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -16,7 +16,7 @@
                 return html;
             }}
         ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
-        ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+        ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
     return cols;
 }
 layui.use(['table','laydate', 'form'], function(){
diff --git a/src/main/webapp/views/checkRecord/checkRecord.html b/src/main/webapp/views/checkRecord/checkRecord.html
index 52a8b1c..a9053df 100644
--- a/src/main/webapp/views/checkRecord/checkRecord.html
+++ b/src/main/webapp/views/checkRecord/checkRecord.html
@@ -32,6 +32,16 @@
                             <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">璐㈠姟瀹℃牳:</label>
+                        <div class="layui-input-inline">
+                            <select name="status">
+                                <option value="">閫夋嫨鐘舵��</option>
+                                <option value="0">鏈鏍�</option>
+                                <option value="1">宸插鏍�</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">&emsp;
                         <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                             <i class="layui-icon">&#xe615;</i>鎼滅储
@@ -56,8 +66,16 @@
 </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>
+    {{# if( d.status === 0 ){ }}
+        <a class="layui-btn layui-btn-xs" lay-event="auditing">璐㈠姟瀹℃牳</a>
+    {{# } }}
+</script>
+<script type="text/html" id="statusTpl">
+    {{# if( d.status === 1 ){ }}
+    <span name="status" class="layui-badge layui-badge-green">宸插鏍�</span>
+    {{# } else if(d.status === 0){ }}
+    <span name="status" class="layui-badge layui-badge-red">鏈鏍�</span>
+    {{# } }}
 </script>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index 22c2297..e34a9d5 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -85,6 +85,12 @@
         .layui-form.layui-border-box.layui-table-view {
             border-top: 1px solid rgba(0,0,0,.1);
         }
+        #search-box {
+            margin-left: 10px;
+            z-index: 999;
+            position: relative;
+            padding: 0 30px 10px 30px;
+        }
     </style>
 </head>
 <body>
@@ -103,6 +109,29 @@
 <div class="home-elem loc-retention">
     <div class="layui-form">
         <div id="form-header">搴撳瓨婊炵暀鏃堕棿缁熻琛�</div>
+        <div class="layui-card" style="padding: 0 20px 1px 20px;">
+            <fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
+                <legend>鎼滅储鏍�</legend>
+                <div id="search-box" class="layui-form layui-card-header">
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
+                        </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>
+            </fieldset>
+
+        </div>
         <table class="layui-hide" id="stayTime" lay-filter="stayTime"></table>
     </div>
 </div>
@@ -252,6 +281,7 @@
         var table = layui.table;
         var $ = layui.jquery;
         var layer = layui.layer;
+        var form = layui.form;
 
         // 鏁版嵁娓叉煋
         tableIns = table.render({
@@ -270,7 +300,6 @@
                 pageSize: 'limit'
             },
             parseData: function (res) {
-                console.log(res)
                 return {
                     'code': res.code,
                     'msg': res.msg,
@@ -283,7 +312,6 @@
             },
             done: function(res, curr, count) {
                 var that = this.elem.next();
-                console.log(res.data)
                 res.data.forEach(function (item, index) {
                     var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
                     if (item.store_max_date != null) {
@@ -352,6 +380,36 @@
                 }
             });
         });
+
+        // 鎼滅储鏍忔悳绱簨浠�
+        form.on('submit(search)', function (data) {
+            tableReload();
+        });
+        // 鎼滅储鏍忔悳绱簨浠�
+        form.on('submit(reset)', function (data) {
+            $(':input', $('#search-box'))
+                .val('')
+                .removeAttr('checked')
+                .removeAttr('selected');
+            var searchData = {};
+            $.each($('#search-box [name]').serializeArray(), function() {
+                searchData[this.name] = this.value;
+            });
+            tableIns.reload({
+                where: searchData
+            });
+
+        });
+
+        function tableReload() {
+            var searchData = {};
+            $.each($('#search-box [name]').serializeArray(), function() {
+                searchData[this.name] = this.value;
+            });
+            tableIns.reload({
+                where: searchData
+            });
+        }
     });
 
 
diff --git a/src/main/webapp/views/locRule/locRule.html b/src/main/webapp/views/locRule/locRule.html
new file mode 100644
index 0000000..143c432
--- /dev/null
+++ b/src/main/webapp/views/locRule/locRule.html
@@ -0,0 +1,179 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <div class="layui-form toolbar" id="search-box">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <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">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</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="limit" placeholder="璇疯緭鍏ヤ笂闄�">
+                    </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>
+
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog.html b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
index 72b13f8..d9ab69c 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -19,6 +19,11 @@
             <input class="layui-input" type="text" name="pakin_id" placeholder="鍏ュ簱閫氱煡鍙�" autocomplete="off">
         </div>
     </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鍙�" autocomplete="off">
+        </div>
+    </div>
     <!-- 鏃ユ湡鑼冨洿 -->
     <div class="layui-inline" style="width: 300px">
         <div class="layui-input-inline">

--
Gitblit v1.9.1