#

zjj

2023-09-14 9c468fe6e597c5bb70d64872aa94835d49a60036

#

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

@@ -413,5 +413,15 @@
        return R.ok(page);
    }

    @RequestMapping(value = "/locDetl/selectLocF")
    @ManagerAuth
    public Boolean selectLocF(@RequestParam String locNo){
        String s = locDetlService.selectLocNoF(locNo);
        if (s.equals("F")){
            return false;
        }
        return true;
    }


}

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

@@ -94,4 +94,6 @@

    int selectAllPymentcount(LocDetlDTO locDetlDTO);
    Double sumAll();

    String selectLocNoF(String locNo);
}

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.result.LocDetlAll;
import com.zy.asrs.entity.result.LocDetlDTO;
@@ -74,4 +75,6 @@

    int selectAllCount(LocDetlDTO locDetlDTO);
    int selectAllPymentcount(LocDetlDTO locDetlDTO);

    String selectLocNoF(String locNo);
}

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.result.LocDetlAll;
import com.zy.asrs.entity.result.LocDetlDTO;
@@ -183,4 +184,9 @@
    public int selectAllPymentcount(LocDetlDTO locDetlDTO) {
        return this.baseMapper.selectAllPymentcount(locDetlDTO);
    }

    @Override
    public String selectLocNoF(String locNo) {
        return this.baseMapper.selectLocNoF(locNo);
    }
}

 src/main/resources/mapper/LocDetlMapper.xml

@@ -558,17 +558,21 @@

    </select>
    <select id="getStockStatisAll" resultType="com.zy.asrs.entity.result.LocDetlAll">
        select * from
        select t.*,m.specs from
        (
        select
        ROW_NUMBER() over (order by sum(a.anfme) desc) as row
        , a.matnr
        , sum(a.anfme) as anfme
        ,owner
        ,payment
        from asr_loc_detl_all a
        where 1=1
        <include refid="stockOutCondition"></include>
        group by a.matnr
        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
        group by a.matnr,a.owner,a.payment
        ) t
        LEFT JOIN man_mat m on t.matnr = m.matnr
        where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
    </select>

    <select id="getStockStatisCountAll" parameterType="java.util.Map" resultType="java.lang.Integer">
@@ -576,16 +580,23 @@
        (
        select
        a.matnr
        ,owner
        ,payment
        from asr_loc_detl_all a
        where 1=1
        <include refid="stockOutCondition"></include>
        group by a.matnr
        group by a.matnr,a.owner,a.payment
        ) b
    </select>

    <select id="sumAll" resultType="java.lang.Double">
        SELECT SUM(anfme) FROM asr_loc_detl_all
    </select>
    <select id="selectLocNoF" resultType="java.lang.String">
        select loc_sts from asr_loc_detl_F_view
        where loc_no = #{locNo}

    </select>


</mapper>

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

@@ -5,6 +5,9 @@
    ];
    arrRemove(detlCols, "field", "anfme")
    arrRemove(detlCols, "field", "zpallet")
    arrRemove(detlCols, "field", "batch")
    arrRemove(detlCols, "field", "model")
    arrRemove(detlCols, "field", "weight")
    cols.push.apply(cols, detlCols);
    // cols.push({field: 'anfme', align: 'center',title: '数量', style: 'font-weight: bold'}
    // )

 src/main/webapp/views/saasLog/saasLog.html

@@ -18,9 +18,17 @@
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label">编号:</label>
                        <label class="layui-form-label">库位号:</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                            <input class="layui-input" type="text" name="loc_no" placeholder="请输入库位号" autocomplete="off">
                        </div>
                        <label class="layui-form-label">物料号:</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="matnr" placeholder="请输入物料号" autocomplete="off">
                        </div>
                        <label class="layui-form-label">操作人:</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="create_by_name" placeholder="请输入操作人" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;