自动化立体仓库 - WMS系统
#
mrzhssss
2022-10-28 25bd8e7a6437bc1b66c6fee2f99d9cb2e3117acd
#
8个文件已修改
10个文件已添加
866 ■■■■■ 已修改文件
src/main/java/checkRecord.sql 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/CheckRecordController.java 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/WrkMastController.java 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/CheckRecord.java 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/dto/WrkDetlWithCheck.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/CheckRecordMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/LocMastMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/CheckRecordService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/LocMastService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/CheckRecordServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/CodeBuilder.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/CheckRecordMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocDetlMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocMastMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/checkRecord/checkRecord.js 258 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/checkRecord/checkRecord.html 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/checkRecord.sql
New file
@@ -0,0 +1,18 @@
-- 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');
src/main/java/com/zy/asrs/controller/CheckRecordController.java
New file
@@ -0,0 +1,125 @@
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.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 CheckRecordController extends BaseController {
    @Autowired
    private CheckRecordService checkRecordService;
    @RequestMapping(value = "/checkRecord/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(checkRecordService.selectById(String.valueOf(id)));
    }
    @RequestMapping(value = "/checkRecord/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<CheckRecord> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(CheckRecord.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(checkRecordService.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 = "/checkRecord/add/auth")
    @ManagerAuth
    public R add(CheckRecord checkRecord) {
        checkRecordService.insert(checkRecord);
        return R.ok();
    }
    @RequestMapping(value = "/checkRecord/update/auth")
    @ManagerAuth
    public R update(CheckRecord checkRecord){
        if (Cools.isEmpty(checkRecord) || null==checkRecord.getLocNo()){
            return R.error();
        }
        checkRecordService.updateById(checkRecord);
        return R.ok();
    }
    @RequestMapping(value = "/checkRecord/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            checkRecordService.deleteById(id);
        }
        return R.ok();
    }
    @RequestMapping(value = "/checkRecord/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<CheckRecord> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("checkRecord"));
        convert(map, wrapper);
        List<CheckRecord> list = checkRecordService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }
    @RequestMapping(value = "/checkRecordQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<CheckRecord> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<CheckRecord> page = checkRecordService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (CheckRecord checkRecord : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", checkRecord.getLocNo());
            map.put("value", checkRecord.getLocNo());
            result.add(map);
        }
        return R.ok(result);
    }
    @RequestMapping(value = "/checkRecord/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<CheckRecord> wrapper = new EntityWrapper<CheckRecord>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != checkRecordService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(CheckRecord.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }
}
src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -10,10 +10,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.dto.WrkDetlWithCheck;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -23,6 +25,16 @@
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private MatService matService;
    @Autowired
    private CheckRecordService checkRecordService;
    @RequestMapping(value = "/wrkMast/{id}/auth")
    @ManagerAuth
@@ -166,4 +178,111 @@
    }
    /********************************边锋新增**************************/
    @GetMapping(value = "/wrkMast/checkDetl")
    public R pickDetl(String barcode) {
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        if (Cools.isEmpty(wrkMast)) {
            return R.error("无法通过托盘码找到对应工作档");
        }
        if (wrkMast.getIoType() != 107) {
            return R.error("工作档非捡料任务");
        }
        if (wrkMast.getWrkSts() != 14){
            return R.error("盘点任务正在执行中,请等待设备运行结束后进行操作");
        }
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        return R.ok(wrkDetls);
    }
    /**
     * 根据盘点修改库存
     * @return
     */
    @Transactional
    @PostMapping("/wrkMast/storeCheck")
    @ManagerAuth(memo = "根据盘点修改库存")
    public R storeCheck(@RequestBody List<WrkDetlWithCheck> wrkDetls){
        Date now = new Date();
        Integer confirmIsZero = 0;
        if (wrkDetls == null || wrkDetls.size() <= 0){
            return R.error("请传入数据");
        }
        if (Cools.isEmpty(wrkDetls.get(0).getBarcode())) {
            return R.error("托盘码[barcode]为空");
        }
        WrkMast wrkMast = wrkMastService.selectByBarcode(wrkDetls.get(0).getBarcode());
        for (WrkDetlWithCheck wrkDetl : wrkDetls) {
            if (Cools.isEmpty(wrkDetl.getBarcode())) {
                return R.error("托盘码[barcode]为空");
            }
            if (Cools.isEmpty(wrkDetl.getMatnr())) {
                return R.error("物料编码[matnr]为空");
            }
            Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
            if (Cools.isEmpty(mat)) {
                return R.error("物料编码[matnr]在物料档案找不到");
            }
            if (Cools.isEmpty(wrkDetl.getAnfme())) {
                return R.error("盘点前数量[anfme]为空");
            }
            if (wrkDetl.getConfirmQty() == null) {
                return R.error("盘点确认量[confirm]为空");
            }
            if (wrkDetl.getConfirmQty() == 0){
                confirmIsZero++;
            }
        }
        /**
         * 如果整个list里的confirmQty数量全是0, 表示整个库位无任何库存,删工作档, 库位改为O
         */
        if (confirmIsZero == wrkDetls.size()){
            locDetlService.delete(new EntityWrapper<LocDetl>()
                    .eq("loc_no",wrkMast.getSourceLocNo()));
            locMastService.updateLocSts(wrkMast.getSourceLocNo(),"O");
            wrkMastService.delete(new EntityWrapper<WrkMast>()
                    .eq("wrk_no",wrkMast.getWrkNo()));
            wrkDetlService.delete(new EntityWrapper<WrkDetl>()
                    .eq("wrk_no",wrkMast.getWrkNo()));
            return R.ok("库存清理成功");
        }else {
            locMastService.updateLocSts(wrkMast.getSourceLocNo(),"F");
            locDetlService.delete(new EntityWrapper<LocDetl>()
                    .eq("loc_no",wrkMast.getSourceLocNo()));
            for (WrkDetlWithCheck wrkDetl : wrkDetls) {
                LocDetl locDetl = new LocDetl();
                Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
                locDetl.sync(mat);
                locDetl.setZpallet(wrkMast.getBarcode());
                locDetl.setAnfme(wrkDetl.getConfirmQty());
                locDetl.setBatch(wrkDetl.getBatch());
                locDetl.setAppeTime(now);
                locDetl.setModiTime(now);
                locDetl.setAppeUser(getUserId());
                locDetl.setModiUser(getUserId());
                locDetl.setLocNo(wrkMast.getSourceLocNo());
                locDetlService.insert(locDetl);
                CheckRecord checkRecord = new CheckRecord();
                checkRecord.sync(mat);
                checkRecord.setAnfme(wrkDetl.getAnfme());
                checkRecord.setBarcode(wrkMast.getBarcode());
                checkRecord.setLocNo(wrkMast.getSourceLocNo());
                checkRecord.setCreateTime(now);
                checkRecord.setBatch(wrkDetl.getBatch());
                checkRecord.setConfirmQty(locDetl.getAnfme());
                checkRecordService.insert(checkRecord);
            }
        }
        return R.ok("库存更新已成功");
    }
}
src/main/java/com/zy/asrs/entity/CheckRecord.java
New file
@@ -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 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 java.io.Serializable;
@Data
@TableName("asr_check_record")
public class CheckRecord implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 库位号
     */
    @ApiModelProperty(value= "库位号")
    @TableId(value = "loc_no", type = IdType.INPUT)
    @TableField("loc_no")
    private String locNo;
    /**
     * 托盘码
     */
    @ApiModelProperty(value= "托盘码")
    private String barcode;
    /**
     * 物料代码
     */
    @ApiModelProperty(value= "物料代码")
    private String matnr;
    /**
     * 物料名称
     */
    @ApiModelProperty(value= "物料名称")
    private String maktx;
    /**
     * 规格
     */
    @ApiModelProperty(value= "规格")
    private String specs;
    /**
     * 批号
     */
    @ApiModelProperty(value= "批号")
    private String batch;
    /**
     * 盘点前数量
     */
    @ApiModelProperty(value= "盘点前数量")
    private Double anfme;
    /**
     * 盘点确认量
     */
    @ApiModelProperty(value= "盘点确认量")
    @TableField("confirm_qty")
    private Double confirmQty;
    /**
     * 记录时间
     */
    @ApiModelProperty(value= "记录时间")
    @TableField("create_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    public CheckRecord() {}
    public CheckRecord(String locNo,String barcode,String matnr,String maktx,String specs,String batch,Double anfme,Double confirmQty,Date createTime) {
        this.locNo = locNo;
        this.barcode = barcode;
        this.matnr = matnr;
        this.maktx = maktx;
        this.specs = specs;
        this.batch = batch;
        this.anfme = anfme;
        this.confirmQty = confirmQty;
        this.createTime = createTime;
    }
//    CheckRecord checkRecord = new CheckRecord(
//            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 void sync(Object source) {
        Synchro.Copy(source, this);
    }
}
src/main/java/com/zy/asrs/entity/dto/WrkDetlWithCheck.java
New file
@@ -0,0 +1,9 @@
package com.zy.asrs.entity.dto;
import com.zy.asrs.entity.WrkDetl;
import lombok.Data;
@Data
public class WrkDetlWithCheck extends WrkDetl {
    private Double confirmQty;
}
src/main/java/com/zy/asrs/mapper/CheckRecordMapper.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.CheckRecord;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface CheckRecordMapper extends BaseMapper<CheckRecord> {
}
src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -21,4 +21,5 @@
    @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
    Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
    void updateLocSts(@Param("locNo") String locNo,@Param("locSts") String locSts);
}
src/main/java/com/zy/asrs/service/CheckRecordService.java
New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.CheckRecord;
import com.baomidou.mybatisplus.service.IService;
public interface CheckRecordService extends IService<CheckRecord> {
}
src/main/java/com/zy/asrs/service/LocMastService.java
@@ -45,4 +45,5 @@
    // 对同组货物进行移库操作
    void breakUp(String locNo, List<String> excludeLocNos);
    void updateLocSts(String locNo, String locSts);
}
src/main/java/com/zy/asrs/service/impl/CheckRecordServiceImpl.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;
import com.zy.asrs.mapper.CheckRecordMapper;
import com.zy.asrs.entity.CheckRecord;
import com.zy.asrs.service.CheckRecordService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("checkRecordService")
public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordMapper, CheckRecord> implements CheckRecordService {
}
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -146,4 +146,9 @@
        workService.shuttleTransfer(groupLoc);
    }
    @Override
    public void updateLocSts(String locNo, String locSts) {
        this.baseMapper.updateLocSts(locNo,locSts);
    }
}
src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
//        generator.table="sys_host";
        // sqlserver
        generator.sqlOsType = SqlOsType.SQL_SERVER;
        generator.url="10.10.10.100:1433;databasename=bfasrs";
        generator.url="192.168.4.15:1433;databasename=bfasrs";
        generator.username="sa";
        generator.password="sa@123";
        generator.table="asr_bas_ste_err_log";
        generator.table="asr_check_record";
        generator.packagePath="com.zy.asrs";
        generator.build();
    }
src/main/resources/mapper/CheckRecordMapper.xml
New file
@@ -0,0 +1,19 @@
<?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.CheckRecordMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.CheckRecord">
        <result column="loc_no" property="locNo" />
        <result column="barcode" property="barcode" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="specs" property="specs" />
        <result column="batch" property="batch" />
        <result column="anfme" property="anfme" />
        <result column="confirm_qty" property="confirmQty" />
        <result column="create_time" property="createTime" />
    </resultMap>
</mapper>
src/main/resources/mapper/LocDetlMapper.xml
@@ -173,9 +173,10 @@
        ROW_NUMBER() over (order by sum(a.anfme) desc) as row
        , a.matnr
        , sum(a.anfme) as anfme
        , a.specs
        from asr_loc_detl a
        where 1=1
        group by a.matnr
        group by a.matnr, a.specs
    </select>
    <select id="selectPakoutByRule" resultMap="BaseResultMap">
src/main/resources/mapper/LocMastMapper.xml
@@ -37,6 +37,9 @@
        <result column="ctn_no" property="ctnNo" />
    </resultMap>
    <update id="updateLocSts">
        UPDATE asr_loc_mast SET loc_sts = #{locSts} WHERE loc_no = #{locNo}
    </update>
    <select id="queryFreeLocMast" resultMap="BaseResultMap">
        select
src/main/webapp/static/js/checkRecord/checkRecord.js
New file
@@ -0,0 +1,258 @@
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: '#checkRecord',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/checkRecord/list/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'locNo', align: 'center',title: '库位号'}
            ,{field: 'barcode', align: 'center',title: '托盘码'}
            ,{field: 'matnr', align: 'center',title: '物料代码'}
            ,{field: 'maktx', align: 'center',title: '物料名称'}
            ,{field: 'specs', align: 'center',title: '规格'}
            ,{field: 'batch', align: 'center',title: '批号'}
            ,{field: 'anfme', align: 'center',title: '盘点前数量'}
            ,{field: 'confirmQty', align: 'center',title: '盘点确认量'}
            ,{field: 'createTime$', 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(checkRecord)', 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(checkRecord)', 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.locNo;
               }));
               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 = {
                        'checkRecord': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/checkRecord/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(checkRecord)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                del([data.locNo]);
                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+"/checkRecord/"+(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+"/checkRecord/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
            });
        }, 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}
     });
}
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -2,10 +2,13 @@
function getCol() {
    var cols = [
        {field: 'anfme', align: 'center',title: '库存数量', style: 'font-weight: bold'}
        ,{field: 'matnr', align: 'center',title: '商品编号'}
        ,{field: 'specs', align: 'center',title: '规格'}
        ,{field: 'maktx', align: 'center',title: '商品名称'}
    ];
    arrRemove(detlCols, "field", "anfme")
    arrRemove(detlCols, "field", "zpallet")
    cols.push.apply(cols, detlCols);
    // cols.push.apply(cols, detlCols);
    // cols.push({field: 'anfme', align: 'center',title: '数量', style: 'font-weight: bold'}
    // )
    return cols;
src/main/webapp/views/checkRecord/checkRecord.html
New file
@@ -0,0 +1,140 @@
<!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="checkRecord" lay-filter="checkRecord"></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/checkRecord/checkRecord.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">库位号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="locNo" placeholder="请输入库位号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">托盘码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="barcode" placeholder="请输入托盘码">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">物料代码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入物料代码">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">物料名称: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="maktx" 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="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="anfme" placeholder="请输入盘点前数量">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">盘点确认量: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="confirmQty" placeholder="请输入盘点确认量">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">记录时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入记录时间">
                    </div>
                </div>
             </div>
        </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>