.gitignore

@@ -33,3 +33,4 @@
### LOG ###
stock
LOG_PATH_IS_UNDEFINED
license.lic

 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/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/application.yml

@@ -86,8 +86,8 @@

# 用友NC对接
NYNC:
  ip: http://192.168.5.200
  port: 1105
  ip: http://192.168.5.160
  port: 8088
  pageSize: 1000
  #1.销售出库单参照发货单新增
  saveRefDelivery: /nccloud/api/ic/saleout/saveRefDelivery

 src/main/resources/config.properties

@@ -1,7 +1,7 @@
#####不变参数
client_id=WMS
client_secret=b5ee040e00584e518c06
pubKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhxRFEtPfreu+ROWtC5IQZVy1Vkkqi0Fk7A4tGvyfLIw2qPNLWrTmCJeJwXLmgiB+EU0RW9U8jFYRAhSKaQY1HTjHMZcXdfH6m7WitT+sIyDVfTO3wVWtvjFBF1o6qi+T7pNsmCjstArnm/OS55kn0zJcRiTTwP1UU1LrkQbytf9ZHOcbKfqjIL8amsinjdxd6ioUM3JT3PpOXCIRDHsQgvAnFx2q7Y902S0PFzc40FwtuwsuKqesvEbIImUcq1wbIDtMegixy+TfJMWcByNLp2iv8/+Zos+hePhfWRPlD2x0vk30xDXMiUVgq0dhxC5C3yeD2QEbLxIlDqK2WebzZQIDAQAB
client_secret=748378be87a94b7889b0
pubKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn4uBKrgJ2TZ4frpUtjuKMKggZu/FFeT2rvu5o0UWKmNCuwlOBQdWItqEV3qFIO+pWI7JMDT400sGrZSZtnGkU5LzmF70HuE1a0WSaOH/2fJyb7JnK/3dVpPx5MOL3vfXCq0eq/iSbXwi9aB0wgp9toh0vgK0S5I+xI9OhnN3k4EuLjCJ55wGPgyYMcCuDW4+FqZBfI5s2NDg7h4Q+zjsqWgAAMM/kw4oKQOzmgBOiiWPmMVOkzt9h4Y7/+uIghFUHf0jHqVvC/AwysAIszdmYY8llUtscIuw+w9pxVAcmwcFI/Ky+xUEKouwPI1SM0D2oe6fcA3+/Co4xuiuhwhNTwIDAQAB
secret_level=L0
#autotest=ture

@@ -18,7 +18,7 @@
## 服务器地址
#baseUrl=http://10.16.7.160:9088
#baseUrl=http://10.10.4.166:9080
baseUrl=http://192.168.5.200:1105
baseUrl=http://192.168.5.160:8088
#baseUrl=http://192.168.61.18:21322
#baseUrl=https://ncc.yyncc.com


 src/main/resources/license.lic

Binary files differ

 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>

<!-- 表格 -->