18516761980
2021-12-27 15b67b954b9622dacb1cc9bf7d95bd066d108fe1
#单据类型区分入库单和出库单
4个文件已修改
1个文件已添加
2个文件已删除
39 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/DocType.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/DocTypeMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/order/order.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
version/db/wms_saas20211222.bak 补丁 | 查看 | 原始文档 | blame | 历史
version/v1.0.0/htwms.sql 补丁 | 查看 | 原始文档 | blame | 历史
version/v1.0.1/pakin.sql 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java
@@ -39,6 +39,11 @@
                  @RequestParam Map<String, Object> param){
        EntityWrapper<DocType> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        if(param.containsKey("doc_class")){
            Integer docClass = Integer.parseInt(param.get("doc_class").toString());
            wrapper.eq("doc_class",param.get("doc_class"));
            param.remove("doc_class");
        }
        convert(param, wrapper);
        hostEq(wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
src/main/java/zy/cloud/wms/manager/entity/DocType.java
@@ -44,6 +44,13 @@
    private String docName;
    /**
     * 单据类别 1: 入库单  2: 出库单
     */
    @ApiModelProperty(value= "单据类别 1: 入库单  2: 出库单  ")
    @TableField("doc_class")
    private Integer docClass;
    /**
     * 状态 1: 正常  0: 禁用
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
@@ -85,10 +92,11 @@
    public DocType() {}
    public DocType(Long hostId, Long docId,String docName,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
    public DocType(Long hostId, Long docId,String docName,Integer docClass, Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.hostId = hostId;
        this.docId = docId;
        this.docName = docName;
        this.docClass = docClass;
        this.status = status;
        this.createBy = createBy;
        this.createTime = createTime;
@@ -142,6 +150,24 @@
        this.docName = docName;
    }
    public Integer getDocClass() {
        return docClass;
    }
    public String getDocClass$(){
        if (null == this.docClass){ return null; }
        switch (this.docClass){
            case 1:
                return "入库单";
            case 2:
                return "出库单";
            default:
                return String.valueOf(this.docClass);
        }
    }
    public void setDocClass(Integer docClass) {
        this.docClass = docClass;
    }
    public Integer getStatus() {
        return status;
    }
src/main/resources/mapper/DocTypeMapper.xml
@@ -7,6 +7,7 @@
        <id column="doc_id" property="docId" />
        <result column="host_id" property="hostId" />
        <result column="doc_name" property="docName" />
        <result column="doc_class" property="docClass" />
        <result column="status" property="status" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
src/main/webapp/static/js/order/order.js
@@ -23,6 +23,9 @@
            pageName: 'curr',
            pageSize: 'limit'
        },
        where: {
            doc_class: 2,//出库单
        },
        parseData: function (res) {
            return {
                'code': res.code,
@@ -51,7 +54,7 @@
    /* 表格搜索 */
    form.on('submit(docTypeTableSearch)', function (data) {
        insTb.reload({where: {doc_name: data.field.docName}});
        insTb.reload({where: {doc_name: data.field.docName,doc_class:2}});
        return false;
    });
version/db/wms_saas20211222.bak
Binary files differ
version/v1.0.0/htwms.sql
Binary files differ
version/v1.0.1/pakin.sql
Binary files differ