fix

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

@@ -77,8 +77,14 @@
           <!--<el-form-item label="子载具编码">
             <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
           </el-form-item>-->
-          <el-form-item v-if="false" label="来源载具">
+          <!-- <el-form-item v-if="false" label="来源载具">
             <el-input v-model="form.source_vehicle_code" style="width: 240px;" />
+          </el-form-item> -->
+          <el-form-item label="托盘类型">
+            <el-radio-group v-model="form.vehicle_type" style="width: 240px">
+              <el-radio label="1">子托盘</el-radio>
+              <el-radio label="0">母托盘</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="入库时间">
             <el-date-picker
@@ -219,7 +225,12 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
         <!--        <el-table-column prop="child_vehicle_code" label="子载具编码" :min-width="flexWidth('child_vehicle_code',crud.data,'子载具编码')"/>-->
-        <el-table-column prop="source_vehicle_code" label="来源载具" :min-width="flexWidth('source_vehicle_code',crud.data,'来源载具')" />
+        <!-- <el-table-column prop="source_vehicle_code" label="来源载具" :min-width="flexWidth('source_vehicle_code',crud.data,'来源载具')" /> -->
+        <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')">
+          <template slot-scope="scope">
+            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
         <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
@@ -294,6 +305,7 @@ import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 const defaultForm = {
   group_id: null,
   vehicle_code: null,
+  vehicle_type: null,
   material_id: null,
   child_vehicle_code: null,
   source_vehicle_code: null,
@@ -325,7 +337,7 @@ const defaultForm = {
 }
 export default {
   name: 'VehicleMaterialGroup',
-  dicts: ['group_status', 'group_bind_material_status'],
+  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
   components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {

lms/nladmin-ui/src/views/wms/sch/material/MaterialDialog.vue

@@ -0,0 +1,166 @@
+<template>
+  <el-dialog
+    title="物料选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="物料名称">
+        <el-input
+          v-model="query.blurry"
+          clearable
+          size="mini"
+          placeholder="物料名称"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用">
+        <el-switch
+          v-model="query.is_used"
+          :active-value="true"
+          :inactive-value="false"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :cell-style="{'text-align':'center'}"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="material_code" label="物料编码" width="160" />
+      <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
+      <el-table-column prop="material_spec" label="物料规格" width="140" />
+      <!--      <el-table-column prop="class_name" label="物料分类" width="140" />-->
+      <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
+      <el-table-column prop="update_name" label="修改人" />
+      <el-table-column prop="update_time" label="修改时间" width="135" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: 'MaterialDialog',
+  components: { rrOperation, pagination },
+  dicts: ['is_used'],
+  cruds() {
+    return CRUD({
+      title: '生产任务',
+      url: 'api/mdBaseMaterial',
+      optShow: {},
+      query: {
+        is_used: true
+      }
+    })
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableRadio: null,
+      tableData: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      } else {
+        this.checkrow = row
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('tableChanged', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+  ::v-deep .el-dialog__body {
+    padding-top: 0px;
+  }
+</style>
+

lms/nladmin-ui/src/views/wms/sch/material/WorkOrderDialog.vue

@@ -0,0 +1,153 @@
+<template>
+  <el-dialog
+    title="工单选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="工单编号">
+        <el-input
+          v-model="query.workorder_code"
+          clearable
+          size="mini"
+          placeholder="工单编号"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :cell-style="{'text-align':'center'}"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="workorder_code" label="工单编号" width="120px" />
+      <el-table-column v-if="false" prop="material_id" label="物料标识" />
+      <el-table-column prop="workshop_code" label="所属车间" min-width="120" show-overflow-tooltip />
+      <el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
+      <el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
+      <el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
+      <el-table-column prop="update_name" label="修改人" />
+      <el-table-column prop="update_time" label="修改时间" width="150" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: 'WorkOrderDialog',
+  components: { rrOperation, pagination },
+  dicts: ['is_used', 'vehicle_type'],
+  cruds() {
+    return CRUD({ title: '生产工单', url: 'api/pdmBdWorkorder', optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableRadio: null,
+      tableData: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      } else {
+        this.checkrow = row
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('tableChanged', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+  ::v-deep .el-dialog__body {
+    padding-top: 0px;
+  }
+</style>
+

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

@@ -0,0 +1,409 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+        <el-form-item label="托盘号">
+            <el-input
+              v-model="query.palletSN"
+              clearable
+              size="mini"
+              placeholder="托盘号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料条码号">
+            <el-input
+              v-model="query.lotSN"
+              clearable
+              size="mini"
+              placeholder="物料条码号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料名称">
+            <el-input
+              v-model="query.productName"
+              clearable
+              size="mini"
+              placeholder="物料名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="供应商编码">
+            <el-input
+              v-model="query.productDescription"
+              clearable
+              size="mini"
+              placeholder="供应商编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="供应商名称">
+            <el-input
+              v-model="query.supplierCode"
+              clearable
+              size="mini"
+              placeholder="供应商名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="绑定状态">
+            <el-select
+              v-model="query.group_bind_material_status"
+              clearable
+              size="mini"
+              placeholder="绑定状态"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.group_bind_material_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
+        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
+          <el-form-item label="载具编码">
+            <el-input v-model="form.vehicle_code" style="width: 240px;" />
+          </el-form-item>
+          <!--<el-form-item label="子载具编码">
+            <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
+          </el-form-item>-->
+          <!-- <el-form-item v-if="false" label="来源载具">
+            <el-input v-model="form.source_vehicle_code" style="width: 240px;" />
+          </el-form-item> -->
+          <el-form-item label="托盘类型">
+          <el-radio-group v-model="form.vehicle_type" style="width: 240px">
+            <el-radio label="1">子托盘</el-radio>
+            <el-radio label="0">母托盘</el-radio>
+          </el-radio-group>
+        </el-form-item>
+          <el-form-item label="入库时间">
+            <el-date-picker
+              v-model="form.instorage_time"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              style="width: 240px;"
+              placeholder="选择日期时间"
+            />
+          </el-form-item>
+          <el-form-item label="点位编码">
+            <el-select
+              v-model="form.point_code"
+              filterable
+              placeholder="请选择"
+              style="width: 240px;"
+              @change="setPointName"
+            >
+              <el-option
+                v-for="item in pointList"
+                :key="item.point_code"
+                :label="item.point_code"
+                :value="item.point_code"
+              >
+                <span style="float: left">{{ item.point_name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
+              </el-option>
+            </el-select>
+            <!--            <el-input v-model="form.point_code" style="width: 240px;" />-->
+          </el-form-item>
+          <el-form-item label="点位名称">
+            <el-input v-model="form.point_name" style="width: 240px;" disabled />
+          </el-form-item>
+          <el-form-item label="是否满托">
+            <el-radio-group v-model="form.is_full" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="批次">
+            <el-input v-model="form.pcsn" style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="静置时间(分钟)">
+            <el-input-number
+              v-model.number="form.standing_time"
+              :min="1"
+              :max="999"
+              style="width: 240px;"
+            />
+          </el-form-item>
+          <el-form-item label="物料数量">
+            <el-input-number
+              v-model.number="form.material_qty"
+              :min="0"
+              style="width: 240px;"
+            />
+          </el-form-item>
+          <el-form-item label="物料重量">
+            <el-input-number
+              v-model.number="form.material_weight"
+              :min="0"
+              style="width: 240px;"
+            />
+          </el-form-item>
+          <el-form-item label="工单编码">
+            <el-input v-model="form.workorder_code" style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="物料来源">
+            <el-radio-group v-model="choose" size="mini" style="width: 240px;">
+              <el-radio-button label="物料" />
+              <el-radio-button label="工单" />
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="false" label="物料名称">
+            <el-input v-model="form.material_id" suffix-icon="el-icon-date" clearable style="width: 370px;" @focus="getMaterial" />
+          </el-form-item>
+          <el-form-item label="物料名称">
+            <el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" />
+          </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input v-model="form.material_code" disabled style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="物料规格">
+            <el-input v-model="form.material_spec" disabled style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="组盘次数">
+            <el-input v-model="form.group_number" style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="任务编码">
+            <el-input v-model="form.task_code" style="width: 240px;" />
+          </el-form-item>
+          <!--<el-form-item label="车间编码">
+            <el-input v-model="form.workshop_code" style="width: 240px;" />
+          </el-form-item>-->
+          <el-form-item label="组盘状态">
+            <el-select
+              v-model="form.group_status"
+              size="mini"
+              placeholder="点位状态"
+              class="filter-item"
+              style="width: 240px;"
+              clearable
+            >
+              <el-option
+                v-for="item in dict.group_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!--<el-form-item label="是否首个流程任务">
+            <el-input v-model="form.is_first_flow_task" style="width: 240px;" />
+          </el-form-item>-->
+          <el-form-item label="流程编码">
+            <el-input v-model="form.flow_code" style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="流程顺序">
+            <el-input v-model="form.flow_num" style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="上一任务">
+            <el-input v-model="form.before_task_code" style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="下一任务">
+            <el-input v-model="form.next_task_code" style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+            <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="simtOrderNo" label="入库单号" :min-width="flexWidth('simtOrderNo',crud.data,'入库单号')" />
+        <el-table-column prop="locationCode" label="场地" :min-width="flexWidth('locationCode',crud.data,'场地')" />
+        <el-table-column prop="simtType" label="入库类型" :min-width="flexWidth('simtType',crud.data,'入库类型')" />
+        <el-table-column prop="deliveryNo" label="到货单号" :min-width="flexWidth('deliveryNo',crud.data,'到货单号')" />
+        <el-table-column prop="whlCode" label="扫描库位" :min-width="flexWidth('whlCode',crud.data,'扫描库位')" />
+        <el-table-column prop="palletSN" label="托盘号" :min-width="flexWidth('palletSN',crud.data,'托盘号')" />
+        <el-table-column prop="lotSN" label="物料条码号" :min-width="flexWidth('lotSN',crud.data,'物料条码号')" />
+        <el-table-column prop="productName" label="物料编码" :min-width="flexWidth('productName',crud.data,'物料编码')" />
+        <el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
+        <el-table-column prop="supplierCode" label="供应商编码" :min-width="flexWidth('supplierCode',crud.data,'供应商编码')" />
+        <el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
+        <el-table-column prop="specification" label="规格" :min-width="flexWidth('specification',crud.data,'规格')" />
+        <el-table-column prop="batch" label="批次号" :min-width="flexWidth('batch',crud.data,'批次号')" />
+        <el-table-column prop="qty" label="数量" :min-width="flexWidth('qty',crud.data,'数量')" />
+        <el-table-column prop="incomingLength" label="来料长度" :min-width="flexWidth('incomingLength',crud.data,'来料长度')" />
+        <el-table-column prop="incomingWeight" label="来料重量" :min-width="flexWidth('incomingWeight',crud.data,'来料重量')" />
+        <el-table-column prop="incomingchipping" label="来料缺陷长度" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度')" />
+        <el-table-column prop="group_bind_material_status" label="绑定状态" :min-width="flexWidth('group_bind_material_status',crud.data,'入库时间')">
+          <template slot-scope="scope">
+            {{ dict.label.group_bind_material_status[scope.row.group_bind_material_status] }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <MaterialDialog :dialog-show.sync="materialDialog" @tableChanged="tableChanged" />
+    <WorkOrderDialog :dialog-show.sync="workOrderDialog" @tableChanged="tableChanged" />
+  </div>
+</template>
+
+<script>
+import crudMaterial from './material'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
+import MaterialDialog from '@/views/wms/sch/group/MaterialDialog.vue'
+import WorkOrderDialog from '@/views/wms/sch/group/WorkOrderDialog.vue'
+import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
+import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
+
+const defaultForm = {
+  group_id: null,
+  vehicle_code: null,
+  vehicle_type: null,
+  material_id: null,
+  child_vehicle_code: null,
+  source_vehicle_code: null,
+  point_code: null,
+  point_name: null,
+  is_full: true,
+  pcsn: null,
+  instorage_time: null,
+  standing_time: null,
+  material_qty: null,
+  material_weight: null,
+  workorder_code: null,
+  group_number: null,
+  task_code: null,
+  ext_data: null,
+  workshop_code: null,
+  group_status: null,
+  table_name: null,
+  table_fk: null,
+  table_fk_id: null,
+  buss_move_id: null,
+  is_first_flow_task: true,
+  flow_code: null,
+  flow_num: null,
+  before_task_code: null,
+  next_task_code: null,
+  remark: null,
+  is_delete: false
+}
+export default {
+  name: 'VehicleMaterialGroup',
+  dicts: ['group_status', 'group_bind_material_status','vehicle_type'],
+  components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '组盘信息管理',
+      url: 'api/material',
+      idField: 'group_id',
+      sort: 'vehicle_code,desc',
+      optShow: {
+        add: false,
+        edit: false,
+        del: true,
+        download: false,
+        reset: true
+      },
+      query: {
+        group_bind_material_status: '2'
+      },
+      crudMethod: { ...crudMaterial }
+    })
+  },
+  data() {
+    return {
+      permission: {
+      },
+      rules: {
+      },
+      workShopList: [],
+      pointList: [],
+      regionList: [],
+      choose: '物料',
+      materialDialog: false,
+      workOrderDialog: false
+    }
+  },
+  created() {
+    this.getWorkShopList()
+    this.getPointList()
+    this.getRegionList()
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    getWorkShopList() { // 获取车间列表
+      crudMdBaseWorkShop.getWorkShopList().then(res => {
+        this.workShopList = res
+      })
+    },
+    getRegionList() {
+      crudSchBaseRegion.getRegionList().then(res => {
+        this.regionList = res
+      })
+    },
+    getMaterial() {
+      if (this.choose === '物料') {
+        this.materialDialog = true
+      } else {
+        this.workOrderDialog = true
+      }
+    },
+    getPointList() { // 获取点位列表
+      crudSchBasePoint.getPointList().then(res => {
+        this.pointList = res
+      })
+    },
+    tableChanged(row) {
+      this.form.material_name = row.material_name
+      this.form.material_id = row.material_id
+      this.form.material_spec = row.material_spec
+      this.form.material_code = row.material_code
+      if (this.choose === '工单') {
+        this.form.workorder_code = row.workorder_code
+      }
+    },
+    clearMaterial() {
+      this.form.material_name = null
+      this.form.material_id = null
+      this.form.material_spec = null
+      this.form.material_code = null
+    },
+    setPointName(data) {
+      var point = this.pointList.find(item => item.point_code === data)
+      this.form.point_name = point.point_name
+    },
+    hand(value) {
+      this.crud.toQuery()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-ui/src/views/wms/sch/material/material.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/material',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/material/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/material',
+    method: 'put',
+    data
+  })
+}
+
+export function getGroup(data) {
+  return request({
+    url: 'api/material/getGroup',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, getGroup }

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

@@ -214,6 +214,9 @@
           <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>
+          <el-form-item v-if="form.point_status !== '1'" label="子载具编码" prop="vehicle_code2">
+            <el-input v-model="form.vehicle_code2" clearable style="width: 370px;" />
+          </el-form-item>
           <!-- <el-form-item label="可放载具类型" prop="can_vehicle_types">
             <el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" clearable style="width: 370px;">
               <el-option
@@ -259,8 +262,9 @@
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column> -->
-        <el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" />
+        <!-- <el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" /> -->
         <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
+        <el-table-column prop="vehicle_code2" label="子载具编码" :min-width="flexWidth('vehicle_code2',crud.data,'子载具编码')" />
         <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
         <el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
           <template slot-scope="scope">