现场调试更改

ruoyi-ui/src/api/bas/cargospace.js

@@ -52,3 +52,13 @@ export function delCargospace(cargoSpaceId) {
 }
 
 
+// 指定货位出库
+export function stockoutByManual(cargoSpaceId) {
+  return request({
+    url: '/api/wmsService/wcs/stockoutByManual',
+    method: 'post',
+    data: { cargoSpaceId: cargoSpaceId } 
+  })
+}
+
+

ruoyi-ui/src/api/in/bindTrayMsg.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询入库信息列表
+export function listBindTrayMsg(query) {
+  return request({
+    url: '/in/bindMsg/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询入库信息详细
+export function getBindTrayMsg(id) {
+  return request({
+    url: '/in/bindMsg/' + id,
+    method: 'get'
+  })
+}
+
+// 新增入库信息
+export function addBindTrayMsg(data) {
+  return request({
+    url: '/pda/bindMsg',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改入库信息
+export function updateBindTrayMsg(data) {
+  return request({
+    url: '/in/bindMsg',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除入库信息
+export function delBindTrayMsg(id) {
+  return request({
+    url: '/in/bindMsg/' + id,
+    method: 'delete'
+  })
+}
+
+// 删除入库信息
+export function delBindTrayMsgByRollerNumber(rollerNumbers) {
+  return request({
+    url: '/in/bindMsg/delete/' + rollerNumbers,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/bas/cargospace/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="仓库id" prop="warehouseId">
+      <el-form-item label="货位id" prop="cargoSpaceId">
         <el-input
-          v-model="queryParams.warehouseId"
-          placeholder="请输入仓库id"
+          v-model="queryParams.cargoSpaceId"
+          placeholder="请输入货位id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -83,22 +83,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="重量" prop="theWeight">
-        <el-input
-          v-model="queryParams.theWeight"
-          placeholder="请输入重量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="高度" prop="theHeight">
         <el-input
           v-model="queryParams.theHeight"
@@ -120,8 +104,8 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          @click="handleAdd"
-          v-hasPermi="['bas:cargospace:add']"
+          @click="stockoutByManualHandle"
+          :disabled="multiple"
         >指定货位出库</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -190,8 +174,6 @@
         </template>
       </el-table-column>
       <el-table-column label="托盘条码" align="center" prop="trayCode" />
-      <el-table-column label="部门名称" align="center" prop="deptName" />
-      <el-table-column label="重量" align="center" prop="theWeight" />
       <el-table-column label="高度" align="center" prop="theHeight" />
       <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -226,8 +208,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="仓库id" prop="warehouseId">
-              <el-input v-model="form.warehouseId" placeholder="请输入仓库id" />
+            <el-form-item label="货位id" prop="cargoSpaceId">
+              <el-input v-model="form.cargoSpaceId" placeholder="请输入货位id" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -343,7 +325,7 @@
 </template>
 
 <script>
-import { listCargospace, getCargospace, delCargospace, addCargospace, updateCargospace } from "@/api/bas/cargospace"
+import { listCargospace, getCargospace, delCargospace, addCargospace, updateCargospace, stockoutByManual } from "@/api/bas/cargospace"
 
 export default {
   name: "Cargospace",
@@ -372,6 +354,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        cargoSpeceId: null,
         warehouseId: null,
         roadwayId: null,
         cargoAreaId: null,
@@ -396,6 +379,9 @@ export default {
         roadwayId: [
           { required: true, message: "巷道id不能为空", trigger: "blur" }
         ],
+        cargoSpaceId: [
+          { required: true, message: "货位id不能为空", trigger: "blur" }
+        ],
         cargoSpaceName: [
           { required: true, message: "货位名称不能为空", trigger: "blur" }
         ],
@@ -476,9 +462,29 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.cargoSpaceId)
+      this.cargoSpaces = selection.map(item => item.cargoSpaceId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+
+    stockoutByManualHandle() {
+      if (!this.cargoSpaces || this.cargoSpaces.length === 0) {
+        this.$modal.msgWarning("请至少选择一个货位执行手动出库操作");
+        return;
+      }
+
+      const cargoSpaceId = this.ids[0]
+      var data ={
+        cargoSpaceId: cargoSpaceId
+      }
+      this.$modal.confirm('是否确认将货位编号为"' + cargoSpaceId + '"货位库存手动出库？').then(() => {
+        return stockoutByManual(cargoSpaceId)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("操作成功")
+      }).catch(() => {})
+    },
+
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()

ruoyi-ui/src/views/in/bindTrayMsg/index.vue

@@ -0,0 +1,438 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="入库主单" prop="stockinId">
+        <el-input
+          v-model="queryParams.stockinId"
+          placeholder="请输入入库主单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入库子单" prop="stockinDetailId">
+        <el-input
+          v-model="queryParams.stockinDetailId"
+          placeholder="请输入入库子单码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="托盘码" prop="trayCode">
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料编码" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="版辊编号" prop="rollerNumber">
+        <el-input
+          v-model="queryParams.rollerNumber"
+          placeholder="请输入版辊编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入库数量" prop="quantity">
+        <el-input
+          v-model="queryParams.quantity"
+          placeholder="请输入入库数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户编码" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门编码" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="颜色" prop="color">
+        <el-input
+          v-model="queryParams.color"
+          placeholder="请输入颜色"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['in:bindMsg:add']"
+        >新增</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['in:bindTrayMsg:edit']"
+        >修改</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['in:bindMsg:remove']"
+        >删除</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['in:bindTrayMsg:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="bindTrayMsgList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="托盘码" align="center" prop="trayCode" />
+      <el-table-column label="入库主单" align="center" prop="stockinId" />
+      <el-table-column label="入库子单" align="center" prop="stockinDetailId" />
+      <el-table-column label="物料编码" align="center" prop="productId" />
+      <el-table-column label="版辊编号" align="center" prop="rollerNumber" />
+      <el-table-column label="入库数量" align="center" prop="quantity" />
+      <el-table-column label="用户编码" align="center" prop="userId" />
+      <el-table-column label="部门编码" align="center" prop="deptId" />
+      <el-table-column label="托盘类型" align="center" prop="trayType" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.in_tray_msg_status" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="${comment}" align="center" prop="jobId" />
+      <el-table-column label="${comment}" align="center" prop="jobDetailId" /> -->
+      <!-- <el-table-column label="${comment}" align="center" prop="supplierId" />
+      <el-table-column label="${comment}" align="center" prop="spec" />
+      <el-table-column label="${comment}" align="center" prop="rollerNumber" />
+      <el-table-column label="${comment}" align="center" prop="diameter" />
+      <el-table-column label="${comment}" align="center" prop="splicingLength" />
+      <el-table-column label="${comment}" align="center" prop="plugHole" /> -->
+      <el-table-column label="颜色" align="center" prop="color" />
+      <!-- <el-table-column label="${comment}" align="center" prop="productName" />
+      <el-table-column label="${comment}" align="center" prop="warehouseName" />
+      <el-table-column label="${comment}" align="center" prop="userName" />
+      <el-table-column label="${comment}" align="center" prop="deptName" />
+      <el-table-column label="${comment}" align="center" prop="supplierName" /> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['in:bindMsg:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['in:bindMsg:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改入库信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="托盘码" prop="trayCode">
+              <el-input v-model="form.trayCode" placeholder="请输入托盘码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="版辊编号" prop="rollerNumber">
+              <el-input v-model="form.rollerNumber" placeholder="请输入版辊编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="入库数量" prop="quantity">
+              <el-input v-model="form.quantity" disabled placeholder="1" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBindTrayMsg, getBindTrayMsg, delBindTrayMsg, delBindTrayMsgByRollerNumber, addBindTrayMsg, updateBindTrayMsg } from "@/api/in/bindTrayMsg"
+import { data } from "vue-barcode";
+
+export default {
+  name: "BindTrayMsg",
+  dicts: ['in_tray_msg_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 入库信息表格数据
+      bindTrayMsgList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        trayCode: null,
+        stockinDetailId: null,
+        productId: null,
+        quantity: null,
+        warehouseId: null,
+        userId: null,
+        deptId: null,
+        trayType: null,
+        trayLocation: null,
+        status: null,
+        jobId: null,
+        jobDetailId: null,
+        stockinId: null,
+        supplierId: null,
+        spec: null,
+        rollerNumber: null,
+        diameter: null,
+        splicingLength: null,
+        plugHole: null,
+        colorSequence: null,
+        color: null,
+        productName: null,
+        warehouseName: null,
+        userName: null,
+        deptName: null,
+        supplierName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "$comment不能为空", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询入库信息列表 */
+    getList() {
+      this.loading = true
+      listBindTrayMsg(this.queryParams).then(response => {
+        this.bindTrayMsgList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        trayCode: null,
+        stockinDetailId: null,
+        productId: null,
+        quantity: null,
+        warehouseId: null,
+        userId: null,
+        deptId: null,
+        createTime: null,
+        trayType: null,
+        trayLocation: null,
+        status: null,
+        jobId: null,
+        jobDetailId: null,
+        stockinId: null,
+        supplierId: null,
+        spec: null,
+        rollerNumber: null,
+        diameter: null,
+        splicingLength: null,
+        plugHole: null,
+        colorSequence: null,
+        color: null,
+        productName: null,
+        warehouseName: null,
+        userName: null,
+        deptName: null,
+        supplierName: null
+      }
+      this.resetForm("form")
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      // this.ids = selection.map(item => item.id)
+      this.rollerNumbers = selection.map(item => item.rollerNumber)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = "添加入库信息"
+    },
+
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getBindTrayMsg(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = "修改入库信息"
+      })
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      if (!this.form.trayCode) {
+          this.$modal.msg('请输入托盘号')
+          return
+      }
+
+      if (!this.form.rollerNumber) {
+        this.$modal.msg('请输入版辊编号')
+        return
+      }
+
+      var data = {
+        trayCode: this.form.trayCode,
+        rollerNumber: this.form.rollerNumber,
+        quantity: this.form.quantity,
+      }
+      
+      addBindTrayMsg(data).then(() => {
+        this.$modal.msgSuccess("新增成功")
+        this.open = false
+        this.getList()
+      }).catch(() => {})
+         
+    },
+
+    /** 删除按钮操作 */
+    // handleDelete(row) {
+    //   // 统一将单条数据转为数组，方便后端 String[] 接收
+    //   const ids = row.id || row.ids;
+
+    //   this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then(function() {
+    //     return delBindTrayMsg(ids)
+    //   }).then(() => {
+    //     this.getList()
+    //     this.$modal.msgSuccess("删除成功")
+    //   }).catch(() => {})
+    // },
+    handleDelete(row) {
+      // 统一将单条数据转为数组，方便后端 String[] 接收
+      const rollerNumbers = row.rollerNumber ? [row.rollerNumber] : this.rollerNumbers;
+console.log(row)
+console.log(rollerNumbers)
+      this.$modal.confirm('是否确认删除版辊编号为"' + rollerNumbers.join(",") + '"的数据项？').then(() => {
+        return delBindTrayMsgByRollerNumber(rollerNumbers)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {
+        this.getList()
+      })
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('in/bindTrayMsg/export', {
+        ...this.queryParams
+      }, `bindTrayMsg_${new Date().getTime()}.xlsx`)
+    },
+
+
+  }
+}
+</script>