#

lty

5 天以前 d964498a12a672139ad25ec774faa054059fa736

#

 src/main/java/com/zy/asrs/controller/LocDetlController.java

@@ -12,9 +12,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
@@ -242,6 +240,15 @@
        return R.ok().add(stockStatis);
    }

    @RequestMapping(value = "/locDetl/check/auth")
    @ManagerAuth
    public R check(@RequestParam(defaultValue = "1")Integer curr,
                    @RequestParam(defaultValue = "10")Integer limit,
                    @RequestParam Map<String, Object> param) {
        Page<CheckDetl> stockStatis = locDetlService.getStockCheck(toPage(curr, limit, param, CheckDetl.class));
        return R.ok().add(stockStatis);
    }

    @Autowired
    private LocDetlMapper LocDetlMapper;


 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java

@@ -1,6 +1,8 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.CheckDetl;
import com.zy.asrs.entity.LocCheck;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.result.StockVo;
import org.apache.ibatis.annotations.Mapper;
@@ -40,9 +42,11 @@
    List<String> selectSameDetlTodayBatch(@Param("matnr") String matnr,@Param("batch") String batch, @Param("start") Integer start, @Param("end") Integer end);

    List<LocDetl> getStockStatis(Map<String, Object> map);
    List<CheckDetl> getStockCheck(Map<String, Object> map);
    Double getAnfmeByMatnr(@Param("matnr") String matnr, @Param("batch") String batch, @Param("specs") String specs);

    Integer getStockStatisCount(Map<String, Object> map);
    Integer getStockCheckCount(Map<String, Object> map);

    List<LocDetl> getStockStatisExcel();


 src/main/java/com/zy/asrs/service/LocDetlService.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.CheckDetl;
import com.zy.asrs.entity.LocCheck;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.result.StockVo;

@@ -40,7 +42,7 @@
    List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end);

    Page<LocDetl> getStockStatis(Page<LocDetl> page);

    Page<CheckDetl> getStockCheck(Page<CheckDetl> page);
    Double getSumAnfme(String matnr);

    List<LocDetl> selectPakoutByRule(String matnr);

 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.CheckDetl;
import com.zy.asrs.entity.LocCheck;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.LocDetlMapper;
@@ -64,6 +66,13 @@
    }

    @Override
    public Page<CheckDetl> getStockCheck(Page<CheckDetl> page) {
        page.setRecords(baseMapper.getStockCheck(page.getCondition()));
        page.setTotal(baseMapper.getStockCheckCount(page.getCondition()));
        return page;
    }

    @Override
    public Double getAnfmeByMatnr(String matnr,String batch, String specs){
        return this.baseMapper.getAnfmeByMatnr(matnr,batch,specs);
    }

 src/main/resources/mapper/LocDetlMapper.xml

@@ -46,6 +46,14 @@
        <result column="memo" property="memo" />
    </resultMap>

    <resultMap id="CheckResultMap" type="com.zy.asrs.entity.CheckDetl">
        <result column="anfme" property="anfme" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="specs" property="specs" />
        <result column="batch" property="batch" />
    </resultMap>

    <sql id="batchSeq">
        <choose>
            <when test="batch != null and batch != ''">
@@ -165,6 +173,29 @@
        </where>
    </select>

    <select id="getStockCheck" resultMap="CheckResultMap">
        select * from (
        select
        ROW_NUMBER() over (order by a.create_time desc) as row,
        a.anfme,
        a.matnr,
        a.maktx,
        a.specs,
        a.batch
        from asr_check_detl a
        <include refid="stockOutCondition" />
        ) t
        where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
    </select>


    <select id="getStockCheckCount" parameterType="java.util.Map" resultType="java.lang.Integer">
        select count(1)
        from asr_check_detl a
        <include refid="stockOutCondition" />
    </select>




    <select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">

 src/main/resources/mapper/ManLocDetlMapper.xml

@@ -33,6 +33,14 @@

    </resultMap>

    <resultMap id="CheckResultMap" type="com.zy.asrs.entity.LocCheck">
        <result column="anfme" property="anfme" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="specs" property="specs" />
        <result column="batch" property="batch" />
    </resultMap>

    <sql id="locDetlCondition">
        <if test="host_id != null and host_id != ''">
            and mld.host_id = #{host_id}
@@ -200,6 +208,31 @@
        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
    </select>

    <select id="getStockCheck" resultMap="CheckResultMap">
        select * from
        (
        select
        ROW_NUMBER() over (order by a.matnr, sum(a.anfme) desc) as row
        , a.matnr
        , sum(a.anfme) as anfme
        from asr_check_detl a
        <include refid="stockOutCondition"></include>
        group by a.matnr
        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
    </select>

    <select id="getStockCheckCount" parameterType="java.util.Map" resultType="java.lang.Integer">
        select count(1) as count from
        (
        select
        a.matnr
        from asr_check_detl a
        where 1=1
        <include refid="stockOutCondition"></include>
        group by a.matnr
        ) b
    </select>

    <select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
        select count(1) as count from
        (

 src/main/webapp/static/js/locDetlStatis/check.js

@@ -20,9 +20,9 @@

    // 数据渲染
    tableIns = table.render({
        elem: '#locDetlStatis',
        elem: '#check',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/locDetl/statis/auth',
        url: baseUrl+'/locDetl/check/auth',
        page: true,
        limit: 20,
        limits: [20, 30, 50, 100, 200, 500],

 src/main/webapp/views/locDetlStatis/check.html

@@ -26,19 +26,19 @@
    <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置
    </button>
  </div>
  <div class="layui-inline">
    <fieldset class="layui-elem-field">
      <legend>总计数量</legend>
      <div class="layui-field-box" id="countNum">
        请稍等
      </div>
    </fieldset>
  </div>
<!--  <div class="layui-inline">-->
<!--    <fieldset class="layui-elem-field">-->
<!--      <legend>总计数量</legend>-->
<!--      <div class="layui-field-box" id="countNum">-->
<!--        请稍等-->
<!--      </div>-->
<!--    </fieldset>-->
<!--  </div>-->
</div>

<!-- 表格 -->
<div class="layui-form">
  <table class="layui-hide" id="locDetlStatis" lay-filter="locDetlStatis"></table>
  <table class="layui-hide" id="check" lay-filter="check"></table>
</div>
<script type="text/html" id="toolbar">

@@ -52,7 +52,7 @@
<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/locDetlStatis/locDetlStatis.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/locDetlStatis/check.js" charset="utf-8"></script>

</body>
</html>