#1

dubin

8 天以前 864c18c46c2db1ae92220181e40b291b3b0d9446

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

@@ -92,26 +92,38 @@
        }
        Date now = new Date();
        for (MatnrDto dto : param.getMats()) {

            Mat mat = matService.selectByMatnr(dto.getMatnr());
            if (mat == null) {
                throw new CoolException("物料数据错误，请联系管理员");
            }
            ManLocDetl manLocDetl = new ManLocDetl();
            manLocDetl.setLocNo(node.getUuid());
            manLocDetl.setNodeId(node.getId());
            manLocDetl.setZpallet(mat.getBarcode());
            manLocDetl.setAnfme(dto.getCount());
            manLocDetl.setMatnr(mat.getMatnr());
            manLocDetl.setMaktx(mat.getMaktx());
            manLocDetl.setName(mat.getName());
            manLocDetl.setSpecs(mat.getSpecs());
            manLocDetl.setModel(mat.getModel());
            manLocDetl.setBatch(mat.getBeBatch() + "");
            manLocDetl.setCreateTime(now);
            manLocDetl.setModiTime(now);
            manLocDetl.setCreateBy(userId);
            SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
            manLocDetlService.insert(manLocDetl);
            ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
                    .eq("loc_no", node.getUuid())
                    .eq("matnr", dto.getMatnr()));
            if (check == null) {
                ManLocDetl manLocDetl = new ManLocDetl();
                manLocDetl.setLocNo(node.getUuid());
                manLocDetl.setNodeId(node.getId());
                manLocDetl.setZpallet(mat.getBarcode());
                manLocDetl.setAnfme(dto.getCount());
                manLocDetl.setMatnr(mat.getMatnr());
                manLocDetl.setMaktx(mat.getMaktx());
                manLocDetl.setName(mat.getName());
                manLocDetl.setBatch(null);
                manLocDetl.setSpecs(mat.getSpecs());
                manLocDetl.setModel(mat.getModel());
                manLocDetl.setCreateTime(now);
                manLocDetl.setModiTime(now);
                manLocDetl.setCreateBy(userId);
                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
                manLocDetlService.insert(manLocDetl);
            }else {
                check.setAnfme(dto.getCount() + check.getAnfme());
                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
                        .eq("loc_no", node.getUuid())
                        .eq("matnr", dto.getMatnr()));
            }


        }
        return R.ok("入库成功");
@@ -136,13 +148,18 @@
                }
                if (manLocDetl.getAnfme() - param.getCount() < 0) {
                    return R.error("物料:"+ param.getMatnr() + " 在库位中数量不足");
                }else {
                } else if (manLocDetl.getAnfme() - param.getCount() == 0) {
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount());
                    manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
                            .eq("loc_no",node.getUuid())
                            .eq("matnr",param.getMatnr()));
                } else {

                    manLocDetl.setAnfme(manLocDetl.getAnfme() - param.getCount());
                    manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
                            .eq("loc_no",node.getUuid())
                            .eq("matnr",param.getMatnr()));
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount());
                }
            }
        }
@@ -152,19 +169,36 @@
    @Transactional
    @Override
    public void locMove(String sourceLocNo, String targetLocNo, Long userId) {
        List<ManLocDetl> targets = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
        List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
                .like("loc_no", sourceLocNo));
        for (ManLocDetl target : targets) {
            Node uuid = nodeService.selectOne(new EntityWrapper<Node>()
        for (ManLocDetl source : sourceManDetl) {
            Node targetNode = nodeService.selectOne(new EntityWrapper<Node>()
                    .eq("uuid", targetLocNo));
            if (uuid == null || uuid.equals("")) {
            Node sourceNode = nodeService.selectOne(new EntityWrapper<Node>()
                    .eq("uuid", sourceLocNo));
            if (targetNode == null || targetNode.equals("")) {
                throw new RuntimeException("无法查询到移库的目标库位");
            }
            manLocDetlService.deleteById(target);
            target.setLocNo(uuid.getUuid());
            target.setNodeId(uuid.getId());
            SaasUtils.insertLog(2,target.getLocNo(), target.getMatnr(), target.getAnfme());
            manLocDetlService.insert(target);
            ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
                    .eq("loc_no", targetNode.getUuid())
                    .eq("matnr", source.getMatnr()));
            if (check == null) {
                manLocDetlService.deleteById(source);
                source.setLocNo(targetNode.getUuid());
                source.setNodeId(targetNode.getId());

                SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme());
                manLocDetlService.insert(source);
            }else {
                check.setAnfme(check.getAnfme() + source.getAnfme());
                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
                        .eq("loc_no", targetNode.getUuid())
                        .eq("matnr", check.getMatnr()));
                manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
                        .eq("loc_no", sourceNode.getUuid())
                        .eq("matnr", source.getMatnr()));
            }

        }
    }
}