From abc2b9b07b1bda5bd0586899de9be737ad9ed168 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Thu, 26 Aug 2021 09:56:35 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreverwin/mesnac/common/dto/LabelPrintDto.java | 11 +++++++++++ .../common/service/impl/ProdReadyTaskServiceImpl.java | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java index 9a63900e..dc3b9043 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java @@ -19,6 +19,9 @@ public class LabelPrintDto implements Serializable { //原材料标签参数 //物料编码 private String item; + + private String itemNumber; + //物料描述 private String itemDescription; //供应商 @@ -45,6 +48,14 @@ public class LabelPrintDto implements Serializable { //打印张数 private Integer printNum; + public String getItemNumber() { + return itemNumber; + } + + public void setItemNumber(String itemNumber) { + this.itemNumber = itemNumber; + } + public String getShopOrder() { return shopOrder; } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index 1dd3f23e..ceeba0f5 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -474,7 +474,9 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl Date: Thu, 26 Aug 2021 10:01:48 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/service/impl/PrintLogServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java index 541629ed..aff0d58d 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java @@ -77,6 +77,7 @@ public class PrintLogServiceImpl extends ServiceImpl i list.get(i).setPrintNum(printList.get(i).getPrintNum()); } + // 访问打印服务 printServer(list); // 更新打印记录：是否已打印、使用的打印机、打印次数 @@ -115,10 +116,14 @@ public class PrintLogServiceImpl extends ServiceImpl i public void sfcLabelPrint(Map map) { Integer qty = (Integer) map.get("qty"); List labelPrintDtoList = (List) map.get("labelPrintDtoList"); - printServer(labelPrintDtoList); + // 解决无法获取list中对象的问题 String parse = JSON.toJSONString(labelPrintDtoList); List labelPrintDtos = JSONObject.parseArray(parse, LabelPrintDto.class); + + // 访问打印服务 + printServer(labelPrintDtos); + // 打印张数 Integer printNum = 0; for (LabelPrintDto labelP:labelPrintDtos) { From af57704e0a13908a870ad46f045b0af80a28cf76 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Thu, 26 Aug 2021 10:05:31 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/InspectionTaskManageServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java index 2f7e9a0f..ac65ac4d 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java @@ -205,7 +205,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ //任务主表 InspectionTask newInspectionTask = new InspectionTask(); BeanUtils.copyProperties(inspectionTaskModel, newInspectionTask); - String newTaskNo = "H_" + DateUtil.getTimeString(); + String newTaskNo = "P_" + DateUtil.getTimeString(); String handle = HandleEnum.INSPECTION_TASK.getHandle(site, newTaskNo); newInspectionTask.setHandle(handle); newInspectionTask.setTaskNo(newTaskNo); From bc81539ac5b3c7aa5d0b1081a260191bac1eba76 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Thu, 26 Aug 2021 11:03:04 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/ProdReadyTaskServiceImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index ceeba0f5..e441cdc4 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -525,12 +525,10 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl Date: Thu, 26 Aug 2021 11:19:03 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/service/impl/ProdReadyTaskServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index e441cdc4..373e6b91 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -468,6 +468,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl Date: Thu, 26 Aug 2021 14:42:21 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E7=82=B9=E6=A3=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equip/service/impl/ResourceInspectPlanServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java index 9071a7da..74424816 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java @@ -149,7 +149,7 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl Date: Thu, 26 Aug 2021 14:43:10 +0800 Subject: [PATCH 7/9] =?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 + + - SELECT IM.ITEM ,S.SFC, IT.DESCRIPTION ITEM_DESCRIPTION, ZSD.SHOP_ORDER, + SELECT IM.ITEM , I.ITEM_BO PRINTER, S.SFC, IT.DESCRIPTION ITEM_DESCRIPTION, ZSD.SHOP_ORDER, I.QTY_ON_HAND QTY ,ZSD.BLANKING_SIZE , CF.VALUE DRAWING_REVISION FROM INVENTORY I LEFT JOIN SFC S ON I.INVENTORY_CONTEXT_GBO = S.HANDLE From e39e3ac2b39f21a67f1c1ad6a2af5265894bf9de Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 26 Aug 2021 15:15:46 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=90=8C=E4=B8=80=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E7=82=B9=E6=A3=80=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equip/service/impl/ResourceInspectPlanServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java index 74424816..4a4d1383 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java @@ -149,7 +149,7 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl