From fa4d9bfb15f40eb011d0d0f6f57ca56daeea9164 Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 27 Aug 2021 17:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=8F=91=E6=96=99PDA?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=90=E8=B4=A8=E3=80=81=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=88=97=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82=E4=BB=B6=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CallItemController.java | 4 +++- .../mesnac/dispatch/dto/IssueItemDto.java | 18 ++++++++++++++++++ .../service/impl/CallItemServiceImpl.java | 2 ++ .../main/resources/mapper/CallItemMapper.xml | 16 ++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java index 29cc8a78..87e4d075 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java @@ -294,7 +294,7 @@ public class CallItemController { */ @ResponseBody @GetMapping("/findIssueItemListPda") - public R findIssueItemListPda(String workCenter, String resource, String item,String requiredFromDate, String requiredToDate, Boolean matchResource) { + public R findIssueItemListPda(String workCenter, String resource, String item,String spec,String texture,String requiredFromDate, String requiredToDate, Boolean matchResource) { List result; try { String site = CommonMethods.getSite(); @@ -306,6 +306,8 @@ public class CallItemController { issueItemDto.setWorkCenter(workCenter); issueItemDto.setMatchResource(matchResource); issueItemDto.setItem(item); + issueItemDto.setSpec(spec); + issueItemDto.setTexture(texture); if (StringUtil.notBlank(requiredFromDate)) { issueItemDto.setRequiredFromDT(LocalDate.parse(requiredFromDate, DateTimeFormatter.ISO_DATE)); } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java index b9629770..090485fe 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java @@ -15,6 +15,8 @@ public class IssueItemDto implements Serializable { private Boolean matchResource; private LocalDate requiredFromDT; private LocalDate requiredToDT; + private String spec; + private String texture; public String getSite() { return site; @@ -95,4 +97,20 @@ public class IssueItemDto implements Serializable { public void setRequiredToDT(LocalDate requiredToDT) { this.requiredToDT = requiredToDT; } + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public String getTexture() { + return texture; + } + + public void setTexture(String texture) { + this.texture = texture; + } } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java index c0b16de0..d8737b61 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java @@ -453,6 +453,8 @@ public class CallItemServiceImpl extends ServiceImpl i String component = callItem.getItem(); String itemGroup = callItem.getItemGroup(); BigDecimal reqQty = callItem.getDispatchQty(); + // 需求件数 + callItem.setDispatchQty(reqQty); String blankingSize = callItem.getBlankingSize(); if (StringUtil.isBlank(blankingSize)) { diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml index 03bfeff7..daf51181 100644 --- a/dispatch/src/main/resources/mapper/CallItemMapper.xml +++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml @@ -1032,6 +1032,8 @@ LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh' LEFT JOIN ITEM I ON I.HANDLE = ZCI.COMPONENT_BO LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = 'zh' + LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = I.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC' + LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = I.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE' LEFT JOIN ITEM_GROUP_MEMBER IGM ON IGM.ITEM_BO = ZCI.COMPONENT_BO LEFT JOIN ITEM_GROUP IG ON IG.HANDLE = IGM.ITEM_GROUP_BO WHERE ZCI.CALL_TYPE = 'MATERIAL' AND ZCI.STATUS = '802' AND ZCI.SITE = #{site} @@ -1050,6 +1052,12 @@ AND ZCI.REQUIRED_DATE_TIME <= #{requiredToDT} + + AND CFA.VALUE LIKE '%' || #{spec} || '%' + + + AND CFB.VALUE LIKE '%' || #{texture} || '%' + GROUP BY ZCI.COMPONENT_BO ,ZSD.WORK_CENTER ,WCT.DESCRIPTION ,I.ITEM ,IT.DESCRIPTION ,ZSD.BLANKING_SIZE ,IG.ITEM_GROUP ORDER BY ZCI.COMPONENT_BO @@ -1065,6 +1073,8 @@ LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh' LEFT JOIN ITEM I ON I.HANDLE = ZCI.COMPONENT_BO LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = 'zh' + LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = I.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC' + LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = I.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE' LEFT JOIN ITEM_GROUP_MEMBER IGM ON IGM.ITEM_BO = ZCI.COMPONENT_BO LEFT JOIN ITEM_GROUP IG ON IG.HANDLE = IGM.ITEM_GROUP_BO LEFT JOIN RESRCE R ON R.RESRCE = ZCI.RESRCE AND R.SITE = ZCI.SITE @@ -1084,6 +1094,12 @@ AND ZCI.REQUIRED_DATE_TIME <= #{requiredToDT} + + AND CFA.VALUE LIKE '%' || #{spec} || '%' + + + AND CFB.VALUE LIKE '%' || #{texture} || '%' + GROUP BY ZCI.COMPONENT_BO ,ZSD.WORK_CENTER ,WCT.DESCRIPTION ,I.ITEM ,IT.DESCRIPTION ,ZSD.BLANKING_SIZE ,IG.ITEM_GROUP , ZCI.RESRCE, R.DESCRIPTION ORDER BY ZCI.COMPONENT_BO