物料、组盘前端界面

wms/qd/src/api/wms/sch/point.js

@@ -39,4 +39,12 @@ export function syncStruct() {
   })
 }
 
-export default { add, edit, del, changeActive, syncStruct }
+export function getPointStatu(data) {
+  return request({
+    url: 'api/point/getPointStatu',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, changeActive, syncStruct, getPointStatu }

wms/qd/src/views/wms/database/material/index.vue

@@ -11,8 +11,8 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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="500px">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
           <el-form-item label="物料编码" prop="material_code">
             <el-input v-model="form.material_code" style="width: 370px;" />
           </el-form-item>
@@ -36,6 +36,29 @@
           <el-form-item label="是否启用" prop="is_used">
             <el-radio v-for="item in dict.is_active" :key="item.id" v-model="form.is_used" :label="item.value">{{ item.label }}</el-radio>
           </el-form-item>
+          <el-form-item label="是否人工打包" prop="is_manmade">
+            <el-radio v-for="item in dict.is_active" :key="item.id" v-model="form.is_manmade" :label="item.value">{{ item.label }}</el-radio>
+          </el-form-item>
+          <el-form-item label="码垛数量" prop="palletize_num">
+            <el-input-number v-model="form.palletize_num" controls-position="right" :min="0" :max="9999" />
+          </el-form-item>
+          <el-form-item label="托盘类型" prop="vehicle_type">
+            <el-select
+              v-model="form.vehicle_type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 250px;"
+            >
+              <el-option
+                v-for="item in dict.MD_EVEHICLE_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item v-if="false" label="外部标识">
             <el-input v-model="form.ext_id" style="width: 370px;" />
           </el-form-item>
@@ -73,6 +96,24 @@
             />
           </template>
         </el-table-column>
+        <el-table-column prop="is_used" label="是否人工打包" width="100px">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.is_manmade"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              active-value="1"
+              inactive-value="0"
+              @change="changeEnabledManmade(scope.row, scope.row.is_manmade)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="palletize_num" label="码垛数量" />
+        <el-table-column prop="vehicle_type" label="托盘类型">
+          <template slot-scope="scope">
+            {{ dict.label.MD_EVEHICLE_TYPE[scope.row.vehicle_type] }}
+          </template>
+        </el-table-column>
         <el-table-column v-if="false" prop="ext_id" label="外部标识" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
@@ -97,12 +138,32 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 
-const defaultForm = { material_id: null, material_code: null, material_name: null, material_spec: null, material_model: null, english_name: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_used: '1', is_delete: null, ext_id: null, stewing_time: null }
+const defaultForm = {
+  material_id: null,
+  material_code: null,
+  material_name: null,
+  material_spec: null,
+  material_model: null,
+  english_name: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  is_used: '1',
+  is_delete: null,
+  is_manmade: '1',
+  vehicle_type: null,
+  palletize_num: '1',
+  ext_id: null,
+  stewing_time: null
+}
 export default {
   name: 'MdMeMaterial',
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['is_active', 'is_used'],
+  dicts: ['is_active', 'is_used', 'MD_EVEHICLE_TYPE'],
   cruds() {
     return CRUD({ title: '物料', url: 'api/mdMeMaterial', idField: 'material_id', sort: 'material_id,desc', crudMethod: { ...crudMdMeMaterial },
       optShow: {
@@ -117,7 +178,7 @@ export default {
     return {
       permission: {
       },
-      rules: {
+      rules: { // 表单验证
         material_code: [
           { required: true, message: '物料编码不能为空', trigger: 'blur' }
         ],
@@ -127,6 +188,15 @@ export default {
         is_used: [
           { required: true, message: '是否启用不能为空', trigger: 'blur' }
         ],
+        is_manmade: [
+          { required: true, message: '是否人工打包不能为空', trigger: 'blur' }
+        ],
+        palletize_num: [
+          { required: true, message: '码垛数量不能为空', trigger: 'blur' }
+        ],
+        vehicle_type: [
+          { required: true, message: '托盘类型不能为空', trigger: 'blur' }
+        ],
         stewing_time: [
           { required: true, message: '静止时间不能为空', trigger: 'blur' }
         ]
@@ -168,6 +238,37 @@ export default {
         }
       })
     },
+    // 改变人工打包状态
+    changeEnabledManmade(data, val) {
+      debugger
+      this.$confirm('此操作将 "' + (val === 1 ? '切换人工打包' : '切换机器打包') + '"' + data.material_code + ', 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        crudMdMeMaterial.edit(data).then(res => {
+          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          debugger
+          if (data.is_manmade === '0') {
+            data.is_manmade = '1'
+            return
+          }
+          if (data.is_manmade === '1') {
+            data.is_manmade = '0'
+          }
+        })
+      }).catch(() => {
+        debugger
+        if (data.is_manmade === '0') {
+          data.is_manmade = '1'
+          return
+        }
+        if (data.is_manmade === '1') {
+          data.is_manmade = '0'
+        }
+      })
+    },
     handleChange(value) {
       console.log(value)
     }

wms/qd/src/views/wms/sch/point/index.vue

@@ -121,17 +121,31 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
+        <template slot="right">
-          slot="right"
+          <el-button
-          class="filter-item"
+            slot="right"
-          type="info"
+            class="filter-item"
-          :loading="syncLoading"
+            type="info"
-          icon="el-icon-refresh"
+            :loading="syncLoading"
-          size="mini"
+            icon="el-icon-refresh"
-          @click="sync()"
+            size="mini"
-        >
+            @click="sync()"
-          仓位同步
+          >
-        </el-button>
+            仓位同步
+          </el-button>
+          <el-button
+            slot="right"
+            class="filter-item"
+            type="primary"
+            :disabled="crud.selections.length === 0"
+            :loading="syncLoading"
+            icon="el-icon-refresh"
+            size="mini"
+            @click="updateStatu"
+          >
+            更新状态
+          </el-button>
+        </template>
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -288,7 +302,7 @@
 </template>
 
 <script>
-import crudPoint, { changeActive } from '@/api/wms/sch/point'
+import crudPoint, { changeActive, getPointStatu } from '@/api/wms/sch/point'
 import crudDevice from '@/api/wms/pdm/device'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
@@ -414,6 +428,11 @@ export default {
       }).catch(err => {
         console.log(err.response.data.message)
       })
+    },
+    updateStatu() {
+      getPointStatu(this.crud.selections).then(res => {
+        console.log('res')
+      })
     }
   }
 }

wms/qd/src/views/wms/st/buss/vehiclegroup/index.vue

@@ -0,0 +1,118 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <label class="el-form-item-label" />
+        <el-input v-model="query.name" clearable placeholder="输入名称或编码" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <rrOperation :crud="crud" />
+      </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="550px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
+          <el-form-item label="托盘编码" prop="vehicle_code">
+            <el-input v-model="form.vehicle_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item v-if="false" label="物料id">
+            <el-input v-model="form.material_id" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item v-if="false" label="物料编码">
+            <el-input v-model="form.material_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="物料" prop="material_name">
+            <label slot="label">物&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;料</label>
+            <el-input v-model="form.material_name" style="width: 370px;" @focus="getMater" />
+          </el-form-item>
+          <el-form-item label="批次">
+            <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
+            <el-input v-model="form.pcsn" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="数量">
+            <label slot="label">数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</label>
+            <el-input v-model="form.qty" style="width: 370px;" />
+          </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>
+      <MaterDialog :dialog-show.sync="materDialog" :dialog-matertype="materType" @tableChanged3="tableChanged3" />
+    </div>
+    <!--分页组件-->
+    <pagination />
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import pagination from '@crud/Pagination'
+import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
+import crudMdMeMaterial from '@/api/wms/database/mdMeMaterial'
+import MaterDialog from '../../in/MaterDialog'
+
+const defaultForm = {
+  group_id: null,
+  vehicle_code: null,
+  material_id: null,
+  material_code: null,
+  material_name: null,
+  pcsn: null,
+  qty: null
+}
+
+export default {
+  name: 'Vehiclegroup',
+  components: { pagination, crudOperation, rrOperation, MaterDialog },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({ title: '物料', url: 'api/mdMeMaterial', idField: 'material_id', sort: 'material_id,desc', crudMethod: { ...crudMdMeMaterial },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }})
+  },
+  data() {
+    return {
+      permission: {},
+      rules: {
+        vehicle_code: [
+          { required: true, message: '托盘编码不能为空', trigger: 'blur' }
+        ],
+        material_name: [
+          { required: true, message: '物料不能为空', trigger: 'change' }
+        ]
+      },
+      materDialog: false,
+      materType: ''
+    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    // 打开选择物料对话框
+    getMater() {
+      this.materDialog = true
+    },
+    tableChanged3(row) {
+      console.log(row)
+      this.form.material_id = row.material_id
+      this.form.material_code = row.material_code
+      this.form.material_name = row.material_name
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>