#

Junjie

13 小时以前 08782f91c979be03a8b911fcc0d4d73ec3329488

#

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

@@ -177,6 +177,7 @@
            HashMap<Integer, List<StationObjModel>> inStationMap = new HashMap<>();
            HashMap<Integer, List<StationObjModel>> outStationMap = new HashMap<>();
            HashMap<Integer, List<StationObjModel>> runBlockReassignStationMap = new HashMap<>();
            HashMap<Integer, List<StationObjModel>> isOutOrderStationMap = new HashMap<>();

            for (Map.Entry<Integer, List<List<HashMap<String, Object>>>> entry : dataMap.entrySet()) {
                Integer lev = entry.getKey();
@@ -267,6 +268,13 @@
                                runBlockReassignStationList.add(stationObjModel);
                                runBlockReassignStationMap.put(deviceNo, runBlockReassignStationList);
                            }

                            Integer isOutOrder = value.getInteger("isOutOrder");
                            if (isOutOrder != null && isOutOrder == 1) {
                                List<StationObjModel> isOutOrderStationList = isOutOrderStationMap.getOrDefault(deviceNo, new ArrayList<>());
                                isOutOrderStationList.add(stationObjModel);
                                isOutOrderStationMap.put(deviceNo, isOutOrderStationList);
                            }
                        } else if (nodeType.equals("rgv")) {
                            //RGV
                            nodeData.put("type", "rgv");
@@ -316,6 +324,7 @@
                List<StationObjModel> inStationList = inStationMap.get(deviceNo);
                List<StationObjModel> outStationList = outStationMap.get(deviceNo);
                List<StationObjModel> runBlockReassignStationList = runBlockReassignStationMap.get(deviceNo);
                List<StationObjModel> isOutOrderStationList = isOutOrderStationMap.get(deviceNo);

                if (barcodeStationList != null) {
                    basDevp.setBarcodeStationList(JSON.toJSONString(barcodeStationList, SerializerFeature.DisableCircularReferenceDetect));
@@ -333,6 +342,10 @@
                    basDevp.setRunBlockReassignLocStationList(JSON.toJSONString(runBlockReassignStationList, SerializerFeature.DisableCircularReferenceDetect));
                }

                if (isOutOrderStationList != null) {
                    basDevp.setIsOutOrderList(JSON.toJSONString(isOutOrderStationList, SerializerFeature.DisableCircularReferenceDetect));
                }

                basDevp.setStationList(JSON.toJSONString(stationList, SerializerFeature.DisableCircularReferenceDetect));
                basDevp.setUpdateTime(new Date());
                basDevpService.insertOrUpdate(basDevp);

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

@@ -113,6 +113,13 @@
    @TableField("run_block_reassign_loc_station_list")
    private String runBlockReassignLocStationList;

    /**
     * 出库排序交互点
     */
    @ApiModelProperty(value= "出库排序交互点")
    @TableField("is_out_order_list")
    private String isOutOrderList;

    public BasDevp() {}

    public BasDevp(Integer devpNo,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String stationList,String barcodeStationList,String inStationList,String outStationList) {

 src/main/resources/mapper/BasDevpMapper.xml

@@ -17,6 +17,7 @@
        <result column="in_station_list" property="inStationList" />
        <result column="out_station_list" property="outStationList" />
        <result column="run_block_reassign_loc_station_list" property="runBlockReassignLocStationList" />
        <result column="is_out_order_list" property="isOutOrderList" />

    </resultMap>


 src/main/webapp/static/js/basDevp/basDevp.js

@@ -38,6 +38,7 @@
          { field: "inStationList", align: "center", title: "入库站点数据" },
          { field: "outStationList", align: "center", title: "出库站点数据" },
          { field: "runBlockReassignLocStationList", align: "center", title: "运行堵塞重新分配库位站点数据" },
          { field: "isOutOrderList", align: "center", title: "出库排序交互点" },

          {
            fixed: "right",

 src/main/webapp/views/basDevp/basDevp.html

@@ -149,6 +149,12 @@
                        <input class="layui-input" name="runBlockReassignLocStationList" placeholder="请输入运行堵塞重新分配库位站点数据">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">出库排序交互点: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="isOutOrderList" placeholder="请输入出库排序交互点">
                    </div>
                </div>

             </div>
        </div>