#

LSH

2023-05-26 6f8cc73c7f986bc89ee1c6fc33c2a7d50cfa6c93

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

@@ -87,9 +87,9 @@
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getBarcode())){
            throw new CoolException("请填写货主信息");
        }
//        if (Cools.isEmpty(param.getBarcode())){
//            throw new CoolException("请填写货主信息");
//        }
        // 判断是否有相同条码的数据
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
@@ -130,6 +130,7 @@
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                    one.setOwner(detlDto.getOwner());
                } else {
                    detlDtos.add(detlDto);
                }
@@ -153,7 +154,7 @@
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setOwner(param.getOwner());
                waitPakin.setOwner(detlDto.getOwner());
                waitPakin.setUuid(uuid);
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
@@ -193,7 +194,7 @@
                    throw new CoolException("修改单据作业数量失败");
                }

                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;
@@ -220,7 +221,7 @@
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setOwner(param.getOwner());
                waitPakin.setOwner(detlDto.getOwner());
                waitPakin.setUuid(uuid);
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
@@ -264,7 +265,7 @@
            manLocDetl.setAnfme(combMat.getAnfme());
            manLocDetl.setModiTime(now);
            manLocDetl.setUuid(uuid);
            manLocDetl.setOwner(param.getOwner());
            manLocDetl.setOwner(1);
            if (!manLocDetlService.insert(manLocDetl)) {
                throw new CoolException("商品上架失败！");
            }
@@ -510,7 +511,6 @@
    @Override
    public R manDetlIn(JSONObject json) {
        Date date = new Date();
        int jsonOwner= (int) json.get("owner");
        String jsonLocNo = (String) json.get("locNo");
        Node node = nodeService.selectOne(new EntityWrapper<Node>()
                .eq("name", jsonLocNo));
@@ -553,7 +553,7 @@
                manLocDetl.setCreateTime(date);
                manLocDetl.setBatch(jsonOrderDetl.getBatch());
                manLocDetl.setUuid(uuid);
                manLocDetl.setOwner(jsonOwner);
                manLocDetl.setOwner(orderDetl.getOwner());
                if(!manLocDetlService.insert(manLocDetl)){
                    return R.error("修改平库物料失败！");
                }