#

tzsk

2024-05-31 b97ab3e077df3665663eb3a5b0c23d54c83a5548

#

 src/main/java/com/zy/asrs/entity/LocMast.java

@@ -224,6 +224,8 @@
            case 1:
                return "低库位";
            case 2:
                return "中库位";
            case 3:
                return "高库位";
            default:
                return String.valueOf(this.locType1);

 src/main/resources/mapper/ViewStayTimeMapper.xml

@@ -92,28 +92,7 @@

<!-- 分页查询AGV和四项库所有信息 -->
<select id="queryAllViewStayTimeList" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
    select
        *
    from (
             select
                 ROW_NUMBER() over (order by stay_time desc) as row
        , *
             from
                 (
                     SELECT
                         GETDATE() AS today
                          , CONVERT(decimal, DATEDIFF(second,all_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
                          , all_loc_detl.*
                     FROM all_loc_detl
                     where 1=1
                     <include refid="viewStayTimeConditionSql"></include>
                 ) t
                     left join (select matnr as c ,store_max_date,store_max,store_min from man_mat) b
                               on t.matnr = b.c
                     left join (select matnr as f,sum(asr_loc_detl.anfme) as sum_qty from asr_loc_detl group by asr_loc_detl.matnr ) as z
                               on z.f= b.c

         ) a  where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
    c
</select>
<select id="getAllViewStayTimeCount" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="Integer">
    select
@@ -138,22 +117,26 @@
<!-- 不分页查询所有信息，用于excel导出 -->
<select id="getViewStayTimeAll" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
    select
    *
    from (
        select
        ROW_NUMBER() over (order by stay_time desc) as row
        , *
        from
        (
            SELECT
            GETDATE() AS today
            , CONVERT(decimal, DATEDIFF(second,asr_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
            , dbo.asr_loc_detl.*
            FROM asr_loc_detl
            INNER JOIN asr_loc_mast ON asr_loc_detl.loc_no = asr_loc_mast.loc_no
            where 1=1
            <include refid="viewStayTimeConditionSql"></include>
        ) t
            *
        from (
                 select
                     ROW_NUMBER() over (order by stay_time desc) as row
            , *
                 from
                     (
                         SELECT
                             GETDATE() AS today
                              , CONVERT(decimal, DATEDIFF(second,all_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
    ,
     all_loc_detl.*
                         FROM all_loc_detl
                     ) t
                         left join (select matnr as c ,store_max_date,store_max,store_min from man_mat) b
                                   on t.matnr = b.c
                         left join (select matnr as f,sum(asr_loc_detl.anfme) as sum_qty from asr_loc_detl group by asr_loc_detl.matnr ) as z
                                   on z.f= b.c


    ) a
</select>


 src/main/webapp/static/js/locMast/locMast.js

@@ -442,7 +442,7 @@
            bay1: $('#bay1').val(),
            lev1: $('#lev1').val(),
            fullPlt: $('#fullPlt').val(),
            locType: $('#locType').val(),
            locType1: $('#locType1').val(),
            outEnable: $('#outEnable').val(),
            ioTime: top.strToDate($('#ioTime\\$').val()),
            firstTime: top.strToDate($('#firstTime\\$').val()),

 src/main/webapp/views/locMast/locMast_detail.html

@@ -71,10 +71,10 @@
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
        <div class="layui-inline" style="width:80%;">
            <label class="layui-form-label">高低类型：</label>
            <div class="layui-input-inline">
                <input id="sheetNo" class="layui-input" type="text">
                <input id="locType1" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">