Merge branch 'master' of http://47.97.1.152:5880/r/zy-asrs-master

luxiaotao1123

2023-12-30 f28b3a9131d2313a889f4a3156dcfabcefce7a84

Merge branch 'master' of http://47.97.1.152:5880/r/zy-asrs-master

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

@@ -34,4 +34,6 @@
    @Update("update wms_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo} and host_id = #{hostId}")
    int updateLocNo(String newLocNo, String oldLocNo, Long hostId);

    IPage<LocDetl> getStockOutPage(IPage<LocDetl> page, Map<String, Object> map);

}

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java

@@ -25,4 +25,6 @@

    boolean updateLocNo(String newLocNo, String oldLocNo, Long hostId);

    IPage<LocDetl> getStockOut(Integer curr, Integer limit, Map<String, Object> param);

}

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java

@@ -61,4 +61,10 @@
    public boolean updateLocNo(String newLocNo, String oldLocNo, Long hostId) {
        return baseMapper.updateLocNo(newLocNo, oldLocNo, hostId) > 0;
    }

    @Override
    public IPage<LocDetl> getStockOut(Integer curr, Integer limit, Map<String, Object> param) {
        Page<LocDetl> page = new Page<>(curr, limit);
        return this.baseMapper.getStockOutPage(page, param);
    }
}

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

@@ -59,7 +59,7 @@
        select
        a.*
        from wms_loc_detl a
        left join wms_loc_mast b on a.loc_no = b.loc_no
        left join common_loc_mast b on a.loc_no = b.loc_no
        where 1=1
        <if test="no!=null and no == 1">
            and b.row1 >= 31
@@ -93,7 +93,7 @@
                    b.bay1 as bay,
                    sum(anfme) as count
                from wms_loc_detl a
                    left join wms_loc_mast b on a.loc_no = b.loc_no
                    left join common_loc_mast b on a.loc_no = b.loc_no
                where 1=1
                  and b.loc_sts = 'F'
                  and a.matnr = #{matnr}
@@ -107,7 +107,7 @@
                    b.bay1 as bay,
                    sum(anfme) as count
                from wms_loc_detl a
                    left join wms_loc_mast b on a.loc_no = b.loc_no
                    left join common_loc_mast b on a.loc_no = b.loc_no
                where 1=1
                  and b.loc_sts = 'F'
                  and a.matnr = #{matnr}
@@ -121,7 +121,7 @@
                    b.bay1 as bay,
                    sum(anfme) as count
                from wms_loc_detl a
                    left join wms_loc_mast b on a.loc_no = b.loc_no
                    left join common_loc_mast b on a.loc_no = b.loc_no
                where 1=1
                  and b.loc_sts = 'F'
                  and a.matnr = #{matnr}
@@ -162,4 +162,15 @@
        <include refid="batchSeq"></include>
    </update>

    <select id="getStockOutPage" resultType="com.zy.asrs.common.wms.entity.LocDetl">
        select
        a.*
        from wms_loc_detl a
        left join common_loc_mast b on a.loc_no = b.loc_no and a.host_id = b.host_id
        where 1=1
        and b.loc_sts = 'F'
        and b.host_id = #{map.hostId}
        <include refid="stockOutCondition"></include>
    </select>

</mapper>

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

@@ -142,4 +142,22 @@
        return R.ok(sum);
    }

    @RequestMapping(value = "/stock/out/list/auth")
    @ManagerAuth
    public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        if (!Cools.isEmpty(param.get("modi_time"))){
            String val = String.valueOf(param.get("modi_time"));
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                param.put("startTime", DateUtils.convert(dates[0]));
                param.put("endTime", DateUtils.convert(dates[1]));
                param.remove("modi_time");
            }
        }
        param.put("hostId", getHostId());
        return R.ok(locDetlService.getStockOut(curr, limit, param));
    }

}

 zy-asrs-wms/src/main/webapp/static/js/pakStore/stockOut.js

@@ -4,7 +4,7 @@
    var cols = [
        {field: 'count', align: 'center',title: '出库数量', edit:'text', width: 130,  style:'color: blue;font-weight: bold'}
        ,{field: 'anfme', align: 'center',title: '库存数量'}
        ,{field: 'locNo$', align: 'center',title: '库位号'}
        ,{field: 'locNo', align: 'center',title: '库位号'}
    ];
    arrRemove(detlCols,  'field', 'anfme');
    cols.push.apply(cols, detlCols);

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

@@ -462,8 +462,8 @@
            typeDesc: $('#typeDesc').val(),
            stnNo: $('#stnNo').val(),
            stnDesc: $('#stnDesc').val(),
            crnNo: $('#crnNo').val(),
            crnStn: $('#crnStn').val(),
            deviceNo: $('#deviceNo').val(),
            deviceStn: $('#deviceStn').val(),
            memo: $('#memo').val(),
            modiUser: $('#modiUser').val(),
            modiTime: top.strToDate($('#modiTime\\$').val()),

 zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html

@@ -106,7 +106,7 @@
    function getCol() {
        var cols = [
            {type: 'checkbox'}
            ,{field: 'locNo$', align: 'center',title: '库位号'}
            ,{field: 'locNo', align: 'center',title: '库位号'}
        ];
        cols.push.apply(cols, detlCols);
        cols.push({field: 'modiUser$', align: 'center',title: '修改人员', hide: true}

 zy-asrs-wms/src/main/webapp/views/pakStore/stockOut.html

@@ -94,14 +94,14 @@
    <!-- 头部 -->
    <script type="text/html" id="toolbar">
        <div class="layui-form">
            <div class="layui-form layui-card-header">
                <span id="memeoSpan" style="margin-left: 25px">订单号：</span>
                <div class="layui-inline">
                    <div class="layui-input-inline">
                        <input id="orderNo" class="layui-input" type="text" name="orderNo" placeholder="订单号" autocomplete="off" style="margin-left: 15px;width: 300px">
                    </div>
                </div>
            </div>
<!--            <div class="layui-form layui-card-header">-->
<!--                <span id="memeoSpan" style="margin-left: 25px">订单号：</span>-->
<!--                <div class="layui-inline">-->
<!--                    <div class="layui-input-inline">-->
<!--                        <input id="orderNo" class="layui-input" type="text" name="orderNo" placeholder="订单号" autocomplete="off" style="margin-left: 15px;width: 300px">-->
<!--                    </div>-->
<!--                </div>-->
<!--            </div>-->
            <div class="layui-btn-container">
                <!-- 1.选择出库口 -->
                <span id="staNoSpan">出库口：</span>

 zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html

@@ -68,17 +68,17 @@
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>设备号：</label>
            <div class="layui-input-inline">
                <input id="crnNo" class="layui-input" type="text">
                <input id="deviceNo" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">设备站点：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="crnStn" class="layui-input" type="text" lay-verify="number"  style="display: none">
                <input id="crnStn$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>
                <input id="deviceStn" class="layui-input" type="text" lay-verify="number"  style="display: none">
                <input id="deviceStn$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="basDevpQueryBycrnStn" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="basDevpQueryBycrnStnSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    <input class="cool-auto-complete-window-input" data-key="basDevpQueryBydeviceStn" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="basDevpQueryBydeviceStnSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>