#

Junjie

2024-01-11 901b2ab3e0e7c592602848cfa256f34c5b0c7bb8

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java

New file
@@ -0,0 +1,21 @@
package com.zy.asrs.common.wms.entity;

import lombok.Data;

/**
 * 日出入库次数统计
 * @author admin
 * @date 2018年11月24日
 */
@Data
public class ViewInOutBean {
    private String ymd;
    private String sourceStaNo;
    private Long stoQty;
    private Long retQty;
    private Long totalQty;
    private int pageNumber;
    private int pageSize;
    private String beginDate; //查询开始日期
    private String endDate;   //查询截止日期
}

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStayTimeBean.java

New file
@@ -0,0 +1,178 @@
package com.zy.asrs.common.wms.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.zy.asrs.common.sys.entity.User;
import com.zy.asrs.common.sys.service.UserService;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.text.SimpleDateFormat;
import java.util.Date;

/**
 * 库存滞留时间实体类
 * @author admin
 * @date 2018年11月23日
 */
@Data
public class ViewStayTimeBean {

    private int pageNumber;
    private int pageSize;

    private int stayTime;

    private String beginDate;
    private String endDate;

    private Integer row;

    @ApiModelProperty(value= "库位号")
    private String locNo;

    @ApiModelProperty(value= "托盘条码")
    private String zpallet;

    @ApiModelProperty(value= "数量")
    private Double anfme;

    @ApiModelProperty(value= "商品编号")
    private String matnr;

    @ApiModelProperty(value= "商品名称")
    private String maktx;

    @ApiModelProperty(value= "序列码")
    private String batch;

    @ApiModelProperty(value= "单据编号")
    private String orderNo;

    @ApiModelProperty(value= "规格")
    private String specs;

    @ApiModelProperty(value= "型号")
    private String model;

    @ApiModelProperty(value= "颜色")
    private String color;

    @ApiModelProperty(value= "品牌")
    private String brand;

    @ApiModelProperty(value= "单位")
    private String unit;

    @ApiModelProperty(value= "单价")
    private Double price;

    @ApiModelProperty(value= "sku")
    private String sku;

    @ApiModelProperty(value= "单位量")
    private Double units;

    @ApiModelProperty(value= "条码")
    private String barcode;

    @ApiModelProperty(value= "产地")
    private String origin;

    @ApiModelProperty(value= "厂家")
    private String manu;

    @ApiModelProperty(value= "生产日期")
    private String manuDate;

    @ApiModelProperty(value= "品项数")
    private String itemNum;

    @ApiModelProperty(value= "安全库存量")
    private Double safeQty;

    @ApiModelProperty(value= "重量")
    private Double weight;

    @ApiModelProperty(value= "长度")
    private Double length;

    @ApiModelProperty(value= "体积")
    private Double volume;

    @ApiModelProperty(value= "三方编码")
    private String threeCode;

    @ApiModelProperty(value= "供应商")
    private String supp;

    @ApiModelProperty(value= "供应商编码")
    private String suppCode;

    @ApiModelProperty(value= "是否批次 1: 是  0: 否  ")
    private Integer beBatch;

    @ApiModelProperty(value= "保质期")
    private String deadTime;

    @ApiModelProperty(value= "预警天数")
    private Integer deadWarn;

    @ApiModelProperty(value= "制购 1: 制造  2: 采购  3: 外协  ")
    private Integer source;

    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer inspect;

    @ApiModelProperty(value= "危险品 1: 是  0: 否  ")
    private Integer danger;

    @ApiModelProperty(value= "修改人员")
    private Long modiUser;

    @ApiModelProperty(value= "修改时间")
    private Date modiTime;

    @ApiModelProperty(value= "创建者")
    private Long appeUser;

    @ApiModelProperty(value= "添加时间")
    private Date appeTime;

    @ApiModelProperty(value= "备注")
    private String memo;

    public String getModiUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.modiUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
        }
        return null;
    }

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getAppeUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.appeUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
        }
        return null;
    }

    public String getAppeTime$(){
        if (Cools.isEmpty(this.appeTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

}

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStockUseBean.java

New file
@@ -0,0 +1,31 @@
package com.zy.asrs.common.wms.entity;

import lombok.Data;

/**
 * 库位使用率视图实体类
 * @author admin
 * @date 2018年11月23日
 */
@Data
public class ViewStockUseBean {
    private String row1;        //钢架号

    private Long totalQty;        //库位总数

    private Long fullQty;        //在库数量

    private Long nullQty;        //空库位

    private Long forbidQty;    //禁用库位

    private Long emptyQty;        //空容器

    private String fullRate;   //在库率

    private String occRate;   //使用率

    private int pageNumber;

    private int pageSize;
}

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java

New file
@@ -0,0 +1,191 @@
package com.zy.asrs.common.wms.entity;

import com.zy.asrs.common.sys.entity.User;
import com.zy.asrs.common.sys.service.UserService;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.text.SimpleDateFormat;
import java.util.Date;

/**
 * 入库明细统计
 * @author admin
 * @date 2018年11月26日
 */
@Data
public class ViewWorkInBean {


    private int pageNumber;
    private int pageSize;

    private int stayTime;

    private String beginDate;
    private String endDate;
    private String queryDate;

    private Integer row;

    private String crnStrTime;
    private String crnEndTime;

    @ApiModelProperty(value= "工作号")
    private Integer wrkNo;

    @ApiModelProperty(value= "工作时间")
    private Date ioTime;

    @ApiModelProperty(value= "库位号")
    private String locNo;

    @ApiModelProperty(value= "托盘条码")
    private String zpallet;

    @ApiModelProperty(value= "数量")
    private Double anfme;

    @ApiModelProperty(value= "商品编号")
    private String matnr;

    @ApiModelProperty(value= "商品名称")
    private String maktx;

    @ApiModelProperty(value= "序列码")
    private String batch;

    @ApiModelProperty(value= "单据编号")
    private String orderNo;

    @ApiModelProperty(value= "规格")
    private String specs;

    @ApiModelProperty(value= "型号")
    private String model;

    @ApiModelProperty(value= "颜色")
    private String color;

    @ApiModelProperty(value= "品牌")
    private String brand;

    @ApiModelProperty(value= "单位")
    private String unit;

    @ApiModelProperty(value= "单价")
    private Double price;

    @ApiModelProperty(value= "sku")
    private String sku;

    @ApiModelProperty(value= "单位量")
    private Double units;

    @ApiModelProperty(value= "条码")
    private String barcode;

    @ApiModelProperty(value= "产地")
    private String origin;

    @ApiModelProperty(value= "厂家")
    private String manu;

    @ApiModelProperty(value= "生产日期")
    private String manuDate;

    @ApiModelProperty(value= "品项数")
    private String itemNum;

    @ApiModelProperty(value= "安全库存量")
    private Double safeQty;

    @ApiModelProperty(value= "重量")
    private Double weight;

    @ApiModelProperty(value= "长度")
    private Double length;

    @ApiModelProperty(value= "体积")
    private Double volume;

    @ApiModelProperty(value= "三方编码")
    private String threeCode;

    @ApiModelProperty(value= "供应商")
    private String supp;

    @ApiModelProperty(value= "供应商编码")
    private String suppCode;

    @ApiModelProperty(value= "是否批次 1: 是  0: 否  ")
    private Integer beBatch;

    @ApiModelProperty(value= "保质期")
    private String deadTime;

    @ApiModelProperty(value= "预警天数")
    private Integer deadWarn;

    @ApiModelProperty(value= "制购 1: 制造  2: 采购  3: 外协  ")
    private Integer source;

    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer inspect;

    @ApiModelProperty(value= "危险品 1: 是  0: 否  ")
    private Integer danger;

    @ApiModelProperty(value= "修改人员")
    private Long modiUser;

    @ApiModelProperty(value= "修改时间")
    private Object modiTime;

    @ApiModelProperty(value= "创建者")
    private Long appeUser;

    @ApiModelProperty(value= "添加时间")
    private Object appeTime;

    @ApiModelProperty(value= "备注")
    private String memo;

    public String getModiUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.modiUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
        }
        return null;
    }

    public String getAppeUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.appeUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
        }
        return null;
    }

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
    }

    public void setQueryDate(String queryDate) {
        this.queryDate = queryDate;
        if (queryDate.contains(" - ")) {
            String[] dates = queryDate.split(" - ");
            this.beginDate = dates[0];
            this.endDate = dates[1];

        }
    }

}

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java

New file
@@ -0,0 +1,33 @@
package com.zy.asrs.common.wms.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zy.asrs.common.wms.entity.ViewInOutBean;
import com.zy.asrs.common.wms.entity.ViewStayTimeBean;
import com.zy.asrs.common.wms.entity.ViewStockUseBean;
import com.zy.asrs.common.wms.entity.ViewWorkInBean;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

import java.util.List;


@Mapper
@Repository
public interface ReportQueryMapper {

    //分页查询库位使用率
    IPage<ViewStockUseBean> queryViewStockUseList(IPage<?> page, ViewStockUseBean viewStockUse);

    //分页查询库存滞留时间
    IPage<ViewStayTimeBean> queryViewStayTimeList(IPage<?> page, ViewStayTimeBean viewStayTime);

    //分页查询站点入出库次数统计
    IPage<ViewInOutBean> queryViewInOutList(IPage<?> page, ViewInOutBean viewInOut);

    //分页查询日入库记录
    IPage<ViewWorkInBean> queryViewWorkInList(IPage<?> page, ViewWorkInBean viewWorkIn);

    //分页查询日出库记录
    IPage<ViewWorkInBean> queryViewWorkOutList(IPage<?> page, ViewWorkInBean viewWorkIn);

}

 zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml

New file
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.ReportQueryMapper">

    <!-- 分页查询所有信息 -->
    <select id="queryViewStockUseList" parameterType="com.zy.asrs.common.wms.entity.ViewStockUseBean" resultType="com.zy.asrs.common.wms.entity.ViewStockUseBean">
        select * from asr_stk_use_view
    </select>

</mapper>

 zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml

New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.ReportQueryMapper">

<!-- mapper不支持sql语句嵌套时，采用sql片段包含方式，解决xml标签问题 -->
<sql id="viewInOutConditionSql">	
    <if test="viewInOut.sourceStaNo!=null and viewInOut.sourceStaNo!='' ">
        and source_sta_no like '%' + #{viewInOut.sourceStaNo} + '%'
    </if>
</sql>

<!-- 分页查询所有信息 -->
<select id="queryViewInOutList" parameterType="com.zy.asrs.common.wms.entity.ViewInOutBean" resultType="com.zy.asrs.common.wms.entity.ViewInOutBean">
    select * from asr_sta_inout_view
    where 1=1
    <include refid="viewInOutConditionSql"></include>
</select>

</mapper>

 zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml

New file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.ReportQueryMapper">

<!-- mapper不支持sql语句嵌套时，采用sql片段包含方式，解决xml标签问题 -->
<sql id="viewStayTimeConditionSql">
        <if test="viewStayTime.locNo!=null and viewStayTime.locNo!='' ">
            and common_loc_mast.loc_no like '%' + #{viewStayTime.locNo} + '%'
        </if>
        <if test="viewStayTime.matnr!=null and viewStayTime.matnr!='' ">
            and matnr like '%' + #{viewStayTime.matnr} + '%'
        </if>
</sql>

<!-- 分页查询所有信息 -->
<select id="queryViewStayTimeList" parameterType="com.zy.asrs.common.wms.entity.ViewStayTimeBean" resultType="com.zy.asrs.common.wms.entity.ViewStayTimeBean">
    SELECT
    GETDATE() AS today
    , CONVERT(decimal, DATEDIFF(second,wms_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
    , wms_loc_detl.*
    FROM wms_loc_detl
    INNER JOIN common_loc_mast ON wms_loc_detl.loc_no = common_loc_mast.loc_no and wms_loc_detl.host_id = common_loc_mast.host_id
    where 1=1
    <include refid="viewStayTimeConditionSql"></include>
</select>

</mapper>

 zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml

New file
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.ReportQueryMapper">

<!-- mapper不支持sql语句嵌套时，采用sql片段包含方式，解决xml标签问题 -->
<sql id="viewWorkInConditionSql">
        <if test="viewWorkIn.locNo!=null and viewWorkIn.locNo!='' ">
            and loc_no like '%' + #{viewWorkIn.locNo} + '%'
        </if>
        <if test="viewWorkIn.matnr!=null and viewWorkIn.matnr!='' ">
            and matnr like '%' + #{viewWorkIn.matnr} + '%'
        </if>
        <if test="viewWorkIn.maktx!=null and viewWorkIn.maktx!='' ">
            and (maktx like '%' + #{viewWorkIn.maktx} + '%'
            or matnr like '%' + #{viewWorkIn.maktx} + '%'
            or lgnum like '%' + #{viewWorkIn.maktx} + '%'
            or tbnum like '%' + #{viewWorkIn.maktx} + '%'
            or tbpos like '%' + #{viewWorkIn.maktx} + '%'
            or zmatid like '%' + #{viewWorkIn.maktx} + '%'
            or maktx like '%' + #{viewWorkIn.maktx} + '%'
            or werks like '%' + #{viewWorkIn.maktx} + '%'
            or anfme like '%' + #{viewWorkIn.maktx} + '%'
            or altme like '%' + #{viewWorkIn.maktx} + '%'
            or zpallet like '%' + #{viewWorkIn.maktx} + '%'
            or bname like '%' + #{viewWorkIn.maktx} + '%'
            )
        </if>
        <if test="viewWorkIn.beginDate!=null and viewWorkIn.beginDate!='' ">
            <![CDATA[
            and io_time >= #{viewWorkIn.beginDate}
            ]]>
        </if>
        <if test="viewWorkIn.endDate!=null and viewWorkIn.endDate!='' ">
            <![CDATA[
            and io_time <= #{viewWorkIn.endDate}
            ]]>
        </if>
</sql>

<!-- 入库统计 -->
<!-- 分页查询所有信息 -->
<select id="queryViewWorkInList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
    select * from asr_wrkin_view
    where 1=1
    <include refid="viewWorkInConditionSql"></include>
</select>

<!-- 出库统计 -->
<!-- 分页查询所有信息 -->
<select id="queryViewWorkOutList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
    select *
    from asr_wrkout_view
    where 1=1
    <include refid="viewWorkInConditionSql"></include>
</select>

</mapper>

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java

New file
@@ -0,0 +1,93 @@
package com.zy.asrs.wms.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.entity.ViewInOutBean;
import com.zy.asrs.common.wms.entity.ViewStayTimeBean;
import com.zy.asrs.common.wms.entity.ViewStockUseBean;
import com.zy.asrs.common.wms.entity.ViewWorkInBean;
import com.zy.asrs.common.wms.mapper.ReportQueryMapper;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.Map;

/**
 * 日志统计控制器层
 * @author admin
 * @date 2018年11月23日
 */
@RestController
@RequestMapping("/report")
public class ReportQueryController extends BaseController {

    @Autowired
    private ReportQueryMapper reportQueryMapper;

    //------------------库位使用统计--------------------------------------
    @RequestMapping("/viewStockUseList.action")
    public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
                                          @RequestParam(defaultValue = "10")Integer limit,
                                          @RequestParam Map<String, Object> param){
        ViewStockUseBean bean = new ViewStockUseBean();
        bean.setPageSize(limit);
        bean.setPageNumber(curr);

        Page<ViewStockUseBean> page = new Page<>(curr, limit);
        IPage<ViewStockUseBean> list = reportQueryMapper.queryViewStockUseList(page, bean);
        return R.ok(list);
    }

    //------------------库存滞留统计--------------------------------------
    @RequestMapping("/viewStayTimeList.action")
    public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
                                                           @RequestParam(defaultValue = "10")Integer limit,
                                                           @RequestParam Map<String, Object> param){
        ViewStayTimeBean bean = new ViewStayTimeBean();
        bean.setPageSize(limit);
        bean.setPageNumber(curr);
        String locNo = String.valueOf(param.get("loc_no"));
        if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
            bean.setLocNo(locNo);
        }

        Page<ViewStayTimeBean> page = new Page<>(curr, limit);
        IPage<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(page, bean);
        return R.ok(list);
    }

    //------------------站点日入出库次数统计--------------------------------------
    @RequestMapping("/viewInOutList.action")
    public Map<String,Object> viewInOutList(@RequestParam(defaultValue = "1")Integer curr,
                                             @RequestParam(defaultValue = "10")Integer limit,
                                             @RequestParam Map<String, Object> param){
        ViewInOutBean bean = new ViewInOutBean();
        bean.setPageSize(limit);
        bean.setPageNumber(curr);
        Page<ViewInOutBean> page = new Page<>(curr, limit);
        IPage<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(page, bean);
        return R.ok(list);
    }

    //------------------日入库明细统计--------------------------------------
    @RequestMapping("/viewWorkInList.action")
    public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
        Page<ViewWorkInBean> page = new Page<>(1, 99999);
        IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(page, bean);
        return R.ok(list);
    }

    //------------------日出库明细统计--------------------------------------
    @RequestMapping("/viewWorkOutList.action")
    public R viewWorkOutList(ViewWorkInBean bean){
        Page<ViewWorkInBean> page = new Page<>(1, 99999);
        IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(page, bean);
        return R.ok(list);
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java

@@ -37,7 +37,7 @@
                  @RequestParam(required = false) String timeRange,
                  @RequestParam Map<String, Object> param) {
        LambdaQueryWrapper<WrkMastLog> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(WrkMastLog::getHostId, getHostId());
//        wrapper.eq(WrkMastLog::getHostId, getHostId());
        if (!Cools.isEmpty(condition)) {
            wrapper.like(WrkMastLog::getWrkNo, condition);
        }
@@ -46,6 +46,18 @@
            wrapper.ge(WrkMastLog::getAppeTime, DateUtils.convert(range[0]));
            wrapper.le(WrkMastLog::getAppeTime, DateUtils.convert(range[1]));
        }
        if (!Cools.isEmpty(param.get("wrkNo"))) {
            wrapper.eq(WrkMastLog::getWrkNo, param.get("wrkNo"));
        }
        if (!Cools.isEmpty(param.get("wrkSts"))) {
            wrapper.eq(WrkMastLog::getWrkSts, param.get("wrkSts"));
        }
        if (!Cools.isEmpty(param.get("ioType"))) {
            wrapper.eq(WrkMastLog::getIoType, param.get("ioType"));
        }
        if (!Cools.isEmpty(param.get("manuType"))) {
            wrapper.like(WrkMastLog::getManuType, param.get("manuType"));
        }
        wrapper.orderByDesc(WrkMastLog::getId);
        return R.ok(wrkMastLogService.page(new Page<>(curr, limit), wrapper));
    }

 zy-asrs-wms/src/main/webapp/static/js/handWrkMast/handWrkMast.js

@@ -11,9 +11,9 @@
    tableIns = table.render({
        elem: '#wrkMast',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/wrkMastLog/list/auth',
        url: baseUrl+'/wrkMastLog/page/auth',
        page: true,
        where: {manu_type : '手动'},
        where: {},
        limit: 50,
        limits: [50, 100, 200, 500],
        even: true,

 zy-asrs-wms/src/main/webapp/static/js/report/reportStockUse.js

@@ -20,13 +20,13 @@
        cols: [[
            // {type: 'checkbox', fixed: 'left'}
            {field: 'row1', title: '钢架号', sort: true, align: 'center'}
            ,{field: 'total_qty', align: 'center',title: '库位总数'}
            ,{field: 'full_qty', align: 'center',title: '在库数量'}
            ,{field: 'null_qty', align: 'center',title: '空库位数量'}
            ,{field: 'forbid_qty', align: 'center',title: '禁用库位数量'}
            ,{field: 'empty_qty', align: 'center',title: '空容器数量'}
            ,{field: 'full_rate', align: 'center',title: '在库率(%)'}
            ,{field: 'occ_rate', align: 'center',title: '使用率(%)'}
            ,{field: 'totalQty', align: 'center',title: '库位总数'}
            ,{field: 'fullQty', align: 'center',title: '在库数量'}
            ,{field: 'nullQty', align: 'center',title: '空库位数量'}
            ,{field: 'forbidQty', align: 'center',title: '禁用库位数量'}
            ,{field: 'emptyQty', align: 'center',title: '空容器数量'}
            ,{field: 'fullRate', align: 'center',title: '在库率(%)'}
            ,{field: 'occRate', align: 'center',title: '使用率(%)'}
        ]],
        request: {
            pageName: 'curr',

 zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js

@@ -2,8 +2,8 @@
function getCol() {
    var cols = [
        {field: 'appeTime$', title: '入库时间', align: 'center', width: 200}
        ,{field: 'stay_time', align: 'center',title: '滞留天数'}
        ,{field: 'loc_no', align: 'center',title: '库位号'}
        ,{field: 'stayTime', align: 'center',title: '滞留天数'}
        ,{field: 'locNo', align: 'center',title: '库位号'}
    ];
    cols.push.apply(cols, detlCols);
    return cols;

 zy-asrs-wms/src/main/webapp/views/handWrkMast/handWrkMast.html

@@ -51,7 +51,7 @@
<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="wrk_no" placeholder="工作号" autocomplete="off">
            <input class="layui-input" type="text" name="wrkNo" placeholder="工作号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
@@ -78,7 +78,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <select name="manu_type">
            <select name="manuType">
                <option value="手动" style="display: none"></option>
                <option value="完成">手动完成</option>
                <option value="取消">手动取消</option>
@@ -88,7 +88,7 @@
    <!-- 日期范围 -->
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">
            <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
            <input class="layui-input layui-laydate-range" name="timeRange" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <!-- 待添加 -->