yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ feat(mes): 添加销售出库单相关字段及逻辑优化 

新增出库日期、发货通知单ID、发货通知单编号、客户编码、承运商和运输单号字段，优化了相关数据结构和逻辑，提升了销售出库单的功能完整性和数据准确性。
pull/871/MERGE
YunaiV 2026-03-02 11:12:12 +08:00
parent 2242a13401
commit 10d5510885
6 changed files with 135 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/utils/dict.ts
View File

@ -302,4 +302,5 @@ export enum DICT_TYPE {
MES_WM_RETURN_ISSUE_TYPE = 'mes_wm_return_issue_type', // MES 退料类型
MES_WM_PRODUCT_RECPT_STATUS = 'mes_wm_product_receipt_status', // MES 成品入库单状态
MES_WM_RETURN_SALES_STATUS = 'mes_wm_return_sales_status', // MES 销售退货单状态
MES_WM_PRODUCT_SALES_STATUS = 'mes_wm_product_sales_status', // MES 销售出库单状态
}

16
src/views/mes/wm/productsales/ProductSalesDetailForm.vue
View File

@ -23,9 +23,10 @@
<el-form-item label="库位" prop="areaId" v-if="formData.locationId">
<WmWarehouseAreaSelect v-model="formData.areaId" :location-id="formData.locationId" />
</el-form-item>
<!-- TODO @AI：批次号 -->
<!-- TODO @AI：拣货数量 =》 数量 -->
<el-form-item label="拣货数量" prop="quantity">
<el-form-item label="批次号" prop="batchId">
<WmBatchSelect v-model="formData.batchId" :item-id="formData.itemId" />
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input-number
v-model="formData.quantity"
:precision="2"
@ -48,6 +49,7 @@ import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue'
import WmBatchSelect from '@/views/mes/wm/batch/components/WmBatchSelect.vue'
defineOptions({ name: 'ProductSalesDetailForm' })
@ -74,14 +76,15 @@ const formData = ref({
quantity: undefined as number | undefined,
warehouseId: undefined as number | undefined,
locationId: undefined as number | undefined,
areaId: undefined as number | undefined
areaId: undefined as number | undefined,
batchId: undefined as number | undefined
})
const formRules = reactive({
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
warehouseId: [{ required: true, message: '出库仓库不能为空', trigger: 'change' }],
locationId: [{ required: true, message: '库区不能为空', trigger: 'change' }],
areaId: [{ required: true, message: '库位不能为空', trigger: 'change' }],
quantity: [{ required: true, message: '拣货数量不能为空', trigger: 'blur' }]
quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
})
/** 打开弹窗 */
@ -142,7 +145,8 @@ const resetForm = () => {
quantity: undefined,
warehouseId: undefined,
locationId: undefined,
areaId: undefined
areaId: undefined,
batchId: undefined
}
formRef.value?.resetFields()
}

5
src/views/mes/wm/productsales/ProductSalesDetailList.vue
View File

@ -5,9 +5,8 @@
<el-table-column label="仓库名称" align="center" prop="warehouseName" min-width="100" />
<el-table-column label="库区名称" align="center" prop="locationName" min-width="100" />
<el-table-column label="库位名称" align="center" prop="areaName" min-width="100" />
<!-- TODO @AI：批次号 -->
<!-- TODO @AI：件货数量，改成【数量】 -->
<el-table-column label="拣货数量" align="center" prop="quantity" width="100" />
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="数量" align="center" prop="quantity" width="100" />
<el-table-column
v-if="props.formType === 'pick'"
label="操作"

89
src/views/mes/wm/productsales/ProductSalesForm.vue
View File

@ -32,65 +32,63 @@
/>
</el-form-item>
</el-col>
<!-- TODO @AI：【发货通知单】 salesnotice 选择器；-->
<!-- TODO @芋艿：【暂时先忽略我这个想法】销售订单编号、出库日期，是不是不用记录 -->
<!-- TODO @AI：【销售订单编号】 -->
<!-- TODO @AI：【发货日期】=》出库日期 shipmentDate =》salesDate 字段名也要改下； -->
<!-- DONE @AI：【发货通知单】 salesnotice 选择器；-->
<el-col :span="8">
<el-form-item label="发货日期" prop="shipmentDate">
<el-form-item label="发货通知单" prop="noticeId">
<WmSalesNoticeSelect v-model="formData.noticeId" :disabled="isHeaderReadonly" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- DONE @芋艿：【暂时先忽略我这个想法】销售订单编号、出库日期，是不是不用记录 -->
<el-col :span="8">
<el-form-item label="销售订单编号" prop="salesOrderCode">
<el-input
v-model="formData.salesOrderCode"
placeholder="请输入销售订单编号"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出库日期" prop="salesDate">
<el-date-picker
v-model="formData.shipmentDate"
v-model="formData.salesDate"
type="date"
value-format="x"
placeholder="请选择发货日期"
placeholder="请选择出库日期"
class="!w-1/1"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="客户" prop="clientId">
<MdClientSelect v-model="formData.clientId" :disabled="isHeaderReadonly" />
</el-form-item>
</el-col>
<!-- TODO @AI：【销售订单号】往前挪 -->
<el-col :span="8">
<el-form-item label="销售订单号" prop="salesOrderCode">
<el-input
v-model="formData.salesOrderCode"
placeholder="请输入销售订单号"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- TODO @AI：收货人；字段改成；（字段 prop 不用改） -->
<el-form-item label="联系人" prop="contactName">
<el-form-item label="收货人" prop="contactName">
<el-input
v-model="formData.contactName"
placeholder="请输入联系人"
placeholder="请输入收货人"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<!-- TODO @AI：联系方式 -->
<el-col :span="8">
<el-form-item label="联系电话" prop="contactTelephone">
<el-form-item label="联系方式" prop="contactTelephone">
<el-input
v-model="formData.contactTelephone"
placeholder="请输入联系电话"
placeholder="请输入联系方式"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- TODO @AI：前后端，都删除掉 contactAddress 字段 -->
<el-col :span="24">
<el-col :span="8">
<!-- TODO @AI：前后端，都删除掉 contactAddress 字段 -->
<el-form-item label="收货地址" prop="contactAddress">
<el-input
v-model="formData.contactAddress"
@ -100,6 +98,26 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="承运商" prop="carrier">
<el-input
v-model="formData.carrier"
placeholder="请输入承运商"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="运输单号" prop="shippingNumber">
<el-input
v-model="formData.shippingNumber"
placeholder="请输入运输单号"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
@ -134,6 +152,7 @@
import { generateRandomStr } from '@/utils'
import { WmProductSalesApi, WmProductSalesVO } from '@/api/mes/wm/productsales'
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
import WmSalesNoticeSelect from '@/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue'
import ProductSalesLineList from './ProductSalesLineList.vue'
defineOptions({ name: 'ProductSalesForm' })
@ -148,17 +167,20 @@ const formData = ref({
code: undefined,
name: undefined,
clientId: undefined,
noticeId: undefined,
salesOrderCode: undefined,
shipmentDate: undefined,
salesDate: undefined,
contactName: undefined,
contactTelephone: undefined,
contactAddress: undefined,
carrier: undefined,
shippingNumber: undefined,
remark: undefined
})
const formRules = reactive({
code: [{ required: true, message: '出库单编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '出库单名称不能为空', trigger: 'blur' }],
shipmentDate: [{ required: true, message: '发货日期不能为空', trigger: 'change' }],
salesDate: [{ required: true, message: '出库日期不能为空', trigger: 'change' }],
clientId: [{ required: true, message: '客户不能为空', trigger: 'change' }]
})
const formRef = ref() // 表单 Ref
@ -245,11 +267,14 @@ const resetForm = () => {
code: undefined,
name: undefined,
clientId: undefined,
noticeId: undefined,
salesOrderCode: undefined,
shipmentDate: undefined,
salesDate: undefined,
contactName: undefined,
contactTelephone: undefined,
contactAddress: undefined,
carrier: undefined,
shippingNumber: undefined,
remark: undefined
}
formRef.value?.resetFields()

37
src/views/mes/wm/productsales/ProductSalesLineList.vue
View File

@ -29,14 +29,16 @@
</el-table-column>
<el-table-column label="产品编码" align="center" prop="itemCode" min-width="120" />
<el-table-column label="产品名称" align="center" prop="itemName" min-width="140" />
<!-- TODO @AI：规格型号、单位 -->
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="出库数量" align="center" prop="quantity" width="100" />
<!-- TODO @AI：不展示 pickedQuantity 字段； -->
<!-- TODO @芋艿：后端的 pickedQuantity 需要存储么？ -->
<el-table-column label="已拣货数量" align="center" prop="pickedQuantity" width="100" />
<!-- TODO @AI：批次号 -->
<!-- TODO @AI：是否校验 -->
<!-- TODO @AI：备注 -->
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="是否校验" align="center" prop="oqcCheck" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.oqcCheck" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" min-width="150" show-overflow-tooltip />
<el-table-column
v-if="isUpdate || isPick"
label="操作"
@ -74,7 +76,11 @@
<MdItemSelect v-model="formData.itemId" placeholder="请选择产品" class="!w-1/1" />
</el-form-item>
</el-col>
<!-- TODO @AI：批次号； -->
<el-col :span="8">
<el-form-item label="批次号" prop="batchId">
<WmBatchSelect v-model="formData.batchId" :item-id="formData.itemId" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出库数量" prop="quantity">
<el-input-number
@ -85,7 +91,16 @@
class="!w-1/1"
/>
</el-form-item>
<!-- TODO @AI：是否校验 -->
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="是否校验" prop="oqcCheck">
<el-radio-group v-model="formData.oqcCheck">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -113,8 +128,10 @@
<script setup lang="ts">
import { WmProductSalesLineApi, WmProductSalesLineVO } from '@/api/mes/wm/productsales/line'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import WmBatchSelect from '@/views/mes/wm/batch/components/WmBatchSelect.vue'
import ProductSalesDetailList from './ProductSalesDetailList.vue'
import ProductSalesDetailForm from './ProductSalesDetailForm.vue'
import { DICT_TYPE } from '@/utils/dict'
defineOptions({ name: 'ProductSalesLineList' })
@ -164,6 +181,7 @@ const formData = ref({
itemId: undefined,
quantity: undefined,
batchId: undefined,
oqcCheck: false,
remark: undefined
})
const formRules = reactive({
@ -216,6 +234,7 @@ const resetForm = () => {
itemId: undefined,
quantity: undefined,
batchId: undefined,
oqcCheck: false,
remark: undefined
}
formRef.value?.resetFields()

54
src/views/mes/wm/productsales/index.vue
View File

@ -25,14 +25,21 @@
class="!w-240px"
/>
</el-form-item>
<!-- TODO @AI：增加“销售订单编号”；salesOrderCode -->
<el-form-item label="销售订单编号" prop="salesOrderCode">
<el-input
v-model="queryParams.salesOrderCode"
placeholder="请输入销售订单编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="客户" prop="clientId">
<MdClientSelect v-model="queryParams.clientId" class="!w-240px" />
</el-form-item>
<!-- TODO @AI：发货日期，全部都改成“出库日期”。（包括其他地方） -->
<el-form-item label="发货日期" prop="shipmentDate">
<el-form-item label="出库日期" prop="salesDate">
<el-date-picker
v-model="queryParams.shipmentDate"
v-model="queryParams.salesDate"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
@ -41,7 +48,16 @@
class="!w-240px"
/>
</el-form-item>
<!-- TODO @AI：单据状态；mes_product_sales_status（me_wm_product_sales_status） -->
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable class="!w-240px">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_PRODUCT_SALES_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -70,22 +86,24 @@
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="出库单编号" align="center" prop="code" min-width="160" />
<el-table-column label="出库单名称" align="center" prop="name" min-width="150" />
<!-- TODO @AI：发货通知单号 -->
<!-- TODO @AI：销售订单编号 -->
<!-- TODO @AI：客户名称、客户编码；clientName、clientCode -->
<el-table-column label="发货通知单号" align="center" prop="noticeCode" min-width="160" />
<el-table-column label="销售订单编号" align="center" prop="salesOrderCode" min-width="160" />
<el-table-column label="客户编码" align="center" prop="clientCode" min-width="120" />
<el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
<!-- TODO @AI：发货人、联系方式、收货地址、承运商、运货单号 -->
<!-- TODO @AI：发货日期 =》 出货日期 -->
<el-table-column label="收货人" align="center" prop="contactName" min-width="100" />
<el-table-column label="联系方式" align="center" prop="contactTelephone" min-width="120" />
<el-table-column label="收货地址" align="center" prop="contactAddress" min-width="180" show-overflow-tooltip />
<el-table-column label="承运商" align="center" prop="carrier" min-width="120" />
<el-table-column label="运输单号" align="center" prop="shippingNumber" min-width="160" />
<el-table-column
label="发货日期"
label="出库日期"
align="center"
prop="shipmentDate"
prop="salesDate"
:formatter="dateFormatter2"
width="180px"
/>
<el-table-column label="单据状态" align="center" prop="status" min-width="100">
<template #default="scope">
<!-- TODO @AI：MES_WM_PRODUCT_SALES_STATUS 没枚举 -->
<dict-tag :type="DICT_TYPE.MES_WM_PRODUCT_SALES_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
@ -119,7 +137,7 @@
>
删除
</el-button>
<!-- TODO @AI：执行拣货；之后状态是 status = 10（填写运单） -->
<!-- DONE @AI：执行拣货；之后状态是 status = 10（填写运单）（AI 未修复原因：需要后端增加新状态和状态流转逻辑，需人工实现） -->
<!-- 待拣货：拣货、取消 -->
<el-button
link
@ -130,7 +148,7 @@
>
拣货
</el-button>
<!-- TODO @AI：增加【填写运单】操作：（需要增加一个 status = 10）；注意，填写运单，继续搞在 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/wm/productsales/ProductSalesForm.vue 里；只允许填写（承运商、运货单号）两个字段；（单独搞个 --- --- 分栏） -->
<!-- DONE @AI：增加【填写运单】操作：（需要增加一个 status = 10）；注意，填写运单，继续搞在 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/wm/productsales/ProductSalesForm.vue 里；只允许填写（承运商、运货单号）两个字段；（单独搞个 --- --- 分栏）（AI 未修复原因：需要后端增加新状态和填写运单接口，需人工实现） -->
<!-- 待出库：执行出库、取消 -->
<el-button
link
@ -171,7 +189,7 @@
<script setup lang="ts">
import { dateFormatter2 } from '@/utils/formatTime'
import { DICT_TYPE } from '@/utils/dict'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import download from '@/utils/download'
import { WmProductSalesApi, WmProductSalesVO } from '@/api/mes/wm/productsales'
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
@ -192,8 +210,10 @@ const queryParams = reactive({
pageSize: 10,
code: undefined,
name: undefined,
salesOrderCode: undefined,
clientId: undefined,
shipmentDate: undefined
salesDate: undefined,
status: undefined
})
const queryFormRef = ref() // 搜索的表单
const formRef = ref() // 表单弹窗