#

wang..123

2022-02-21 d385e17d9c172c7659b252c538b45e7091c9de24

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

@@ -4,8 +4,8 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.MatCodeCountDto;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.mapper.WrkDetlMapper;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.WrkDetlService;
@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@@ -32,22 +33,63 @@
        for (MatCodeCountDto dto : matCodeCountDtos) {
            MatCode matCode = matCodeService.selectById(dto.getMatNo());
            if (Cools.isEmpty(matCode)){
                throw new CoolException("物料条码数据为空");
                throw new CoolException("产品条码数据为空");
            }
            // 保持工作档明细
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setIoTime(new Date());
            wrkDetl.setAnfme(dto.getCount()); // 数量
            wrkDetl.setQty(dto.getCount()); // 数量
            VersionUtils.setWrkDetl(wrkDetl, matCode); // 版本控制
            wrkDetl.setBillNo((null != dto.getBillNo()) ? dto.getBillNo() : "0");
            wrkDetl.setSeqNo((null != dto.getSeqNo()) ? dto.getSeqNo() : 0);
            if (Cools.isEmpty(dto.getSupplier())){
                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
                wrkDetl.setSupplier(sdf.format(new Date()));
            }else {
                wrkDetl.setSupplier(dto.getSupplier());
            }
            wrkDetl.setZpallet(barcode); // 托盘条码
            wrkDetl.setAppeUser(userId);
            wrkDetl.setAppeTime(new Date());
            wrkDetl.setMemo(dto.getMemo());
            wrkDetl.setModiUser(userId);
            wrkDetl.setModiTime(new Date());
            //新增加字段
            if(matCode.getWeight()==null){
                matCode.setWeight(0.0);
            }
            if(matCode.getStr6()==null){
                matCode.setStr6(0.0);
                wrkDetl.setAllQty(dto.getCount());
            }else {
                wrkDetl.setAllQty(matCode.getStr6()*dto.getCount());
            }
            wrkDetl.setAllWeight(matCode.getWeight()*dto.getCount()+30);
            wrkDetl.setSource(dto.getSource());
            wrkDetl.setVendor(dto.getVendor());
            wrkDetl.setWeight(matCode.getWeight());
            wrkDetl.setQtyBox(matCode.getStr6());
            wrkDetl.setStr3(matCode.getStr3());
            wrkDetl.setStr4(matCode.getStr4());
            wrkDetl.setStr5(matCode.getStr5());
            if (!this.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        }
    }

    @Override
    @Transactional
    public List<WrkDetl> queryWrkDetl(String matNo, String locNo) {
        return baseMapper.queryWrkDetl(matNo, locNo);
    }

    /**
     * PDA盘点根据出库口查询对应物料信息
     */
    @Override
    public List<WrkDetl> queryMatFromDevNo(Integer devNo) {
        return baseMapper.queryMatFromDevNo(devNo);
    }
}