From ae70b86facead46e750633b07496d892f501e97c Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 10 Oct 2025 14:12:18 +0800 Subject: [PATCH] =?UTF-8?q?2025-10-10=20=E9=A2=86=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=E7=9A=84=E6=9D=90=E6=96=99=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IssureNotifyController.java | 12 ++++ .../entity/BomAlternativePartsData.java | 70 +++++++++++++++++++ .../mapper/IssureNotifyMapper.java | 7 ++ .../service/IssureNotifyService.java | 7 ++ .../service/impl/IssureNotifyServiceImpl.java | 4 ++ .../vo/SOIssueNotifyOrderList.java | 4 +- .../mapper/orderIssure/IssureNotifyMapper.xml | 22 ++++++ 7 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/gaotao/modules/orderIssure/entity/BomAlternativePartsData.java diff --git a/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java b/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java index 4d8fe4e..1285433 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java +++ b/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java @@ -362,4 +362,16 @@ public class IssureNotifyController { return R.ok("保存成功"); } + /** + * 查询BOM替代料列表 + * @param data 查询条件 + * @return R + */ + @PostMapping(value="/getBomAlternativeParts") + @ResponseBody + public R getBomAlternativeParts(@RequestBody BomAlternativePartsData data) { + List list = issureNotifyService.getBomAlternativeParts(data); + return R.ok().put("rows", list); + } + } diff --git a/src/main/java/com/gaotao/modules/orderIssure/entity/BomAlternativePartsData.java b/src/main/java/com/gaotao/modules/orderIssure/entity/BomAlternativePartsData.java new file mode 100644 index 0000000..5564537 --- /dev/null +++ b/src/main/java/com/gaotao/modules/orderIssure/entity/BomAlternativePartsData.java @@ -0,0 +1,70 @@ +package com.gaotao.modules.orderIssure.entity; + +import lombok.Data; + +/** + * BOM替代料数据实体 + */ +@Data +public class BomAlternativePartsData { + /** + * 站点 + */ + private String site; + + /** + * 申请单号 + */ + private String notifyNo; + + /** + * 工单号 + */ + private String orderNo; + + /** + * 子件编码（用于查询条件） + */ + private String componentPart; + + /** + * 母件编码 + */ + private String partNo; + + /** + * 母件名称 + */ + private String partDesc; + + /** + * 子件编码 + */ + private String componentPartNo; + + /** + * 子件名称 + */ + private String componentPartDesc; + + /** + * 替代料编码 + */ + private String alternativePartNo; + + /** + * 替代料名称 + */ + private String alternativePartDesc; + + /** + * 替代比例 + */ + private String replacementRatio; + + /** + * 优先级 + */ + private Integer priority; +} + diff --git a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java index 5aff1a0..9c10979 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java +++ b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java @@ -175,4 +175,11 @@ public interface IssureNotifyMapper extends BaseMapper { * @return 物料信息 */ PartEntity getPartBySiteAndPartNo(@Param("site") String site, @Param("partNo") String partNo); + + /** + * 查询BOM替代料列表 + * @param data 查询条件 + * @return 替代料列表 + */ + List getBomAlternativeParts(BomAlternativePartsData data); } diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java b/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java index 12f729e..982e98e 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java @@ -150,4 +150,11 @@ public interface IssureNotifyService { * @param data 材料明细数据 */ void saveSOIssueNotifyOrderMateria(SOIssueNotifyOrderMaterialListData data); + + /** + * 查询BOM替代料列表 + * @param data 查询条件 + * @return 替代料列表 + */ + List getBomAlternativeParts(BomAlternativePartsData data); } diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java index 0282754..c415a3b 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java @@ -528,5 +528,9 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { issureNotifyMapper.saveSOIssueNotifyOrderMateria(data); } + @Override + public List getBomAlternativeParts(BomAlternativePartsData data) { + return issureNotifyMapper.getBomAlternativeParts(data); + } } diff --git a/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyOrderList.java b/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyOrderList.java index 16880b3..ae56066 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyOrderList.java +++ b/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyOrderList.java @@ -51,8 +51,8 @@ public class SOIssueNotifyOrderList { * */ private String outWorkOrderFlag; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date needDate; private String locationNo; private String resourceId; diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 16c95f8..57a918c 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -585,4 +585,26 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) FROM part WHERE Site = #{site} AND PartNo = #{partNo} + + + \ No newline at end of file