#

LSH

2023-07-15 afd021e2e0312582c27caf905dc278f79af3ef59

#

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

@@ -762,6 +762,13 @@
        } else if (waitPakins.get(0).getIoStatus() == "Y") {
            return R.error("组托已经生成工作档");
        }

        for (WaitPakin waitPakin: waitPakins) {
            List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("zpallet", waitPakin.getZpallet()));
            if (Cools.isEmpty(manLocDetls) || manLocDetls.size()>0){
                return R.error("所在库位已存在明细");
            }
        }
        //判断订单是否完成
        boolean log =true;


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

@@ -104,13 +104,13 @@
                throw new CoolException("物料数据错误，请联系管理员");
            }
            ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
                    .eq("loc_no", node.getUuid())
                    .eq("loc_no", node.getName())
                    .eq("matnr", dto.getMatnr()));
            if (check == null) {
                ManLocDetl manLocDetl = new ManLocDetl();
                manLocDetl.setLocNo(node.getUuid());
                manLocDetl.setLocNo(node.getName());
                manLocDetl.setNodeId(node.getId());
                manLocDetl.setZpallet(mat.getBarcode());
                manLocDetl.setZpallet(node.getName());
                manLocDetl.setAnfme(dto.getCount());
                manLocDetl.setMatnr(mat.getMatnr());
                manLocDetl.setMaktx(mat.getMaktx());
@@ -126,10 +126,11 @@
                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername());
                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()));
//                check.setAnfme(dto.getCount() + check.getAnfme());
//                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
//                        .eq("loc_no", node.getName())
//                        .eq("matnr", dto.getMatnr()));
                return R.error("库位存在物料，请勿重复入库");
            }
            if (!Cools.isEmpty(dto.getOrderNo())) {
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()