#

lty

1 天以前 29578eda327f96e2e7311c4ef347bc2a1a378150

#

 license.lic

Binary files differ

 src/main/java/com/zy/asrs/controller/MatController.java

@@ -140,9 +140,11 @@
        if (Cools.isEmpty(mat) || null==mat.getId()){
            return R.error();
        }
        String oldMatnr = matService.getOldMatnr(mat.getId());
        mat.setUpdateBy(getUserId());
        mat.setUpdateTime(new Date());
        matService.updateById(mat);

        return R.ok();
    }


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

@@ -34,6 +34,20 @@
    private Long wrkNo;

    /**
     * rvg号
     */
    @ApiModelProperty(value = "RGV编号")
    @TableField("rgv_no")
    private Integer rgvNo;

    /**
     * 工位号
     */
    @ApiModelProperty(value = "工位号")
    @TableField("work_sta")
    private Integer workSta;

    /**
     * 工作档开始位置
     */
    @ApiModelProperty(value = "工作档开始位置")

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

@@ -35,6 +35,20 @@
    private Long wrkNo;

    /**
     * rvg号
     */
    @ApiModelProperty(value = "RGV编号")
    @TableField("rgv_no")
    private Integer rgvNo;

    /**
     * 工位号
     */
    @ApiModelProperty(value = "工位号")
    @TableField("work_sta")
    private Integer workSta;

    /**
     * 工作档开始位置
     */
    @ApiModelProperty(value= "工作档开始位置")

 src/main/java/com/zy/asrs/mapper/MatMapper.java

@@ -26,5 +26,6 @@
    List<Mat> getMatTurnPage(Map<String, Object> map);

    Integer getStockOutPageCount(Map<String, Object> map);
    String getOldMatnr(Long id);

}

 src/main/java/com/zy/asrs/service/MatService.java

@@ -17,5 +17,7 @@
    Page<Mat> getMatTurnPage(Page<Mat> page);

    Mat selectNewUpdateTime();
    String getOldMatnr(Long id);


}

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

@@ -44,6 +44,10 @@
        page.setTotal(16);
        return page;
    };
    @Override
    public String getOldMatnr(Long id){
        return this.baseMapper.getOldMatnr(id);
    }




 src/main/resources/license.lic

Binary files differ

 src/main/resources/mapper/MatMapper.xml

@@ -141,4 +141,9 @@
            and a.matnr = #{matnr}
        </if>
    </select>
    <select id="getOldMatnr" resultType="String">
        select matnr
        from man_mat
        where id = #{id}
    </select>
</mapper>

 src/main/resources/mapper/WrkMastStaLogMapper.xml

@@ -18,7 +18,8 @@
        <result column="wrk_type" property="wrkType" />
        <result column="bign_time" property="bignTime" />
        <result column="wrk_crn" property="wrkCrn" />

        <result column="work_sta" property="workSta"/>
        <result column="rgv_no" property="rgvNo"/>
    </resultMap>

</mapper>

 src/main/resources/mapper/WrkMastStaMapper.xml

@@ -17,6 +17,8 @@
        <result column="line_number" property="lineNumber" />
        <result column="wrk_type" property="wrkType" />
        <result column="bign_time" property="bignTime" />
        <result column="work_sta" property="workSta"/>
        <result column="rgv_no" property="rgvNo"/>

    </resultMap>


 src/main/webapp/static/js/wrkMastSta/wrkMastSta.js

@@ -28,6 +28,8 @@
            ,{field: 'wrkEnd', align: 'center',title: '工作档结束位置',hide: false}
            ,{field: 'staStart', align: 'center',title: '小车接货位置',hide: false}
            ,{field: 'staEnd', align: 'center',title: '小车放货位置',hide: false}
            ,{field: 'rgvNo', align: 'center',title: 'RGV执行编号',hide: false}
            ,{field: 'workSta', align: 'center',title: 'RGV执行工位',hide: false}
            ,{field: 'type$', align: 'center',title: '货物类型',hide: false}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态',hide: false}
            ,{field: 'lineNumber', align: 'center',title: '行号',hide: true}

 src/main/webapp/views/wrkMastSta/wrkMastSta.html

@@ -143,6 +143,18 @@
                        <input class="layui-input" name="staEnd" placeholder="请输入小车放货位置" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">RGV执行编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rgvNo" placeholder="请输入RGV执行编号" lay-vertype="tips" >
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">RGV执行工位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="workSta" placeholder="请输入RGV执行编号" lay-vertype="tips" >
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">添加时间: </label>-->
<!--                    <div class="layui-input-block">-->

 src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html

@@ -144,6 +144,18 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">RGV执行编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rgvNo" placeholder="请输入RGV执行编号" lay-vertype="tips" >
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">RGV执行工位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="workSta" placeholder="请输入RGV执行编号" lay-vertype="tips" >
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入添加时间">