Browse Source

feat(logistics): 更新物流查询功能以支持物料编码筛选和客户信息显示

- 修改 InspectionRequestDetailMapper.xml 中的字段映射,将 poNo 和 poItemNo 替换为 order_ref1 和 order_ref2
- 在 LogisticsMapper.xml 中添加物料编码筛选条件
- 为 LogisticsPoData 类新增 cCustomer 字段用于显示客户信息
- 为 LogisticsSearchData 类新增 partNo 字段用于物料编码搜索功能
- 更新数据库查询排序逻辑以匹配新的字段映射
master
qiankanghui 3 days ago
parent
commit
8b180723ea
  1. 1
      src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java
  2. 5
      src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java
  3. 6
      src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
  4. 4
      src/main/resources/mapper/npcIqc/LogisticsMapper.xml

1
src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java

@ -6,6 +6,7 @@ import java.util.Date;
@Data @Data
public class LogisticsPoData { public class LogisticsPoData {
private String cCustomer;
private String orderNo; private String orderNo;

5
src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java

@ -21,4 +21,9 @@ public class LogisticsSearchData extends QueryPage {
* 供应商名称 * 供应商名称
*/ */
private String supplierName; private String supplierName;
/**
* 物料编码
*/
private String partNo;
} }

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

@ -39,8 +39,8 @@
<select id="getInspectionResultList" resultType="com.xujie.modules.inspection.data.InspectionResultVO"> <select id="getInspectionResultList" resultType="com.xujie.modules.inspection.data.InspectionResultVO">
SELECT SELECT
d.request_no AS requestNo, d.request_no AS requestNo,
sub.po_no AS poNo,
sub.po_item_no AS poItemNo,
sub.order_ref1 AS poNo,
sub.order_ref2 AS poItemNo,
d.part_no AS partNo, d.part_no AS partNo,
p.part_desc AS partDesc, p.part_desc AS partDesc,
d.qty AS qty, d.qty AS qty,
@ -50,7 +50,7 @@
ON d.request_no = sub.request_no AND d.site = sub.site AND d.item_no = sub.item_no 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 part p ON d.part_no = p.part_no AND d.site = p.site
WHERE d.request_no = #{requestNo} AND d.site = #{site} WHERE d.request_no = #{requestNo} AND d.site = #{site}
ORDER BY d.item_no ASC, sub.po_no ASC, sub.po_item_no ASC
ORDER BY d.item_no ASC, sub.order_ref1 ASC, sub.order_ref2 ASC
</select> </select>
<update id="lockInspectQty"> <update id="lockInspectQty">

4
src/main/resources/mapper/npcIqc/LogisticsMapper.xml

@ -27,6 +27,9 @@
<if test="param.supplierName != null and param.supplierName != ''"> <if test="param.supplierName != null and param.supplierName != ''">
AND s.supplier_name LIKE '%' + #{param.supplierName} + '%' AND s.supplier_name LIKE '%' + #{param.supplierName} + '%'
</if> </if>
<if test="param.partNo != null and param.partNo != ''">
AND d.part_no LIKE '%' + #{param.partNo} + '%'
</if>
GROUP BY GROUP BY
d.c_flexid, d.c_flexid,
h.supplier_no, h.supplier_no,
@ -37,6 +40,7 @@
<!-- 查询PO清单 --> <!-- 查询PO清单 -->
<select id="getPoListPage" resultType="com.xujie.modules.npcIqc.data.LogisticsPoData"> <select id="getPoListPage" resultType="com.xujie.modules.npcIqc.data.LogisticsPoData">
SELECT SELECT
h.c_customer AS cCustomer,
d.order_no AS orderNo, d.order_no AS orderNo,
d.item_no AS itemNo, d.item_no AS itemNo,
d.part_no AS partNo, d.part_no AS partNo,

Loading…
Cancel
Save