代码更新

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -233,6 +233,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             param.put("io_type", "2");
             param.put("vehicle_type", vehicle_type);
             param.put("vehicle_code", vehicle_code);
+            param.put("material_num", material_num);
             // 创建任务
             YqxCallMaterialTask taskBean = SpringContextHolder.getBean(YqxCallMaterialTask.class);
             String task_id = taskBean.createTask(param);

lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java

@@ -104,4 +104,12 @@ public class PointController {
         pointService.changeUsed(jsonObject);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
+
+    @Log("锁定与解锁")
+    @PostMapping("/changeLock")
+    @ApiOperation("锁定与解锁")
+    public ResponseEntity<Object> changeLock(@RequestBody JSONObject jsonObject) {
+        pointService.changeLock(jsonObject);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java

@@ -90,4 +90,10 @@ public interface PointService {
      * @param jsonObject
      */
     void changeUsed(JSONObject jsonObject);
+
+    /**
+     * 改变锁定类型
+     * @param jsonObject
+     */
+    void changeLock(JSONObject jsonObject);
 }

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java

@@ -49,6 +49,9 @@ public class PointDto implements Serializable {
     /** MES设备编码 */
     private String mes_device_code;
 
+    /** 物料标识 */
+    private Long material_id;
+
     /** 允许的载具类型 */
     private String can_vehicle_type;
 
@@ -108,4 +111,4 @@ public class PointDto implements Serializable {
 
     /** 修改时间 */
     private String update_time;
-}
+}

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java

@@ -153,6 +153,14 @@ public class PointServiceImpl implements PointService {
             throw new BadRequestException("被删除或无权限，操作失败!");
         }
 
+        String pointStatus = dto.getPoint_status();
+        if (ObjectUtil.isNotEmpty(pointStatus) && pointStatus.equals("1")) {
+            entity.setMaterial_id(null);
+            entity.setVehicle_type(null);
+            entity.setVehicle_code(null);
+            entity.setVehicle_qty(null);
+        }
+
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
 
@@ -275,6 +283,24 @@ public class PointServiceImpl implements PointService {
         }
     }
 
+    /**
+     * 改变锁定类型
+     *
+     * @param jsonObject
+     */
+    @Override
+    public void changeLock(JSONObject jsonObject) {
+        WQLObject wo = WQLObject.getWQLObject("sch_base_Point");
+        JSONArray data = jsonObject.getJSONArray("data");
+        String lock = jsonObject.getString("lock_type");
+        for ( int i = 0; i < data.size(); i++ ) {
+            JSONObject object = data.getJSONObject(i);
+            if (lock.equals("1")) object.put("lock_type", 1);
+            else object.put("lock_type", 2);
+            wo.update(object);
+        }
+    }
+
     //根据重量返回最大的 级数
     public String getLoadSeriesByqty(Double qty) {
         JSONArray dictArr = WQLObject.getWQLObject("sys_dict_detail").query("dict_id ='108'", "label").getResultJSONArray(0);

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java

@@ -43,7 +43,8 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
 
         String task_id = task.getString("task_id");
         JSONObject taskObj = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
-
+        // 物料点
+        JSONObject material_point = pointTab.query("point_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0);
         //任务取消
         if (StrUtil.equals(status, "0")) {
             // 取消删除任务
@@ -61,6 +62,11 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
             taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
             taskObj.put("remark", "已取消");
             taskTab.update(taskObj);
+
+            // 点位解锁 并设置空位
+            material_point.put("lock_type", "1");
+            material_point.put("point_status", "1");
+            pointTab.update(material_point);
         }
 
         if ("1".equals(status)) {
@@ -77,18 +83,7 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
             taskObj.put("update_time", DateUtil.now());
             taskTab.update(taskObj);
 
-            String point_code3 = taskObj.getString("point_code3");
-            if (ObjectUtil.isEmpty(point_code3)) point_code3 = taskObj.getString("point_code2"); // 终点
-            JSONObject point3Obj = pointTab.query("point_code = '" + point_code3 + "'").uniqueResult(0);
             JSONObject requestObj = task.getJSONObject("request_param");
-            //工单标识
-            String workorder_id = requestObj.getString("material_info_id");
-            //生产工单表【PDM_BD_WorkOrder】
-            WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
-            JSONObject workorderObj = workOrderTab.query("workorder_id", workorder_id).uniqueResult(0);
-
-            JSONObject point3 = pointTab.query("point_code = '" + point_code3 + "'").uniqueResult(0);
-
 
             //区域出入表【st_ivt_regionIO】
             WQLObject regionIoTab = WQLObject.getWQLObject("st_ivt_regionIO");
@@ -97,15 +92,15 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
             regionIoObj.put("bill_code", CodeUtil.getNewCode("IN_STORE_CODE"));
             regionIoObj.put("buss_date", DateUtil.today());
             regionIoObj.put("io_type", "2");
-            regionIoObj.put("region_id", point3.getString("region_id"));
+            regionIoObj.put("region_id", material_point.getString("region_id"));
-            regionIoObj.put("region_code", point3.getString("region_code"));
+            regionIoObj.put("region_code", material_point.getString("region_code"));
-            regionIoObj.put("region_name", point3.getString("region_name"));
+            regionIoObj.put("region_name", material_point.getString("region_name"));
             regionIoObj.put("material_id", taskObj.getString("material_id"));
             regionIoObj.put("vehicle_code", taskObj.getString("vehicle_code"));
-            regionIoObj.put("qty", requestObj.getString("qty"));
+            regionIoObj.put("qty", requestObj.getString("material_num"));
             regionIoObj.put("bill_status", "3");
             regionIoObj.put("start_point_code", taskObj.getString("point_code1"));
-            regionIoObj.put("end_point_code", taskObj.getString("point_code3"));
+            regionIoObj.put("end_point_code", taskObj.getString("point_code2"));
             regionIoObj.put("create_mode", "2");
             regionIoObj.put("pcsn", DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyyMMdd"));
             regionIoObj.put("create_id", SecurityUtils.getCurrentUserId());
@@ -113,14 +108,12 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
             regionIoObj.put("create_time", DateUtil.now());
             regionIoTab.insert(regionIoObj);
 
-
             //完成后将仓位库存删掉
             //仓位库存表【ST_IVT_StructIvt】
             WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
             ivtTab.delete("point_code = '" + taskObj.getString("point_code1") + "'");
 
             // 点位解锁 并设置空位
-            JSONObject material_point = pointTab.query("point_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0);
             material_point.put("lock_type", "1");
             material_point.put("point_status", "1");
             pointTab.update(material_point);
@@ -148,33 +141,17 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
             //1、根据物料id查找养生A区物料点
             JSONObject json1 = WQL.getWO("QSCH_yqxCallMAterial_01").addParamMap(param1).process().uniqueResult(0);
             if (ObjectUtil.isNotEmpty(json1)) {
-                Integer block_num = json1.getInteger("block_num");
-                Integer row_num = json1.getInteger("row_num");
-                Integer col_num = json1.getInteger("col_num");
                 // 拿到点位
                 JSONObject material_point = pointTab.query("point_id = '" + json1.getString("point_id") + "' and lock_type = '1'").uniqueResult(0);
                 if (ObjectUtil.isEmpty(material_point)) throw new BadRequestException("数据错误，请校验!");
                 // 物料点位上锁
-                material_point.put("lock_type", 2);
+                material_point.put("lock_type", "2");
                 pointTab.update(material_point);
-                //需要设置等待点
-                if (row_num < 9) {
-                    //二楼终点追加任务，taskObj的code2存叫料点
-                    JSONObject jsonObject = pointTab.query("block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num ='9'").uniqueResult(0);
-                    taskObj.put("point_code1", taskObj.getString("point_code2")); // 叫料点
-                    taskObj.put("point_code2", jsonObject.getString("point_code")); // 等待点
-                    taskObj.put("point_code3", material_point.getString("point_code")); // 物料点
-                    taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
-                    taskObj.put("acs_task_type", "4");
-                    taskObj.put("update_time", DateUtil.now());
-                } else if (row_num == 9) {
-                    //二楼普通任务
-                    taskObj.put("point_code1", material_point.getString("point_code"));
-                    taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
-                    taskObj.put("acs_task_type", "2");
-                    taskObj.put("update_time", DateUtil.now());
-                }
 
+                taskObj.put("point_code1", material_point.getString("point_code"));
+                taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
+                taskObj.put("acs_task_type", "2");
+                taskObj.put("update_time", DateUtil.now());
                 taskTab.update(taskObj);
             } else {
                 taskObj.put("remark", "养生A区无所需物料");
@@ -220,14 +197,18 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
         String point_code2 = whereJson.getString("point_code2");
         String vehicle_type = whereJson.getString("vehicle_type");
         String vehicle_code = whereJson.getString("vehicle_code");
-        String qty = whereJson.getString("qty");
+        String qty = whereJson.getString("material_num");
 
         //生产工单表【PDM_BD_WorkOrder】
         WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
+        //任务表【SCH_BASE_Task】
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
+        //判断当前点是否有未完成的任务
+        JSONObject taskObj = taskTab.query("is_delete='0' and point_code2 = '" + point_code2 + "'  and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code2 + "存在未完成的任务");
         //点位基础表【SCH_BASE_Point】
         WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");
         String device_code = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0).getString("device_code");
-
         JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0);
         if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除");
 
@@ -247,8 +228,6 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
                 .create_time(DateUtil.now())
                 .request_param(whereJson.toJSONString())
                 .build();
-        //任务表【SCH_BASE_Task】
-        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         taskTab.insert(json);
 
@@ -263,41 +242,17 @@ public class YqxCallMaterialTask extends AbstractAcsTask {
         JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
         if (ObjectUtil.isNotEmpty(taskObj))
             this.updateTaskStatus(taskObj,"2");
+        else {
+            throw new BadRequestException("未找到该任务或者任务已完成");
+        }
     }
 
 
     @Override
     public void cancel(String task_id) {
-    }
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-
+        JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
-    @Transactional(rollbackFor = Exception.class)
+        if (ObjectUtil.isNotEmpty(taskObj))
-    @Override
+            this.updateTaskStatus(taskObj,"0");
-    public String againApply(String task_id) {
-        /*
-         * 再次下发任务处理方法
-         * 涉及业务：入空载具、出空载具、入物料、出物料
-         */
-
-        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
-//        WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表
-
-        JSONObject taskObj = taskTab.query("task_id ='" + task_id + "'").uniqueResult(0);
-//        JSONObject jsonPoint2 = pointTab.query("point_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0); //
-
-        // code1是叫料点，code3是物料点 -> code1是物料点，code2是等待点，code3是叫料点
-        String askPoint = taskObj.getString("point_code1");
-        taskObj.put("point_code1", taskObj.getString("point_code3"));
-        taskObj.put("point_code3", askPoint);
-
-        taskObj.put("remark", "二次申请货位");
-        taskObj.put("update_time", DateUtil.now());
-        taskTab.update(taskObj);
-
-
-        //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
-        String point_code =taskObj.getString("point_code3");
-        String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
-
-        return newPoint;
     }
 }

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yqxCallMAterial_01.wql

@@ -65,7 +65,7 @@
                 OPTION 输入.vehicle_type <> ""
                      p.can_vehicle_type like 输入.vehicle_type
                 ENDOPTION
-                ORDER BY block_num,col_num
+                ORDER BY block_num,row_num desc,col_num
             ENDSELECT
         ENDQUERY
     ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java

@@ -104,7 +104,7 @@ public class CpOutTask extends AbstractAcsTask {
             point1Obj.put("lock_type", "1");
             point1Obj.put("point_status", "1");
             point2Obj.put("lock_type", "1");
-            point2Obj.put("point_status", "1");
+            point2Obj.put("point_status", "3");
             pointTab.update(point1Obj);
             pointTab.update(point2Obj);
         }

lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java

@@ -158,7 +158,7 @@ public class RegionIoServiceImpl implements RegionIoService {
 //            param.put("vehicle_type", vehicle_type);
             param.put("iostorinv_id", dtoJSONObject.getString("iostorinv_id"));
             CpOutTask taskBean = SpringContextHolder.getBean(CpOutTask.class);
-            String task_id = taskBean.createTask(param);
+//            String task_id = taskBean.createTask(param);
         }
 
     }

lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java

@@ -244,11 +244,6 @@ public class StructivtServiceImpl implements StructivtService {
             JSONObject structivts = jsonArray.getJSONObject(i);
             // 如果是空位或者锁定就跳过
             if (structivts.getString("lock_type").equals("2") || !structivts.getString("point_status").equals("3")) continue;
-            // 找到任務
-            JSONObject taskObj = taskTab.query("task_id = '" + structivts.getString("task_id") + "'").uniqueResult(0);
-            String end_point_code = taskObj.getString("point_code3");
-            if (ObjectUtil.isEmpty(end_point_code)) end_point_code = taskObj.getString("point_code2");
-
             // 插入regionIO - 未锁定，有料位
             JSONObject regionIoObj = new JSONObject();
             regionIoObj.put("iostorinv_id", IdUtil.getSnowflake(1, 1).nextId());
@@ -264,8 +259,6 @@ public class StructivtServiceImpl implements StructivtService {
             regionIoObj.put("start_point_code", structivts.getString("point_code")); // 起点
             String start_region_id = pointTab.query("point_code = '" + structivts.getString("point_code") + "'").uniqueResult(0).getString("region_id");
             if (ObjectUtil.isNotEmpty(start_region_id))
-//                regionIoObj.put("start_region_id", start_region_id);
-            regionIoObj.put("task_id", structivts.getString("task_id"));
             regionIoObj.put("region_id", structivts.getString("region_id"));
             regionIoObj.put("region_code", structivts.getString("region_code"));
             regionIoObj.put("region_name", structivts.getString("region_name"));

lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/wql/ST_IVT_STRUCTIVT.wql

@@ -48,48 +48,48 @@
     IF 输入.flag = "1"
         PAGEQUERY
             SELECT
-                cppoint.*,
+                str.*,
-                str.stockrecord_id,
+                point.vehicle_type,
-                str.pcsn,
+                point.layer_num,
-                str.material_id,
+                point.row_num,
-                str.ivt_qty,
+                point.col_num,
-                str.qty_unit_id,
+                point.is_used,
-                str.instorage_time,
+                point.lock_type,
-                str.standing_time
+                point.point_status
             FROM
                 st_ivt_structivt str
-                LEFT JOIN sch_base_point cppoint ON str.point_id = cppoint.point_id
+                LEFT JOIN sch_base_point point ON str.point_id = point.point_id
             WHERE
-                cppoint.region_code IN 输入.region_code
+                point.region_code IN 输入.region_code
                 OPTION 输入.point_code <> ""
-                    point_code LIKE 输入.point_code
+                    point.point_code LIKE 输入.point_code
                 ENDOPTION
                 OPTION 输入.point_status <> ""
-                    point_status = 输入.point_status
+                    point.point_status = 输入.point_status
                 ENDOPTION
                 OPTION 输入.vehicle_type <> ""
-                    vehicle_type = 输入.vehicle_type
+                    point.vehicle_type = 输入.vehicle_type
                 ENDOPTION
                 OPTION 输入.layer_num <> ""
-                    cppoint.layer_num = 输入.layer_num
+                    point.layer_num = 输入.layer_num
                 ENDOPTION
                 OPTION 输入.row_num <> ""
-                    row_num = 输入.row_num
+                    point.row_num = 输入.row_num
                 ENDOPTION
                 OPTION 输入.col_num <> ""
-                    col_num = 输入.col_num
+                    point.col_num = 输入.col_num
                 ENDOPTION
                 OPTION 输入.lock_type <> ""
-                    lock_type = 输入.lock_type
+                    point.lock_type = 输入.lock_type
                 ENDOPTION
                 OPTION 输入.is_used <> ""
-                    is_used = 输入.is_used
+                    point.is_used = 输入.is_used
                 ENDOPTION
                 OPTION 输入.begin_time <> ""
-                    instorage_time >= 输入.begin_time
+                    str.instorage_time >= 输入.begin_time
                 ENDOPTION
                 OPTION 输入.end_time <> ""
-                    instorage_time <= 输入.end_time
+                    str.instorage_time <= 输入.end_time
                 ENDOPTION
             ENDSELECT
         ENDPAGEQUERY

lms/nladmin-ui/src/api/wms/sch/point.js

@@ -52,7 +52,6 @@ export function getRegion() {
   })
 }
 
-
 export function changeUsed(data) {
   return request({
     url: 'api/point/changeUsed',
@@ -61,4 +60,12 @@ export function changeUsed(data) {
   })
 }
 
-export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed }
+export function changeLock(data) {
+  return request({
+    url: 'api/point/changeLock',
+    method: 'post',
+    data: data
+  })
+}
+
+export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock }

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -7,7 +7,7 @@
           :inline="true"
           class="demo-form-inline"
           label-position="right"
-          label-width="80px"
+          label-width="90px"
           label-suffix=":"
         >
           <el-form-item label="模糊搜索">
@@ -69,22 +69,51 @@
               />
             </el-select>
           </el-form-item>
-
+          <el-form-item label="块" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')">
-          <el-form-item label="锁定类型">
+            <el-input
-            <el-select
+              v-model="query.block_num"
-              v-model="query.lock_type"
               clearable
               size="mini"
-              placeholder="锁定类型"
+              placeholder="块"
-              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="排" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')">
+            <el-input
+              v-model="query.row_num"
+              clearable
+              size="mini"
+              placeholder="排"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="列" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')">
+            <el-input
+              v-model="query.col_num"
+              clearable
+              size="mini"
+              placeholder="列"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="层" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')">
+            <el-input
+              v-model="query.layer_num"
+              clearable
+              size="mini"
+              placeholder="层"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="锁定类型">
+            <el-switch
+              v-model="query.lock_type"
+              active-value="2"
+              inactive-value="1"
+              active-color="#409EFF"
+              inactive-color="#C0CCDA"
               @change="hand"
-            >
+            />
-              <el-option
-                v-for="item in dict.d_lock_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
           </el-form-item>
 
           <el-form-item label="是否启用">
@@ -109,6 +138,7 @@
           size="mini"
           type="primary"
           icon="el-icon-circle-check"
+          v-if="crud.query.is_used == 0"
           :disabled="crud.selections.length === 0"
           @click="changeUsed(crud.selections, 1)"
         >
@@ -118,13 +148,38 @@
           slot="right"
           class="filter-item"
           size="mini"
-          type="danger"
+          type="primary"
           icon="el-icon-circle-close"
+          v-if="crud.query.is_used == 1"
           :disabled="crud.selections.length === 0"
           @click="changeUsed(crud.selections, 0)"
         >
           禁用
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          size="mini"
+          type="danger"
+          icon="el-icon-circle-check"
+          v-if="crud.query.lock_type == 1"
+          :disabled="crud.selections.length === 0"
+          @click="changeLock(crud.selections, 2)"
+        >
+          锁定
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          size="mini"
+          type="danger"
+          icon="el-icon-circle-close"
+          v-if="crud.query.lock_type == 2"
+          :disabled="crud.selections.length === 0"
+          @click="changeLock(crud.selections, 1)"
+        >
+          解锁
+        </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -339,6 +394,11 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    [CRUD.HOOK.afterToCU]() {
+      if (this.form.region_id) {
+        this.getPointStatusAndTypeList(this.form.region_id)
+      }
+    },
     hand(value) {
       this.crud.toQuery()
     },
@@ -389,6 +449,15 @@ export default {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
+    },
+    changeLock(data, flag) { // 更改锁定状态
+      const param = {}
+      param.data = data
+      param.lock_type = flag
+      crudPoint.changeLock(param).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
     }
 
   }