#

DELL

2022-05-06 b43d307ac60607bcc556ca52c54cee0176b66273

#

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

@@ -12,8 +12,10 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.MatCodePrint;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.CodeRes;
@@ -40,6 +42,8 @@

    @Autowired
    private MatCodeService matCodeService;
    @Autowired
    private LocDetlService locDetlService;

    @RequestMapping(value = "/matCode/{id}/auth")
    @ManagerAuth
@@ -117,6 +121,10 @@
            return R.error();
        }
        for (MatCode entity : list){
            Integer count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("mat_no",entity.getMatNo()));
            if(count>0){
                return R.error("产品编码" + entity.getMatNo() + "在库存中已存在，禁止删除");
            }
            matCodeService.delete(new EntityWrapper<>(entity));
        }
        return R.ok();

 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,8 +281,8 @@
                wrkDetl.setModiTime(new Date());
                wrkDetl.setModiUser(userId);
                wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
                wrkDetl.setQtyBox(matCode.getStr6());
                wrkDetl.setWeight(matCode.getWeight());
                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());