From 041f592b1208bff1b80d903cad9f403c043e0dda Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Thu, 26 Aug 2021 09:48:17 +0800 Subject: [PATCH 1/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=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=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, 2 insertions(+) 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 19ebf9ef..2f7e9a0f 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 @@ -212,6 +212,8 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ newInspectionTask.setStatus(Constants.INSPECTION_TASK_STATUS_NEW); newInspectionTask.setResult(null); newInspectionTask.setComments(null); + newInspectionTask.setCreatedDateTime(dateTime); + newInspectionTask.setModifiedDateTime(dateTime); inspectionTaskService.save(newInspectionTask); } } 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 2/2] =?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