#显示器更新

Junjie

2024-02-21 64d50dea0a2d166e13dc818f7c6a95394f208860

#显示器更新

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -35,12 +35,18 @@
    private Date ioTime;

    /**
     * 数量
     * 作业数量
     */
    @ApiModelProperty(value= "数量")
    @ApiModelProperty(value= "作业数量")
    private Double anfme;

    /**
     * 总库存
     */
    @ApiModelProperty(value= "总库存")
    private Double stock;

    /**
     * 托盘条码
     */
    @ApiModelProperty(value= "托盘条码")

 src/main/java/com/zy/asrs/entity/WrkDetlLog.java

@@ -42,12 +42,18 @@
    private Date ioTime;

    /**
     * 数量
     * 作业数量
     */
    @ApiModelProperty(value= "数量")
    @ApiModelProperty(value= "作业数量")
    private Double anfme;

    /**
     * 总库存
     */
    @ApiModelProperty(value= "总库存")
    private Double stock;

    /**
     * 托盘条码
     */
    @ApiModelProperty(value= "托盘条码")

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

@@ -3061,13 +3061,17 @@
                        if (locDetls.isEmpty() && ioType != 101) {
                            List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
                            wrkDetls.forEach(wrkDetl -> {
                                ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
                                if (wrkDetl.getAnfme() > 0D) {
                                    ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
                                }
                            });

                            if (wrkDetls.isEmpty()) {//从历史档查询
                                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()));
                                    if (wrkDetlLog.getAnfme() > 0D) {
                                        ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
                                    }
                                }
                            }
                        }

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -7,6 +7,7 @@
        <result column="wrk_no" property="wrkNo" />
        <result column="io_time" property="ioTime" />
        <result column="anfme" property="anfme" />
        <result column="stock" property="stock" />
        <result column="zpallet" property="zpallet" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -7,6 +7,7 @@
        <result column="wrk_no" property="wrkNo" />
        <result column="io_time" property="ioTime" />
        <result column="anfme" property="anfme" />
        <result column="stock" property="stock" />
        <result column="zpallet" property="zpallet" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />