diff --git a/src/main/java/com/xujie/modules/inspection/data/InspectionResultVO.java b/src/main/java/com/xujie/modules/inspection/data/InspectionResultVO.java
index 461edda..a42a44d 100644
--- a/src/main/java/com/xujie/modules/inspection/data/InspectionResultVO.java
+++ b/src/main/java/com/xujie/modules/inspection/data/InspectionResultVO.java
@@ -1,6 +1,8 @@
package com.xujie.modules.inspection.data;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -100,6 +102,7 @@ public class InspectionResultVO {
/**
* CRD
*/
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date crd;
/**
@@ -128,4 +131,48 @@ public class InspectionResultVO {
@TableField(exist = false)
private String categoryLevel3;
+
+ /**
+ * 订单数量(PODetail.a_qty,非物理列)
+ */
+ @TableField(exist = false)
+ @JsonProperty("aQty")
+ private BigDecimal aQty;
+
+ /**
+ * ETA(PODetail.c_eta,非物理列)
+ */
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date eta;
+
+ /**
+ * Planner(POHeader.c_planner 显示名,非物理列)
+ */
+ @TableField(exist = false)
+ private String planner;
+
+ /**
+ * 抽样数(qc_iqc_record.sampling_qty,非物理列)
+ */
+ @TableField(exist = false)
+ private BigDecimal samplingQty;
+
+ /**
+ * 抽样合格数(qc_iqc_record.pass_qty,非物理列)
+ */
+ @TableField(exist = false)
+ private BigDecimal passQty;
+
+ /**
+ * 检验结果(qc_iqc_record.inspection_result,非物理列)
+ */
+ @TableField(exist = false)
+ private String inspectionResultQc;
+
+ /**
+ * 验货结果备注(qc_iqc_record.inspection_remark,非物理列)
+ */
+ @TableField(exist = false)
+ private String inspectionRemark;
}
diff --git a/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java b/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java
index aa5deff..6b85180 100644
--- a/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java
+++ b/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java
@@ -135,4 +135,36 @@ public class InspectionRequestDetailSub extends QueryPage {
*/
@TableField(exist = false)
private String planner;
+
+ /**
+ * D_Issue(POHeader.order_date,PO Issue Date,非物理列)
+ */
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date issueDate;
+
+ /**
+ * A_CRD(PODetail.c_real_crd,非物理列)
+ */
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date realCrd;
+
+ /**
+ * Standard_TT(PODetail.standard_tt,非物理列)
+ */
+ @TableField(exist = false)
+ private Integer standardTt;
+
+ /**
+ * P_Departure(POHeader.c_departure,非物理列)
+ */
+ @TableField(exist = false)
+ private String departure;
+
+ /**
+ * P_Destination(POHeader.c_destination,非物理列)
+ */
+ @TableField(exist = false)
+ private String destination;
}
diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java
index b468774..f072cb0 100644
--- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java
+++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java
@@ -26,4 +26,9 @@ public class LogisticsSearchData extends QueryPage {
* 产品编码
*/
private String partNo;
+
+ /**
+ * 客户(对应 POHeader.c_customer,按账号 Customer 权限过滤)
+ */
+ private String customer;
}
diff --git a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
index 04eec3a..5ba8c4c 100644
--- a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
+++ b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
@@ -44,6 +44,7 @@
d.request_no AS requestNo,
sub.order_ref1 AS poNo,
sub.order_ref2 AS poItemNo,
+ sub.order_ref2 AS orderRef2,
d.part_no AS partNo,
p.part_desc AS partDesc,
p.item AS item,
@@ -52,11 +53,33 @@
d.inspect_result AS inspectResult,
p.sku,
p.category_level2,
- p.category_level3
+ p.category_level3,
+ ISNULL(pod.a_qty, 0) AS aQty,
+ poh.ship_via AS shipMethod,
+ pod.c_crd AS crd,
+ pod.c_eta AS eta,
+ ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), poh.c_planner) AS planner,
+ ISNULL(dbo.plm_get_user_display(hdr.site, hdr.qc_operator), hdr.qc_operator) AS qcOperator,
+ qc.sampling_qty AS samplingQty,
+ qc.pass_qty AS passQty,
+ qc.inspection_result AS inspectionResultQc,
+ qc.inspection_remark AS inspectionRemark
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
LEFT JOIN part p ON d.part_no = p.part_no AND d.site = p.site
+ LEFT JOIN PODetail pod
+ ON pod.site = sub.site AND pod.order_no = sub.po_no AND pod.item_no = sub.po_item_no
+ LEFT JOIN POHeader poh
+ ON poh.site = sub.site AND poh.order_no = sub.po_no
+ LEFT JOIN srm_inspection_request_header hdr
+ ON hdr.site = d.site AND hdr.request_no = d.request_no
+ OUTER APPLY (
+ SELECT TOP 1 q.sampling_qty, q.pass_qty, q.inspection_result, q.inspection_remark
+ FROM qc_iqc_record q
+ WHERE q.site = d.site AND q.inspection_no = d.inspect_no
+ ORDER BY CASE WHEN q.action_date IS NULL THEN 1 ELSE 0 END ASC, q.action_date ASC, q.create_date ASC
+ ) qc
WHERE d.request_no = #{requestNo} AND d.site = #{site}
ORDER BY d.item_no ASC, sub.order_ref1 ASC, sub.order_ref2 ASC
diff --git a/src/main/resources/mapper/inspection/InspectionRequestDetailSubMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestDetailSubMapper.xml
index 1c764ec..0cc7f49 100644
--- a/src/main/resources/mapper/inspection/InspectionRequestDetailSubMapper.xml
+++ b/src/main/resources/mapper/inspection/InspectionRequestDetailSubMapper.xml
@@ -16,6 +16,11 @@
ISNULL(pod.a_qty, 0) AS aQty,
pod.c_eta AS eta,
ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), poh.c_planner) AS planner,
+ poh.order_date AS issueDate,
+ pod.c_real_crd AS realCrd,
+ pod.standard_tt AS standardTt,
+ (SELECT TOP 1 pi_d.port_name FROM port_info pi_d WHERE pi_d.port_code = poh.c_departure) AS departure,
+ (SELECT TOP 1 pi_a.port_name FROM port_info pi_a WHERE pi_a.port_code = poh.c_destination) AS destination,
(
ISNULL(pod.a_qty, 0)
- ISNULL(pod.to_inspect_qty, 0)
diff --git a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml
index 2571634..175e4c1 100644
--- a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml
+++ b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml
@@ -30,6 +30,10 @@
AND d.part_no LIKE '%' + #{param.partNo} + '%'
+
+
+ AND h.c_customer = #{param.customer}
+
GROUP BY
d.c_flexid,
h.supplier_no,