#平库库位whs_type==1

Junjie

2024-07-04 99543f7e820927a8826a7308461a8ab94c361859

#平库库位whs_type==1

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

@@ -15,6 +15,6 @@
    @Select("select loc_no from common_loc_mast where 1=1 and loc_sts = 'O' and host_id = #{hostId}")
    List<String> queryGroupEmptyStock(Long hostId);

    List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd, Long hostId);
    List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd, Long hostId,Long whsType);

}

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

@@ -46,6 +46,8 @@
    @Autowired
    private LocDirectionService locDirectionService;

    private Long WHS_TYPE = 0L;//默认立库

    /**
     * 生成工作号
     *
@@ -91,6 +93,11 @@
     */
    @Transactional
    public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, List<String> matnrs, String batch, Long hostId, LocTypeDto locTypeDto, int times) {
        if (sourceStaNo==999){//平库内置判断站点（临时解决方案）
            WHS_TYPE = 1L;//平库
        } else {
            WHS_TYPE = 0L;//立库
        }
        // 目标库位
        LocMast locMast = null;

@@ -150,7 +157,7 @@
                continue;
            }

            List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd(), hostId);
            List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd(), hostId,WHS_TYPE);
            for (LocMast locMast0 : locMasts) {
                //预留空库位
                if (locMastService.checkEmptyCount(locMast0, 10, hostId)) {
@@ -237,12 +244,14 @@
                    .eq(LocMast::getLocSts, "D")
                    .eq(LocMast::getLocType1, locTypeDto.getLocType1())
                    .eq(LocMast::getCrnNo, staDesc.getDeviceNo())
                    .eq(LocMast::getWhsType, WHS_TYPE)
                    .eq(LocMast::getHostId, hostId);

            LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
                    .eq(LocMast::getLocSts, "O")
                    .eq(LocMast::getLocType1, locTypeDto.getLocType1())
                    .eq(LocMast::getCrnNo, staDesc.getDeviceNo())
                    .eq(LocMast::getWhsType, WHS_TYPE)
                    .eq(LocMast::getHostId, hostId);

            //库位搜索范围
@@ -312,6 +321,7 @@
        LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
                .eq(LocMast::getLocSts, "O")
                .eq(LocMast::getHostId, hostId)
                .eq(LocMast::getWhsType, WHS_TYPE)
                .in(LocMast::getRow1, curRow)
                .orderByAsc(LocMast::getBay1)
                .orderByAsc(LocMast::getLev1);
@@ -331,7 +341,7 @@
        for (LocMast mast : locMasts) {
            LocMast innerLoc = null;
            for (String loc : Utils.getGroupLoc(mast.getLocNo(), hostId)) {
                LocMast one = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, loc).eq(LocMast::getHostId, hostId));
                LocMast one = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, loc).eq(LocMast::getHostId, hostId).eq(LocMast::getWhsType, WHS_TYPE));
                if (!one.getLocSts().equals("O")) {
                    innerLoc = null;
                    continue;

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

@@ -19,7 +19,7 @@
    /**
     * 检索可用库位
     */
    List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd, Long hostId);
    List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd, Long hostId,Long whsType);

    /**
     * 检查当前库位所属巷道的空库位数量

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

@@ -35,8 +35,8 @@
    }

    @Override
    public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd, Long hostId) {
        return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd, hostId);
    public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd, Long hostId,Long whsType) {
        return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd, hostId, whsType);
    }

    @Override

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

@@ -245,7 +245,7 @@
    @Transactional
    public R WarehouseIn(String locNo, String barcode,Long hostId) {
        //判断库位状态
        LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locNo).eq(LocMast::getHostId,hostId));
        LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locNo).eq(LocMast::getHostId,hostId).eq(LocMast::getWhsType,1L));
        if (Cools.isEmpty(locMast)){
            return R.error("该库位不存在");
        }
@@ -314,7 +314,7 @@
    @Transactional
    public R WarehouseOut(CombParam combParam, Long hostId) {
        //判断库位状态
        LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, combParam.getLocno()).eq(LocMast::getHostId,hostId));
        LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, combParam.getLocno()).eq(LocMast::getHostId,hostId).eq(LocMast::getWhsType,1L));
        if (Cools.isEmpty(locMast)){
            return R.error("该库位不存在");
        }

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

@@ -10,6 +10,9 @@
        <if test="locType1 != null">
            and loc_type1 = #{locType1}
        </if>
        <if test="whsType != null">
            and whs_type = #{whsType}
        </if>
        <if test="rowBeg != null">
            and row1 >= #{rowBeg}
        </if>

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

@@ -184,6 +184,7 @@
                    locMast.setModiUser(getUserId());
                    locMast.setModiTime(new Date());
                    locMast.setHostId(hostId);
                    locMast.setWhsType(0L);
                    list.add(locMast);
                }
            }

 zy-asrs-wms/src/main/resources/application.yml

@@ -13,7 +13,7 @@
#    url: jdbc:sqlserver://localhost:1433;databasename=jmasrs
#    username: sa
#    password: sa@123
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ncasrs
    url: jdbc:sqlserver://192.168.4.61:1433;databasename=ncasrs
    username: sa
    password: sa@123
  mvc:

 zy-asrs-wms/src/main/webapp/static/layuiadmin/json/layim/getList.js

@@ -1,96 +1 @@
{
  "code": 0
  ,"msg": ""
  ,"data": {
    "mine": {
      "username": "纸飞机"
      ,"id": "100000"
      ,"status": "online"
      ,"sign": "在深邃的编码世界，做一枚轻盈的纸飞机"
      ,"avatar": "//res.layui.com/images/fly/avatar/00.jpg"
    }
    ,"friend": [{
      "groupname": "知名人物"
      ,"id": 0
      ,"list": [{
        "username": "贤心"
        ,"id": "100001"
        ,"avatar": "//tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg"
        ,"sign": "这些都是测试数据，实际使用请严格按照该格式返回"
        ,"status": "online"
      },{
        "username": "刘涛tamia"
        ,"id": "100001222"
        ,"sign": "如约而至，不负姊妹欢乐颂"
        ,"avatar": "//tva4.sinaimg.cn/crop.0.1.1125.1125.180/475bb144jw8f9nwebnuhkj20v90vbwh9.jpg"
      },{
        "username": "谢楠"
        ,"id": "10034001"
        ,"avatar": "//tva2.sinaimg.cn/crop.1.0.747.747.180/633f068fjw8f9h040n951j20ku0kr74t.jpg"
        ,"sign": ""
      },{
        "username": "马小云"
        ,"id": "168168"
        ,"avatar": "//tva1.sinaimg.cn/crop.0.0.180.180.180/7fde8b93jw1e8qgp5bmzyj2050050aa8.jpg"
        ,"sign": "让天下没有难写的代码"
      },{
        "username": "徐小峥"
        ,"id": "666666"
        ,"avatar": "//tva1.sinaimg.cn/crop.0.0.512.512.180/6a4acad5jw8eqi6yaholjj20e80e8t9f.jpg"
        ,"sign": "代码在囧途，也要写到底"
      }]
    },{
      "groupname": "网红声优"
      ,"id": 1
      ,"list": [{
        "username": "罗玉凤"
        ,"id": "121286"
        ,"avatar": "//tva4.sinaimg.cn/crop.0.0.640.640.180/4a02849cjw8fc8vn18vktj20hs0hs75v.jpg"
        ,"sign": "在自己实力不济的时候，不要去相信什么媒体和记者。他们不是善良的人，有时候候他们的采访对当事人而言就是陷阱"
      },{
        "username": "Z_子晴"
        ,"id": "108101"
        ,"avatar": "//tva1.sinaimg.cn/crop.0.23.1242.1242.180/8693225ajw8fbimjimpjwj20yi0zs77l.jpg"
        ,"sign": "微电商达人"
      },{
        "username": "大鱼_MsYuyu"
        ,"id": "12123454"
        ,"avatar": "//tva2.sinaimg.cn/crop.0.0.512.512.180/005LMAegjw8f2bp9qg4mrj30e80e8dg5.jpg"
        ,"sign": "我瘋了！這也太準了吧  超級笑點低"
      },{
        "username": "醋醋cucu"
        ,"id": "102101"
        ,"avatar": "//tva2.sinaimg.cn/crop.0.0.640.640.180/648fbe5ejw8ethmg0u9egj20hs0ht0tn.jpg"
        ,"sign": ""
      },{
        "username": "柏雪近在它香"
        ,"id": "3435343"
        ,"avatar": "//tva2.sinaimg.cn/crop.0.8.751.751.180/961a9be5jw8fczq7q98i7j20kv0lcwfn.jpg"
        ,"sign": ""
      }]
    },{
      "groupname": "女神艺人"
      ,"id": 2
      ,"list": [{
        "username": "王祖贤"
        ,"id": "76543"
        ,"avatar": "//wx2.sinaimg.cn/mw690/5db11ff4gy1flxmew7edlj203d03wt8n.jpg"
        ,"sign": "我爱贤心"
      },{
        "username": "佟丽娅"
        ,"id": "4803920"
        ,"avatar": "//tva3.sinaimg.cn/crop.0.0.750.750.180/5033b6dbjw8etqysyifpkj20ku0kuwfw.jpg"
        ,"sign": "我也爱贤心吖吖啊"
      }]
    }]
    ,"group": [{
      "groupname": "前端群"
      ,"id": "101"
      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.200.200.50/006q8Q6bjw8f20zsdem2mj305k05kdfw.jpg"
    },{
      "groupname": "Fly社区官方群"
      ,"id": "102"
      ,"avatar": "//tva2.sinaimg.cn/crop.0.0.199.199.180/005Zseqhjw1eplix1brxxj305k05kjrf.jpg"
    }]
  }
}
{"code":0,"msg":"","data":{"mine":{"username":"纸飞机","id":"100000","status":"online","sign":"在深邃的编码世界，做一枚轻盈的纸飞机","avatar":"//res.layui.com/images/fly/avatar/00.jpg"},"friend":[{"groupname":"知名人物","id":0,"list":[{"username":"贤心","id":"100001","avatar":"//tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg","sign":"这些都是测试数据，实际使用请严格按照该格式返回","status":"online"},{"username":"刘涛tamia","id":"100001222","sign":"如约而至，不负姊妹欢乐颂","avatar":"//tva4.sinaimg.cn/crop.0.1.1125.1125.180/475bb144jw8f9nwebnuhkj20v90vbwh9.jpg"},{"username":"谢楠","id":"10034001","avatar":"//tva2.sinaimg.cn/crop.1.0.747.747.180/633f068fjw8f9h040n951j20ku0kr74t.jpg","sign":""},{"username":"马小云","id":"168168","avatar":"//tva1.sinaimg.cn/crop.0.0.180.180.180/7fde8b93jw1e8qgp5bmzyj2050050aa8.jpg","sign":"让天下没有难写的代码"},{"username":"徐小峥","id":"666666","avatar":"//tva1.sinaimg.cn/crop.0.0.512.512.180/6a4acad5jw8eqi6yaholjj20e80e8t9f.jpg","sign":"代码在囧途，也要写到底"}]},{"groupname":"网红声优","id":1,"list":[{"username":"罗玉凤","id":"121286","avatar":"//tva4.sinaimg.cn/crop.0.0.640.640.180/4a02849cjw8fc8vn18vktj20hs0hs75v.jpg","sign":"在自己实力不济的时候，不要去相信什么媒体和记者。他们不是善良的人，有时候候他们的采访对当事人而言就是陷阱"},{"username":"Z_子晴","id":"108101","avatar":"//tva1.sinaimg.cn/crop.0.23.1242.1242.180/8693225ajw8fbimjimpjwj20yi0zs77l.jpg","sign":"微电商达人"},{"username":"大鱼_MsYuyu","id":"12123454","avatar":"//tva2.sinaimg.cn/crop.0.0.512.512.180/005LMAegjw8f2bp9qg4mrj30e80e8dg5.jpg","sign":"我瘋了！這也太準了吧  超級笑點低"},{"username":"醋醋cucu","id":"102101","avatar":"//tva2.sinaimg.cn/crop.0.0.640.640.180/648fbe5ejw8ethmg0u9egj20hs0ht0tn.jpg","sign":""},{"username":"柏雪近在它香","id":"3435343","avatar":"//tva2.sinaimg.cn/crop.0.8.751.751.180/961a9be5jw8fczq7q98i7j20kv0lcwfn.jpg","sign":""}]},{"groupname":"女神艺人","id":2,"list":[{"username":"王祖贤","id":"76543","avatar":"//wx2.sinaimg.cn/mw690/5db11ff4gy1flxmew7edlj203d03wt8n.jpg","sign":"我爱贤心"},{"username":"佟丽娅","id":"4803920","avatar":"//tva3.sinaimg.cn/crop.0.0.750.750.180/5033b6dbjw8etqysyifpkj20ku0kuwfw.jpg","sign":"我也爱贤心吖吖啊"}]}],"group":[{"groupname":"前端群","id":"101","avatar":"//tva1.sinaimg.cn/crop.0.0.200.200.50/006q8Q6bjw8f20zsdem2mj305k05kdfw.jpg"},{"groupname":"Fly社区官方群","id":"102","avatar":"//tva2.sinaimg.cn/crop.0.0.199.199.180/005Zseqhjw1eplix1brxxj305k05kjrf.jpg"}]}}

 zy-asrs-wms/src/main/webapp/static/layuiadmin/json/layim/getMembers.js

@@ -1,67 +1 @@
{
  "code": 0
  ,"msg": ""
  ,"data": {
    "list": [{
      "username": "贤心"
      ,"id": "100001"
      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg"
      ,"sign": "这些都是测试数据，实际使用请严格按照该格式返回"
    },{
      "username": "Z_子晴"
      ,"id": "108101"
      ,"avatar": "//tva1.sinaimg.cn/crop.0.23.1242.1242.180/8693225ajw8fbimjimpjwj20yi0zs77l.jpg"
      ,"sign": "微电商达人"
    },{
      "username": "Lemon_CC"
      ,"id": "102101"
      ,"avatar": "//tva4.sinaimg.cn/crop.0.0.180.180.180/6d424ea5jw1e8qgp5bmzyj2050050aa8.jpg"
      ,"sign": ""
    },{
      "username": "马小云"
      ,"id": "168168"
      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.180.180.180/7fde8b93jw1e8qgp5bmzyj2050050aa8.jpg"
      ,"sign": "让天下没有难写的代码"
    },{
      "username": "徐小峥"
      ,"id": "666666"
      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.512.512.180/6a4acad5jw8eqi6yaholjj20e80e8t9f.jpg"
      ,"sign": "代码在囧途，也要写到底"
    },{
      "username": "罗玉凤"
      ,"id": "121286"
      ,"avatar": "//tva4.sinaimg.cn/crop.0.0.640.640.180/4a02849cjw8fc8vn18vktj20hs0hs75v.jpg"
      ,"sign": "在自己实力不济的时候，不要去相信什么媒体和记者。他们不是善良的人，有时候候他们的采访对当事人而言就是陷阱"
    },{
      "username": "刘涛tamia"
      ,"id": "100001222"
      ,"avatar": "//tva4.sinaimg.cn/crop.0.1.1125.1125.180/475bb144jw8f9nwebnuhkj20v90vbwh9.jpg"
      ,"sign": "如约而至，不负姊妹欢乐颂"
    },{
        "username": "大鱼_MsYuyu"
        ,"id": "12123454"
        ,"avatar": "//tva2.sinaimg.cn/crop.0.0.512.512.180/005LMAegjw8f2bp9qg4mrj30e80e8dg5.jpg"
        ,"sign": "我瘋了！這也太準了吧  超級笑點低"
      },{
        "username": "谢楠"
        ,"id": "10034001"
        ,"avatar": "//tva2.sinaimg.cn/crop.1.0.747.747.180/633f068fjw8f9h040n951j20ku0kr74t.jpg"
        ,"sign": ""
      },{
        "username": "柏雪近在它香"
        ,"id": "3435343"
        ,"avatar": "//tva2.sinaimg.cn/crop.0.8.751.751.180/961a9be5jw8fczq7q98i7j20kv0lcwfn.jpg"
        ,"sign": ""
      },{
        "username": "林心如"
        ,"id": "76543"
        ,"avatar": "//tva3.sinaimg.cn/crop.0.0.512.512.180/48f122e6jw8fcmi072lkyj20e80e8t9i.jpg"
        ,"sign": "我爱贤心"
      },{
        "username": "佟丽娅"
        ,"id": "4803920"
        ,"avatar": "//tva3.sinaimg.cn/crop.0.0.750.750.180/5033b6dbjw8etqysyifpkj20ku0kuwfw.jpg"
        ,"sign": "我也爱贤心吖吖啊"
      }]
  }
}
{"code":0,"msg":"","data":{"list":[{"username":"贤心","id":"100001","avatar":"//tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg","sign":"这些都是测试数据，实际使用请严格按照该格式返回"},{"username":"Z_子晴","id":"108101","avatar":"//tva1.sinaimg.cn/crop.0.23.1242.1242.180/8693225ajw8fbimjimpjwj20yi0zs77l.jpg","sign":"微电商达人"},{"username":"Lemon_CC","id":"102101","avatar":"//tva4.sinaimg.cn/crop.0.0.180.180.180/6d424ea5jw1e8qgp5bmzyj2050050aa8.jpg","sign":""},{"username":"马小云","id":"168168","avatar":"//tva1.sinaimg.cn/crop.0.0.180.180.180/7fde8b93jw1e8qgp5bmzyj2050050aa8.jpg","sign":"让天下没有难写的代码"},{"username":"徐小峥","id":"666666","avatar":"//tva1.sinaimg.cn/crop.0.0.512.512.180/6a4acad5jw8eqi6yaholjj20e80e8t9f.jpg","sign":"代码在囧途，也要写到底"},{"username":"罗玉凤","id":"121286","avatar":"//tva4.sinaimg.cn/crop.0.0.640.640.180/4a02849cjw8fc8vn18vktj20hs0hs75v.jpg","sign":"在自己实力不济的时候，不要去相信什么媒体和记者。他们不是善良的人，有时候候他们的采访对当事人而言就是陷阱"},{"username":"刘涛tamia","id":"100001222","avatar":"//tva4.sinaimg.cn/crop.0.1.1125.1125.180/475bb144jw8f9nwebnuhkj20v90vbwh9.jpg","sign":"如约而至，不负姊妹欢乐颂"},{"username":"大鱼_MsYuyu","id":"12123454","avatar":"//tva2.sinaimg.cn/crop.0.0.512.512.180/005LMAegjw8f2bp9qg4mrj30e80e8dg5.jpg","sign":"我瘋了！這也太準了吧  超級笑點低"},{"username":"谢楠","id":"10034001","avatar":"//tva2.sinaimg.cn/crop.1.0.747.747.180/633f068fjw8f9h040n951j20ku0kr74t.jpg","sign":""},{"username":"柏雪近在它香","id":"3435343","avatar":"//tva2.sinaimg.cn/crop.0.8.751.751.180/961a9be5jw8fczq7q98i7j20kv0lcwfn.jpg","sign":""},{"username":"林心如","id":"76543","avatar":"//tva3.sinaimg.cn/crop.0.0.512.512.180/48f122e6jw8fcmi072lkyj20e80e8t9i.jpg","sign":"我爱贤心"},{"username":"佟丽娅","id":"4803920","avatar":"//tva3.sinaimg.cn/crop.0.0.750.750.180/5033b6dbjw8etqysyifpkj20ku0kuwfw.jpg","sign":"我也爱贤心吖吖啊"}]}}