#

Junjie

14 小时以前 46fc024595970335c4207c80729329abd90b0cc5

#

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

@@ -93,6 +93,20 @@
    @TableField("out_station_list")
    private String outStationList;

    /**
     * 最大入库任务数
     */
    @ApiModelProperty(value= "最大入库任务数")
    @TableField("max_in_task")
    private Integer maxInTask;

    /**
     * 最大出库任务数
     */
    @ApiModelProperty(value= "最大出库任务数")
    @TableField("max_out_task")
    private Integer maxOutTask;

    public BasCrnp() {}

    public BasCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {

 src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java

@@ -124,7 +124,7 @@
        ZyCrnStatusEntity crnStatus = zyCrnConnectDriver.getStatus();
        if (crnStatus == null) {
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】读取堆垛机plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
            News.error("SiemensCrn"+" - 5"+" - 读取堆垛机plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
            News.error("SiemensCrn读取堆垛机plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
            return;
        }

@@ -202,6 +202,8 @@
                basCrnp.setStatus(1);
                basCrnp.setInEnable("N");
                basCrnp.setOutEnable("N");
                basCrnp.setMaxInTask(5);
                basCrnp.setMaxOutTask(5);
                basCrnp.setCreateTime(new Date());
                basCrnpService.insert(basCrnp);
            }

 src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java

@@ -112,6 +112,16 @@
            return;
        }

        List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .eq("crn_no", basCrnp.getCrnNo())
                .eq("io_type", WrkIoType.IN.id)
        );
        // 检查是否超过最大入库任务数
        if(inWrkMasts.size() >= basCrnp.getMaxInTask()){
            News.info("堆垛机:{} 已达最大入库任务数，当前任务数:{}", basCrnp.getCrnNo(), inWrkMasts.size());
            return;
        }

        Integer crnNo = basCrnp.getCrnNo();

        for (StationObjModel stationObjModel : inStationList) {
@@ -199,6 +209,16 @@
            return;
        }

        List<WrkMast> outWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .eq("crn_no", basCrnp.getCrnNo())
                .eq("io_type", WrkIoType.OUT.id)
        );
        // 检查是否超过最大出库任务数
        if(outWrkMasts.size() >= basCrnp.getMaxOutTask()){
            News.info("堆垛机:{} 已达最大出库任务数，当前任务数:{}", basCrnp.getCrnNo(), outWrkMasts.size());
            return;
        }

        Integer crnNo = basCrnp.getCrnNo();

        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()

 src/main/resources/mapper/BasCrnpMapper.xml

@@ -17,6 +17,8 @@
        <result column="control_rows" property="controlRows" />
        <result column="in_station_list" property="inStationList" />
        <result column="out_station_list" property="outStationList" />
        <result column="max_in_task" property="maxInTask" />
        <result column="max_out_task" property="maxOutTask" />

    </resultMap>


 src/main/webapp/static/js/basCrnp/basCrnp.js

@@ -30,6 +30,8 @@
            ,{field: 'controlRows', align: 'center',title: '控制库位排号'}
            ,{field: 'inStationList', align: 'center',title: '入库站列表'}
            ,{field: 'outStationList', align: 'center',title: '出库站列表'}
            ,{field: 'maxInTask', align: 'center',title: '最大入库任务数'}
            ,{field: 'maxOutTask', align: 'center',title: '最大出库任务数'}
            // ,{field: 'createBy', align: 'center',title: '创建人员'}
            // ,{field: 'createTime$', align: 'center',title: '创建时间'}
            // ,{field: 'updateBy', align: 'center',title: '修改人员'}

 src/main/webapp/views/basCrnp/basCrnp.html

@@ -119,6 +119,18 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">最大入库任务数: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="maxInTask" placeholder="请输入最大入库任务数">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">最大出库任务数: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="maxOutTask" placeholder="请输入最大出库任务数">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备注: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="memo" placeholder="请输入备注">