Browse Source

feat(inspection): 添加SKU和分类字段支持

- 在 InspectionRequestDetail 实体中新增 sku、categoryLevel2、categoryLevel3 字段
- 在 InspectionRequestDetailSub 实体中新增 sku、categoryLevel2、categoryLevel3 字段
- 在 InspectionResultVO 中新增 sku、categoryLevel2、categoryLevel3 字段
- 更新 InspectionRequestDetailMapper.xml 查询语句以包含产品表相关字段
- 更新 InspectionRequestDetailSubMapper.xml 查询语句以包含产品表相关字段
- 在验货申请确认流程中添加检验模板校验功能
master
qiankanghui 4 days ago
parent
commit
8b708128e4
  1. 10
      src/main/java/com/xujie/modules/inspection/data/InspectionResultVO.java
  2. 9
      src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetail.java
  3. 9
      src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java
  4. 4
      src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java
  5. 8
      src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
  6. 1
      src/main/resources/mapper/inspection/InspectionRequestDetailSubMapper.xml

10
src/main/java/com/xujie/modules/inspection/data/InspectionResultVO.java

@ -1,5 +1,6 @@
package com.xujie.modules.inspection.data;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.math.BigDecimal;
@ -115,4 +116,13 @@ public class InspectionResultVO {
* QC人员
*/
private String qcOperator;
@TableField(exist = false)
private String sku;
@TableField(exist = false)
private String categoryLevel2;
@TableField(exist = false)
private String categoryLevel3;
}

9
src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetail.java

@ -73,4 +73,13 @@ public class InspectionRequestDetail extends QueryPage {
* 检验结果
*/
private String inspectResult;
@TableField(exist = false)
private String sku;
@TableField(exist = false)
private String categoryLevel2;
@TableField(exist = false)
private String categoryLevel3;
}

9
src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java

@ -88,4 +88,13 @@ public class InspectionRequestDetailSub extends QueryPage {
@TableField(exist = false)
private String isChanged;
@TableField(exist = false)
private String sku;
@TableField(exist = false)
private String categoryLevel2;
@TableField(exist = false)
private String categoryLevel3;
}

4
src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java

@ -376,6 +376,10 @@ public class InspectionRequestServiceImpl extends ServiceImpl<InspectionRequestH
throw new RuntimeException("只有草稿状态的验货申请可以确认,当前状态:" + header.getStatus());
}
// 校验检验模板是否维护
List<String> requestNos = Arrays.asList(requestNo);
validateInspectionTemplate(site, requestNos);
// 2. 修改头表状态为已确认
baseMapper.confirm(site, requestNo);

8
src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml

@ -25,7 +25,8 @@
<!-- 分页查询明细列表 -->
<select id="getPageList" resultType="com.xujie.modules.inspection.entity.InspectionRequestDetail">
SELECT <include refid="BaseColumnList" />
SELECT <include refid="BaseColumnList" />,
p.sku,p.category_level2,p.category_level3
FROM srm_inspect_request_detail d
LEFT JOIN part p ON d.part_no = p.part_no AND d.site = p.site
<where>
@ -46,7 +47,10 @@
p.part_desc AS partDesc,
sub.qty AS qty,
sub.approve_qty AS approveQty,
d.inspect_result AS inspectResult
d.inspect_result AS inspectResult,
p.sku,
p.category_level2,
p.category_level3
FROM srm_inspect_request_detail d
INNER JOIN srm_inspect_request_detail_sub sub
ON d.request_no = sub.request_no AND d.site = sub.site AND d.item_no = sub.item_no

1
src/main/resources/mapper/inspection/InspectionRequestDetailSubMapper.xml

@ -10,6 +10,7 @@
<select id="getPageList" resultType="com.xujie.modules.inspection.entity.InspectionRequestDetailSub">
SELECT
<include refid="BaseColumnList"/>,
p.sku,p.category_level2,p.category_level3,
CASE
WHEN d.ship_mothod != poh.ship_via
OR CONVERT(varchar(10), d.crd, 23) != CONVERT(varchar(10), ISNULL(pod.c_crd, pod.want_receive_date), 23)

Loading…
Cancel
Save