#

luxiaotao1123

2022-04-01 44c5f7f1c1b9cccd131df7d4c9a33af979635ece

#

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

@@ -34,6 +34,18 @@
    private Date ioTime;

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

    /**
     * 托盘条码
     */
    @ApiModelProperty(value= "托盘条码")
    private String zpallet;

    /**
     * 物料
     */
    @ApiModelProperty(value= "商品编号")
@@ -59,70 +71,168 @@
    private String orderNo;

    /**
     * 仓库号
     * 规格
     */
    @ApiModelProperty(value= "规格")
    private String lgnum;
    private String specs;

    /**
     * 仓库号
     * 型号
     */
    @ApiModelProperty(value= "型号")
    private String type;
    private String model;

    /**
     * 条码
     * 颜色
     */
    @ApiModelProperty(value= "条码")
    @ApiModelProperty(value= "颜色")
    private String color;

    /**
     * 批号
     * 品牌
     */
    @ApiModelProperty(value= "批号")
    private String supplier;

    /**
     * 单据编号
     */
    @ApiModelProperty(value= "单据编号")
    private String warehouse;

    /**
     * 品项数
     */
    @ApiModelProperty(value= "品项数")
    @ApiModelProperty(value= "品牌")
    private String brand;

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

    /**
     * 单位
     */
    @ApiModelProperty(value= "单位")
    private String altme;
    private String unit;

    /**
     * 托盘条码
     * 单价
     */
    @ApiModelProperty(value= "托盘条码")
    private String zpallet;
    @ApiModelProperty(value= "单价")
    private Double price;

    /**
     * 客户名称
     * sku
     */
    @ApiModelProperty(value= "客户名称")
    private String bname;
    @ApiModelProperty(value= "sku")
    private String sku;

    /**
     * 备注
     * 单位量
     */
    @ApiModelProperty(value= "备注")
    private String memo;
    @ApiModelProperty(value= "单位量")
    private Double units;

    /**
     * 条码
     */
    @ApiModelProperty(value= "条码")
    private String barcode;

    /**
     * 产地
     */
    @ApiModelProperty(value= "产地")
    private String origin;

    /**
     * 厂家
     */
    @ApiModelProperty(value= "厂家")
    private String manu;

    /**
     * 生产日期
     */
    @ApiModelProperty(value= "生产日期")
    @TableField("manu_date")
    private String manuDate;

    /**
     * 品项数
     */
    @ApiModelProperty(value= "品项数")
    @TableField("item_num")
    private String itemNum;

    /**
     * 安全库存量
     */
    @ApiModelProperty(value= "安全库存量")
    @TableField("safe_qty")
    private Double safeQty;

    /**
     * 重量
     */
    @ApiModelProperty(value= "重量")
    private Double weight;

    /**
     * 长度
     */
    @ApiModelProperty(value= "长度")
    private Double length;

    /**
     * 体积
     */
    @ApiModelProperty(value= "体积")
    private Double volume;

    /**
     * 三方编码
     */
    @ApiModelProperty(value= "三方编码")
    @TableField("three_code")
    private String threeCode;

    /**
     * 供应商
     */
    @ApiModelProperty(value= "供应商")
    private String supp;

    /**
     * 供应商编码
     */
    @ApiModelProperty(value= "供应商编码")
    @TableField("supp_code")
    private String suppCode;

    /**
     * 是否批次 1: 是  0: 否
     */
    @ApiModelProperty(value= "是否批次 1: 是  0: 否  ")
    @TableField("be_batch")
    private Integer beBatch;

    /**
     * 保质期
     */
    @ApiModelProperty(value= "保质期")
    @TableField("dead_time")
    private String deadTime;

    /**
     * 预警天数
     */
    @ApiModelProperty(value= "预警天数")
    @TableField("dead_warn")
    private Integer deadWarn;

    /**
     * 制购 1: 制造  2: 采购  3: 外协
     */
    @ApiModelProperty(value= "制购 1: 制造  2: 采购  3: 外协  ")
    private Integer source;

    /**
     * 要求检验 1: 是  0: 否
     */
    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer check;

    /**
     * 危险品 1: 是  0: 否
     */
    @ApiModelProperty(value= "危险品 1: 是  0: 否  ")
    private Integer danger;

    /**
     * 修改人员
@@ -152,6 +262,12 @@
    @TableField("appe_time")
    private Date appeTime;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";
@@ -159,6 +275,56 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
    }

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.beBatch);
        }
    }

    public String getSource$(){
        if (null == this.source){ return null; }
        switch (this.source){
            case 1:
                return "制造";
            case 2:
                return "采购";
            case 3:
                return "外协";
            default:
                return String.valueOf(this.source);
        }
    }

    public String getCheck$(){
        if (null == this.check){ return null; }
        switch (this.check){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.check);
        }
    }

    public String getDanger$(){
        if (null == this.danger){ return null; }
        switch (this.danger){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.danger);
        }
    }

    public String getModiUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);

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

@@ -34,6 +34,18 @@
    private Date ioTime;

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

    /**
     * 托盘条码
     */
    @ApiModelProperty(value= "托盘条码")
    private String zpallet;

    /**
     * 物料
     */
    @ApiModelProperty(value= "商品编号")
@@ -58,72 +70,169 @@
    @TableField("order_no")
    private String orderNo;


    /**
     * 仓库号
     * 规格
     */
    @ApiModelProperty(value= "规格")
    private String lgnum;
    private String specs;

    /**
     * 仓库号
     * 型号
     */
    @ApiModelProperty(value= "型号")
    private String type;
    private String model;

    /**
     * 仓库号
     * 颜色
     */
    @ApiModelProperty(value= "条码")
    @ApiModelProperty(value= "颜色")
    private String color;

    /**
     * 仓库号
     * 品牌
     */
    @ApiModelProperty(value= "批号")
    private String supplier;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "单据编号")
    private String warehouse;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "品项数")
    @ApiModelProperty(value= "品牌")
    private String brand;

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

    /**
     * 单位
     */
    @ApiModelProperty(value= "单位")
    private String altme;
    private String unit;

    /**
     * 托盘条码
     * 单价
     */
    @ApiModelProperty(value= "托盘条码")
    private String zpallet;
    @ApiModelProperty(value= "单价")
    private Double price;

    /**
     * 用户ID
     * sku
     */
    @ApiModelProperty(value= "客户名称")
    private String bname;
    @ApiModelProperty(value= "sku")
    private String sku;

    /**
     * 备注
     * 单位量
     */
    @ApiModelProperty(value= "备注")
    private String memo;
    @ApiModelProperty(value= "单位量")
    private Double units;

    /**
     * 条码
     */
    @ApiModelProperty(value= "条码")
    private String barcode;

    /**
     * 产地
     */
    @ApiModelProperty(value= "产地")
    private String origin;

    /**
     * 厂家
     */
    @ApiModelProperty(value= "厂家")
    private String manu;

    /**
     * 生产日期
     */
    @ApiModelProperty(value= "生产日期")
    @TableField("manu_date")
    private String manuDate;

    /**
     * 品项数
     */
    @ApiModelProperty(value= "品项数")
    @TableField("item_num")
    private String itemNum;

    /**
     * 安全库存量
     */
    @ApiModelProperty(value= "安全库存量")
    @TableField("safe_qty")
    private Double safeQty;

    /**
     * 重量
     */
    @ApiModelProperty(value= "重量")
    private Double weight;

    /**
     * 长度
     */
    @ApiModelProperty(value= "长度")
    private Double length;

    /**
     * 体积
     */
    @ApiModelProperty(value= "体积")
    private Double volume;

    /**
     * 三方编码
     */
    @ApiModelProperty(value= "三方编码")
    @TableField("three_code")
    private String threeCode;

    /**
     * 供应商
     */
    @ApiModelProperty(value= "供应商")
    private String supp;

    /**
     * 供应商编码
     */
    @ApiModelProperty(value= "供应商编码")
    @TableField("supp_code")
    private String suppCode;

    /**
     * 是否批次 1: 是  0: 否
     */
    @ApiModelProperty(value= "是否批次 1: 是  0: 否  ")
    @TableField("be_batch")
    private Integer beBatch;

    /**
     * 保质期
     */
    @ApiModelProperty(value= "保质期")
    @TableField("dead_time")
    private String deadTime;

    /**
     * 预警天数
     */
    @ApiModelProperty(value= "预警天数")
    @TableField("dead_warn")
    private Integer deadWarn;

    /**
     * 制购 1: 制造  2: 采购  3: 外协
     */
    @ApiModelProperty(value= "制购 1: 制造  2: 采购  3: 外协  ")
    private Integer source;

    /**
     * 要求检验 1: 是  0: 否
     */
    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer check;

    /**
     * 危险品 1: 是  0: 否
     */
    @ApiModelProperty(value= "危险品 1: 是  0: 否  ")
    private Integer danger;

    /**
     * 修改人员
@@ -153,6 +262,11 @@
    @TableField("appe_time")
    private Date appeTime;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
@@ -161,6 +275,56 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
    }

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.beBatch);
        }
    }

    public String getSource$(){
        if (null == this.source){ return null; }
        switch (this.source){
            case 1:
                return "制造";
            case 2:
                return "采购";
            case 3:
                return "外协";
            default:
                return String.valueOf(this.source);
        }
    }

    public String getCheck$(){
        if (null == this.check){ return null; }
        switch (this.check){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.check);
        }
    }

    public String getDanger$(){
        if (null == this.danger){ return null; }
        switch (this.danger){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.danger);
        }
    }

    public String getModiUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -6,25 +6,45 @@
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetlLog">
        <result column="wrk_no" property="wrkNo" />
        <result column="io_time" property="ioTime" />
        <result column="anfme" property="anfme" />
        <result column="zpallet" property="zpallet" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="batch" property="batch" />
        <result column="order_no" property="orderNo" />
        <result column="lgnum" property="lgnum" />
        <result column="type" property="type" />

        <result column="specs" property="specs" />
        <result column="model" property="model" />
        <result column="color" property="color" />
        <result column="supplier" property="supplier" />
        <result column="warehouse" property="warehouse" />
        <result column="brand" property="brand" />
        <result column="anfme" property="anfme" />
        <result column="altme" property="altme" />
        <result column="zpallet" property="zpallet" />
        <result column="bname" property="bname" />
        <result column="memo" property="memo" />
        <result column="unit" property="unit" />
        <result column="price" property="price" />
        <result column="sku" property="sku" />
        <result column="units" property="units" />
        <result column="barcode" property="barcode" />
        <result column="origin" property="origin" />
        <result column="manu" property="manu" />
        <result column="manu_date" property="manuDate" />
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />
        <result column="supp_code" property="suppCode" />
        <result column="be_batch" property="beBatch" />
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="check" property="check" />
        <result column="danger" property="danger" />

        <result column="modi_user" property="modiUser" />
        <result column="modi_time" property="modiTime" />
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="memo" property="memo" />
    </resultMap>

</mapper>

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -6,25 +6,45 @@
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetl">
        <result column="wrk_no" property="wrkNo" />
        <result column="io_time" property="ioTime" />
        <result column="anfme" property="anfme" />
        <result column="zpallet" property="zpallet" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="batch" property="batch" />
        <result column="order_no" property="orderNo" />
        <result column="lgnum" property="lgnum" />
        <result column="type" property="type" />

        <result column="specs" property="specs" />
        <result column="model" property="model" />
        <result column="color" property="color" />
        <result column="supplier" property="supplier" />
        <result column="warehouse" property="warehouse" />
        <result column="brand" property="brand" />
        <result column="anfme" property="anfme" />
        <result column="altme" property="altme" />
        <result column="zpallet" property="zpallet" />
        <result column="bname" property="bname" />
        <result column="memo" property="memo" />
        <result column="unit" property="unit" />
        <result column="price" property="price" />
        <result column="sku" property="sku" />
        <result column="units" property="units" />
        <result column="barcode" property="barcode" />
        <result column="origin" property="origin" />
        <result column="manu" property="manu" />
        <result column="manu_date" property="manuDate" />
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />
        <result column="supp_code" property="suppCode" />
        <result column="be_batch" property="beBatch" />
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="check" property="check" />
        <result column="danger" property="danger" />

        <result column="modi_user" property="modiUser" />
        <result column="modi_time" property="modiTime" />
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="memo" property="memo" />
    </resultMap>

    <select id="selectByWrkNo" resultMap="BaseResultMap">

 src/main/webapp/static/js/common.js

@@ -213,16 +213,36 @@
var detlCols = [
    {field: 'matnr', align: 'center',title: '商品编号'}
    ,{field: 'maktx', align: 'center',title: '商品名称'}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: true}
    ,{field: 'batch', align: 'center',title: '批号'}
    ,{field: 'lgnum', align: 'center',title: '规格'}
    ,{field: 'type', align: 'center',title: '型号', hide: true}
    ,{field: 'supplier', align: 'center',title: '批号', hide: true}
    ,{field: 'anfme', align: 'center',title: '数量'}
    ,{field: 'altme', align: 'center',title: '单位'}
    ,{field: 'color', align: 'center',title: '条码'}
    ,{field: 'warehouse', align: 'center',title: '单据编号', hide: true}
    ,{field: 'brand', align: 'center',title: '品项数', hide: true}
    ,{field: 'zpallet', align: 'center',title: '托盘条码'}
    ,{field: 'bname', align: 'center',title: '客户名称', hide: true}

    ,{field: 'specs', align: 'center',title: '规格'}
    ,{field: 'model', align: 'center',title: '型号', hide: true}
    ,{field: 'color', align: 'center',title: '颜色', hide: true}
    ,{field: 'brand', align: 'center',title: '品牌'}
    ,{field: 'unit', align: 'center',title: '单位'}
    ,{field: 'price', align: 'center',title: '单价', hide: true}
    ,{field: 'sku', align: 'center',title: 'sku', hide: true}
    ,{field: 'units', align: 'center',title: '单位量', hide: true}
    ,{field: 'barcode', align: 'center',title: '条码', hide: true}
    ,{field: 'origin', align: 'center',title: '产地', hide: true}
    ,{field: 'manu', align: 'center',title: '厂家', hide: true}
    ,{field: 'manuDate', align: 'center',title: '生产日期', hide: true}
    ,{field: 'itemNum', align: 'center',title: '品项数', hide: true}
    ,{field: 'safeQty', align: 'center',title: '安全库存量', hide: true}
    ,{field: 'weight', align: 'center',title: '重量', hide: true}
    ,{field: 'length', align: 'center',title: '长度', hide: true}
    ,{field: 'volume', align: 'center',title: '体积', hide: true}
    ,{field: 'threeCode', align: 'center',title: '三方编码', hide: true}
    ,{field: 'supp', align: 'center',title: '供应商'}
    ,{field: 'suppCode', align: 'center',title: '供应商编码', hide: true}
    ,{field: 'beBatch$', align: 'center',title: '是否批次', hide: true}
    ,{field: 'deadTime', align: 'center',title: '保质期', hide: true}
    ,{field: 'deadWarn', align: 'center',title: '预警天数', hide: true}
    ,{field: 'source$', align: 'center',title: '制购', hide: true}
    ,{field: 'check$', align: 'center',title: '要求检验', hide: true}
    ,{field: 'danger$', align: 'center',title: '危险品', hide: true}
]