#入库找库位基础逻辑完成，接口第一次测试完成，测试结果："OK"

LSH

2023-07-24 022c1483e1cb87b22742b247f25f8152a010bf2f

#入库找库位基础逻辑完成，接口第一次测试完成，测试结果："OK"

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

@@ -259,6 +259,44 @@
    }


    /**
     * 中控：码垛完成下发入库信息
     */
    @PostMapping("/cs1/auth/v1")
    @AppAuth(memo = "中控：码垛前上报条码,生成测试工作档")
    public synchronized R cs1(@RequestHeader(required = false) String appkey,
                                              @RequestBody PalletizingCompleteParam param,
                                              HttpServletRequest request) {
        auth(appkey, param, request);
        openService.cs1(param.getBarcode());
        return R.ok(param);
    }

    /**
     * 中控：码垛完成下发入库信息
     */
    @PostMapping("/cs2/auth/v1")
    @AppAuth(memo = "中控：码垛完成下发入库信息,生成测试工作档")
    public synchronized R cs2(@RequestHeader(required = false) String appkey,
                                                @RequestBody PalletizingCompleteParam param,
                                                HttpServletRequest request) {
        auth(appkey, param, request);
        openService.cs2();
        return R.ok(param);
    }

    /**
     * 中控：码垛完成下发入库信息
     */
    @PostMapping("/cs3/auth/v1")
    @AppAuth(memo = "中控：码垛完成下发入库信息,生成测试工作档")
    public synchronized R cs3(@RequestHeader(required = false) String appkey,
                                                @RequestBody PalletizingCompleteParam param,
                                                HttpServletRequest request) {
        auth(appkey, param, request);
        openService.cs3();
        return R.ok(param);
    }


    /*...........................上饶江铜..............以上.............徐工汉云...........................*/

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

@@ -52,7 +52,7 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
                wrapper.eq(entry.getKey(), val);
            }
        }
    }

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

@@ -54,4 +54,8 @@

    void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param);

    void cs1(String barcode);
    void cs2();
    void cs3();

}

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

@@ -802,7 +802,7 @@
            for (WrkDetl wrkDetl:wrkDetls){
                if (wrkDetl.getBatch().equals(matList.getBoxNo())){//木箱编码
                    wrkDetl.setInspect(1);
                    wrkDetlService.updateById(wrkDetl);
                    wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
                    wrkDetlsNew.add(wrkDetl);
                    sign=false;
                    break;
@@ -887,7 +887,7 @@
                    for (WrkDetl wrkDetl:wrkDetls){
                        if (wrkDetl.getBatch().equals(matList.getBoxNo())){//木箱编码
                            wrkDetl.setOrigin(matList.getPosition());
                            wrkDetlService.updateById(wrkDetl);
                            wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
                            sign=false;
                            break;
                        }
@@ -905,5 +905,37 @@
        }
    }

    /*
     *
     * */
    @Override
    @Transactional
    public void cs1(String barcode) {
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 201));
        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(201));
        wrkMast.setWrkNo(workNo);
        wrkMast.setBarcode(barcode);
        wrkMast.setWrkSts(42L);
        wrkMastService.insert(wrkMast);
    }

    /*
     *
     * */
    @Override
    @Transactional
    public void cs2() {

    }

    /*
     *
     * */
    @Override
    @Transactional
    public void cs3() {

    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/
}

 src/main/java/com/zy/common/service/CommonService.java

@@ -132,23 +132,9 @@
                        break;
                    }
                }
                String val = String.valueOf(vo.getValue());
                if (Cools.isEmpty(batch)) {
                    batch = val;
                } else {
                    int year0 = Integer.parseInt(batch.substring(0, 2));
                    int month0 = Integer.parseInt(batch.substring(2, 4));
                    int year = Integer.parseInt(val.substring(0, 2));
                    int month = Integer.parseInt(val.substring(2, 4));
                    if (year <= year0) {
                        if (month < month0) {
                            batch = val;
                        }
                    }
                }
            }
            if (sameMatnr) {
                List<String> locNos = locDetlService.getSameDetlToday2(matnr, batch, sRow, eRow);
                List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
                for (String locNo : locNos) {
                    if (Utils.isShallowLoc(slaveProperties, locNo)) {
                        continue;
@@ -291,6 +277,9 @@
                locTypeDto.setLocType1((short) 2);
                return getLocNo(1, staDescId, sourceStaNo, list, locTypeDto, times);
            }
            if (!sign){
                throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
            }
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");
        }