opt: LMS解包区任务完成点位赋值，ACS数据初始化结构

acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/DeviceType.java

@@ -19,9 +19,7 @@ public enum DeviceType {
     plcDb("plcDb块", 13),
     shadow("影子设备", 15),
     button("按钮",14),
-    other("其他设备", 16),
+    other("其他设备", 16);
-    unpacking("解包机", 17),
-    unpacking_converyor("解包机输送线", 18);
 
 
     private String code;

acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/unpacking_conveyor/UnpackingConveyorDefination.java

@@ -44,7 +44,7 @@ public class UnpackingConveyorDefination implements OpcDeviceDriverDefination {
     @Override
     public List<DeviceType> getFitDeviceTypes() {
         List<DeviceType> types = new LinkedList();
-        types.add(DeviceType.unpacking_converyor);
+        types.add(DeviceType.conveyor);
         return types;
     }
 

acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/unpacking_machine/UnpackingMachineDefination.java

@@ -45,7 +45,7 @@ public class UnpackingMachineDefination implements OpcDeviceDriverDefination {
     @Override
     public List<DeviceType> getFitDeviceTypes() {
         List<DeviceType> types = new LinkedList();
-        types.add(DeviceType.unpacking);
+        types.add(DeviceType.station);
         return types;
     }
 

acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java

@@ -133,6 +133,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         }
         // 删除当前角色绑定的菜单
         roleMapper.deleteRoleMenuBatchRoleIds(Arrays.asList(roleId));
+        if (menuIds.size() == 0) {
+            throw new BadRequestException("角色不能没有菜单权限！");
+        }
         // 插入数据
         roleMapper.insertRoleMenu(roleId, menuIds);
     }

acs/acs2/nladmin-ui/src/views/acs/device/config.vue

@@ -64,7 +64,6 @@
 
       <!--  组件-->
       <component :is="currentComponent" :parent-form="form" />
-
     </el-row>
   </div>
 </template>
@@ -82,9 +81,11 @@ import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two'
 import xg_agv from '@/views/acs/device/driver/agv/xg_agv'
 import xg_agv_car from '@/views/acs/device/driver/agv/xg_agv_car.vue'
 import standard_manipulator from '@/views/acs/device/driver/one_manipulator/standard_manipulator.vue'
+import unpacking_machine from '@/views/acs/device/driver/unpacking_machine.vue'
 export default {
   name: 'DeviceConfig',
   components: {
+    unpacking_machine,
     standard_autodoor,
     standard_ordinary_site,
     standard_inspect_site,

acs/acs2/nladmin-ui/src/views/acs/device/driver/unpacking_machine.vue

@@ -0,0 +1,508 @@
+<template>
+  <!--解包机站点-->
+  <div>
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">设备协议：</span>
+      </div>
+
+      <el-row>
+        <el-col :span="12">
+          OpcServer:
+          <el-select
+            v-model="opc_id"
+            placeholder="无"
+            clearable
+            filterable
+            @change="changeOpc"
+          >
+            <el-option
+              v-for="item in dataOpcservers"
+              :key="item.opc_id"
+              :label="item.opc_name"
+              :value="item.opc_id"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          PLC:
+          <el-select
+            v-model="plc_id"
+            placeholder="无"
+            clearable
+            filterable
+            @change="changePlc"
+          >
+            <el-option
+              v-for="item in dataOpcPlcs"
+              :key="item.plc_id"
+              :label="item.plc_name"
+              :value="item.plc_id"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">输送系统：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="电气调度号" label-width="150px">
+              <el-input v-model="form.address" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">指令相关：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检验有货">
+              <el-switch v-model="form.inspect_in_stocck" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="取货校验" label-width="150px">
+              <el-switch v-model="form.ignore_pickup_check" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="放货校验" label-width="150px">
+              <el-switch v-model="form.ignore_release_check" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="呼叫">
+              <el-switch v-model="form.apply_task" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="响应" label-width="150px">
+              <el-switch v-model="form.manual_create_task" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="关联设备" prop="device_code">
+              <el-select
+                v-model="form.link_device_code"
+                filterable
+                multiple
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_code"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="关联三色灯" prop="device_code" label-width="100px">
+              <el-select
+                v-model="form.link_three_lamp"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_code"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否输入物料" label-width="150px">
+              <el-switch v-model="form.input_material" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">AGV相关：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="取货">
+              <el-switch v-model="form.is_pickup" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="放货">
+              <el-switch v-model="form.is_release" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC读取字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data1"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data1[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishReadEdit(data1[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbr_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC写入字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data2"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data2[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishWriteEdit(data2[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbr_value2">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_read2()">测试读</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data2[scope.$index].dbr_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbw_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span" />
+        <el-button
+          :loading="false"
+          icon="el-icon-check"
+          size="mini"
+          style="float: right; padding: 6px 9px"
+          type="primary"
+          @click="doSubmit"
+        >保存
+        </el-button>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {
+  queryDriverConfig,
+  updateConfig,
+  testRead,
+  testwrite
+} from '@/api/acs/device/driverConfig'
+import { selectOpcList } from '@/api/acs/device/opc'
+import { selectPlcList } from '@/api/acs/device/opcPlc'
+import { selectListByOpcID } from '@/api/acs/device/opcPlc'
+
+import crud from '@/mixins/crud'
+import deviceCrud from '@/api/acs/device/device'
+
+
+export default {
+  name: 'UnpackingMachine',
+  mixins: [crud],
+  props: {
+    parentForm: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      device_code: '',
+      device_id: '',
+      plc_id: '',
+      plc_code: '',
+      opc_id: '',
+      opc_code: '',
+      configLoading: false,
+      dataOpcservers: [],
+      dataOpcPlcs: [],
+      deviceList: [],
+      data1: [],
+      data2: [],
+      form: {
+        inspect_in_stocck: true,
+        ignore_pickup_check: true,
+        ignore_release_check: true,
+        apply_task: true,
+        link_three_lamp: '',
+        manual_create_task: true,
+        is_pickup: true,
+        is_release: true,
+        link_device_code: [],
+        address: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      // 从父表单获取设备编码
+      this.device_id = this.$props.parentForm.device_id
+      this.device_code = this.$props.parentForm.device_code
+      queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
+        // 给表单赋值，并且属性不能为空
+        if (data.form) {
+          const arr = Object.keys(data.form)
+          // 不为空
+          if (arr.length > 0) {
+            this.form = data.form
+          }
+        }
+
+        // 给表单赋值，并且属性不能为空
+        if (data.parentForm) {
+          const arr = Object.keys(data.parentForm)
+          // 不为空
+          if (arr.length > 0) {
+            this.opc_code = data.parentForm.opc_code
+            this.plc_code = data.parentForm.plc_code
+          }
+        }
+        this.data1 = data.rs
+        this.data2 = data.ws
+        this.sliceItem()
+      })
+      selectPlcList().then(data => {
+        this.dataOpcPlcs = data
+        this.plc_id = this.$props.parentForm.opc_plc_id
+      })
+      selectOpcList().then(data => {
+        this.dataOpcservers = data
+        this.opc_id = this.$props.parentForm.opc_server_id
+      })
+      deviceCrud.selectDeviceList().then(data => {
+        this.deviceList = data
+      })
+    })
+  },
+  methods: {
+    finishReadEdit(data) {
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('mode') !== -1) {
+        debugger
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // .之后的字符串
+        const afterStr = dbValue.match(/\.(\S*)/)[1]
+        // 取最后数字
+        const endNumber = afterStr.substring(1)
+        // 最后为非数字
+        if (isNaN(parseInt(endNumber))) {
+          return
+        }
+        for (const val in this.data1) {
+          if (this.data1[val].code.indexOf('move') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
+          }
+          if (this.data1[val].code.indexOf('error') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 5)
+          }
+          if (this.data1[val].code.indexOf('task') !== -1) {
+            this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 7)
+          }
+        }
+      }
+    },
+    finishWriteEdit(data) {
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('to_command') !== -1) {
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // .之后的字符串
+        const afterStr = dbValue.match(/\.(\S*)/)[1]
+        // 取最后数字
+        const endNumber = afterStr.substring(1)
+        // 最后为非数字
+        if (isNaN(parseInt(endNumber))) {
+          return
+        }
+        for (const val in this.data2) {
+          if (this.data2[val].code.indexOf('to_target') !== -1) {
+            this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
+          }
+          if (this.data2[val].code.indexOf('to_task') !== -1) {
+            this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
+          }
+        }
+      }
+    },
+    changeOpc(val) {
+      this.dataOpcservers.forEach(item => {
+        if (item.opc_id === val) {
+          this.opc_code = item.opc_code
+        }
+      })
+
+      selectListByOpcID(val).then(data => {
+        this.dataOpcPlcs = data
+        this.plc_id = ''
+        this.plc_code = ''
+        if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
+          this.plc_id = this.dataOpcPlcs[0].plc_id
+          this.plc_code = this.dataOpcPlcs[0].plc_code
+        }
+        this.sliceItem()
+      })
+    },
+    changePlc(val) {
+      this.dataOpcPlcs.forEach(item => {
+        if (item.plc_id === val) {
+          this.plc_code = item.plc_code
+          this.sliceItem()
+          return
+        }
+      })
+    },
+    test_read1() {
+      testRead(this.data1, this.opc_id).then(data => {
+        this.data1 = data
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    test_read2() {
+      testRead(this.data2, this.opc_id).then(data => {
+        this.data2 = data
+        console.log(this.data2)
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    test_write1() {
+      testwrite(this.data2, this.opc_id).then(data => {
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.configLoading = true
+          // 根据驱动类型判断是否为路由设备
+          const parentForm = this.parentForm
+          parentForm.is_route = true
+          parentForm.plc_id = this.plc_id
+          parentForm.opc_id = this.opc_id
+          updateConfig(parentForm, this.form, this.data1, this.data2).then(res => {
+            this.notify('保存成功', 'success')
+            this.configLoading = false
+          }).catch(err => {
+            this.configLoading = false
+            console.log(err.response.data.message)
+          })
+        }
+      })
+    },
+    sliceItem() { // 拼接DB的Item值
+      this.data1.forEach(item => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
+        }
+      })
+      this.data2.forEach(item => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaSchPointController.java

@@ -58,6 +58,12 @@ public class PdaSchPointController {
     public ResponseEntity<Object> regionList(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(pdaSchPointService.regionList(whereJson), HttpStatus.OK);
     }
+    @PostMapping("/allRegionList")
+    @Log("获取区域下拉框数组")
+    @SaIgnore
+    public ResponseEntity<Object> allRegionList(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaSchPointService.allRegionList(whereJson), HttpStatus.OK);
+    }
     @PostMapping("/pointList")
     @Log("获取点位下拉框数组")
     @SaIgnore

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaSchPointService.java

@@ -49,4 +49,6 @@ public interface PdaSchPointService extends IService<SchBasePoint> {
     PdaResponse regionList(JSONObject whereJson);
 
     PdaResponse pointListByRegion(JSONObject whereJson);
+
+    PdaResponse allRegionList(JSONObject whereJson);
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaSchPointServiceImpl.java

@@ -101,4 +101,16 @@ public class PdaSchPointServiceImpl extends ServiceImpl<SchBasePointMapper, SchB
                 .collect(Collectors.toList());
         return PdaResponse.requestParamOk(list);
     }
+
+    @Override
+    public PdaResponse allRegionList(JSONObject whereJson) {
+        List<SelectItemVo> list = regionService.list(new LambdaQueryWrapper<SchBaseRegion>()
+                        .orderByAsc(SchBaseRegion::getOrder_seq)).stream().map(p -> SelectItemVo
+                        .builder()
+                        .text(p.getRegion_name())
+                        .value(p.getRegion_code())
+                        .build())
+                .collect(Collectors.toList());
+        return PdaResponse.requestParamOk(list);
+    }
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/controller/SchBaseRegionController.java

@@ -1,6 +1,7 @@
 package org.nl.wms.sch_manage.controller;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBasePoint.java

@@ -1,5 +1,6 @@
 package org.nl.wms.sch_manage.service.dao;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -48,10 +49,10 @@ public class SchBasePoint  implements Serializable {
 
     private Integer vehicle_max_qty;
 
-
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String vehicle_type;
 
-
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String vehicle_code;
 
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbDownAgvTask.java

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -154,21 +155,49 @@ public class JbDownAgvTask extends AbstractTask {
             SchBasePoint khgPoint = pointService.getById(taskObj.getPoint_code2());
             khgPoint.setPoint_status("2");
             khgPoint.setUpdate_time(DateUtil.now());
-            pointService.updateById(khgPoint);
+            // 终点保存数据 空缓存点
+            SchBasePoint khcPoint = pointService.getById(taskObj.getPoint_code4());
+            khcPoint.setPoint_status("2");
+            khcPoint.setVehicle_code(taskObj.getVehicle_code());
+            khcPoint.setVehicle_type(taskObj.getVehicle_type());
+            khcPoint.setUpdate_time(DateUtil.now());
+            pointService.updateBatchById(Arrays.asList(khcPoint, khgPoint));
         }
         if ("2".equals(taskObj.getTask_group_seq().toString())) {
             SchBasePoint jbjPoint = pointService.getById(taskObj.getPoint_code1());
+            SchBasePoint mhcPoint = pointService.getById(taskObj.getPoint_code2());
+            SchBasePoint khcPoint = pointService.getById(taskObj.getPoint_code3());
+            // 空缓存点清空
+            khcPoint.setPoint_status("1");
+            khcPoint.setVehicle_code(null);
+            khcPoint.setVehicle_type(null);
+            khcPoint.setUpdate_time(DateUtil.now());
+            // 满缓存点设置值
+            mhcPoint.setPoint_status("3");
+            mhcPoint.setVehicle_code(taskObj.getVehicle_code2());
+            mhcPoint.setVehicle_type(taskObj.getVehicle_type());
+            mhcPoint.setUpdate_time(DateUtil.now());
+            // 对接位设置空桶
             jbjPoint.setPoint_status("2");
+            jbjPoint.setVehicle_type(taskObj.getVehicle_type());
             jbjPoint.setVehicle_code(taskObj.getVehicle_code());
             jbjPoint.setUpdate_time(DateUtil.now());
-            pointService.updateById(jbjPoint);
+            pointService.updateBatchById(Arrays.asList(jbjPoint, khcPoint, mhcPoint));
         }
         if ("3".equals(taskObj.getTask_group_seq().toString())) {
-            // 开盖设置成空位
             SchBasePoint khgPoint = pointService.getById(taskObj.getPoint_code2());
+            SchBasePoint mhcPoint = pointService.getById(taskObj.getPoint_code1());
+            // 开盖设置成空位
             khgPoint.setPoint_status("1");
             khgPoint.setUpdate_time(DateUtil.now());
-            pointService.updateById(khgPoint);
+            // 满点清空
+            mhcPoint.setPoint_status("1");
+            mhcPoint.setVehicle_code(null);
+            mhcPoint.setVehicle_type(null);
+            mhcPoint.setUpdate_time(DateUtil.now());
+            pointService.updateBatchById(Arrays.asList(khgPoint, mhcPoint));
+
+            // 3条任务完成
             SchBaseTask task = new SchBaseTask();
             task.setTask_status(TaskStatus.FINISHED.getCode());
             TaskUtils.setUpdateByType(task, taskFinishedType);
@@ -176,6 +205,7 @@ public class JbDownAgvTask extends AbstractTask {
             task.setFinished_type(taskFinishedType.getCode());
             taskService.update(task, new LambdaQueryWrapper<SchBaseTask>()
                     .eq(SchBaseTask::getTask_group_id, taskObj.getTask_group_id()));
+            // 出库完成
             inBillService.taskFinish(taskObj);
             return;
         }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java

@@ -705,6 +705,7 @@ public class InBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
             task1.put("point_code2", cfgjPoint.getPoint_code());
             task1.put("point_code3", cfgjPoint.getPoint_code());
             task1.put("point_code4", emptyPoint.getPoint_code());
+            task1.put("vehicle_type", inStruct.getStoragevehicle_type());
             task1.put("seq", 1);
             // 空托盘
             task1.put("vehicle_code", inStruct.getStoragevehicle_code());
@@ -726,6 +727,7 @@ public class InBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
             task2.put("seq", 2);
             // 空托盘
             task2.put("vehicle_code", inStruct.getStoragevehicle_code());
+            task2.put("vehicle_type", inStruct.getStoragevehicle_type());
             // 入库的满托盘
             task2.put("vehicle_code2", map.get("storagevehicle_code"));
 
@@ -744,6 +746,7 @@ public class InBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
             task3.put("seq", 3);
             // 空托盘
             task3.put("vehicle_code", inStruct.getStoragevehicle_code());
+            task3.put("vehicle_type", inStruct.getStoragevehicle_type());
             // 入库的满托盘
             task3.put("vehicle_code2", map.get("storagevehicle_code"));
             List<JSONObject> jsonObjects = Arrays.asList(task1, task2, task3);

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

@@ -307,7 +307,7 @@
         <!--        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'载具数量')" />-->
         <!--        <el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'载具数量')" />-->
         <!--        <el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'载具数量')" />-->
-        <el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')" />
+        <el-table-column prop="parent_point_code" label="所属设备" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')" />
         <el-table-column prop="ing_task_code" label="在执行的任务标识" :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')" />
         <el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
           <template slot-scope="scope">