四项库出库作业 出库相同物料不同料箱号报错bug修复 新增平库无组托上架功能

zyx

2024-01-02 ec583e53bb8f1f79f48063c48d554fa895e321a6

四项库出库作业 出库相同物料不同料箱号报错bug修复
新增平库无组托上架功能

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

@@ -482,6 +482,13 @@

    }

    //平库上架(无组托上架)
    @RequestMapping("/node/pakin/v1")
    public R nodePakinNoComb(@RequestBody CombParam param){
        mobileService.nodePakinNoComb(param);
        return R.ok();
    }

    private String findNodeLoc(List<LocRule> locRules){
        for (LocRule locRule : locRules) {
            if (Cools.isEmpty(locRule.getOther())) {

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

@@ -28,4 +28,6 @@
    void nodePakout(NodePakoutParam param, User user);

    void modifyWrkDetl(List<WrkDetl> wrkDetls, List<ModifyPakoutParam.CA> params, Long userId);

    void nodePakinNoComb(CombParam param);
}

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

@@ -615,6 +615,48 @@
        });
    }

    @Override
    public void nodePakinNoComb(CombParam param) {
        if(Cools.isEmpty(param.getLocno())){
            throw new CoolException("库位号未填写，无法入库");
        }
        param.getCombMats().forEach(combMat -> {
            Wrapper<ManLocDetl> wrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", param.getLocno()).eq("matnr",combMat.getMatnr());
            Utils.wapperSetCondition(wrapper,"container_code",combMat.getContainerCode());
            Utils.wapperSetCondition(wrapper,"batch",combMat.getBatch());
            Utils.wapperSetCondition(wrapper,"csocode",combMat.getCsocode());
            Utils.wapperSetCondition(wrapper,"isoseq",combMat.getIsoseq());
            ManLocDetl manLocDetl = manLocDetlService.selectOne(wrapper);
            if(Cools.isEmpty(manLocDetl)){
                saveManlocDetl(combMat,param.getLocno());
            }else{
                manLocDetl.setAnfme(manLocDetl.getAnfme() + combMat.getAnfme());
                manLocDetlService.update(manLocDetl,wrapper);
            }
            //生成平库入出库日志
            SaasUtils.insertLog(0,param.getLocno(),combMat.getMatnr(), combMat.getAnfme(),"");
        });

    }

    private boolean saveManlocDetl(CombParam.CombMat combMat, String locNo){
        Node node = nodeService.selectOne(new EntityWrapper<Node>()
                .eq("name", locNo));
        Mat mat = matService.selectByMatnr(combMat.getMatnr());
        ManLocDetl manLocDetl = new ManLocDetl();
        BeanUtils.copyProperties(mat,manLocDetl);
        manLocDetl.setAnfme(combMat.getAnfme());
        manLocDetl.setNodeId(node.getId());
        manLocDetl.setContainerCode(combMat.getContainerCode());
        manLocDetl.setCsocode(combMat.getCsocode());
        manLocDetl.setIsoseq(combMat.getIsoseq());
        manLocDetl.setCreateTime(new Date());
        manLocDetl.setModiTime(new Date());
        manLocDetl.setLocNo(locNo);
        manLocDetl.setStatus(1);
        return manLocDetlService.insert(manLocDetl);
    }

    private void saveManlocDetl(WaitPakin waitPakin, Date now, String locNo){

        Node node = nodeService.selectOne(new EntityWrapper<Node>()

 src/main/java/com/zy/common/model/OutLocDto.java

@@ -47,6 +47,15 @@
                if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
                    continue;
                }
                if(!Cools.eq(next.getLocDetl().getSuppCode(),locDetl.getSuppCode())){
                    continue;
                }
                if(!Cools.eq(next.getLocDetl().getThreeCode(),locDetl.getThreeCode())){
                    continue;
                }
                if(!Cools.eq(next.getLocDetl().getDeadTime(),locDetl.getDeadTime())){
                    continue;
                }
                if (next.getCount() > locDetl.getAnfme()) {
                    throw new CoolException("服务器内部错误");
                }