rev:载具维护异常

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/controller/MdPbVehicleMaterController.java

@@ -2,11 +2,17 @@ package org.nl.wms.md_manage.vehicleMater.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.domain.exception.BadRequestException;
+import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
+import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
 import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
 import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
 import org.nl.wms.md_manage.vehicleMater.service.dto.VehicleMaterQuery;
@@ -34,6 +40,8 @@ public class MdPbVehicleMaterController {
 
     @Autowired
     private IMdPbVehicleMaterService iMdPbVehicleMaterService;
+    @Autowired
+    private IMdMeMaterialbaseService materialbaseService;
 
 
     @GetMapping()
@@ -41,6 +49,24 @@ public class MdPbVehicleMaterController {
         return new ResponseEntity<>(TableDataInfo.build(iMdPbVehicleMaterService.page(page.build(), query.build())), HttpStatus.OK);
     }
 
+    @GetMapping("/getMaterialByVehicle/{vehicle_code}")
+    public ResponseEntity<Object> getMaterialByVehicle(@PathVariable String vehicle_code) {
+        LambdaQueryWrapper<MdPbVehicleMater> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MdPbVehicleMater::getVehicle_code, vehicle_code);
+        MdPbVehicleMater one = iMdPbVehicleMaterService.getOne(lqw);
+        JSONObject res = new JSONObject();
+        res.put("vehicle_code", vehicle_code);
+        if (ObjectUtil.isNotEmpty(one)) {
+            MdMeMaterialbase materialbase = materialbaseService.getById(one.getMaterial_id());
+            res.put("material_id", one.getMaterial_id());
+            res.put("pcsn", one.getPcsn());
+            res.put("material_code", materialbase.getMaterial_code());
+            res.put("storage_qty", one.getQty());
+            res.put("material_spec", materialbase.getMaterial_spec());
+        }
+        return new ResponseEntity<>(res, HttpStatus.OK);
+    }
+
     @GetMapping("getVehicleMater/{code}")
     public ResponseEntity<Object> vehicleInfo(@PathVariable String code) {
         List<MdPbVehicleMater> dick_code = iMdPbVehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>()
@@ -57,6 +83,26 @@ public class MdPbVehicleMaterController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/updateVehicleMaterial")
+    public ResponseEntity<Object> updateVehicleMaterial(@RequestBody JSONObject req) {
+        String vehicle_code = req.getString("vehicle_code");
+        Assert.notBlank(vehicle_code);
+        LambdaQueryWrapper<MdPbVehicleMater> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MdPbVehicleMater::getVehicle_code, vehicle_code);
+        MdPbVehicleMater one = iMdPbVehicleMaterService.getOne(lqw);
+        if (ObjectUtil.isEmpty(one)) {
+            throw new BadRequestException("载具物料表中不存在该载具信息!");
+        }
+        MdMeMaterialbase materialbase = materialbaseService.getOne(new LambdaQueryWrapper<MdMeMaterialbase>().eq(MdMeMaterialbase::getMaterial_code, req.getString("material_code")));
+        MdPbVehicleMater mater = new MdPbVehicleMater();
+        mater.setId(one.getId());
+        mater.setMaterial_id(materialbase.getMaterial_id());
+        mater.setPcsn(req.getString("pcsn"));
+        mater.setQty(req.getBigDecimal("storage_qty"));
+        iMdPbVehicleMaterService.updateById(mater);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
 
 }
 

wms_pro/qd/src/views/wms/base_manage/vehicle/MaterDialog.vue

@@ -0,0 +1,213 @@
+<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="物料类别">
+        <treeselect
+          v-model="query.material_type_id"
+          :load-options="loadClass"
+          :options="classes"
+          style="width: 200px;"
+          placeholder="选择物料类别"
+        />
+      </el-form-item>
+      <el-form-item label="模糊搜索">
+        <el-input
+          v-model="query.search"
+          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
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @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="物料编码" min-width="150" show-overflow-tooltip />
+      <el-table-column prop="material_name" label="物料名称" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="material_spec" label="规格" show-overflow-tooltip />
+      <el-table-column prop="material_model" label="型号" />
+      <el-table-column prop="class_code" label="分类编码" />
+      <el-table-column prop="class_name" label="物料分类" />
+      <el-table-column prop="single_weight" label="物料单重" />
+      <el-table-column
+        show-overflow-tooltip
+        min-width="100"
+        prop="product_series_name"
+        label="系列"
+      />
+      <el-table-column prop="unit_name" label="计量单位" />
+    </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 crudMaterialbase from '@/views/wms/base_manage/material/material'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudClassstandard from '@/views/wms/base_manage/class_standard/classstandard'
+
+export default {
+  name: 'MaterDtl',
+  components: { rrOperation, pagination, Treeselect },
+  cruds() {
+    return CRUD({ title: '物料', url: 'api/bmMaterial', crudMethod: { ...crudMaterialbase }, optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  dicts: ['product_series'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    },
+    materOptCode: {
+      type: String,
+      default: '00'
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      class_idStr: null,
+      checkrow: null,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    seriesFormat(row) {
+      return this.dict.label.product_series[row.product_series]
+    },
+    open() {
+      const param = {
+        'materOpt_code': this.materOptCode
+      }
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    handleSelectionChange(val, row) {
+      if (this.isSingle) {
+        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.dialogVisible = false
+        this.$emit('update:dialogShow', false)
+        this.$emit('setMaterValue', 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('setMaterValue', this.rows)
+    },
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+

wms_pro/qd/src/views/wms/base_manage/vehicle/index.vue

@@ -81,8 +81,9 @@
           </el-form-item>
           <el-form-item label="物料编码" prop="material_code">
             <template slot-scope="scope">
-              <el-input v-model="materialForm.material_code" clearable style="width: 370px" @clear="materialForm.material_id='',materialForm.material_code='',materialForm.material_name='',materialForm.material_spec=''">
+              <el-input v-model="materialForm.material_code" clearable style="width: 370px"
-                <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
+                        @clear="materialForm.material_id='',materialForm.material_code='',materialForm.material_name='',materialForm.material_spec=''">
+                <el-button slot="append" icon="el-icon-plus" @click="queryMater"/>
               </el-input>
             </template>
           </el-form-item>
@@ -92,8 +93,8 @@
           <el-form-item label="物料数量" prop="storage_qty">
             <el-input v-model="materialForm.storage_qty" clearable style="width: 370px;"/>
           </el-form-item>
-          <el-form-item label="物料重量" prop="weight">
+          <el-form-item label="批    次" prop="pcsn">
-            <el-input v-model="materialForm.weight" clearable style="width: 370px;" />
+            <el-input v-model="materialForm.pcsn" clearable style="width: 370px;"/>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -275,7 +276,9 @@
           fixed="right"
         >
           <template slot-scope="scope">
-            <el-button icon="el-icon-position" type="text" class="filter-item" size="mini" @click="updateweight(scope.row)">修改</el-button>
+            <el-button icon="el-icon-position" type="text" class="filter-item" size="mini"
+                       @click="updateweight(scope.row)">修改
+            </el-button>
 
             <udOperation
               :data="scope.row"
@@ -287,12 +290,12 @@
         </el-table-column>
       </el-table>
       <!--      分页组件-->
-      <!--      <MaterDtl-->
+      <MaterDtl
-      <!--        :dialog-show.sync="materialShow"-->
+        :dialog-show.sync="materialShow"
-      <!--        :is-single="true"-->
+        :is-single="true"
-      <!--        :mater-opt-code="materType"-->
+        :mater-opt-code="materType"
-      <!--        @setMaterValue="setMaterValue"-->
+        @setMaterValue="setMaterValue"
-      <!--      />-->
+      />
       <pagination/>
     </div>
   </div>
@@ -306,7 +309,7 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import {getLodop} from '@/assets/js/lodop/LodopFuncs'
-// import MaterDtl from '@/views/wms/pub/MaterDialog'
+import MaterDtl from './MaterDialog'
 
 const defaultForm = {
   vehicle_code: null,
@@ -331,7 +334,7 @@ const defaultForm = {
 export default {
   name: 'Storagevehicleinfo',
   dicts: ['storagevehicle_type', "VEHICLE_OVER_TYPE"],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: {pagination, crudOperation, rrOperation, udOperation, MaterDtl},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -408,25 +411,24 @@ export default {
     onCloseDialog() {
       this.form = defaultForm
     },
-    queryMater(index, row) {
+    queryMater() {
       this.materialShow = true
     },
     setMaterValue(row) {
       this.$set(this.materialForm, 'material_code', row.material_code)
-      this.$set(this.materialForm, 'material_spec', row.material_spec)
+      this.$set(this.materialForm, 'material_id', row.material_id)
+      this.$set(this.materialForm, 'material_code', row.material_code)
     },
     materiValueCancel() {
       this.updateForm = {}
       this.pointMVisible = false
+      this.dialogVisible = false
     },
     materiValueSubmit() {
-      console.log(this.updateForm)
+      crudStoragevehicleinfo.updateVehicleMaterial(this.materialForm).then(res => {
-      // crudStoragevehicleinfo.updateVehicleMaterial(this.materialForm).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      //   this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.materiValueCancel()
-      //   this.materiValueCancel()
+      })
-      // }).catch(() => {
-      //
-      // })
     },
     hand(value) {
       this.crud.toQuery()
@@ -499,9 +501,9 @@ export default {
       }
     },
     toView(row) {
-      crudStoragevehicleinfo.vehileInfo(row).then(data => {
       this.dialogVisible = true
-        this.materialForm = data
+      crudStoragevehicleinfo.getMaterialByVehicle(row).then(res => {
+        this.materialForm = res
       })
     },
     updateweight(row) {

wms_pro/qd/src/views/wms/base_manage/vehicle/vehicle.js

@@ -38,6 +38,7 @@ export function getVehicle(code) {
     method: 'get'
   })
 }
+
 export function vehileInfo(data) {
   return request({
     url: 'api/bmVehicleInfo/vehicleInfo?vehicle_code=' + data,
@@ -47,10 +48,17 @@ export function vehileInfo(data) {
 
 export function updateVehicleMaterial(data) {
   return request({
-    url: 'api/bmVehicleInfo/updateVehicleMaterial',
+    url: 'api/MdPbVehicleMater/updateVehicleMaterial',
     method: 'post',
     data
   })
 }
 
-export default { add, edit, del, changeActive, getVehicle, vehileInfo, updateVehicleMaterial }
+export function getMaterialByVehicle(vehicle_code) {
+  return request({
+    url: 'api/MdPbVehicleMater/getMaterialByVehicle/' + vehicle_code,
+    method: 'get'
+  })
+}
+
+export default {add, edit, del, changeActive, getMaterialByVehicle, getVehicle, vehileInfo, updateVehicleMaterial}