#

Junjie

5 天以前 ba7819193551a1ec22d863a375868c89c18b6e5d

#

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

@@ -310,6 +310,13 @@
    @TableField("box_type3")
    private String boxType3 = "";

    /**
     * 库存
     */
    @ApiModelProperty(value = "库存")
    @TableField("stock_num")
    private Double stockNum;

    public String getIoTime$() {
        if (Cools.isEmpty(this.ioTime)) {
            return "";

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

@@ -310,6 +310,13 @@
    @TableField("box_type3")
    private String boxType3 = "";

    /**
     * 库存
     */
    @ApiModelProperty(value = "库存")
    @TableField("stock_num")
    private Double stockNum;

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";

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

@@ -482,6 +482,19 @@
                        , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());

            }

            Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
                    .eq("loc_no", wrkMast.getLocNo())
                    .eq("matnr", orderDetlPakout.getMatnr());
            if (!Cools.isEmpty(locDto.getBatch())) {
                wrapper.eq("batch", locDto.getBatch());
            }
            if (!Cools.isEmpty(orderDetlPakout.getSpecs())) {
                wrapper.eq("specs", orderDetlPakout.getSpecs());
            }

            LocDetl locDetl = locDetlService.selectOne(wrapper);

            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(orderDetlPakout);
            wrkDetl.setZpallet(wrkMast.getBarcode());
@@ -496,6 +509,7 @@
            wrkDetl.setModiUser(userId);
            wrkDetl.setThreeCode(orderDetlPakout.getId() + "");
            wrkDetl.setSupp(orderPakout.getCstmrName());
            wrkDetl.setStockNum(locDetl.getAnfme());//库存

            //计算辅数量
            Double weight = MatUtils.calcWeight(wrkDetl.getMatnr(), wrkDetl.getAnfme());

 src/main/resources/mapper/asrs/WrkDetlLogMapper.xml

@@ -51,6 +51,7 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="stock_num" property="stockNum" />
    </resultMap>

    <sql id="batchSeq">

 src/main/resources/mapper/asrs/WrkDetlMapper.xml

@@ -51,6 +51,7 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="stock_num" property="stockNum" />
    </resultMap>

    <sql id="batchSeq">