#

Junjie

9 天以前 c1d66ef17e3538c056db1df1d023e7153e7594e5

#

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

@@ -138,9 +138,23 @@
    @TableField("max_out_task")
    private Integer maxOutTask;

    /**
     * 工位1禁止执行列
     */
    @ApiModelProperty(value= "工位1禁止执行列")
    @TableField("disable_station_one_bays")
    private String disableStationOneBays;

    /**
     * 工位2禁止执行列
     */
    @ApiModelProperty(value= "工位2禁止执行列")
    @TableField("disable_station_two_bays")
    private String disableStationTwoBays;

    public BasDualCrnp() {}

    public BasDualCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String controlRows,String deepRows,String inStationList,String outStationList,Integer maxInTask,Integer maxOutTask) {
    public BasDualCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String controlRows,String deepRows,String inStationList,String outStationList,Integer maxInTask,Integer maxOutTask,String disableStationOneBays,String disableStationTwoBays) {
        this.status = status;
        this.wrkNo = wrkNo;
        this.inEnable = inEnable;

 src/main/resources/mapper/BasDualCrnpMapper.xml

@@ -20,6 +20,8 @@
        <result column="out_station_list" property="outStationList" />
        <result column="max_in_task" property="maxInTask" />
        <result column="max_out_task" property="maxOutTask" />
        <result column="disable_station_one_bays" property="disableStationOneBays" />
        <result column="disable_station_two_bays" property="disableStationTwoBays" />

    </resultMap>


 src/main/webapp/static/js/basDualCrnp/basDualCrnp.js

@@ -38,6 +38,8 @@
            ,{field: 'outStationList', align: 'center',title: '出库站点'}
            ,{field: 'maxInTask', align: 'center',title: '最大入库任务数'}
            ,{field: 'maxOutTask', align: 'center',title: '最大出库任务数'}
            ,{field: 'disableStationOneBays', align: 'center',title: '工位1禁止执行列'}
            ,{field: 'disableStationTwoBays', align: 'center',title: '工位2禁止执行列'}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],

 src/main/webapp/views/basDualCrnp/basDualCrnp.html

@@ -166,6 +166,18 @@
                        <input class="layui-input" name="maxOutTask" placeholder="请输入最大出库任务数">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">工位1禁止执行列: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="disableStationOneBays" placeholder="请输入工位1禁止执行列">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">工位2禁止执行列: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="disableStationTwoBays" placeholder="请输入工位2禁止执行列">
                    </div>
                </div>

             </div>
        </div>