#

DELL

2022-05-06 b43d307ac60607bcc556ca52c54cee0176b66273

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

@@ -265,6 +265,9 @@
            // 生成工作档明细
            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                MatCode matCode = matCodeService.selectById(detlDto.getLocDetl().getMatNo());
                if(Cools.isEmpty(matCode)){
                    throw new CoolException("产品编码在基础数据中不存在，请确认");
                }
                // 出库时，数量为0的直接忽略
                if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
                WrkDetl wrkDetl = new WrkDetl();
@@ -278,13 +281,16 @@
                wrkDetl.setModiTime(new Date());
                wrkDetl.setModiUser(userId);
                wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
                wrkDetl.setQtyBox(matCode.getStr6());
                wrkDetl.setWeight(matCode.getWeight());
                wrkDetl.setAllWeight(qty*matCode.getWeight()+30);
                wrkDetl.setAllQty(qty*matCode.getStr6());
                wrkDetl.setQtyBox(matCode.getStr6()!=null ? matCode.getStr6() : 0);
                wrkDetl.setWeight(matCode.getWeight()!=null ? matCode.getWeight() : 0);
                wrkDetl.setAllWeight(matCode.getWeight()!=null ? qty*matCode.getWeight()+30 : 0);
                wrkDetl.setAllQty(matCode.getStr6()!=null ? qty*matCode.getStr6() : 0);
                wrkDetl.setVendor(detlDto.getLocDetl().getVendor());
                wrkDetl.setSource(detlDto.getLocDetl().getSource());
                wrkDetl.setSupplier(detlDto.getLocDetl().getSupplier());
                wrkDetl.setStr5(matCode.getStr5());
                wrkDetl.setStr4(matCode.getStr4());
                wrkDetl.setStr3(matCode.getStr3());
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }
@@ -693,6 +699,9 @@
                locDetl.setQtyBox(matCode.getStr6());
                locDetl.setAllQty(matCode.getStr6()*adjust.getCount());
                locDetl.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
                locDetl.setStr3(matCode.getStr3());
                locDetl.setStr4(matCode.getStr4());
                locDetl.setStr5(matCode.getStr5());
                if (!locDetlService.insert(locDetl)) {
                    throw new CoolException("保存库存明细失败");
                }
@@ -725,6 +734,9 @@
                        sqlParam1.setQtyBox(matCode.getStr6());
                        sqlParam1.setAllQty(matCode.getStr6()*adjust.getCount());
                        sqlParam1.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
                        sqlParam1.setStr5(matCode.getStr5());
                        sqlParam1.setStr4(matCode.getStr4());
                        sqlParam1.setStr3(matCode.getStr3());
                        if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
                                .eq("loc_no", locMast.getLocNo())
                                .eq("mat_no", adjust.getMatNo())