#

Junjie

13 小时以前 9a3dd3c806104ce59abcba635e67355573bd68ac

#

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

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

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

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

                if (barcodeStationList != null) {
                    basDevp.setBarcodeStationList(JSON.toJSONString(barcodeStationList, SerializerFeature.DisableCircularReferenceDetect));
@@ -346,6 +355,10 @@
                    basDevp.setIsOutOrderList(JSON.toJSONString(isOutOrderStationList, SerializerFeature.DisableCircularReferenceDetect));
                }

                if (isLiftTransferStationList != null) {
                    basDevp.setIsLiftTransferList(JSON.toJSONString(isLiftTransferStationList, 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

@@ -120,6 +120,13 @@
    @TableField("is_out_order_list")
    private String isOutOrderList;

    /**
     * 顶升移栽点
     */
    @ApiModelProperty(value= "顶升移栽点")
    @TableField("is_lift_transfer_list")
    private String isLiftTransferList;

    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

@@ -18,6 +18,7 @@
        <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" />
        <result column="is_lift_transfer_list" property="isLiftTransferList" />

    </resultMap>


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

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

          {
            fixed: "right",

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

@@ -155,6 +155,12 @@
                        <input class="layui-input" name="isOutOrderList" placeholder="请输入出库排序交互点">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">顶升移栽点: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="isLiftTransferList" placeholder="请输入电梯中转点">
                    </div>
                </div>

             </div>
        </div>
@@ -194,4 +200,3 @@
    </form>
</script>
</html>