#

Junjie

7 天以前 b67bafd95dc17136ac0eab068ba51cd55e1669f3

#

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

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

    /**
     * 退库标记
     */
    @ApiModelProperty(value= "退库标记")
    @TableField("tk_flag")
    private String tkFlag = "";

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){

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

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

    /**
     * 退库标记
     */
    @ApiModelProperty(value= "退库标记")
    @TableField("tk_flag")
    private String tkFlag = "";

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -19,6 +19,9 @@
    // 库位编号
    private String locNo;

    //退库组托
    private String tkFlag;


    private List<CombMat> combMats;


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

@@ -629,6 +629,9 @@
                waitPakin.setStandby1(detlDto.getStandby1());
                waitPakin.setStandby2(detlDto.getStandby2());
                waitPakin.setStandby3(detlDto.getStandby3());
                if ("Y".equals(param.getTkFlag())) {
                    waitPakin.setTkFlag(detlDto.getTkFlag());
                }
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }

 src/main/java/com/zy/common/model/DetlDto.java

@@ -38,6 +38,8 @@

    private Double weight;

    //退库组托
    private String tkFlag;


    public DetlDto() {

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

@@ -53,6 +53,7 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="tk_flag" property="tkFlag" />
    </resultMap>

</mapper>

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

@@ -53,6 +53,7 @@
        <result column="box_type1" property="boxType1" />
        <result column="box_type2" property="boxType2" />
        <result column="box_type3" property="boxType3" />
        <result column="tk_flag" property="tkFlag" />
    </resultMap>

</mapper>