From 6f6f29c39b47f37206dbdd5ea8507455583b56ae Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Thu, 8 Oct 2026 17:13:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(logistics):=20=E6=B7=BB=E5=8A=A0=E7=89=A9?= =?UTF-8?q?=E6=B5=81=E6=95=B0=E6=8D=AECRD=E3=80=81ETA=E5=92=8C=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在LogisticsPoData中新增crd、eta、shipVia字段 - 在LogisticsPoOrderData中新增qty、crd、eta、shipVia字段 - 修改LogisticsMapper.xml查询语句添加新字段映射 - 在SrmPartSku实体中新增basePartNo基准料号字段 - 更新SrmPartSkuMapper.xml的查询和插入语句 - 在SrmPartSkuServiceImpl中添加输入数据标准化处理 --- .../baseInformation/entity/SrmPartSku.java | 5 +++++ .../service/impl/SrmPartSkuServiceImpl.java | 2 ++ .../modules/npcIqc/data/LogisticsPoData.java | 15 ++++++++++++++ .../npcIqc/data/LogisticsPoOrderData.java | 20 +++++++++++++++++++ .../baseInformation/SrmPartSkuMapper.xml | 5 +++++ .../mapper/npcIqc/LogisticsMapper.xml | 7 +++++++ 6 files changed, 54 insertions(+) diff --git a/src/main/java/com/xujie/modules/baseInformation/entity/SrmPartSku.java b/src/main/java/com/xujie/modules/baseInformation/entity/SrmPartSku.java index a5e968f..6d6e681 100644 --- a/src/main/java/com/xujie/modules/baseInformation/entity/SrmPartSku.java +++ b/src/main/java/com/xujie/modules/baseInformation/entity/SrmPartSku.java @@ -19,6 +19,11 @@ public class SrmPartSku extends QueryPage { private String active; + /** + * 基准料号(part_sku.bast_part_no) + */ + private String basePartNo; + private String createBy; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/src/main/java/com/xujie/modules/baseInformation/service/impl/SrmPartSkuServiceImpl.java b/src/main/java/com/xujie/modules/baseInformation/service/impl/SrmPartSkuServiceImpl.java index 06c5bf0..62ffa88 100644 --- a/src/main/java/com/xujie/modules/baseInformation/service/impl/SrmPartSkuServiceImpl.java +++ b/src/main/java/com/xujie/modules/baseInformation/service/impl/SrmPartSkuServiceImpl.java @@ -31,6 +31,7 @@ public class SrmPartSkuServiceImpl implements SrmPartSkuService { if (partSku == null) { return R.error("参数不能为空"); } + normalizeInput(partSku); if (StringUtils.isBlank(partSku.getSku())) { return R.error("SKU 不能为空"); } @@ -114,6 +115,7 @@ public class SrmPartSkuServiceImpl implements SrmPartSkuService { partSku.setSku(StringUtils.trimToEmpty(partSku.getSku())); partSku.setRemark(StringUtils.trimToEmpty(partSku.getRemark())); partSku.setActive(StringUtils.trimToEmpty(partSku.getActive())); + partSku.setBasePartNo(StringUtils.trimToEmpty(partSku.getBasePartNo())); partSku.setCreateBy(StringUtils.trimToEmpty(partSku.getCreateBy())); } } diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java index f7b6043..e7801bb 100644 --- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java @@ -25,4 +25,19 @@ public class LogisticsPoData { private String sku; private String orderRef1; + + /** + * CRD(确认完货日期,PODetail.c_crd) + */ + private Date crd; + + /** + * ETA(预估到货时间,PODetail.c_eta) + */ + private Date eta; + + /** + * Method(运输方式,POHeader.ship_via,存的是 ship_method.method_desc) + */ + private String shipVia; } diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoOrderData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoOrderData.java index 40c21f9..0405bea 100644 --- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoOrderData.java +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoOrderData.java @@ -44,4 +44,24 @@ public class LogisticsPoOrderData { * SKU */ private String sku; + + /** + * 订单数量(PODetail.qty) + */ + private Double qty; + + /** + * CRD(确认完货日期,PODetail.c_crd) + */ + private Date crd; + + /** + * ETA(预估到货时间,PODetail.c_eta) + */ + private Date eta; + + /** + * Method(运输方式,POHeader.ship_via,存的是 ship_method.method_desc) + */ + private String shipVia; } diff --git a/src/main/resources/mapper/baseInformation/SrmPartSkuMapper.xml b/src/main/resources/mapper/baseInformation/SrmPartSkuMapper.xml index 2681571..ae35031 100644 --- a/src/main/resources/mapper/baseInformation/SrmPartSkuMapper.xml +++ b/src/main/resources/mapper/baseInformation/SrmPartSkuMapper.xml @@ -8,6 +8,7 @@ + @@ -17,6 +18,7 @@ sku, remark, active, + bast_part_no AS basePartNo, create_date, create_by @@ -55,6 +57,7 @@ sku, remark, active, + bast_part_no, create_date, create_by ) VALUES ( @@ -62,6 +65,7 @@ #{sku}, #{remark}, #{active}, + #{basePartNo}, GETDATE(), #{createBy} ) @@ -73,6 +77,7 @@ remark = #{remark}, active = #{active}, + bast_part_no = #{basePartNo}, create_by = #{createBy} WHERE site = #{site} diff --git a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml index 68cbd71..e464113 100644 --- a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml +++ b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml @@ -49,6 +49,9 @@ d.c_ship_qty AS shippedQty, d.c_flexid AS flexId, d.order_ref1 AS orderRef1, + d.c_crd AS crd, + d.c_eta AS eta, + h.ship_via AS shipVia, p.sku FROM PODetail d LEFT JOIN POHeader h @@ -72,6 +75,10 @@ h.c_customer AS cCustomer, h.supplier_no AS supplierNo, d.part_no AS partNo, + d.qty AS qty, + d.c_crd AS crd, + d.c_eta AS eta, + h.ship_via AS shipVia, p.sku AS sku FROM PODetail d INNER JOIN POHeader h