入库通知档和历史档增加mat_type物料类型，组托增加mat_type

Junjie

2023-05-24 64126dfd00ed90af484fbf7b173e00fcebc4f9fa

入库通知档和历史档增加mat_type物料类型，组托增加mat_type

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

@@ -155,6 +155,13 @@
    @ApiModelProperty(value= "是否冻结")
    private Integer frozen;

    /**
     * 物料类型{1:单品,2:高频,3:混放}
     */
    @ApiModelProperty(value= "物料类型")
    @TableField("mat_type")
    private Integer matType;

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){
@@ -222,4 +229,20 @@
    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

    public String getMatType$() {
        if (this.matType == null) {
            return "";
        }
        switch (this.matType) {
            case 1:
                return "单品";
            case 2:
                return "高频";
            case 3:
                return "混放";
            default:
                return "";
        }
    }
}

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

@@ -151,6 +151,13 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 物料类型{1:单品,2:高频,3:混放}
     */
    @ApiModelProperty(value= "物料类型")
    @TableField("mat_type")
    private Integer matType;

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){
@@ -215,4 +222,20 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public String getMatType$() {
        if (this.matType == null) {
            return "";
        }
        switch (this.matType) {
            case 1:
                return "单品";
            case 2:
                return "高频";
            case 3:
                return "混放";
            default:
                return "";
        }
    }

}

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

@@ -149,6 +149,7 @@
                waitPakin.setMemo(detlDto.getMemo());
                waitPakin.setFrozen(param.getFrozen()); // 是否冻结
                waitPakin.setManu(detlDto.getCstmr());
                waitPakin.setMatType(mat.getMatType());//物料类型
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -199,6 +200,7 @@
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setMatType(mat.getMatType());//物料类型
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -502,6 +504,7 @@
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setMatType(mat.getMatType());//物料类型
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }

 src/main/resources/mapper/WaitPakinLogMapper.xml

@@ -47,6 +47,7 @@
        <result column="appe_time" property="appeTime" />
        <result column="appe_user" property="appeUser" />
        <result column="memo" property="memo" />
        <result column="mat_type" property="matType" />
    </resultMap>

</mapper>

 src/main/resources/mapper/WaitPakinMapper.xml

@@ -47,6 +47,7 @@
        <result column="appe_time" property="appeTime" />
        <result column="appe_user" property="appeUser" />
        <result column="memo" property="memo" />
        <result column="mat_type" property="matType" />
    </resultMap>

</mapper>

 src/main/webapp/static/js/waitPakin/waitPakin.js

@@ -2,6 +2,7 @@
function getCol() {
    var cols = [ {type: 'checkbox'} ];
    cols.push.apply(cols, detlCols);
    cols.push({field: 'matType$', align: 'center',title: '物料类型'})
    cols.push({field: 'status', align: 'center',title: '数据状态', templet:function(row){
                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='正常|锁定'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.status === 'Y'){html += " checked ";}

 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js

@@ -3,6 +3,7 @@
    var cols = [
    ];
    cols.push.apply(cols, detlCols);
    cols.push({field: 'matType$', align: 'center',title: '物料类型'})
    cols.push({field: 'status', align: 'center',title: '数据状态', templet:function(row){
                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='正常|锁定' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.status === 'Y'){html += " checked ";}