From bb17f7e1ab825d29bf270356d5548b5a987140b0 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Fri, 16 Jul 2021 16:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=89=93=E5=8D=B0=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/dto/SfcDispatchDto.java | 12 ++ .../src/main/resources/application-dev.yml | 4 + .../controller/CallItemController.java | 13 ++ .../mesnac/dispatch/model/CallItem.java | 92 +++++++++++++ .../main/resources/mapper/CallItemMapper.xml | 122 +++++++++++------- 5 files changed, 197 insertions(+), 46 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java index 5881700c..db29e45a 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java @@ -162,6 +162,10 @@ public class SfcDispatchDto implements Serializable{ * 工单自定义字段-工作令号 */ private String workOrder; + /** + * 工单自定义字段-项目号 + */ + private String itemNumber; /** * 工单组件信息 */ @@ -532,6 +536,14 @@ public class SfcDispatchDto implements Serializable{ this.workOrder = workOrder; } + public String getItemNumber() { + return itemNumber; + } + + public void setItemNumber(String itemNumber) { + this.itemNumber = itemNumber; + } + public String getComponent() { return component; } diff --git a/console/src/main/resources/application-dev.yml b/console/src/main/resources/application-dev.yml index 8f182ed2..709ff74e 100644 --- a/console/src/main/resources/application-dev.yml +++ b/console/src/main/resources/application-dev.yml @@ -31,3 +31,7 @@ ftp: username: zjw password: zhaojiawei +#打印服务器配置 +print: + server: http://localhost:8080/CodeSoftPrintWeb/printService + 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 065bd182..80b57687 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 @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.dispatch.controller; +import cn.hutool.core.date.DateUtil; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.dispatch.dto.IssueItemDto; import com.foreverwin.modular.core.exception.BusinessException; @@ -41,6 +42,12 @@ public class CallItemController { List result; try { callItem.setSite(CommonMethods.getSite()); + if (callItem.getStartFromDate_S() != null) { + callItem.setStartFromDate(DateUtil.parse(callItem.getStartFromDate_S())); + } + if (callItem.getStartToDate_S() != null) { + callItem.setStartToDate(DateUtil.parse(callItem.getStartToDate_S())); + } result = callItemService.findCallItemList(callItem); } catch (Exception e) { return R.failed(e.getMessage()); @@ -61,6 +68,12 @@ public class CallItemController { List result; try { callItem.setSite(CommonMethods.getSite()); + if (callItem.getStartFromDate_S() != null) { + callItem.setStartFromDate(DateUtil.parse(callItem.getStartFromDate_S())); + } + if (callItem.getStartToDate_S() != null) { + callItem.setStartToDate(DateUtil.parse(callItem.getStartToDate_S())); + } result = callItemService.findCallItemDetailList(callItem); } catch (Exception e) { return R.failed(e.getMessage()); 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 0243d9f9..aaba62fc 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 @@ -10,6 +10,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; +import java.util.Date; + import com.baomidou.mybatisplus.annotation.IdType; /** @@ -150,6 +152,8 @@ public class CallItem extends Model { @TableField(exist = false) private String workOrder; @TableField(exist = false) + private String itemNumber; + @TableField(exist = false) private String workCenter; @TableField(exist = false) private String dispatchNo; @@ -165,6 +169,22 @@ public class CallItem extends Model { private LocalDateTime plannedStartDate; @TableField(exist = false) private String remark; + @TableField(exist = false) + private String startFromDate_S; + @TableField(exist = false) + private String startToDate_S; + @TableField(exist = false) + private Date startFromDate; + @TableField(exist = false) + private Date startToDate; + @TableField(exist = false) + private String requireFromDate_S; + @TableField(exist = false) + private String requireToDate_S; + @TableField(exist = false) + private Date requireFromDate; + @TableField(exist = false) + private Date requireToDate; public String getHandle() { return handle; @@ -398,6 +418,14 @@ public class CallItem extends Model { this.workOrder = workOrder; } + public String getItemNumber() { + return itemNumber; + } + + public void setItemNumber(String itemNumber) { + this.itemNumber = itemNumber; + } + public String getWorkCenter() { return workCenter; } @@ -462,6 +490,70 @@ public class CallItem extends Model { this.remark = remark; } + public String getStartFromDate_S() { + return startFromDate_S; + } + + public void setStartFromDate_S(String startFromDate_S) { + this.startFromDate_S = startFromDate_S; + } + + public String getStartToDate_S() { + return startToDate_S; + } + + public void setStartToDate_S(String startToDate_S) { + this.startToDate_S = startToDate_S; + } + + public Date getStartFromDate() { + return startFromDate; + } + + public void setStartFromDate(Date startFromDate) { + this.startFromDate = startFromDate; + } + + public Date getStartToDate() { + return startToDate; + } + + public void setStartToDate(Date startToDate) { + this.startToDate = startToDate; + } + + public String getRequireFromDate_S() { + return requireFromDate_S; + } + + public void setRequireFromDate_S(String requireFromDate_S) { + this.requireFromDate_S = requireFromDate_S; + } + + public String getRequireToDate_S() { + return requireToDate_S; + } + + public void setRequireToDate_S(String requireToDate_S) { + this.requireToDate_S = requireToDate_S; + } + + public Date getRequireFromDate() { + return requireFromDate; + } + + public void setRequireFromDate(Date requireFromDate) { + this.requireFromDate = requireFromDate; + } + + public Date getRequireToDate() { + return requireToDate; + } + + public void setRequireToDate(Date requireToDate) { + this.requireToDate = requireToDate; + } + 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 16f7d227..65c4e194 100644 --- a/dispatch/src/main/resources/mapper/CallItemMapper.xml +++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml @@ -34,6 +34,7 @@ + @@ -629,54 +630,71 @@