mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(inventory): 添加产品编码和型号搜索功能 

- 在库存交付页面添加产品编码和型号搜索字段
- 在库存执行页面添加产品编码和型号搜索字段
- 在外部库存页面添加产品编码和型号搜索字段
- 在项目信息页面添加产品编码和型号搜索字段
- 更新库存交付数据映射器支持产品编码和型号查询
- 扩展项目信息实体类添加产品编码和型号属性
- 更新项目信息数据映射器支持产品编码和型号过滤查询
dev_1.0.1^2
chenhao 2026-02-09 10:09:37 +08:00
parent 7ff9552621
commit 830fde4bc0
7 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oms_web/oms_vue/src/views/inventory/delivery/index.vue
View File

@ -27,6 +27,12 @@
<el-option v-for="item in dict.type.delivery_type" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="请输入产品编码" clearable size="small" @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="产品型号" prop="model">
<el-input v-model="queryParams.model" placeholder="请输入产品型号" clearable size="small" @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>
@ -169,6 +175,8 @@ export default {
orderCode: null,
projectName: null,
deliveryType: null,
productCode: undefined,
model: undefined,
isAsc : 'desc',
orderByColumn : 'createTime',
},

8
oms_web/oms_vue/src/views/inventory/execution/index.vue
View File

@ -55,6 +55,12 @@
/>
</el-select>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="请输入产品编码" clearable size="small" @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="产品型号" prop="productModel">
<el-input v-model="queryParams.productModel" placeholder="请输入产品型号" clearable size="small" @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="时间选择">
<el-select v-model="queryParams.timeType" placeholder="请选择时间类型" clearable style="width: 150px">
<el-option label="要求到货时间" value="0" />
@ -249,6 +255,8 @@ export default {
projectName: null,
outerStatus: null,
deliveryStatus: null,
productCode: null,
productModel: null,
signStatus: null,
timeType: '0', // 默认按要求到货时间搜索
orderByColumn: 'approveTime',

8
oms_web/oms_vue/src/views/inventory/outer/index.vue
View File

@ -19,6 +19,12 @@
<el-option v-for="dict in dict.type.outer_delivery_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="请输入产品编码" clearable size="small" @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="产品型号" prop="model">
<el-input v-model="queryParams.model" placeholder="请输入产品型号" clearable size="small" @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>
@ -102,6 +108,8 @@ export default {
orderCode: undefined,
projectName: undefined,
deliveryStatus: undefined,
productCode: undefined,
model: undefined,
isAsc : 'desc',
orderByColumn : 'createTime',
},

11
oms_web/oms_vue/src/views/project/info/index.vue
View File

@ -1,4 +1,4 @@
<template>
<template xmlns="http://www.w3.org/1999/html">
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="项目编号" prop="projectCode">
@ -96,6 +96,13 @@
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="请输入产品编码" clearable size="small" @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="产品型号" prop="productModel">
<el-input v-model="queryParams.productModel" placeholder="请输入产品型号" clearable size="small" @keyup.enter.native="handleQuery"/>
</el-form-item>
<br/>
<el-form-item label="时间选择" prop="timeType">
<el-select v-model="queryParams.timeType" placeholder="请选择时间类型" @change="handleTimeTypeChange">
<el-option label="预计下单时间" value="0" />
@ -328,6 +335,8 @@ export default {
pageSize: 10,
projectCode: null,
projectName: null,
productCode: null,
productModel: null,
customerName: null,
bgProperty: null,
industryType: null,

2
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
View File

@ -231,6 +231,8 @@ public class ProjectInfo extends BaseEntity
private List<OmsFileLog> projectFileList;
private String fileId;
private String partnerSystemUserId;
private String productCode;
private String productModel;
private Integer quotationId;
private List<Integer> quotationIdList;

2
ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
View File

@ -54,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deliveryTime != null ">and t1.delivery_time = #{deliveryTime}</if>
<if test="deliveryType != null and deliveryType != ''">and t1.delivery_type = #{deliveryType}</if>
<if test="projectCode != null and projectCode != ''">and t5.project_code = #{projectCode}</if>
<if test="model != null and model != ''">and t7.model like concat('%',#{model},'%')</if>
<if test="productCode != null and productCode != ''">and t7.product_code = #{productCode}</if>
<if test="productCodeList != null and productCodeList.size>0">and t3.product_code in
<foreach item="item" index="index" collection="productCodeList" separator="," open="(" close=")">
#{item}

2
ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
View File

@ -148,6 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="partnerCode != null and partnerCode != ''"> and t1.partner_code = #{partnerCode}</if>
<if test="partnerName != null and partnerName != ''"> and t1.partner_name = #{partnerName}</if>
<if test="contactWay != null and contactWay != ''"> and t1.contact_way = #{contactWay}</if>
<if test="productCode != null and productCode != ''"> and t1.id in (select project_id from project_product_info where product_bom_code = #{productCode})</if>
<if test="productModel != null and productModel != ''"> and t1.id in (select project_id from project_product_info where model like concat('%', #{productModel},'%'))</if>
<if test="estimatedAmount != null "> and t1.estimated_amount = #{estimatedAmount}</if>
<if test="currencyType != null and currencyType != ''"> and t1.currency_type = #{currencyType}</if>
<if test="estimatedOrderTime != null "> and t1.estimated_order_time = #{estimatedOrderTime}</if>