#

ytfl

2 天以前 920631775c8b2d6c0541ae4d69c34c8a8675bf60

#

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

@@ -379,9 +379,13 @@
                    @RequestParam Map<String, Object> param) {
        Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
        for (LocDetl locDetl : stockStatis.getRecords()) {
            Double weight = locDetl.getWeight();
            String standby1 = locDetl.getStandby1();
            Mat mat = matService.selectByMatnr(locDetl.getMatnr());
            if (mat != null) {
                locDetl.sync(mat);
                locDetl.setStandby1(standby1);
                locDetl.setWeight(weight);
            }
        }
        return R.ok().add(stockStatis);
@@ -420,4 +424,14 @@
        return R.ok(sum);
    }

    /**
     * 获取库存总数
     * @return
     */
    @RequestMapping("/locDetl/count2")
    public R getAllCount2(){
        Integer sum = locDetlService.sum2();
        return R.ok(sum);
    }

}

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

@@ -355,7 +355,7 @@
            ckbmList.add(storeType.getStoreId());
        }

        NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
        /*NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
                .eq("WLBM", combMat.getMatnr())
                .eq("VBATCHCODE", combMat.getBatch())
                .in("CKBM", ckbmList)
@@ -389,7 +389,7 @@
        List<CombParam.CombMat> combMats = combParam.getCombMats();
        for (CombParam.CombMat mat : combMats) {
            mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
        }
        }*/

        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");

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

@@ -87,6 +87,8 @@

    Integer sum();

    Integer sum2();

    List<LocDetl> unreason();

    Double selectLocDetlSumQty(String locNo);

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

@@ -76,6 +76,8 @@

    Integer sum();

    Integer sum2();

    List<LocDetl> unreason();

    Double getLocDetlSumQty(String locNo);

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

@@ -152,6 +152,15 @@
        return this.baseMapper.sum();
    }

    /**
     * 获取库存总数
     * @return
     */
    @Override
    public Integer sum2() {
        return this.baseMapper.sum2();
    }

    @Override
    public List<LocDetl> unreason() {
        return this.baseMapper.unreason();

 src/main/resources/mapper/asrs/LocDetlMapper.xml

@@ -387,11 +387,13 @@
            ROW_NUMBER() over (order by sum(a.anfme) desc) as row
            , a.matnr
            , a.batch
            , a.standby1
            , sum(a.anfme) as anfme
            , sum(a.weight) as weight
            from asr_loc_detl a
            where 1=1
            <include refid="stockOutCondition"></include>
            group by a.matnr, a.batch
            group by a.matnr, a.batch , a.standby1
         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
    </select>

@@ -642,6 +644,9 @@
    <select id="sum" resultType="java.lang.Integer">
        SELECT SUM(anfme) FROM asr_loc_detl
    </select>
    <select id="sum2" resultType="java.lang.Integer">
        SELECT SUM(weight) FROM asr_loc_detl
    </select>
    <select id="unreason" resultMap="BaseResultMap">
        SELECT
            *

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

@@ -3,8 +3,9 @@
    var cols = [
        {field: 'anfme', align: 'center',title: '库存数量', style: 'font-weight: bold'}
    ];
    arrRemove(detlCols, "field", "anfme")
    arrRemove(detlCols, "field", "zpallet")
    arrRemove(detlCols, "field", "orderNo")
    arrRemove(detlCols, "field", "supp")
    cols.push.apply(cols, detlCols);
    // cols.push({field: 'anfme', align: 'center',title: '数量', style: 'font-weight: bold'}
    // )
@@ -72,6 +73,19 @@
                }
            });

            /**
             * 显示库存总数量
             */
            $.ajax({
                url: baseUrl+"/locDetl/count2",
                headers: {'token': localStorage.getItem('token')},
                contentType:'application/json;charset=UTF-8',
                method: 'POST',
                success: function (res) {
                    $("#countNum2").text(res.data + '个');
                }
            });

        }
    });


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

@@ -34,6 +34,14 @@
            </div>
        </fieldset>
    </div>
    <div class="layui-inline">
        <fieldset class="layui-elem-field">
            <legend>总计辅数量</legend>
            <div class="layui-field-box" id="countNum2">
                请稍等
            </div>
        </fieldset>
    </div>
</div>

<!-- 表格 -->