自动化立体仓库 - WMS系统
13
zhang
12 小时以前 c302def08211c8cecfbf28308a2bcaf4115ac990
13
6个文件已修改
20 ■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/LocDetlService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pakStore/stockAdjust.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakStore/stockAdjust.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -30,6 +30,13 @@
        // 变更数量
        private Double count;
        // 变更数量
        private String standby1;
        // 序列码
        private String orderNo;
        public LocDetlAdjust(String matnr, String batch, Double count) {
            this.matnr = matnr;
            this.batch = batch;
src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -36,6 +36,8 @@
    boolean updateAnfme(Double anfme, String locNo, String matnr
            ,String batch,String brand,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3);
    boolean updateLocNo(String newLocNo, String oldLocNo);
    boolean updateBarcode(String locNo, String barcode);
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -74,6 +74,8 @@
    }
    @Override
    public boolean updateLocNo(String newLocNo, String oldLocNo) {
        return baseMapper.updateLocNo(newLocNo, oldLocNo) > 0;
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1035,7 +1035,7 @@
                        // todo 盘点记录
                        // 修改库存
                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(),
                                locDetl.getStandby1(), locDetl.getStandby2(), locDetl.getStandby3(), locDetl.getBoxType1(), locDetl.getBoxType2(), locDetl.getBoxType3())) {
                                adjust.getStandby1(), locDetl.getStandby2(), locDetl.getStandby3(), locDetl.getBoxType1(), locDetl.getBoxType2(), locDetl.getBoxType3())) {
                            throw new CoolException(locDetl.getLocNo() + "库位," + locDetl.getMatnr() + "商品," + locDetl.getBatch() + "批号修改数量失败");
                        }
                        // 保存调整记录
src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -7,11 +7,14 @@
    var cols = [
        {fixed: 'left', field: 'count', title: '实际数量', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'}
        ,{field: 'anfme', align: 'center',title: '数量'}
        ,{field: 'orderNo', align: 'center',title: '单据编号', edit: true}
        ,{field: 'batch', align: 'center',title: '批号(编辑)', edit: true, style: 'font-weight:bold'}
        ,{field: 'standby1', align: 'center', edit: true,title: '仓库'}
        ,{field: 'standby1', align: 'center', edit: true,title: '仓库编号'}
    ];
    arrRemove(detlCols, "field", "anfme");
    arrRemove(detlCols, "field", "batch");
    arrRemove(detlCols, "field", "orderNo");
    arrRemove(detlCols, "field", "standby1$");
    cols.push.apply(cols, detlCols);
    cols.push({fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:80})
    return cols;
src/main/webapp/views/pakStore/stockAdjust.html
@@ -126,7 +126,7 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/pakStore/stockAdjust.js?v=1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/pakStore/stockAdjust.js?v=2" charset="utf-8"></script>
</body>
</html>