#

Junjie

2023-12-14 e77056ff1b06e9b2512e95d6c3ca9d2fc5dee0b7

#

 src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java

@@ -11,6 +11,6 @@
@Repository
public interface WrkDetlLogMapper extends BaseMapper<WrkDetlLog> {

    List<WrkDetlLog> selectLatestByWorkNo(Integer workNo);
    List<WrkDetlLog> selectLatestByWorkNo(Integer workNo, String barcode);

}

 src/main/java/com/zy/asrs/service/WrkDetlLogService.java

@@ -7,6 +7,6 @@

public interface WrkDetlLogService extends IService<WrkDetlLog> {

    List<WrkDetlLog> selectLatestByWorkNo(Integer workNo);
    List<WrkDetlLog> selectLatestByWorkNo(Integer workNo, String barcode);

}

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

@@ -2934,7 +2934,7 @@
                            });

                            if (wrkDetls.isEmpty()) {//从历史档查询
                                List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo);
                                List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
                                for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {
                                    ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
                                }

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

@@ -12,7 +12,7 @@
public class WrkDetlLogServiceImpl extends ServiceImpl<WrkDetlLogMapper, WrkDetlLog> implements WrkDetlLogService {

    @Override
    public List<WrkDetlLog> selectLatestByWorkNo(Integer workNo) {
        return this.baseMapper.selectLatestByWorkNo(workNo);
    public List<WrkDetlLog> selectLatestByWorkNo(Integer workNo, String barcode) {
        return this.baseMapper.selectLatestByWorkNo(workNo, barcode);
    }
}

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -53,6 +53,7 @@
        order by io_time desc) a
        where wdl.wrk_no = a.wrk_no
        and wdl.io_time = a.io_time
        and zpallet = #{barcode}
    </select>

</mapper>