From fa4d9bfb15f40eb011d0d0f6f57ca56daeea9164 Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 27 Aug 2021 17:07:54 +0800 Subject: [PATCH 1/5] =?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 From 1d51db451e81c949b3467fa75e9d3640f079183a Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Sun, 29 Aug 2021 18:16:38 +0800 Subject: [PATCH 2/5] erp --- .../src/main/java/com/foreverwin/mesnac/common/util/ERPAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/util/ERPAPI.java b/common/src/main/java/com/foreverwin/mesnac/common/util/ERPAPI.java index 1e7d6d6d..c22a155c 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/util/ERPAPI.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/util/ERPAPI.java @@ -26,7 +26,7 @@ public class ERPAPI { String server = System.getProperty("ws.erp.server"); String port = System.getProperty("ws.erp.port"); - return String.format("http://%s:%s/sap/bc/srt/rfc/sap/zws_zmes_prodordconf/302/zws_zmes_prodordconf/zws_zmes_prodordconf", server, port); + return String.format("http://%s:%s/sap/bc/srt/rfc/sap/zws_zmes_prodordconf/900/zws_zmes_prodordconf/zws_zmes_prodordconf", server, port); } public static void apply(Object stubImpl) { From 11c7a962a8cf99723e6b0cfa530272b0f8a99e2c Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Sun, 29 Aug 2021 18:23:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?erp=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/erp/ZWS_ZMES_PRODORDCONF_ServiceLocator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/erp/ZWS_ZMES_PRODORDCONF_ServiceLocator.java b/common/src/main/java/com/foreverwin/mesnac/common/erp/ZWS_ZMES_PRODORDCONF_ServiceLocator.java index af327125..a4c1bc19 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/erp/ZWS_ZMES_PRODORDCONF_ServiceLocator.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/erp/ZWS_ZMES_PRODORDCONF_ServiceLocator.java @@ -22,7 +22,7 @@ public class ZWS_ZMES_PRODORDCONF_ServiceLocator extends org.apache.axis.client. } // Use to get a proxy class for ZWS_ZMES_PRODORDCONF - private java.lang.String ZWS_ZMES_PRODORDCONF_address = "http://sapdev.mesnac.com:8000/sap/bc/srt/rfc/sap/zws_zmes_prodordconf/302/zws_zmes_prodordconf/zws_zmes_prodordconf"; + private java.lang.String ZWS_ZMES_PRODORDCONF_address = "http://srm.mesnac.com:8000/sap/bc/srt/rfc/sap/zws_zmes_prodordconf/900/zws_zmes_prodordconf/zws_zmes_prodordconf"; public java.lang.String getZWS_ZMES_PRODORDCONFAddress() { return ZWS_ZMES_PRODORDCONF_address; From eecc81755f42072cfcb6ff6a20f4164be229e089 Mon Sep 17 00:00:00 2001 From: zpl Date: Sun, 29 Aug 2021 19:38:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=90=8C=E4=B8=80=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=B8=8D=E7=BB=B4=E6=8A=A4=E7=9B=B8=E5=90=8C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=82=B9=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml index cfebf0b7..d5debda4 100644 --- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml @@ -731,7 +731,8 @@ From 64da93ed437deee3798de7bd0b64163812c38b36 Mon Sep 17 00:00:00 2001 From: zpl Date: Mon, 30 Aug 2021 10:53:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=82=B9=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meapi/src/main/resources/mapper/ResrceMapper.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml index beea997e..ccfef860 100644 --- a/meapi/src/main/resources/mapper/ResrceMapper.xml +++ b/meapi/src/main/resources/mapper/ResrceMapper.xml @@ -611,4 +611,12 @@ GROUP BY RS.HANDLE, RS.SITE, RS.RESRCE, RS.DESCRIPTION, RS.STATUS_BO, RS.PROCESS_RESOURCE, RS.OPERATION_BO, RS.VALID_FROM, RS.VALID_TO, RS.SETUP_STATE, RS.CREATED_DATE_TIME, RS.MODIFIED_DATE_TIME + + + +