From 62212348cb2400e14de857195adaa5d41acec696 Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 26 Aug 2021 14:43:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E6=96=99PDA=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E2=80=94=E2=80=94=E6=9D=90=E8=B4=A8=E3=80=81=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dispatch/mapper/CallItemMapper.java | 2 +- .../mesnac/dispatch/model/CallItem.java | 22 +++++++++++++ .../main/resources/mapper/CallItemMapper.xml | 31 +++++++++++++------ 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java index 321ad02f..b4a844e5 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java @@ -34,7 +34,7 @@ public interface CallItemMapper extends BaseMapper { List findCallItemDetailList(CallItem callItem); - List findCallItemListPda(@Param("site") String site,@Param("local") String local,@Param("user") String user,@Param("callItem")CallItem callItem); + List findCallItemListPda(@Param("site") String site,@Param("locale") String locale,@Param("user") String user,@Param("callItem")CallItem callItem); List findCallItemDetailListByDispatchBo(@Param("site") String site, @Param("list") List list); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java index aebe76ec..068ae2aa 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java @@ -197,6 +197,12 @@ public class CallItem extends Model { private Date requireFromDate; @TableField(exist = false) private Date requireToDate; + /**规格**/ + @TableField(exist = false) + private String spec; + /**材质**/ + @TableField(exist = false) + private String texture; public String getHandle() { return handle; @@ -614,6 +620,22 @@ public class CallItem extends Model { this.requireToDate = requireToDate; } + 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; + } + public static final String HANDLE = "HANDLE"; public static final String SITE = "SITE"; diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml index 11d56627..0e03f30b 100644 --- a/dispatch/src/main/resources/mapper/CallItemMapper.xml +++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml @@ -1074,8 +1074,9 @@ SELECT MML.* , ZSD.PLANNED_START_DATE FROM ( SELECT ZCI.SITE, CF.VALUE WORK_ORDER, ZCI.STATUS ,WC.WORK_CENTER, WCT.DESCRIPTION WORK_CENTER_DESCRIPTION, ZCI.SHOP_ORDER , ZCI.RESRCE, - IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION,ZCI.COMPONENT_BO , - CP.ITEM COMPONENT, ITT.DESCRIPTION COMPONENT_DESCRIPTION, ZSD.BLANKING_SIZE, + IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, + ZCI.COMPONENT_BO , CP.ITEM COMPONENT, ITT.DESCRIPTION COMPONENT_DESCRIPTION, + CFA.VALUE SPEC, CFB.VALUE TEXTURE, ZSD.BLANKING_SIZE, /*MIN(ZSD.PLANNED_START_DATE) , MIN(SO.PLANNED_START_DATE) , ZCI.CALL_TYPE,*/ SUM(ZCI.REQUIRED_QTY) REQUIRED_QTY @@ -1084,12 +1085,14 @@ INNER JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZCI.SHOP_ORDER AND SO.SITE = ZCI.SITE LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER' INNER JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER AND WC.SITE = ZCI.SITE - INNER JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE + INNER JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = #{locale} INNER JOIN ITEM IM ON IM.HANDLE = SO.ITEM_BO - INNER JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE + INNER JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = #{locale} INNER JOIN ITEM CP ON CP.HANDLE = ZCI.COMPONENT_BO - INNER JOIN ITEM_T ITT ON ITT.ITEM_BO = CP.HANDLE - WHERE ZCI.SITE = #{site} AND WCT.LOCALE = #{local} AND IT.LOCALE = #{local} AND ITT.LOCALE = #{local} + INNER JOIN ITEM_T ITT ON ITT.ITEM_BO = CP.HANDLE AND ITT.LOCALE = #{locale} + LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = CP.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC' + LEFT JOIN CUSTOM_FIELDS CFB ON CFA.HANDLE = CP.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE' + WHERE ZCI.SITE = #{site} AND ZCI.CALL_TYPE = #{callItem.callType} @@ -1097,7 +1100,7 @@ AND ZSD.EMPLOYEE LIKE '%' ||#{user} || '%' GROUP BY ZCI.SITE, CF.VALUE, ZCI.STATUS ,WC.WORK_CENTER, IM.ITEM, ZSD.BLANKING_SIZE, CP.ITEM, ZCI.RESRCE, ZCI.CALL_TYPE,ZCI.SHOP_ORDER ,ZCI.COMPONENT_BO , - WCT.DESCRIPTION ,IT.DESCRIPTION , ITT.DESCRIPTION ) MML + WCT.DESCRIPTION ,IT.DESCRIPTION , ITT.DESCRIPTION ,CFA.VALUE , CFB.VALUE ) MML LEFT JOIN ( SELECT MIN(ZSD.PLANNED_START_DATE) PLANNED_START_DATE,SHOP_ORDER FROM Z_SFC_DISPATCH zsd WHERE ZSD.SITE = #{site} GROUP BY ZSD.SHOP_ORDER) ZSD ON ZSD.SHOP_ORDER = MML.SHOP_ORDER @@ -1108,20 +1111,28 @@ AND MML.RESRCE = #{callItem.resrce} - - AND MML.COMPONENT = #{callItem.component} + + AND MML.COMPONENT_DESCRIPTION LIKE '%'|| #{callItem.componentDescription} ||'%' AND MML.STATUS = #{callItem.status} + + AND MML.SPEC LIKE '%' || #{callItem.spec} || '%' + + + AND MML.TEXTURE LIKE '%' || #{callItem.texture} || '%' + AND ZSD.PLANNED_START_DATE >= #{callItem.startFromDate} AND ZSD.PLANNED_START_DATE <= #{callItem.startToDate} - ORDER BY MML.SHOP_ORDER,MML.WORK_CENTER,MML.ITEM,MML.COMPONENT,MML.BLANKING_SIZE,ZSD.PLANNED_START_DATE + ORDER BY MML.COMPONENT_DESCRIPTION,MML.TEXTURE,MML.SPEC,MML.BLANKING_SIZE,ZSD.PLANNED_START_DATE + +