From 9a0722689f6219ea7c3372a28c32d6570bfb9a25 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Wed, 3 Sep 2025 17:45:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E9=A1=B5=E9=9D=A2=E5=B9=B6=E4=BC=98=E5=8C=96=20AGV=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增质检页面组件，实现质检相关的功能和界面
- 在 AGV 页面中添加 AGV 状态的字典标签显示
- 优化 AGV 页面的导入逻辑，减少冗余代码
---
 src/views/wms/instockPrint/agv.vue |   5 +-
 src/views/wms/instockPrint/qc.vue  | 483 +++++++++++++++++++++++++++++
 2 files changed, 487 insertions(+), 1 deletion(-)
 create mode 100644 src/views/wms/instockPrint/qc.vue

diff --git a/src/views/wms/instockPrint/agv.vue b/src/views/wms/instockPrint/agv.vue
index ea79942..1dd3130 100644
--- a/src/views/wms/instockPrint/agv.vue
+++ b/src/views/wms/instockPrint/agv.vue
@@ -113,6 +113,9 @@
         <!-- <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[12].visible">
         </el-table-column> -->
         <el-table-column label="agv状态" align="center" prop="agvStatus" v-if="columns[8].visible">
+          <template #default="scope">
+            <dict-tag :options="agv_status" :value="scope.row.agvStatus"/>
+          </template>
         </el-table-column>
         <!-- <el-table-column label="推荐库位id" align="center" prop="recommendWarehouseId" v-if="inboundStatusdVisble.value">
         </el-table-column>
@@ -202,7 +205,7 @@ import {
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { material_mategories, wms_barcode_if } = toRefs<any>(proxy?.useDict('material_mategories', 'wms_barcode_if'));
+const { material_mategories, wms_barcode_if, agv_status } = toRefs<any>(proxy?.useDict('material_mategories', 'wms_barcode_if', 'agv_status'));
 const instockPrintList = ref<InstockPrintVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
diff --git a/src/views/wms/instockPrint/qc.vue b/src/views/wms/instockPrint/qc.vue
new file mode 100644
index 0000000..df94dbf
--- /dev/null
+++ b/src/views/wms/instockPrint/qc.vue
@@ -0,0 +1,483 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <!-- <el-form-item label="入库单子表主键" prop="instockPrintId">
+              <el-input v-model="queryParams.instockPrintId" placeholder="请输入入库单子表主键" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-form-item label="入库单号" prop="instockCode">
+              <el-input v-model="queryParams.instockCode" placeholder="请输入入库单号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="批次码" prop="batchCode">
+              <el-input v-model="queryParams.batchCode" placeholder="请输入批次码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item label="条码数量" prop="materialQty">
+              <el-input v-model="queryParams.materialQty" placeholder="请输入条码数量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="分包数量" prop="apportionQty">
+              <el-input v-model="queryParams.apportionQty" placeholder="请输入分包数量" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+<!--            <el-form-item label="物料" prop="materialId">
+              <el-select v-model="queryParams.materialId" placeholder="请选择物料">
+            <el-option
+              v-for="item in materialList"
+              :key="item.materialId"
+              :label="item.materialCode"
+              :value="item.materialId"
+            />
+          </el-select>
+            </el-form-item>-->
+            <!-- <el-form-item label="物料编码" prop="materialCode">
+              <el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+<!--            <el-form-item label="物料名称" prop="materialName">
+              <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="物料规格" prop="materialSpe">
+              <el-input v-model="queryParams.materialSpe" placeholder="请输入物料规格" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="计量单位名称" prop="unitName" label-width="120px">
+              <el-input v-model="queryParams.unitName" placeholder="请输入计量单位名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="是否有条码" prop="codeYesNo" label-width="120px">-->
+<!--              <el-select v-model="queryParams.codeYesNo" placeholder="请选择物料大类">-->
+<!--            <el-option-->
+<!--                v-for="dict in wms_barcode_if"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.label"-->
+<!--                :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="物料大类" prop="materialCategoryId">-->
+<!--              <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类">-->
+
+<!--                <el-option v-for="item in mategoryOptions"-->
+<!--                           :key="item.materialCategoryId"-->
+<!--                           :label="item.materialCategoryName"-->
+<!--                           :value="item.materialCategoryId"-->
+<!--                />-->
+
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+<!--            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:instockPrint:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:instockPrint:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">-->
+<!--            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:instockPrint:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:instockPrint:export']">导出</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handlePrint">打印</el-button>
+          </el-col>-->
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="instockPrintList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="入库单子表主键" align="center" prop="instockPrintId" v-if="columns[0].visible"/> -->
+        <el-table-column label="入库单号" align="center" prop="instockCode" v-if="columns[0].visible"/>
+        <el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[1].visible"/>
+        <el-table-column label="每包数量" align="center" prop="materialQty" v-if="columns[2].visible"/>
+        <el-table-column label="条码数量" align="center" prop="apportionQty" v-if="columns[3].visible"/>
+        <!-- <el-table-column label="物料id" align="center" prop="materialId" v-if="columns[6].visible"/> -->
+        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[4].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[5].visible"/>
+        <el-table-column label="物料规格" align="center" prop="materialSpe" v-if="columns[6].visible"/>
+        <el-table-column label="计量单位名称" align="center" prop="unitName" v-if="columns[7].visible"/>
+        <!-- <el-table-column label="是否有条码" align="center" prop="codeYesNo" v-if="columns[11].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_barcode_if" :value="scope.row.codeYesNo"/>
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[12].visible">
+        </el-table-column> -->
+        <el-table-column label="质检状态" align="center" prop="inspectionType" v-if="columns[8].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_inspection_type" :value="scope.row.inspectionType"/>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="推荐库位id" align="center" prop="recommendWarehouseId" v-if="inboundStatusdVisble.value">
+        </el-table-column>
+        <el-table-column label="入库状态(0-待入库,1-已入库,2-入库中)" align="center" prop="inboundStatus" v-if="inboundStatusdVisble.value">
+          <template #default="scope">
+            <dict-tag :options="wms_inbound_status" :value="scope.row.inboundStatus"/>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="实际入库时间" align="center" prop="actualInboundTime"  width="120px" v-if="inboundStatusdVisble">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.actualInboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="质检要求" align="center" prop="inspectionRequest" v-if="columns[9].visible">
+          <template #default="scope">
+            <dict-tag :options="inspection_request" :value="scope.row.inspectionRequest"/>
+          </template>
+        </el-table-column>
+
+        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:instockPrint:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:instockPrint:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column> -->
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改入库单-物料打印条码对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="instockPrintFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="入库单子表主键" prop="instockPrintId">
+          <el-input v-model="form.instockPrintId" placeholder="请输入入库单子表主键" />
+        </el-form-item>
+        <el-form-item label="入库单号" prop="instockCode">
+          <el-input v-model="form.instockCode" placeholder="请输入入库单号" />
+        </el-form-item>
+        <el-form-item label="批次码" prop="batchCode">
+          <el-input v-model="form.batchCode" placeholder="请输入批次码" />
+        </el-form-item>
+        <el-form-item label="条码数量" prop="materialQty">
+          <el-input v-model="form.materialQty" placeholder="请输入条码数量" />
+        </el-form-item>
+        <el-form-item label="分包数量" prop="apportionQty">
+          <el-input v-model="form.apportionQty" placeholder="请输入分包数量" />
+        </el-form-item>
+        <el-form-item label="物料id" prop="materialId">
+          <el-input v-model="form.materialId" placeholder="请输入物料id" />
+        </el-form-item>
+        <el-form-item label="物料编码" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+        </el-form-item>
+        <el-form-item label="物料规格" prop="materialSpe">
+          <el-input v-model="form.materialSpe" placeholder="请输入物料规格" />
+        </el-form-item>
+        <el-form-item label="计量单位名称" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入计量单位名称" />
+        </el-form-item>
+        <el-form-item label="是否有条码" prop="codeYesNo">
+          <el-input v-model="form.codeYesNo" placeholder="请输入是否有条码" />
+        </el-form-item>
+        <el-form-item label="物料大类" prop="materialCategoryId">
+          <el-input v-model="form.materialCategoryId" placeholder="请输入物料大类" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="InstockPrint" lang="ts">
+import { listInstockPrint, getInstockPrint, delInstockPrint, addInstockPrint, updateInstockPrint, printInstockPrint } from '@/api/wms/instockPrint';
+import { InstockPrintVO, InstockPrintQuery, InstockPrintForm } from '@/api/wms/instockPrint/types';
+import {
+  getMaterialList
+} from '@/api/wms/linkage'
+
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { material_mategories, wms_barcode_if, inspection_request,wms_inspection_type } = toRefs<any>(proxy?.useDict('material_mategories', 'wms_barcode_if', 'inspection_request', 'wms_inspection_type'));
+const instockPrintList = ref<InstockPrintVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const vos = ref<Array<InstockPrintVO>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const materialList = ref([]);
+const queryFormRef = ref<ElFormInstance>();
+const instockPrintFormRef = ref<ElFormInstance>();
+
+
+
+const initFormData: InstockPrintForm = {
+  instockPrintId: undefined,
+  instockCode: undefined,
+  batchCode: undefined,
+  materialQty: undefined,
+  apportionQty: undefined,
+  materialId: undefined,
+  materialCode: undefined,
+  materialName: undefined,
+  materialSpe: undefined,
+  unitName: undefined,
+  codeYesNo: undefined,
+  materialCategoryId: undefined,
+  materialCategoryName: undefined,
+  locationId: undefined,
+  inboundStatus: undefined,
+  actualInboundTime: undefined,
+  createTime: undefined,
+  inspectionRequest: '0',
+  inspectionType: undefined,
+}
+
+const data = reactive<PageData<InstockPrintForm, InstockPrintQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    instockPrintId: undefined,
+    instockCode: undefined,
+    batchCode: undefined,
+    materialQty: undefined,
+    apportionQty: undefined,
+    materialId: undefined,
+    materialCode: undefined,
+    materialName: undefined,
+    materialSpe: undefined,
+    unitName: undefined,
+    codeYesNo: undefined,
+    materialCategoryId: undefined,
+    materialCategoryName: undefined,//字段映射
+    locationId: undefined,
+    inboundStatus: undefined,
+    actualInboundTime: undefined,
+    createTime: undefined,
+    inspectionRequest: '0',
+    inspectionType: undefined,
+    params: {
+    }
+  },
+  rules: {
+    // instockPrintId: [
+    //   { required: true, message: "入库单子表主键不能为空", trigger: "blur" }
+    // ],
+    // instockCode: [
+    //   { required: true, message: "入库单号不能为空", trigger: "blur" }
+    // ],
+    // batchCode: [
+    //   { required: true, message: "批次码不能为空", trigger: "blur" }
+    // ],
+    // materialQty: [
+    //   { required: true, message: "条码数量不能为空", trigger: "blur" }
+    // ],
+    // apportionQty: [
+    //   { required: true, message: "分包数量不能为空", trigger: "blur" }
+    // ],
+    // materialId: [
+    //   { required: true, message: "物料id不能为空", trigger: "blur" }
+    // ],
+    // materialCode: [
+    //   { required: true, message: "物料编码不能为空", trigger: "blur" }
+    // ],
+    // materialName: [
+    //   { required: true, message: "物料名称不能为空", trigger: "blur" }
+    // ],
+    // materialSpe: [
+    //   { required: true, message: "物料规格不能为空", trigger: "blur" }
+    // ],
+    // unitName: [
+    //   { required: true, message: "计量单位名称不能为空", trigger: "blur" }
+    // ],
+    // codeYesNo: [
+    //   { required: true, message: "是否有条码不能为空", trigger: "blur" }
+    // ],
+    // materialCategoryId: [
+    //   { required: true, message: "物料大类不能为空", trigger: "blur" }
+    // ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+
+// 获取路由实例
+const route = useRoute();
+// 控制入库状态相关列的显示
+const inboundStatusdVisble = ref(false);
+// 初始化时获取路由参数并设置到查询表单
+let routeInboundStatusValue = '';
+if (route.query.inboundStatus ) {
+  // 确保值是字符串类型，如果是数组则取第一个元素
+  const inboundStatusdValue = Array.isArray(route.query.inboundStatus )
+    ? route.query.inboundStatus[0]
+    : route.query.inboundStatus;
+  queryParams.value.inboundStatus = inboundStatusdValue;
+  routeInboundStatusValue = inboundStatusdValue; // 保存路由参数值
+  // 设置入库状态相关列显示
+  inboundStatusdVisble.value = true;
+}
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  // { key: 0, label: `入库单子表主键`, visible: true },
+  { key: 0, label: `入库单号`, visible: true },
+  { key: 1, label: `批次码`, visible: true },
+  { key: 2, label: `每包数量`, visible: true },
+  { key: 3, label: `条码数量`, visible: true },
+  // { key: 6, label: `物料`, visible: false },
+  { key: 4, label: `物料编码`, visible: true },
+  { key: 5, label: `物料名称`, visible: true },
+  { key: 6, label: `物料规格`, visible: true },
+  { key: 7, label: `计量单位名称`, visible: true },
+  // { key: 9, label: `是否有条码`, visible: false },
+  // { key: 10, label: `物料大类`, visible: false },
+  { key: 8, label: `质检状态`, visible: true },
+  { key: 9, label: `质检要求`, visible: true },
+  // { key: 13, label: `推荐库位id`, visible: inboundStatusdVisble.value },
+  // { key: 14, label: `入库状态(0-待入库,1-已入库,2-入库中)`, visible: inboundStatusdVisble.value },
+  // { key: 15, label: `实际入库时间`, visible: inboundStatusdVisble.value },
+]);
+
+/** 查询入库单-物料打印条码列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listInstockPrint(queryParams.value);
+  instockPrintList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  queryParams.value.inboundStatus = routeInboundStatusValue;
+  instockPrintFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  queryParams.value.inboundStatus = routeInboundStatusValue;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  queryParams.value.inboundStatus = routeInboundStatusValue;
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: InstockPrintVO[]) => {
+  vos.value = selection
+  console.log(vos.value)
+  ids.value = selection.map(item => item.instockPrintId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加入库单-物料打印条码";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: InstockPrintVO) => {
+  reset();
+  const _instockPrintId = row?.instockPrintId || ids.value[0]
+  const res = await getInstockPrint(_instockPrintId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改入库单-物料打印条码";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  instockPrintFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.instockPrintId) {
+        await updateInstockPrint(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addInstockPrint(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: InstockPrintVO) => {
+  const _instockPrintIds = row?.instockPrintId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除入库单-物料打印条码编号为"' + _instockPrintIds + '"的数据项？').finally(() => loading.value = false);
+  await delInstockPrint(_instockPrintIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+/** 打印按钮操作 */
+const handlePrint = async (row?: InstockPrintVO) => {
+  console.log(vos.value)
+  const _instockPrintVOs = vos.value;
+  // await proxy?.$modal.confirm('是否确认删除入库单-物料打印条码编号为"' + _instockPrintIds + '"的数据项？').finally(() => loading.value = false);
+  await printInstockPrint({'vos':_instockPrintVOs});
+  // proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/instockPrint/export', {
+    ...queryParams.value
+  }, `instockPrint_${new Date().getTime()}.xlsx`)
+}
+
+let mategoryOptions = ref([]);
+const getMaterialCategorySelect = async () => {
+  const res = await getBaseMaterialCategoryListInWMS(null);
+  mategoryOptions.value = res.data;
+};
+
+onMounted(() => {
+
+  getMaterialList().then(e => {
+    materialList.value = e.data
+  })
+  getList();
+  getMaterialCategorySelect();
+});
+</script>