rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rakor:59bbb396c31ed21e230d1d6c913c002c29d03872
Branches Tags
rakor:develop
rakor:qms/yf
rakor:qms/develop
rakor:qms/zhangke
rakor:dev_zhangke
rakor:demo
rakor:feature/rustfs
rakor:sit
rakor:feature/bug-884
rakor:feature/bug-883
rakor:feature/bug-890
rakor:feature/bug-776
rakor:feature/bug-784
rakor:feature/bug-788
rakor:feature/bug-787
rakor:rakor
rakor:template
..
compare: rakor:04109205c8cdefd2801a7aca0db0f503892add37
Branches Tags
rakor:qms/yf
rakor:qms/develop
rakor:qms/zhangke
rakor:develop
rakor:dev_zhangke
rakor:demo
rakor:feature/rustfs
rakor:sit
rakor:feature/bug-884
rakor:feature/bug-883
rakor:feature/bug-890
rakor:feature/bug-776
rakor:feature/bug-784
rakor:feature/bug-788
rakor:feature/bug-787
rakor:rakor
rakor:template

No commits in common. "59bbb396c31ed21e230d1d6c913c002c29d03872" and "04109205c8cdefd2801a7aca0db0f503892add37" have entirely different histories.
59bbb396c3 ... 04109205c8

3 changed files with 4 additions and 166 deletions
Show Stats Expand all files Collapse all files

71
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialSearchQO.java
View File

@ -2,7 +2,6 @@ package com.nflg.wms.common.pojo.qo;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
/**
@ -36,76 +35,6 @@ public class QmsQcMaterialSearchQO extends PageQO {
*/
private String materialName;
/**
* 描述是否变更（精确匹配）：false=未变更，true=已变更
*/
private Boolean materialDescIsUpgrade;
/**
* 物料类别全路径名称（模糊匹配）
*/
private String materialCategoryCodePathName;
/**
* 物料图号（模糊匹配）
*/
private String drawingNo;
/**
* 图号版本号（模糊匹配）
*/
private String drawingNoVer;
/**
* 物料材质（模糊匹配）
*/
private String materialTexture;
/**
* 物料规格（模糊匹配）
*/
private String materialSpecifications;
/**
* 规则是否已维护（精确匹配）：false=未维护，true=已维护
*/
private Boolean isStandardMaintained;
/**
* 创建方式（精确匹配）：0=人工操作，1=系统同步
*/
private Integer createdType;
/**
* 创建人名称（模糊匹配）
*/
private String createByName;
/**
* 创建时间范围-开始日期（含）
*/
private LocalDate createTimeStart;
/**
* 创建时间范围-结束日期（含）
*/
private LocalDate createTimeEnd;
/**
* 修改人名称（模糊匹配）
*/
private String updateByName;
/**
* 修改时间范围-开始日期（含）
*/
private LocalDate updateTimeStart;
/**
* 修改时间范围-结束日期（含）
*/
private LocalDate updateTimeEnd;
/**
* 排序字段（对应 QmsQcMaterialVO 中的字段名，如 materialNo、createTime 等）
* 为空时默认按物料编号倒序

6
nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
View File

@ -6,7 +6,7 @@
SELECT
t.id,
t.task_no,
t.request_no,
t.check_no,
t.material_id,
m.material_no,
m.material_desc,
@ -109,7 +109,7 @@
SELECT
t.id,
t.task_no,
t.request_no,
t.check_no,
t.material_id,
m.material_no,
m.material_desc,
@ -182,7 +182,7 @@
<select id="getDetail" resultType="com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskVO">
SELECT t.id,
t.task_no,
t.request_no,
t.check_no,
t.material_id,
m.material_no,
m.material_desc,

93
nflg-wms-repository/src/main/resources/mapper/QmsQcMaterialMapper.xml
View File

@ -5,10 +5,6 @@
<!--
分页查询质检物料
支持动态过滤：物料类别编码(materialCategoryCode)、物料编号模糊(materialNo)、物料描述模糊(materialDesc)、物料名称模糊(materialName)
、描述是否变更(materialDescIsUpgrade)、类别全路径名称模糊(materialCategoryCodePathName)、图号模糊(drawingNo)
、图号版本号模糊(drawingNoVer)、材质模糊(materialTexture)、规格模糊(materialSpecifications)
、规则是否已维护(isStandardMaintained)、创建方式(createdType)、创建人模糊(createByName)
、创建时间范围(createTimeStart/createTimeEnd)、修改人模糊(updateByName)、修改时间范围(updateTimeStart/updateTimeEnd)
-->
<select id="searchPage" resultType="com.nflg.wms.common.pojo.vo.QmsQcMaterialVO">
SELECT
@ -51,48 +47,6 @@
<if test="request.materialName != null and request.materialName != ''">
AND material_name ilike concat('%', #{request.materialName}, '%')
</if>
<if test="request.materialDescIsUpgrade != null">
AND material_desc_is_upgrade = #{request.materialDescIsUpgrade}
</if>
<if test="request.materialCategoryCodePathName != null and request.materialCategoryCodePathName != ''">
AND material_category_code_path_name ilike concat('%', #{request.materialCategoryCodePathName}, '%')
</if>
<if test="request.drawingNo != null and request.drawingNo != ''">
AND drawing_no ilike concat('%', #{request.drawingNo}, '%')
</if>
<if test="request.drawingNoVer != null and request.drawingNoVer != ''">
AND drawing_no_ver ilike concat('%', #{request.drawingNoVer}, '%')
</if>
<if test="request.materialTexture != null and request.materialTexture != ''">
AND material_texture ilike concat('%', #{request.materialTexture}, '%')
</if>
<if test="request.materialSpecifications != null and request.materialSpecifications != ''">
AND material_specifications ilike concat('%', #{request.materialSpecifications}, '%')
</if>
<if test="request.isStandardMaintained != null">
AND is_standard_maintained = #{request.isStandardMaintained}
</if>
<if test="request.createdType != null">
AND created_type = #{request.createdType}
</if>
<if test="request.createByName != null and request.createByName != ''">
AND create_by_name ilike concat('%', #{request.createByName}, '%')
</if>
<if test="request.createTimeStart != null">
AND create_time &gt;= #{request.createTimeStart}::date
</if>
<if test="request.createTimeEnd != null">
AND create_time &lt; (#{request.createTimeEnd}::date + interval '1 day')
</if>
<if test="request.updateByName != null and request.updateByName != ''">
AND update_by_name ilike concat('%', #{request.updateByName}, '%')
</if>
<if test="request.updateTimeStart != null">
AND update_time &gt;= #{request.updateTimeStart}::date
</if>
<if test="request.updateTimeEnd != null">
AND update_time &lt; (#{request.updateTimeEnd}::date + interval '1 day')
</if>
</where>
ORDER BY
<choose>
@ -129,15 +83,12 @@
<!--
查询全部质检物料（不分页，用于导出）
支持动态过滤：物料类别编码(materialCategoryCode)、物料编号模糊(materialNo)、物料描述模糊(materialDesc)、物料名称模糊(materialName)
、描述是否变更(materialDescIsUpgrade)、类别全路径名称模糊(materialCategoryCodePathName)、图号模糊(drawingNo)
、图号版本号模糊(drawingNoVer)、材质模糊(materialTexture)、规格模糊(materialSpecifications)
、规则是否已维护(isStandardMaintained)、创建方式(createdType)、创建人模糊(createByName)
、创建时间范围(createTimeStart/createTimeEnd)、修改人模糊(updateByName)、修改时间范围(updateTimeStart/updateTimeEnd)
-->
<select id="searchAll" resultType="com.nflg.wms.common.pojo.dto.QmsQcMaterialExportDTO">
SELECT
material_no,
material_desc,
CASE WHEN material_desc_is_upgrade THEN '是' ELSE '否' END AS material_desc_is_upgrade,
material_category_code,
material_category_code_path_name,
drawing_no,
@ -171,48 +122,6 @@
<if test="request.materialName != null and request.materialName != ''">
AND material_name ilike concat('%', #{request.materialName}, '%')
</if>
<if test="request.materialDescIsUpgrade != null">
AND material_desc_is_upgrade = #{request.materialDescIsUpgrade}
</if>
<if test="request.materialCategoryCodePathName != null and request.materialCategoryCodePathName != ''">
AND material_category_code_path_name ilike concat('%', #{request.materialCategoryCodePathName}, '%')
</if>
<if test="request.drawingNo != null and request.drawingNo != ''">
AND drawing_no ilike concat('%', #{request.drawingNo}, '%')
</if>
<if test="request.drawingNoVer != null and request.drawingNoVer != ''">
AND drawing_no_ver ilike concat('%', #{request.drawingNoVer}, '%')
</if>
<if test="request.materialTexture != null and request.materialTexture != ''">
AND material_texture ilike concat('%', #{request.materialTexture}, '%')
</if>
<if test="request.materialSpecifications != null and request.materialSpecifications != ''">
AND material_specifications ilike concat('%', #{request.materialSpecifications}, '%')
</if>
<if test="request.isStandardMaintained != null">
AND is_standard_maintained = #{request.isStandardMaintained}
</if>
<if test="request.createdType != null">
AND created_type = #{request.createdType}
</if>
<if test="request.createByName != null and request.createByName != ''">
AND create_by_name ilike concat('%', #{request.createByName}, '%')
</if>
<if test="request.createTimeStart != null">
AND create_time &gt;= #{request.createTimeStart}::date
</if>
<if test="request.createTimeEnd != null">
AND create_time &lt; (#{request.createTimeEnd}::date + interval '1 day')
</if>
<if test="request.updateByName != null and request.updateByName != ''">
AND update_by_name ilike concat('%', #{request.updateByName}, '%')
</if>
<if test="request.updateTimeStart != null">
AND update_time &gt;= #{request.updateTimeStart}::date
</if>
<if test="request.updateTimeEnd != null">
AND update_time &lt; (#{request.updateTimeEnd}::date + interval '1 day')
</if>
</where>
ORDER BY
<choose>