From 53d7c472cf9d2c9b7545c971d75d639a5add7134 Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 26 Aug 2021 10:01:48 +0800 Subject: [PATCH 1/2] =?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 2/2] =?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);