From 6d157881c197e62ae0597dd342857dd265462f8c Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Thu, 1 Jul 2021 15:02:23 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8F=AB=E6=96=99?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/constant/Constants.java | 4 + .../mesnac/common/dto/SfcDispatchDto.java | 18 ++ .../mesnac/common/enums/HandleEnum.java | 3 + .../controller/CallItemController.java | 10 +- .../controller/SfcDispatchController.java | 2 +- .../dispatch/mapper/CallItemMapper.java | 20 +- .../mesnac/dispatch/model/CallItem.java | 177 +++++++++---- .../mesnac/dispatch/model/SfcDispatch.java | 104 ++++---- .../dispatch/model/ShopOrderRelease.java | 9 + .../dispatch/service/CallItemService.java | 10 +- .../dispatch/service/SfcDispatchService.java | 1 + .../service/impl/CallItemServiceImpl.java | 75 +++++- .../service/impl/SfcDispatchServiceImpl.java | 11 +- .../impl/ShopOrderReleaseServiceImpl.java | 10 + .../main/resources/mapper/CallItemMapper.xml | 232 +++++++++++------- .../resources/mapper/SfcDispatchMapper.xml | 30 ++- .../meapi/controller/ResrceController.java | 23 +- .../production/mapper/SfcDataMapper.java | 1 + .../service/impl/SfcDataServiceImpl.java | 11 +- .../main/resources/mapper/SfcDataMapper.xml | 4 + 20 files changed, 556 insertions(+), 199 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java index 954a830d..8c9bf8a5 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java @@ -17,4 +17,8 @@ public interface Constants { String STATUS_N = "N"; String SITE_ADMIN = "SITE_ADMIN"; + + //叫料类型 + String CALL_TYPE_MATERIAL = "MATERIAL"; + String CALL_TYPE_OPERATION = "OPERATION"; } 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 74a86a02..bae3f554 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 @@ -135,6 +135,7 @@ public class SfcDispatchDto implements Serializable { /** * 前置工序 */ + private String prepositionStepId; private String prepositionOperation; /** * 是否首工序 @@ -143,6 +144,7 @@ public class SfcDispatchDto implements Serializable { /** * 物料编号&描述 */ + private String itemBo; private String item; private String itemDescription; private String qtyToBuild; @@ -442,6 +444,14 @@ public class SfcDispatchDto implements Serializable { this.remark = remark; } + public String getPrepositionStepId() { + return prepositionStepId; + } + + public void setPrepositionStepId(String prepositionStepId) { + this.prepositionStepId = prepositionStepId; + } + public String getPrepositionOperation() { return prepositionOperation; } @@ -458,6 +468,14 @@ public class SfcDispatchDto implements Serializable { this.isFirstOperation = isFirstOperation; } + public String getItemBo() { + return itemBo; + } + + public void setItemBo(String itemBo) { + this.itemBo = itemBo; + } + public String getItem() { return item; } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java index 633abb1a..07e27bcc 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java @@ -20,6 +20,9 @@ public enum HandleEnum { /**物料清单**/ BOM("BOMBO:","BOMBO:{0},{1},{2},{3}"), + /**叫料**/ + CALL_ITEM("CallItemBO:", "CallItemBO:{0},{1}"), + /**工单*/ SHOP_ORDER( "ShopOrderBO:", "ShopOrderBO:{0},{1}" ), 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 3fc22a44..4e7e12f6 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 @@ -16,7 +16,7 @@ import java.util.List; /** * * @author Leon.L - * @since 2021-06-24 + * @since 2021-06-30 */ @RestController @RequestMapping("/Z-CALL-ITEM") @@ -72,7 +72,7 @@ public class CallItemController { .or().like(CallItem::getCallItemNo, frontPage.getGlobalQuery()) .or().like(CallItem::getShopOrder, frontPage.getGlobalQuery()) .or().like(CallItem::getSfc, frontPage.getGlobalQuery()) - .or().like(CallItem::getDispatchNo, frontPage.getGlobalQuery()) + .or().like(CallItem::getSfcDispatchBo, frontPage.getGlobalQuery()) .or().like(CallItem::getOperation, frontPage.getGlobalQuery()) .or().like(CallItem::getStepId, frontPage.getGlobalQuery()) .or().like(CallItem::getResrce, frontPage.getGlobalQuery()) @@ -80,9 +80,9 @@ public class CallItemController { .or().like(CallItem::getCallType, frontPage.getGlobalQuery()) .or().like(CallItem::getStatus, frontPage.getGlobalQuery()) .or().like(CallItem::getCallStatus, frontPage.getGlobalQuery()) - .or().like(CallItem::getSendStatus, frontPage.getGlobalQuery()) - .or().like(CallItem::getCreateUserBo, frontPage.getGlobalQuery()) - .or().like(CallItem::getUpdateUserBo, frontPage.getGlobalQuery()) + .or().like(CallItem::getIssueStatus, frontPage.getGlobalQuery()) + .or().like(CallItem::getCreateUser, frontPage.getGlobalQuery()) + .or().like(CallItem::getUpdateUser, frontPage.getGlobalQuery()) ); } result = callItemService.page(frontPage.getPagePlus(), queryWrapper); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java index 4057dbcd..8a00ce6d 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java @@ -229,7 +229,7 @@ public class SfcDispatchController { String user = CommonMethods.getUser(); flag = sfcDispatchService.releaseDispatch(site, user, message, sfcDispatchList); } catch (Exception e) { - return R.failed(e.getMessage()); + return R.failed("派工发布失败：" + e.getMessage()); } 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 bce1f5aa..c7c2b63f 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 @@ -1,18 +1,36 @@ package com.foreverwin.mesnac.dispatch.mapper; +import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.dispatch.model.CallItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.dispatch.model.SfcDispatch; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* Mapper 接口 *

* * @author Leon.L - * @since 2021-06-24 + * @since 2021-06-30 */ @Repository public interface CallItemMapper extends BaseMapper { + /** + * 派工叫料组件数据删除 + * + * @param list + */ + void deleteDispatchCallItem(List list); + + /** + * 查询叫料组件 + * + * @param list + * @return + */ + List selectDispatchCallItem(List list); } \ No newline at end of file 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 50d8ec6e..0db327df 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 @@ -5,6 +5,8 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; + +import java.math.BigDecimal; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; @@ -16,10 +18,11 @@ import com.baomidou.mybatisplus.annotation.IdType; *

* * @author Leon.L - * @since 2021-06-24 + * @since 2021-06-30 */ @TableName("Z_CALL_ITEM") + public class CallItem extends Model { private static final long serialVersionUID = 1L; @@ -34,6 +37,11 @@ public class CallItem extends Model { */ @TableField("SITE") private String site; + /** + * 派工单号 + */ + @TableField("SFC_DISPATCH_BO") + private String sfcDispatchBo; /** * 叫料单号 */ @@ -50,22 +58,17 @@ public class CallItem extends Model { @TableField("SFC") private String sfc; /** - * 派工单号 - */ - @TableField("DISPATCH_NO") - private String dispatchNo; - /** - * 工序编号 + * 操作编号 */ @TableField("OPERATION") private String operation; /** - * 步骤标识 + * 步骤标示 */ @TableField("STEP_ID") private String stepId; /** - * 资源编号 + * 设备编号 */ @TableField("RESRCE") private String resrce; @@ -75,7 +78,7 @@ public class CallItem extends Model { @TableField("COMPONENT_BO") private String componentBo; /** - * 叫料类型：MATERIAL/OPERATION + * 叫料类型 */ @TableField("CALL_TYPE") private String callType; @@ -89,6 +92,11 @@ public class CallItem extends Model { */ @TableField("REQUIRED_DATE_TIME") private LocalDateTime requiredDateTime; + /** + * 发料数量 + */ + @TableField("ISSUE_QTY") + private Double issueQty; /** * 状态 */ @@ -102,30 +110,46 @@ public class CallItem extends Model { /** * 发料状态 */ - @TableField("SEND_STATUS") - private String sendStatus; + @TableField("ISSUE_STATUS") + private String issueStatus; /** * 创建用户 */ - @TableField("CREATE_USER_BO") - private String createUserBo; + @TableField("CREATE_USER") + private String createUser; /** * 创建时间 */ @TableField("CREATED_DATE_TIME") private LocalDateTime createdDateTime; /** - * 更新用户 + * 修改用户 */ - @TableField("UPDATE_USER_BO") - private String updateUserBo; + @TableField("UPDATE_USER") + private String updateUser; /** - * 更新时间 + * 修改时间 */ @TableField("UPDATED_DATE_TIME") private LocalDateTime updatedDateTime; + @TableField(exist = false) + private String workOrder; + @TableField(exist = false) + private String resourceType; + @TableField(exist = false) + private String blankingSize; + @TableField(exist = false) + private BigDecimal dispatchQty; + @TableField(exist = false) + private String itemDescription; + @TableField(exist = false) + private String operationDescription; + @TableField(exist = false) + private String remark; + + public String getHandle() { return handle; } @@ -166,12 +190,12 @@ public class CallItem extends Model { this.sfc = sfc; } - public String getDispatchNo() { - return dispatchNo; + public String getSfcDispatchBo() { + return sfcDispatchBo; } - public void setDispatchNo(String dispatchNo) { - this.dispatchNo = dispatchNo; + public void setSfcDispatchBo(String sfcDispatchBo) { + this.sfcDispatchBo = sfcDispatchBo; } public String getOperation() { @@ -230,6 +254,14 @@ public class CallItem extends Model { this.requiredDateTime = requiredDateTime; } + public Double getIssueQty() { + return issueQty; + } + + public void setIssueQty(Double issueQty) { + this.issueQty = issueQty; + } + public String getStatus() { return status; } @@ -246,20 +278,20 @@ public class CallItem extends Model { this.callStatus = callStatus; } - public String getSendStatus() { - return sendStatus; + public String getIssueStatus() { + return issueStatus; } - public void setSendStatus(String sendStatus) { - this.sendStatus = sendStatus; + public void setIssueStatus(String issueStatus) { + this.issueStatus = issueStatus; } - public String getCreateUserBo() { - return createUserBo; + public String getCreateUser() { + return createUser; } - public void setCreateUserBo(String createUserBo) { - this.createUserBo = createUserBo; + public void setCreateUser(String createUser) { + this.createUser = createUser; } public LocalDateTime getCreatedDateTime() { @@ -270,12 +302,12 @@ public class CallItem extends Model { this.createdDateTime = createdDateTime; } - public String getUpdateUserBo() { - return updateUserBo; + public String getUpdateUser() { + return updateUser; } - public void setUpdateUserBo(String updateUserBo) { - this.updateUserBo = updateUserBo; + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; } public LocalDateTime getUpdatedDateTime() { @@ -286,18 +318,74 @@ public class CallItem extends Model { this.updatedDateTime = updatedDateTime; } + public String getWorkOrder() { + return workOrder; + } + + public void setWorkOrder(String workOrder) { + this.workOrder = workOrder; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + public String getBlankingSize() { + return blankingSize; + } + + public void setBlankingSize(String blankingSize) { + this.blankingSize = blankingSize; + } + + public BigDecimal getDispatchQty() { + return dispatchQty; + } + + public void setDispatchQty(BigDecimal dispatchQty) { + this.dispatchQty = dispatchQty; + } + + public String getItemDescription() { + return itemDescription; + } + + public void setItemDescription(String itemDescription) { + this.itemDescription = itemDescription; + } + + public String getOperationDescription() { + return operationDescription; + } + + public void setOperationDescription(String operationDescription) { + this.operationDescription = operationDescription; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + public static final String HANDLE = "HANDLE"; public static final String SITE = "SITE"; + public static final String SFC_DISPATCH_BO = "SFC_DISPATCH_BO"; + public static final String CALL_ITEM_NO = "CALL_ITEM_NO"; public static final String SHOP_ORDER = "SHOP_ORDER"; public static final String SFC = "SFC"; - public static final String DISPATCH_NO = "DISPATCH_NO"; - public static final String OPERATION = "OPERATION"; public static final String STEP_ID = "STEP_ID"; @@ -312,17 +400,19 @@ public class CallItem extends Model { public static final String REQUIRED_DATE_TIME = "REQUIRED_DATE_TIME"; + public static final String ISSUE_QTY = "ISSUE_QTY"; + public static final String STATUS = "STATUS"; public static final String CALL_STATUS = "CALL_STATUS"; - public static final String SEND_STATUS = "SEND_STATUS"; + public static final String ISSUE_STATUS = "ISSUE_STATUS"; - public static final String CREATE_USER_BO = "CREATE_USER_BO"; + public static final String CREATE_USER = "CREATE_USER"; public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; - public static final String UPDATE_USER_BO = "UPDATE_USER_BO"; + public static final String UPDATE_USER = "UPDATE_USER"; public static final String UPDATED_DATE_TIME = "UPDATED_DATE_TIME"; @@ -337,10 +427,10 @@ public class CallItem extends Model { return "CallItem{" + "handle = " + handle + ", site = " + site + + ", sfcDispatchBo = " + sfcDispatchBo + ", callItemNo = " + callItemNo + ", shopOrder = " + shopOrder + ", sfc = " + sfc + - ", dispatchNo = " + dispatchNo + ", operation = " + operation + ", stepId = " + stepId + ", resrce = " + resrce + @@ -348,12 +438,13 @@ public class CallItem extends Model { ", callType = " + callType + ", requiredQty = " + requiredQty + ", requiredDateTime = " + requiredDateTime + + ", issueQty = " + issueQty + ", status = " + status + ", callStatus = " + callStatus + - ", sendStatus = " + sendStatus + - ", createUserBo = " + createUserBo + + ", issueStatus = " + issueStatus + + ", createUser = " + createUser + ", createdDateTime = " + createdDateTime + - ", updateUserBo = " + updateUserBo + + ", updateUser = " + updateUser + ", updatedDateTime = " + updatedDateTime + "}"; } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatch.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatch.java index 2306c167..8b5c9cd1 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatch.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatch.java @@ -16,10 +16,11 @@ import com.baomidou.mybatisplus.annotation.IdType; *

* * @author Leon.L - * @since 2021-06-21 + * @since 2021-06-30 */ @TableName("Z_SFC_DISPATCH") + public class SfcDispatch extends Model { private static final long serialVersionUID = 1L; @@ -192,6 +193,8 @@ public class SfcDispatch extends Model { /** * 前置工序 */ + @TableField("PREPOSITION_STEP_ID") + private String prepositionStepId; @TableField("PREPOSITION_OPERATION") private String prepositionOperation; /** @@ -586,93 +589,103 @@ public class SfcDispatch extends Model { this.other5 = other5; } -public static final String HANDLE = "HANDLE"; + public String getPrepositionStepId() { + return prepositionStepId; + } + + public void setPrepositionStepId(String prepositionStepId) { + this.prepositionStepId = prepositionStepId; + } + + public static final String HANDLE = "HANDLE"; + + public static final String SITE = "SITE"; -public static final String SITE = "SITE"; + public static final String SHOP_ORDER = "SHOP_ORDER"; -public static final String SHOP_ORDER = "SHOP_ORDER"; + public static final String SFC = "SFC"; -public static final String SFC = "SFC"; + public static final String BLANKING_SIZE = "BLANKING_SIZE"; -public static final String BLANKING_SIZE = "BLANKING_SIZE"; + public static final String DISPATCH_SEQ = "DISPATCH_SEQ"; -public static final String DISPATCH_SEQ = "DISPATCH_SEQ"; + public static final String DISPATCH_NO = "DISPATCH_NO"; -public static final String DISPATCH_NO = "DISPATCH_NO"; + public static final String DISPATCH_STATUS = "DISPATCH_STATUS"; -public static final String DISPATCH_STATUS = "DISPATCH_STATUS"; + public static final String DRAWINGS_NO = "DRAWINGS_NO"; -public static final String DRAWINGS_NO = "DRAWINGS_NO"; + public static final String DRAWINGS_REVISION = "DRAWINGS_REVISION"; -public static final String DRAWINGS_REVISION = "DRAWINGS_REVISION"; + public static final String IS_LOCK = "IS_LOCK"; -public static final String IS_LOCK = "IS_LOCK"; + public static final String ROUTER_BO = "ROUTER_BO"; -public static final String ROUTER_BO = "ROUTER_BO"; + public static final String STEP_ID = "STEP_ID"; -public static final String STEP_ID = "STEP_ID"; + public static final String OPERATION = "OPERATION"; -public static final String OPERATION = "OPERATION"; + public static final String RESOURCE_TYPE = "RESOURCE_TYPE"; -public static final String RESOURCE_TYPE = "RESOURCE_TYPE"; + public static final String WORK_CENTER = "WORK_CENTER"; -public static final String WORK_CENTER = "WORK_CENTER"; + public static final String RESRCE = "RESRCE"; -public static final String RESRCE = "RESRCE"; + public static final String EMPLOYEE = "EMPLOYEE"; -public static final String EMPLOYEE = "EMPLOYEE"; + public static final String TURN_OPERATION = "TURN_OPERATION"; -public static final String TURN_OPERATION = "TURN_OPERATION"; + public static final String DISPATCH_QTY = "DISPATCH_QTY"; -public static final String DISPATCH_QTY = "DISPATCH_QTY"; + public static final String PROD_HOURS = "PROD_HOURS"; -public static final String PROD_HOURS = "PROD_HOURS"; + public static final String PLANNED_START_DATE = "PLANNED_START_DATE"; -public static final String PLANNED_START_DATE = "PLANNED_START_DATE"; + public static final String PLANNED_COMP_DATE = "PLANNED_COMP_DATE"; -public static final String PLANNED_COMP_DATE = "PLANNED_COMP_DATE"; + public static final String EARLIEST_START_DATE = "EARLIEST_START_DATE"; -public static final String EARLIEST_START_DATE = "EARLIEST_START_DATE"; + public static final String LATEST_END_DATE = "LATEST_END_DATE"; -public static final String LATEST_END_DATE = "LATEST_END_DATE"; + public static final String SO_RELEASED_DATE = "SO_RELEASED_DATE"; -public static final String SO_RELEASED_DATE = "SO_RELEASED_DATE"; + public static final String SFC_RELEASED_DATE = "SFC_RELEASED_DATE"; -public static final String SFC_RELEASED_DATE = "SFC_RELEASED_DATE"; + public static final String RELEASED_COMPLETE_DATE = "RELEASED_COMPLETE_DATE"; -public static final String RELEASED_COMPLETE_DATE = "RELEASED_COMPLETE_DATE"; + public static final String ACTUAL_START_DATE = "ACTUAL_START_DATE"; -public static final String ACTUAL_START_DATE = "ACTUAL_START_DATE"; + public static final String ACTUAL_COMPLETE_DATE = "ACTUAL_COMPLETE_DATE"; -public static final String ACTUAL_COMPLETE_DATE = "ACTUAL_COMPLETE_DATE"; + public static final String IS_DISPATCH = "IS_DISPATCH"; -public static final String IS_DISPATCH = "IS_DISPATCH"; + public static final String IS_IMPORT = "IS_IMPORT"; -public static final String IS_IMPORT = "IS_IMPORT"; + public static final String REMARK = "REMARK"; -public static final String REMARK = "REMARK"; + public static final String PREPOSITION_OPERATION = "PREPOSITION_OPERATION"; -public static final String PREPOSITION_OPERATION = "PREPOSITION_OPERATION"; + public static final String IS_FIRST_OPERATION = "IS_FIRST_OPERATION"; -public static final String IS_FIRST_OPERATION = "IS_FIRST_OPERATION"; + public static final String CREATE_USER = "CREATE_USER"; -public static final String CREATE_USER = "CREATE_USER"; + public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; -public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + public static final String MODIFY_USER = "MODIFY_USER"; -public static final String MODIFY_USER = "MODIFY_USER"; + public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; -public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + public static final String OTHER_1 = "OTHER_1"; -public static final String OTHER_1 = "OTHER_1"; + public static final String OTHER_2 = "OTHER_2"; -public static final String OTHER_2 = "OTHER_2"; + public static final String OTHER_3 = "OTHER_3"; -public static final String OTHER_3 = "OTHER_3"; + public static final String OTHER_4 = "OTHER_4"; -public static final String OTHER_4 = "OTHER_4"; + public static final String OTHER_5 = "OTHER_5"; -public static final String OTHER_5 = "OTHER_5"; + public static final String PREPOSITION_STEP_ID = "PREPOSITION_STEP_ID"; @Override @@ -716,6 +729,7 @@ public static final String OTHER_5 = "OTHER_5"; ", isDispatch = " + isDispatch + ", isImport = " + isImport + ", remark = " + remark + + ", prepositionStepId = " + prepositionStepId + ", prepositionOperation = " + prepositionOperation + ", isFirstOperation = " + isFirstOperation + ", createUser = " + createUser + diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java index 6cc271ad..a03785ee 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java @@ -35,6 +35,7 @@ public class ShopOrderRelease extends SfcDispatch { /** * 物料编号&描述 */ + private String itemBo; private String item; private String itemDescription; private String qtyToBuild; @@ -101,6 +102,14 @@ public class ShopOrderRelease extends SfcDispatch { this.statusName = statusName; } + public String getItemBo() { + return itemBo; + } + + public void setItemBo(String itemBo) { + this.itemBo = itemBo; + } + public String getItem() { return item; } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java index f9a58bcb..5c89329e 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.dispatch.model.CallItem; import com.baomidou.mybatisplus.extension.service.IService; -import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -15,7 +14,7 @@ import java.util.List; *

* * @author Leon.L - * @since 2021-06-24 + * @since 2021-06-30 */ public interface CallItemService extends IService { @@ -28,5 +27,12 @@ public interface CallItemService extends IService { List selectList(CallItem callItem); + /** + * 保存叫料数据 + * + * @param site + * @param user + * @param sfcDispatchList + */ void saveCallItem(String site, String user, List sfcDispatchList); } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java index be1bb738..aecfc5ea 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java @@ -53,6 +53,7 @@ public interface SfcDispatchService extends IService { * 1.可用状态包括（新建、暂挂） * 2.需校验资源、计划开始时间、计划结束时间不为空 * 3.需校验派工资源的类型和需求资源类型一致 + * * @param site * @param user * @param message |派工保存返回提示 diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java index 5bfaa977..7dcbd9e1 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java @@ -1,7 +1,10 @@ package com.foreverwin.mesnac.dispatch.service.impl; +import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.dto.SfcDispatchDto; -import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease; +import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -13,6 +16,8 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; /** *

@@ -20,7 +25,7 @@ import java.util.List; *

* * @author Leon.L - * @since 2021-06-24 + * @since 2021-06-30 */ @Service @Transactional(rollbackFor = Exception.class) @@ -49,9 +54,73 @@ public class CallItemServiceImpl extends ServiceImpl i if (sfcDispatchList == null || sfcDispatchList.size() <= 0) { return; } + LocalDateTime nowDate = LocalDateTime.now(); + //查询叫料组件 + List callItemList = callItemMapper.selectDispatchCallItem(sfcDispatchList); + if (callItemList == null || callItemList.size() <= 0) { + throw BusinessException.build("发布的派工单没有物料清单组件"); + } + List list = new ArrayList<>(); - } + //删除原来的数据 + callItemMapper.deleteDispatchCallItem(sfcDispatchList); + + //工序叫料数据 + for (SfcDispatchDto sfcDispatchDto : sfcDispatchList) { + String prepositionStepId = sfcDispatchDto.getPrepositionStepId(); + if (StringUtil.isBlank(prepositionStepId)) { + continue; + } + + String callItemNo = sfcDispatchDto.getSfc() + sfcDispatchDto.getStepId() + prepositionStepId; + CallItem callItem = new CallItem(); + callItem.setCallItemNo(callItemNo); + callItem.setHandle(HandleEnum.CALL_ITEM.getHandle(site, callItemNo)); + callItem.setSite(site); + callItem.setShopOrder(sfcDispatchDto.getShopOrder()); + callItem.setSfc(sfcDispatchDto.getSfc()); + callItem.setSfcDispatchBo(sfcDispatchDto.getHandle()); + callItem.setOperation(sfcDispatchDto.getOperation()); + callItem.setStepId(sfcDispatchDto.getStepId()); + callItem.setResrce(sfcDispatchDto.getResrce()); + callItem.setCallType(Constants.CALL_TYPE_OPERATION); + callItem.setComponentBo(sfcDispatchDto.getItemBo()); + callItem.setRequiredQty(sfcDispatchDto.getDispatchQty()); + callItem.setRequiredDateTime(sfcDispatchDto.getPlannedStartDate()); + callItem.setStatus(Constants.STATUS_NEW); + callItem.setCallStatus(Constants.STATUS_NEW); + callItem.setIssueStatus(Constants.STATUS_NEW); + callItem.setCreateUser(user); + callItem.setCreatedDateTime(nowDate); + callItem.setUpdateUser(user); + callItem.setUpdatedDateTime(nowDate); + list.add(callItem); + } + //组件叫料数据 + for (int i = 0; i< callItemList.size(); i++) { + CallItem callItem = callItemList.get(i); + String component = StringUtil.trimHandle(callItem.getComponentBo()); + String callItemNo = callItem.getSfc() + callItem.getStepId() + callItem.getOperation() + component; + callItem.setCallItemNo(callItemNo); + callItem.setHandle(HandleEnum.CALL_ITEM.getHandle(site, callItemNo)); + callItem.setCallType(Constants.CALL_TYPE_MATERIAL); + callItem.setStatus(Constants.STATUS_NEW); + callItem.setCallStatus(Constants.STATUS_NEW); + callItem.setIssueStatus(Constants.STATUS_NEW); + callItem.setCreateUser(user); + callItem.setCreatedDateTime(nowDate); + callItem.setUpdateUser(user); + callItem.setUpdatedDateTime(nowDate); + list.add(callItem); + } + + + //数据保存 + if (list != null && list.size() > 0) { + this.saveBatch(list); + } + } } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index 9561b9ce..1fa57092 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -73,8 +73,10 @@ public class SfcDispatchServiceImpl extends ServiceImpl sfcDispatchList) { Boolean flag = this.sfcDispatch(site, user, DispatchStatusEnum.RELEASE.getCode(), message, sfcDispatchList); - //保存叫料数据 - callItemService.saveCallItem(site, user, sfcDispatchList); + if (flag) { + //保存叫料数据 + callItemService.saveCallItem(site, user, sfcDispatchList); + } return flag; } @@ -387,6 +389,11 @@ public class SfcDispatchServiceImpl extends ServiceImpl sfcDispatchList = new ArrayList<>(); //-------------------------------------------------------------------------------------------------------------- @@ -247,6 +251,8 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService { sfcDispatchModel.setIsDispatch(Constants.BOOL_FALSE); sfcDispatchModel.setIsImport(Constants.BOOL_FALSE); sfcDispatchModel.setIsFirstOperation(isFirstOperation); + sfcDispatchModel.setPrepositionStepId(prepositionStepId); + sfcDispatchModel.setPrepositionOperation(prepositionOperation); sfcDispatchModel.setCreateUser(user); sfcDispatchModel.setCreatedDateTime(nowDate); sfcDispatchModel.setModifyUser(user); @@ -259,6 +265,10 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService { //赋值下一步骤 routerStepBo = routerDTO.getNextStepBo(); + + //前置工序&步骤赋值 + prepositionStepId = stepId; + prepositionOperation = operation; } //批量插入工位&人员派工数据 diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml index 27652c5e..23b5622c 100644 --- a/dispatch/src/main/resources/mapper/CallItemMapper.xml +++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml @@ -6,10 +6,10 @@ + - @@ -19,16 +19,25 @@ - - + + - + + + + + + + + + + - HANDLE, SITE, CALL_ITEM_NO, SHOP_ORDER, SFC, DISPATCH_NO, OPERATION, STEP_ID, RESRCE, COMPONENT_BO, CALL_TYPE, REQUIRED_QTY, REQUIRED_DATE_TIME, STATUS, CALL_STATUS, SEND_STATUS, CREATE_USER_BO, CREATED_DATE_TIME, UPDATE_USER_BO, UPDATED_DATE_TIME + HANDLE, SITE, SFC_DISPATCH_BO, CALL_ITEM_NO, SHOP_ORDER, SFC, OPERATION, STEP_ID, RESRCE, COMPONENT_BO, CALL_TYPE, REQUIRED_QTY, REQUIRED_DATE_TIME, STATUS, CALL_STATUS, ISSUE_STATUS, CREATE_USER, CREATED_DATE_TIME, UPDATE_USER, UPDATED_DATE_TIME @@ -61,13 +70,13 @@ SELECT FROM Z_CALL_ITEM - HANDLE=#{ew.handle} + HANDLE=#{ew.handle} AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} AND CALL_ITEM_NO=#{ew.entity.callItemNo} AND SHOP_ORDER=#{ew.entity.shopOrder} AND SFC=#{ew.entity.sfc} - AND DISPATCH_NO=#{ew.entity.dispatchNo} AND OPERATION=#{ew.entity.operation} AND STEP_ID=#{ew.entity.stepId} AND RESRCE=#{ew.entity.resrce} @@ -75,12 +84,13 @@ AND CALL_TYPE=#{ew.entity.callType} AND REQUIRED_QTY=#{ew.entity.requiredQty} AND REQUIRED_DATE_TIME=#{ew.entity.requiredDateTime} + AND ISSUE_QTY=#{ew.entity.issueQty} AND STATUS=#{ew.entity.status} AND CALL_STATUS=#{ew.entity.callStatus} - AND SEND_STATUS=#{ew.entity.sendStatus} - AND CREATE_USER_BO=#{ew.entity.createUserBo} + AND ISSUE_STATUS=#{ew.entity.issueStatus} + AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND UPDATE_USER_BO=#{ew.entity.updateUserBo} + AND UPDATE_USER=#{ew.entity.updateUser} AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime} @@ -90,28 +100,29 @@ - - HANDLE=#{ew.entity.handle} - - AND SITE=#{ew.entity.site} - AND CALL_ITEM_NO=#{ew.entity.callItemNo} - AND SHOP_ORDER=#{ew.entity.shopOrder} - AND SFC=#{ew.entity.sfc} - AND DISPATCH_NO=#{ew.entity.dispatchNo} - AND OPERATION=#{ew.entity.operation} - AND STEP_ID=#{ew.entity.stepId} - AND RESRCE=#{ew.entity.resrce} - AND COMPONENT_BO=#{ew.entity.componentBo} - AND CALL_TYPE=#{ew.entity.callType} - AND REQUIRED_QTY=#{ew.entity.requiredQty} - AND REQUIRED_DATE_TIME=#{ew.entity.requiredDateTime} - AND STATUS=#{ew.entity.status} - AND CALL_STATUS=#{ew.entity.callStatus} - AND SEND_STATUS=#{ew.entity.sendStatus} - AND CREATE_USER_BO=#{ew.entity.createUserBo} - AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND UPDATE_USER_BO=#{ew.entity.updateUserBo} - AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime} + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} + AND CALL_ITEM_NO=#{ew.entity.callItemNo} + AND SHOP_ORDER=#{ew.entity.shopOrder} + AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} + AND STEP_ID=#{ew.entity.stepId} + AND RESRCE=#{ew.entity.resrce} + AND COMPONENT_BO=#{ew.entity.componentBo} + AND CALL_TYPE=#{ew.entity.callType} + AND REQUIRED_QTY=#{ew.entity.requiredQty} + AND REQUIRED_DATE_TIME=#{ew.entity.requiredDateTime} + AND ISSUE_QTY=#{ew.entity.issueQty} + AND STATUS=#{ew.entity.status} + AND CALL_STATUS=#{ew.entity.callStatus} + AND ISSUE_STATUS=#{ew.entity.issueStatus} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND UPDATE_USER=#{ew.entity.updateUser} + AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime} ${ew.sqlSegment} @@ -132,10 +143,10 @@ HANDLE=#{ew.entity.handle} AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} AND CALL_ITEM_NO=#{ew.entity.callItemNo} AND SHOP_ORDER=#{ew.entity.shopOrder} AND SFC=#{ew.entity.sfc} - AND DISPATCH_NO=#{ew.entity.dispatchNo} AND OPERATION=#{ew.entity.operation} AND STEP_ID=#{ew.entity.stepId} AND RESRCE=#{ew.entity.resrce} @@ -143,12 +154,13 @@ AND CALL_TYPE=#{ew.entity.callType} AND REQUIRED_QTY=#{ew.entity.requiredQty} AND REQUIRED_DATE_TIME=#{ew.entity.requiredDateTime} + AND ISSUE_QTY=#{ew.entity.issueQty} AND STATUS=#{ew.entity.status} AND CALL_STATUS=#{ew.entity.callStatus} - AND SEND_STATUS=#{ew.entity.sendStatus} - AND CREATE_USER_BO=#{ew.entity.createUserBo} + AND ISSUE_STATUS=#{ew.entity.issueStatus} + AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND UPDATE_USER_BO=#{ew.entity.updateUserBo} + AND UPDATE_USER=#{ew.entity.updateUser} AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime} @@ -170,10 +182,10 @@ HANDLE=#{ew.entity.handle} AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} AND CALL_ITEM_NO=#{ew.entity.callItemNo} AND SHOP_ORDER=#{ew.entity.shopOrder} AND SFC=#{ew.entity.sfc} - AND DISPATCH_NO=#{ew.entity.dispatchNo} AND OPERATION=#{ew.entity.operation} AND STEP_ID=#{ew.entity.stepId} AND RESRCE=#{ew.entity.resrce} @@ -181,12 +193,13 @@ AND CALL_TYPE=#{ew.entity.callType} AND REQUIRED_QTY=#{ew.entity.requiredQty} AND REQUIRED_DATE_TIME=#{ew.entity.requiredDateTime} + AND ISSUE_QTY=#{ew.entity.issueQty} AND STATUS=#{ew.entity.status} AND CALL_STATUS=#{ew.entity.callStatus} - AND SEND_STATUS=#{ew.entity.sendStatus} - AND CREATE_USER_BO=#{ew.entity.createUserBo} + AND ISSUE_STATUS=#{ew.entity.issueStatus} + AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND UPDATE_USER_BO=#{ew.entity.updateUserBo} + AND UPDATE_USER=#{ew.entity.updateUser} AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime} @@ -208,10 +221,10 @@ HANDLE=#{ew.entity.handle} AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} AND CALL_ITEM_NO=#{ew.entity.callItemNo} AND SHOP_ORDER=#{ew.entity.shopOrder} AND SFC=#{ew.entity.sfc} - AND DISPATCH_NO=#{ew.entity.dispatchNo} AND OPERATION=#{ew.entity.operation} AND STEP_ID=#{ew.entity.stepId} AND RESRCE=#{ew.entity.resrce} @@ -219,12 +232,13 @@ AND CALL_TYPE=#{ew.entity.callType} AND REQUIRED_QTY=#{ew.entity.requiredQty} AND REQUIRED_DATE_TIME=#{ew.entity.requiredDateTime} + AND ISSUE_QTY=#{ew.entity.issueQty} AND STATUS=#{ew.entity.status} AND CALL_STATUS=#{ew.entity.callStatus} - AND SEND_STATUS=#{ew.entity.sendStatus} - AND CREATE_USER_BO=#{ew.entity.createUserBo} + AND ISSUE_STATUS=#{ew.entity.issueStatus} + AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND UPDATE_USER_BO=#{ew.entity.updateUserBo} + AND UPDATE_USER=#{ew.entity.updateUser} AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime} @@ -246,10 +260,10 @@ HANDLE=#{ew.entity.handle} AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} AND CALL_ITEM_NO=#{ew.entity.callItemNo} AND SHOP_ORDER=#{ew.entity.shopOrder} AND SFC=#{ew.entity.sfc} - AND DISPATCH_NO=#{ew.entity.dispatchNo} AND OPERATION=#{ew.entity.operation} AND STEP_ID=#{ew.entity.stepId} AND RESRCE=#{ew.entity.resrce} @@ -257,12 +271,13 @@ AND CALL_TYPE=#{ew.entity.callType} AND REQUIRED_QTY=#{ew.entity.requiredQty} AND REQUIRED_DATE_TIME=#{ew.entity.requiredDateTime} + AND ISSUE_QTY=#{ew.entity.issueQty} AND STATUS=#{ew.entity.status} AND CALL_STATUS=#{ew.entity.callStatus} - AND SEND_STATUS=#{ew.entity.sendStatus} - AND CREATE_USER_BO=#{ew.entity.createUserBo} + AND ISSUE_STATUS=#{ew.entity.issueStatus} + AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND UPDATE_USER_BO=#{ew.entity.updateUserBo} + AND UPDATE_USER=#{ew.entity.updateUser} AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime} @@ -284,10 +299,10 @@ HANDLE=#{ew.entity.handle} AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} AND CALL_ITEM_NO=#{ew.entity.callItemNo} AND SHOP_ORDER=#{ew.entity.shopOrder} AND SFC=#{ew.entity.sfc} - AND DISPATCH_NO=#{ew.entity.dispatchNo} AND OPERATION=#{ew.entity.operation} AND STEP_ID=#{ew.entity.stepId} AND RESRCE=#{ew.entity.resrce} @@ -295,12 +310,13 @@ AND CALL_TYPE=#{ew.entity.callType} AND REQUIRED_QTY=#{ew.entity.requiredQty} AND REQUIRED_DATE_TIME=#{ew.entity.requiredDateTime} + AND ISSUE_QTY=#{ew.entity.issueQty} AND STATUS=#{ew.entity.status} AND CALL_STATUS=#{ew.entity.callStatus} - AND SEND_STATUS=#{ew.entity.sendStatus} - AND CREATE_USER_BO=#{ew.entity.createUserBo} + AND ISSUE_STATUS=#{ew.entity.issueStatus} + AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND UPDATE_USER_BO=#{ew.entity.updateUserBo} + AND UPDATE_USER=#{ew.entity.updateUser} AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime} @@ -318,10 +334,10 @@ HANDLE, SITE, + SFC_DISPATCH_BO, CALL_ITEM_NO, SHOP_ORDER, SFC, - DISPATCH_NO, OPERATION, STEP_ID, RESRCE, @@ -329,21 +345,22 @@ CALL_TYPE, REQUIRED_QTY, REQUIRED_DATE_TIME, + ISSUE_QTY, STATUS, CALL_STATUS, - SEND_STATUS, - CREATE_USER_BO, + ISSUE_STATUS, + CREATE_USER, CREATED_DATE_TIME, - UPDATE_USER_BO, + UPDATE_USER, UPDATED_DATE_TIME, VALUES #{handle}, #{site}, + #{sfcDispatchBo}, #{callItemNo}, #{shopOrder}, #{sfc}, - #{dispatchNo}, #{operation}, #{stepId}, #{resrce}, @@ -351,12 +368,13 @@ #{callType}, #{requiredQty}, #{requiredDateTime}, + #{issueQty}, #{status}, #{callStatus}, - #{sendStatus}, - #{createUserBo}, + #{issueStatus}, + #{createUser}, #{createdDateTime}, - #{updateUserBo}, + #{updateUser}, #{updatedDateTime}, @@ -369,10 +387,10 @@ #{handle}, #{site}, + #{sfcDispatchBo}, #{callItemNo}, #{shopOrder}, #{sfc}, - #{dispatchNo}, #{operation}, #{stepId}, #{resrce}, @@ -380,12 +398,13 @@ #{callType}, #{requiredQty}, #{requiredDateTime}, + #{issueQty}, #{status}, #{callStatus}, - #{sendStatus}, - #{createUserBo}, + #{issueStatus}, + #{createUser}, #{createdDateTime}, - #{updateUserBo}, + #{updateUser}, #{updatedDateTime}, @@ -394,10 +413,10 @@ UPDATE Z_CALL_ITEM SITE=#{et.site}, + SFC_DISPATCH_BO=#{et.sfcDispatchBo}, CALL_ITEM_NO=#{et.callItemNo}, SHOP_ORDER=#{et.shopOrder}, SFC=#{et.sfc}, - DISPATCH_NO=#{et.dispatchNo}, OPERATION=#{et.operation}, STEP_ID=#{et.stepId}, RESRCE=#{et.resrce}, @@ -405,24 +424,25 @@ CALL_TYPE=#{et.callType}, REQUIRED_QTY=#{et.requiredQty}, REQUIRED_DATE_TIME=#{et.requiredDateTime}, + ISSUE_QTY=#{et.issueQty}, STATUS=#{et.status}, CALL_STATUS=#{et.callStatus}, - SEND_STATUS=#{et.sendStatus}, - CREATE_USER_BO=#{et.createUserBo}, + ISSUE_STATUS=#{et.issueStatus}, + CREATE_USER=#{et.createUser}, CREATED_DATE_TIME=#{et.createdDateTime}, - UPDATE_USER_BO=#{et.updateUserBo}, + UPDATE_USER=#{et.updateUser}, UPDATED_DATE_TIME=#{et.updatedDateTime}, - WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} UPDATE Z_CALL_ITEM SITE=#{et.site}, + SFC_DISPATCH_BO=#{et.sfcDispatchBo}, CALL_ITEM_NO=#{et.callItemNo}, SHOP_ORDER=#{et.shopOrder}, SFC=#{et.sfc}, - DISPATCH_NO=#{et.dispatchNo}, OPERATION=#{et.operation}, STEP_ID=#{et.stepId}, RESRCE=#{et.resrce}, @@ -430,24 +450,25 @@ CALL_TYPE=#{et.callType}, REQUIRED_QTY=#{et.requiredQty}, REQUIRED_DATE_TIME=#{et.requiredDateTime}, + ISSUE_QTY=#{et.issueQty}, STATUS=#{et.status}, CALL_STATUS=#{et.callStatus}, - SEND_STATUS=#{et.sendStatus}, - CREATE_USER_BO=#{et.createUserBo}, + ISSUE_STATUS=#{et.issueStatus}, + CREATE_USER=#{et.createUser}, CREATED_DATE_TIME=#{et.createdDateTime}, - UPDATE_USER_BO=#{et.updateUserBo}, + UPDATE_USER=#{et.updateUser}, UPDATED_DATE_TIME=#{et.updatedDateTime}, - WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} UPDATE Z_CALL_ITEM SITE=#{et.site}, + SFC_DISPATCH_BO=#{et.sfcDispatchBo}, CALL_ITEM_NO=#{et.callItemNo}, SHOP_ORDER=#{et.shopOrder}, SFC=#{et.sfc}, - DISPATCH_NO=#{et.dispatchNo}, OPERATION=#{et.operation}, STEP_ID=#{et.stepId}, RESRCE=#{et.resrce}, @@ -455,12 +476,13 @@ CALL_TYPE=#{et.callType}, REQUIRED_QTY=#{et.requiredQty}, REQUIRED_DATE_TIME=#{et.requiredDateTime}, + ISSUE_QTY=#{et.issueQty}, STATUS=#{et.status}, CALL_STATUS=#{et.callStatus}, - SEND_STATUS=#{et.sendStatus}, - CREATE_USER_BO=#{et.createUserBo}, + ISSUE_STATUS=#{et.issueStatus}, + CREATE_USER=#{et.createUser}, CREATED_DATE_TIME=#{et.createdDateTime}, - UPDATE_USER_BO=#{et.updateUserBo}, + UPDATE_USER=#{et.updateUser}, UPDATED_DATE_TIME=#{et.updatedDateTime}, @@ -468,10 +490,10 @@ HANDLE=#{ew.entity.handle} AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} AND CALL_ITEM_NO=#{ew.entity.callItemNo} AND SHOP_ORDER=#{ew.entity.shopOrder} AND SFC=#{ew.entity.sfc} - AND DISPATCH_NO=#{ew.entity.dispatchNo} AND OPERATION=#{ew.entity.operation} AND STEP_ID=#{ew.entity.stepId} AND RESRCE=#{ew.entity.resrce} @@ -479,12 +501,13 @@ AND CALL_TYPE=#{ew.entity.callType} AND REQUIRED_QTY=#{ew.entity.requiredQty} AND REQUIRED_DATE_TIME=#{ew.entity.requiredDateTime} + AND ISSUE_QTY=#{ew.entity.issueQty} AND STATUS=#{ew.entity.status} AND CALL_STATUS=#{ew.entity.callStatus} - AND SEND_STATUS=#{ew.entity.sendStatus} - AND CREATE_USER_BO=#{ew.entity.createUserBo} + AND ISSUE_STATUS=#{ew.entity.issueStatus} + AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND UPDATE_USER_BO=#{ew.entity.updateUserBo} + AND UPDATE_USER=#{ew.entity.updateUser} AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime} @@ -523,10 +546,10 @@ HANDLE=#{ew.entity.handle} AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} AND CALL_ITEM_NO=#{ew.entity.callItemNo} AND SHOP_ORDER=#{ew.entity.shopOrder} AND SFC=#{ew.entity.sfc} - AND DISPATCH_NO=#{ew.entity.dispatchNo} AND OPERATION=#{ew.entity.operation} AND STEP_ID=#{ew.entity.stepId} AND RESRCE=#{ew.entity.resrce} @@ -534,12 +557,13 @@ AND CALL_TYPE=#{ew.entity.callType} AND REQUIRED_QTY=#{ew.entity.requiredQty} AND REQUIRED_DATE_TIME=#{ew.entity.requiredDateTime} + AND ISSUE_QTY=#{ew.entity.issueQty} AND STATUS=#{ew.entity.status} AND CALL_STATUS=#{ew.entity.callStatus} - AND SEND_STATUS=#{ew.entity.sendStatus} - AND CREATE_USER_BO=#{ew.entity.createUserBo} + AND ISSUE_STATUS=#{ew.entity.issueStatus} + AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND UPDATE_USER_BO=#{ew.entity.updateUserBo} + AND UPDATE_USER=#{ew.entity.updateUser} AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime} @@ -559,4 +583,40 @@ + + DELETE FROM Z_CALL_ITEM WHERE SFC_DISPATCH_BO IN + + #{item.handle} + + + + + + diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index 618d504b..dc205d9d 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -37,6 +37,7 @@ + @@ -52,6 +53,7 @@ + @@ -69,7 +71,7 @@ - HANDLE, SITE, SHOP_ORDER, SFC, BLANKING_SIZE, DISPATCH_SEQ, DISPATCH_NO, DISPATCH_STATUS, DRAWINGS_NO, DRAWINGS_REVISION, IS_LOCK, ROUTER_BO, STEP_ID, OPERATION, RESOURCE_TYPE, WORK_CENTER, RESRCE, EMPLOYEE, TURN_OPERATION, DISPATCH_QTY, PROD_HOURS, PLANNED_START_DATE, PLANNED_COMP_DATE, EARLIEST_START_DATE, LATEST_END_DATE, SO_RELEASED_DATE, SFC_RELEASED_DATE, RELEASED_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, IS_DISPATCH, IS_IMPORT, REMARK, PREPOSITION_OPERATION, IS_FIRST_OPERATION, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME, OTHER_1, OTHER_2, OTHER_3, OTHER_4, OTHER_5 + HANDLE, SITE, SHOP_ORDER, SFC, BLANKING_SIZE, DISPATCH_SEQ, DISPATCH_NO, DISPATCH_STATUS, DRAWINGS_NO, DRAWINGS_REVISION, IS_LOCK, ROUTER_BO, STEP_ID, OPERATION, RESOURCE_TYPE, WORK_CENTER, RESRCE, EMPLOYEE, TURN_OPERATION, DISPATCH_QTY, PROD_HOURS, PLANNED_START_DATE, PLANNED_COMP_DATE, EARLIEST_START_DATE, LATEST_END_DATE, SO_RELEASED_DATE, SFC_RELEASED_DATE, RELEASED_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, IS_DISPATCH, IS_IMPORT, REMARK, PREPOSITION_STEP_ID, PREPOSITION_OPERATION, IS_FIRST_OPERATION, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME, OTHER_1, OTHER_2, OTHER_3, OTHER_4, OTHER_5 @@ -136,6 +138,8 @@ AND IS_DISPATCH=#{ew.entity.isDispatch} AND IS_IMPORT=#{ew.entity.isImport} AND REMARK=#{ew.entity.remark} + AND PREPOSITION_STEP_ID=#{ew.entity.prepositionStepId} + AND PREPOSITION_OPERATION=#{ew.entity.prepositionOperation} AND IS_FIRST_OPERATION=#{ew.entity.isFirstOperation} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} @@ -189,6 +193,8 @@ AND IS_DISPATCH=#{ew.entity.isDispatch} AND IS_IMPORT=#{ew.entity.isImport} AND REMARK=#{ew.entity.remark} + AND PREPOSITION_STEP_ID=#{ew.entity.prepositionStepId} + AND PREPOSITION_OPERATION=#{ew.entity.prepositionOperation} AND IS_FIRST_OPERATION=#{ew.entity.isFirstOperation} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} @@ -250,6 +256,8 @@ AND IS_DISPATCH=#{ew.entity.isDispatch} AND IS_IMPORT=#{ew.entity.isImport} AND REMARK=#{ew.entity.remark} + AND PREPOSITION_STEP_ID=#{ew.entity.prepositionStepId} + AND PREPOSITION_OPERATION=#{ew.entity.prepositionOperation} AND IS_FIRST_OPERATION=#{ew.entity.isFirstOperation} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} @@ -311,6 +319,8 @@ AND IS_DISPATCH=#{ew.entity.isDispatch} AND IS_IMPORT=#{ew.entity.isImport} AND REMARK=#{ew.entity.remark} + AND PREPOSITION_STEP_ID=#{ew.entity.prepositionStepId} + AND PREPOSITION_OPERATION=#{ew.entity.prepositionOperation} AND IS_FIRST_OPERATION=#{ew.entity.isFirstOperation} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} @@ -372,6 +382,8 @@ AND IS_DISPATCH=#{ew.entity.isDispatch} AND IS_IMPORT=#{ew.entity.isImport} AND REMARK=#{ew.entity.remark} + AND PREPOSITION_STEP_ID=#{ew.entity.prepositionStepId} + AND PREPOSITION_OPERATION=#{ew.entity.prepositionOperation} AND IS_FIRST_OPERATION=#{ew.entity.isFirstOperation} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} @@ -433,6 +445,8 @@ AND IS_DISPATCH=#{ew.entity.isDispatch} AND IS_IMPORT=#{ew.entity.isImport} AND REMARK=#{ew.entity.remark} + AND PREPOSITION_STEP_ID=#{ew.entity.prepositionStepId} + AND PREPOSITION_OPERATION=#{ew.entity.prepositionOperation} AND IS_FIRST_OPERATION=#{ew.entity.isFirstOperation} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} @@ -494,6 +508,8 @@ AND IS_DISPATCH=#{ew.entity.isDispatch} AND IS_IMPORT=#{ew.entity.isImport} AND REMARK=#{ew.entity.remark} + AND PREPOSITION_STEP_ID=#{ew.entity.prepositionStepId} + AND PREPOSITION_OPERATION=#{ew.entity.prepositionOperation} AND IS_FIRST_OPERATION=#{ew.entity.isFirstOperation} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} @@ -551,6 +567,7 @@ IS_DISPATCH, IS_IMPORT, REMARK, + PREPOSITION_STEP_ID, PREPOSITION_OPERATION, IS_FIRST_OPERATION, CREATE_USER, @@ -597,6 +614,7 @@ #{isDispatch}, #{isImport}, #{remark}, + #{prepositionStepId}, #{prepositionOperation}, #{isFirstOperation}, #{createUser}, @@ -650,6 +668,7 @@ #{isDispatch}, #{isImport}, #{remark}, + #{prepositionStepId}, #{prepositionOperation}, #{isFirstOperation}, #{createUser}, @@ -699,6 +718,7 @@ IS_DISPATCH=#{et.isDispatch}, IS_IMPORT=#{et.isImport}, REMARK=#{et.remark}, + PREPOSITION_STEP_ID=#{et.prepositionStepId}, PREPOSITION_OPERATION=#{et.prepositionOperation}, IS_FIRST_OPERATION=#{et.isFirstOperation}, CREATE_USER=#{et.createUser}, @@ -748,6 +768,7 @@ IS_DISPATCH=#{et.isDispatch}, IS_IMPORT=#{et.isImport}, REMARK=#{et.remark}, + PREPOSITION_STEP_ID=#{et.prepositionStepId}, PREPOSITION_OPERATION=#{et.prepositionOperation}, IS_FIRST_OPERATION=#{et.isFirstOperation}, CREATE_USER=#{et.createUser}, @@ -797,6 +818,7 @@ IS_DISPATCH=#{et.isDispatch}, IS_IMPORT=#{et.isImport}, REMARK=#{et.remark}, + PREPOSITION_STEP_ID=#{et.prepositionStepId}, PREPOSITION_OPERATION=#{et.prepositionOperation}, IS_FIRST_OPERATION=#{et.isFirstOperation}, CREATE_USER=#{et.createUser}, @@ -845,6 +867,7 @@ AND IS_DISPATCH=#{ew.entity.isDispatch} AND IS_IMPORT=#{ew.entity.isImport} AND REMARK=#{ew.entity.remark} + AND PREPOSITION_STEP_ID=#{ew.entity.prepositionStepId} AND PREPOSITION_OPERATION=#{ew.entity.prepositionOperation} AND IS_FIRST_OPERATION=#{ew.entity.isFirstOperation} AND CREATE_USER=#{ew.entity.createUser} @@ -924,6 +947,8 @@ AND IS_DISPATCH=#{ew.entity.isDispatch} AND IS_IMPORT=#{ew.entity.isImport} AND REMARK=#{ew.entity.remark} + AND PREPOSITION_STEP_ID=#{ew.entity.prepositionStepId} + AND PREPOSITION_OPERATION=#{ew.entity.prepositionOperation} AND IS_FIRST_OPERATION=#{ew.entity.isFirstOperation} AND CREATE_USER=#{ew.entity.createUser} AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} @@ -969,12 +994,13 @@ diff --git a/meapi/src/main/resources/mapper/NcGroupMapper.xml b/meapi/src/main/resources/mapper/NcGroupMapper.xml index 8307268b..9ce975bc 100644 --- a/meapi/src/main/resources/mapper/NcGroupMapper.xml +++ b/meapi/src/main/resources/mapper/NcGroupMapper.xml @@ -180,12 +180,12 @@ AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} - ${ew.sqlSegment} + AND ${ew.sqlSegment} - ${ew.sqlSegment} + AND ${ew.sqlSegment} From 3ab2ca7531d9e3fd9ab9475a85cac482ea6b5e34 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Fri, 2 Jul 2021 15:10:30 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/constant/Constants.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java index 1c48f152..a2020367 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java @@ -20,4 +20,26 @@ public interface Constants { String RESOURCE_INSPECT_TASK = "RESOURCE_INSPECT_TASK"; String SITE_ADMIN = "SITE_ADMIN"; + //首件检验 + String INSPECTION_TYPE_S="S"; + //互检检验 + String INSPECTION_TYPE_H="H"; + //自检检验 + String INSPECTION_TYPE_Z="Z"; + //专检检验 + String INSPECTION_TYPE_P="P"; + //日常保养 + String INSPECTION_TYPE_EM="EM"; + //一级保养 + String INSPECTION_TYPE_OM="OM"; + //二级保养 + String INSPECTION_TYPE_SM="SM"; + //日点检 + String INSPECTION_TYPE_DM="DM"; + //周点检 + String INSPECTION_TYPE_WM="WM"; + //月点检 + String INSPECTION_TYPE_MM="MM"; + //年点检 + String INSPECTION_TYPE_YM="YM"; } From 4d733abd4eaf5fe23f8cf277f8975860a3caa5be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Fri, 2 Jul 2021 15:35:04 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=90=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnormalBillController.java | 10 ++++++++++ .../mesnac/anomaly/model/AbnormalBill.java | 1 + .../anomaly/service/AbnormalBillService.java | 2 ++ .../service/impl/AbnormalBillServiceImpl.java | 19 ++++++++++++++----- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java index 043b1896..fbf0d39c 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java @@ -232,6 +232,16 @@ public class AbnormalBillController { return R.ok(abnormalBillService.anomalyReport(abnormalBill, abnormalBillDispose,ncGroupAndNcCodes,dutyCauseType,dutyType)); } + /** + * 设备异常提报 + * @param abnormalBill + * @return + */ + @GetMapping("/anomalyReportDevice") + public R anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose){ + return R.ok(abnormalBillService.anomalyReportDevice(abnormalBill,abnormalBillDispose)); + } + /** * 取消原因 diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java index 6f6e852f..00fe7a76 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java index f5e6f937..5c5f1969 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java @@ -47,4 +47,6 @@ public interface AbnormalBillService extends IService { void cancelBrowse(String handle,String cancelBrowse); + String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose); + } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index d86f7e49..ca57a77a 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -143,6 +143,15 @@ public class AbnormalBillServiceImpl extends ServiceImpl dutyCauseType,List dutyType) { String site = CommonMethods.getSite(); @@ -174,7 +183,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl causeTypes = new ArrayList<>(); //判断原因分类是否为空 - if(dutyCauseType.size() >= 1){ + if(dutyCauseType != null && dutyCauseType.size() >= 1){ for(String cause:dutyCauseType){ AbnormalCause abnormalCause = new AbnormalCause(); String uuid = UUID.randomUUID().toString(); @@ -198,7 +207,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl dutyTypes = new ArrayList<>(); //判断责任分类是否为空 - if(dutyType.size() >= 1){ + if(dutyType != null && dutyType.size() >= 1){ for(String duty:dutyType){ AbnormalDuty abnormalDuty = new AbnormalDuty(); String uuid = UUID.randomUUID().toString(); @@ -234,7 +243,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl Date: Mon, 5 Jul 2021 08:46:36 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=90=E6=8A=A5=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/service/impl/AbnormalBillServiceImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index ca57a77a..ab215637 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -135,8 +135,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl 0){ + abnormalNcCodeService.saveOrUpdateBatch(abnormalNcCodes); + abnormalBill.setNcCode(ncCodes.substring(0,ncCodes.length() - 1)); + } this.saveOrUpdate(abnormalBill); abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose); return abnormalBill.getAbnormalNo(); @@ -292,8 +294,4 @@ public class AbnormalBillServiceImpl extends ServiceImpl Date: Mon, 5 Jul 2021 14:01:02 +0800 Subject: [PATCH 6/8] 123 --- dispatch/src/main/resources/mapper/CallItemMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml index 23b5622c..e6c1efe5 100644 --- a/dispatch/src/main/resources/mapper/CallItemMapper.xml +++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml @@ -606,7 +606,7 @@ - SELECT ZCI.HANDLE, ZCI.SITE, CF.VALUE WORK_ORDER, ZSD.WORK_CENTER, ZSD.SHOP_ORDER, ZSD.SFC, ZSD.DISPATCH_NO, CP.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, ZSD.BLANKING_SIZE, ZSD.DISPATCH_STATUS, ZCI.OPERATION, OPT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.DISPATCH_QTY, ZSD.PLANNED_START_DATE, ZSD.REMARK FROM Z_SFC_DISPATCH ZSD From fc7ea04394d3faacea378901923e854de49cb428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Mon, 5 Jul 2021 14:02:32 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnormalBillController.java | 24 ++-- .../mesnac/anomaly/dto/AbnormalBillDto.java | 64 ++++++++++ .../anomaly/mapper/AbnormalBillMapper.java | 10 +- .../mesnac/anomaly/model/AbnormalBill.java | 48 ++++---- .../anomaly/service/AbnormalBillService.java | 10 +- .../service/impl/AbnormalBillServiceImpl.java | 19 ++- .../resources/mapper/AbnormalBillMapper.xml | 116 +++++++++++++----- 7 files changed, 219 insertions(+), 72 deletions(-) create mode 100644 anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java index fbf0d39c..dcf00be5 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java @@ -1,11 +1,12 @@ package com.foreverwin.mesnac.anomaly.controller; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto; import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.foreverwin.mesnac.anomaly.service.AbnormalBillService; +import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.model.DataField; import com.foreverwin.mesnac.meapi.model.NcCode; import com.foreverwin.mesnac.meapi.model.WorkCenter; @@ -24,7 +25,7 @@ import java.util.List; /** * * @author robert - * @since 2021-06-25 + * @since 2021-07-05 */ @RestController @RequestMapping("/Z-ABNORMAL-BILL") @@ -104,7 +105,7 @@ public class AbnormalBillController { .or().like(AbnormalBill::getPbUser, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getPbQty, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getDiscover, frontPage.getGlobalQuery()) - .or().like(AbnormalBill::getInspecter, frontPage.getGlobalQuery()) + .or().like(AbnormalBill::getInspector, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getEntityLocation, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getReportFrom, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getObjectBo, frontPage.getGlobalQuery()) @@ -170,10 +171,13 @@ public class AbnormalBillController { @GetMapping("/init") public R init(String messageType){ HashMap hashMap = new HashMap<>(); - //消息类型 - List ncByNG = ncCodeService.findNcByNG(messageType); String site = CommonMethods.getSite(); - hashMap.put("ncByNG",ncByNG); + //消息类型 + if(!StringUtil.isBlank(messageType)){ + List ncByNG = ncCodeService.findNcByNG(messageType); + + hashMap.put("ncByNG",ncByNG); + } //工作中心 WorkCenter workCenter = new WorkCenter(); workCenter.setWcCategory("LEVEL4"); @@ -238,7 +242,7 @@ public class AbnormalBillController { * @return */ @GetMapping("/anomalyReportDevice") - public R anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose){ + public R anomalyReportDevice(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose){ return R.ok(abnormalBillService.anomalyReportDevice(abnormalBill,abnormalBillDispose)); } @@ -254,4 +258,10 @@ public class AbnormalBillController { abnormalBillService.cancelBrowse(handle,cancelBrowse); return R.ok(); } + + @GetMapping("/backLog") + public R backLog(AbnormalBillDto abnormalBillDto){ + return R.ok(abnormalBillService.backLog(abnormalBillDto)); + } + } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java new file mode 100644 index 00000000..617bd715 --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java @@ -0,0 +1,64 @@ +package com.foreverwin.mesnac.anomaly.dto; + +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; + +import java.time.LocalDateTime; + +/** + * @Description TODO + * @Author zhaojiawei + * @Since 2021-07-05 + */ +public class AbnormalBillDto extends AbnormalBill { + + /** + * seq + */ + String seq; + /** + * 物料描述 + */ + String itemDescription; + + /** + * 开始时间 + */ + LocalDateTime startDateTime; + + /** + * 结束时间 + */ + LocalDateTime endDateTime; + + public String getSeq() { + return seq; + } + + public void setSeq(String seq) { + this.seq = seq; + } + + public String getItemDescription() { + return itemDescription; + } + + public void setItemDescription(String itemDescription) { + this.itemDescription = itemDescription; + } + + public LocalDateTime getStartDateTime() { + return startDateTime; + } + + public void setStartDateTime(LocalDateTime startDateTime) { + this.startDateTime = startDateTime; + } + + public LocalDateTime getEndDateTime() { + return endDateTime; + } + + public void setEndDateTime(LocalDateTime endDateTime) { + this.endDateTime = endDateTime; + } +} diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java index b6e46d7f..3b49f7d4 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java @@ -1,18 +1,22 @@ package com.foreverwin.mesnac.anomaly.mapper; -import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* 异常单 Mapper 接口 *

* * @author robert - * @since 2021-06-25 + * @since 2021-07-05 */ @Repository public interface AbnormalBillMapper extends BaseMapper { - + List backLog(@Param("abnormalBill")AbnormalBillDto abnormalBillDto, @Param("language")String language); } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java index 00fe7a76..b0ab7eac 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import java.time.LocalDateTime; @@ -16,7 +15,7 @@ import java.time.LocalDateTime; *

* * @author robert - * @since 2021-06-25 + * @since 2021-07-05 */ @TableName("Z_ABNORMAL_BILL") @@ -41,12 +40,12 @@ public class AbnormalBill extends Model { @TableField("ABNORMAL_NO") private String abnormalNo; /** - * 异常状态 新建/响应中/方案确认/纠防确认/取消/关闭 + * 异常状态 新建 N/ X响应中/F方案确认/J纠防确认/Q取消/G关闭 */ @TableField("STATUS") private String status; /** - * 异常类型 + * 异常类型 Q｜其他，Z｜质量，S｜设备 */ @TableField("TYPE") private String type; @@ -111,7 +110,7 @@ public class AbnormalBill extends Model { @TableField("NC_QTY") private String ncQty; /** - * 问题等级 + * 问题等级 A,B,C */ @TableField("PB_GRADE") private String pbGrade; @@ -131,22 +130,22 @@ public class AbnormalBill extends Model { @TableField("REPAIR_DATE_TIME") private LocalDateTime repairDateTime; /** - * 发现环节 + * 发现环节 Z|自制 W| 外协 D｜到货 K｜客户 */ @TableField("DISCOVER") private String discover; /** * 检验人员 */ - @TableField("INSPECTER") - private String inspecter; + @TableField("INSPECTOR") + private String inspector; /** * 实物位置 */ @TableField("ENTITY_LOCATION") private String entityLocation; /** - * 上报来源 + * 上报来源 B｜自保。 J｜质检 R｜设备人员 Z｜设备自动 */ @TableField("REPORT_FROM") private String reportFrom; @@ -188,8 +187,8 @@ public class AbnormalBill extends Model { /** * 创建日期 */ - @TableField("CREATED_DATA_TIME") - private LocalDateTime createdDataTime; + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; /** * 修改人 */ @@ -201,6 +200,7 @@ public class AbnormalBill extends Model { @TableField("MODIFIED_DATE_TIME") private LocalDateTime modifiedDateTime; + public String getHandle() { return handle; } @@ -377,12 +377,12 @@ public class AbnormalBill extends Model { this.discover = discover; } - public String getInspecter() { - return inspecter; + public String getInspector() { + return inspector; } - public void setInspecter(String inspecter) { - this.inspecter = inspecter; + public void setInspector(String inspector) { + this.inspector = inspector; } public String getEntityLocation() { @@ -457,12 +457,12 @@ public class AbnormalBill extends Model { this.createdUser = createdUser; } - public LocalDateTime getCreatedDataTime() { - return createdDataTime; + public LocalDateTime getCreatedDateTime() { + return createdDateTime; } - public void setCreatedDataTime(LocalDateTime createdDataTime) { - this.createdDataTime = createdDataTime; + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; } public String getModifiedUser() { @@ -481,7 +481,7 @@ public class AbnormalBill extends Model { this.modifiedDateTime = modifiedDateTime; } - public static final String HANDLE = "HANDLE"; +public static final String HANDLE = "HANDLE"; public static final String SITE = "SITE"; @@ -525,7 +525,7 @@ public static final String REPAIR_DATE_TIME = "REPAIR_DATE_TIME"; public static final String DISCOVER = "DISCOVER"; -public static final String INSPECTER = "INSPECTER"; +public static final String INSPECTOR = "INSPECTOR"; public static final String ENTITY_LOCATION = "ENTITY_LOCATION"; @@ -545,7 +545,7 @@ public static final String CANCEL_USER = "CANCEL_USER"; public static final String CREATED_USER = "CREATED_USER"; -public static final String CREATED_DATA_TIME = "CREATED_DATA_TIME"; +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; public static final String MODIFIED_USER = "MODIFIED_USER"; @@ -582,7 +582,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; ", pbQty = " + pbQty + ", repairDateTime = " + repairDateTime + ", discover = " + discover + - ", inspecter = " + inspecter + + ", inspector = " + inspector + ", entityLocation = " + entityLocation + ", reportFrom = " + reportFrom + ", objectBo = " + objectBo + @@ -592,7 +592,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; ", cancelDateTime = " + cancelDateTime + ", cancelUser = " + cancelUser + ", createdUser = " + createdUser + - ", createdDataTime = " + createdDataTime + + ", createdDateTime = " + createdDateTime + ", modifiedUser = " + modifiedUser + ", modifiedDateTime = " + modifiedDateTime + "}"; diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java index 5c5f1969..b7ff9c2c 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java @@ -2,6 +2,7 @@ package com.foreverwin.mesnac.anomaly.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto; import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.foreverwin.modular.core.util.FrontPage; @@ -14,7 +15,7 @@ import java.util.List; *

* * @author robert - * @since 2021-06-25 + * @since 2021-07-05 */ public interface AbnormalBillService extends IService { @@ -49,4 +50,11 @@ public interface AbnormalBillService extends IService { String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose); + /** + * 待办事项 + * @param abnormalBillDto + * @return + */ + List backLog(AbnormalBillDto abnormalBillDto); + } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index ab215637..8088fb12 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -3,6 +3,7 @@ package com.foreverwin.mesnac.anomaly.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto; import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillMapper; import com.foreverwin.mesnac.anomaly.model.*; import com.foreverwin.mesnac.anomaly.service.*; @@ -18,11 +19,14 @@ import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; /** *

@@ -30,13 +34,14 @@ import java.util.*; *

* * @author robert - * @since 2021-06-25 + * @since 2021-07-05 */ @Service @Transactional(rollbackFor = Exception.class) public class AbnormalBillServiceImpl extends ServiceImpl implements AbnormalBillService { + @Autowired private AbnormalBillMapper abnormalBillMapper; @@ -64,7 +69,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, AbnormalBill abnormalBill) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -153,6 +157,12 @@ public class AbnormalBillServiceImpl extends ServiceImpl backLog(AbnormalBillDto abnormalBillDto) { + String language = LocaleContextHolder.getLocale().getLanguage(); + return abnormalBillMapper.backLog(abnormalBillDto, language); + + } @Override public void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List dutyCauseType,List dutyType) { @@ -234,7 +244,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl - + @@ -36,14 +36,21 @@ - + + + + + + + + - HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTER, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME + HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME @@ -99,7 +106,7 @@ AND PB_QTY=#{ew.entity.pbQty} AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} AND DISCOVER=#{ew.entity.discover} - AND INSPECTER=#{ew.entity.inspecter} + AND INSPECTOR=#{ew.entity.inspector} AND ENTITY_LOCATION=#{ew.entity.entityLocation} AND REPORT_FROM=#{ew.entity.reportFrom} AND OBJECT_BO=#{ew.entity.objectBo} @@ -109,7 +116,7 @@ AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} AND CANCEL_USER=#{ew.entity.cancelUser} AND CREATED_USER=#{ew.entity.createdUser} - AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -144,7 +151,7 @@ AND PB_QTY=#{ew.entity.pbQty} AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} AND DISCOVER=#{ew.entity.discover} - AND INSPECTER=#{ew.entity.inspecter} + AND INSPECTOR=#{ew.entity.inspector} AND ENTITY_LOCATION=#{ew.entity.entityLocation} AND REPORT_FROM=#{ew.entity.reportFrom} AND OBJECT_BO=#{ew.entity.objectBo} @@ -154,7 +161,7 @@ AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} AND CANCEL_USER=#{ew.entity.cancelUser} AND CREATED_USER=#{ew.entity.createdUser} - AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -197,7 +204,7 @@ AND PB_QTY=#{ew.entity.pbQty} AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} AND DISCOVER=#{ew.entity.discover} - AND INSPECTER=#{ew.entity.inspecter} + AND INSPECTOR=#{ew.entity.inspector} AND ENTITY_LOCATION=#{ew.entity.entityLocation} AND REPORT_FROM=#{ew.entity.reportFrom} AND OBJECT_BO=#{ew.entity.objectBo} @@ -207,7 +214,7 @@ AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} AND CANCEL_USER=#{ew.entity.cancelUser} AND CREATED_USER=#{ew.entity.createdUser} - AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -250,7 +257,7 @@ AND PB_QTY=#{ew.entity.pbQty} AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} AND DISCOVER=#{ew.entity.discover} - AND INSPECTER=#{ew.entity.inspecter} + AND INSPECTOR=#{ew.entity.inspector} AND ENTITY_LOCATION=#{ew.entity.entityLocation} AND REPORT_FROM=#{ew.entity.reportFrom} AND OBJECT_BO=#{ew.entity.objectBo} @@ -260,7 +267,7 @@ AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} AND CANCEL_USER=#{ew.entity.cancelUser} AND CREATED_USER=#{ew.entity.createdUser} - AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -303,7 +310,7 @@ AND PB_QTY=#{ew.entity.pbQty} AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} AND DISCOVER=#{ew.entity.discover} - AND INSPECTER=#{ew.entity.inspecter} + AND INSPECTOR=#{ew.entity.inspector} AND ENTITY_LOCATION=#{ew.entity.entityLocation} AND REPORT_FROM=#{ew.entity.reportFrom} AND OBJECT_BO=#{ew.entity.objectBo} @@ -313,7 +320,7 @@ AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} AND CANCEL_USER=#{ew.entity.cancelUser} AND CREATED_USER=#{ew.entity.createdUser} - AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -356,7 +363,7 @@ AND PB_QTY=#{ew.entity.pbQty} AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} AND DISCOVER=#{ew.entity.discover} - AND INSPECTER=#{ew.entity.inspecter} + AND INSPECTOR=#{ew.entity.inspector} AND ENTITY_LOCATION=#{ew.entity.entityLocation} AND REPORT_FROM=#{ew.entity.reportFrom} AND OBJECT_BO=#{ew.entity.objectBo} @@ -366,7 +373,7 @@ AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} AND CANCEL_USER=#{ew.entity.cancelUser} AND CREATED_USER=#{ew.entity.createdUser} - AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -409,7 +416,7 @@ AND PB_QTY=#{ew.entity.pbQty} AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} AND DISCOVER=#{ew.entity.discover} - AND INSPECTER=#{ew.entity.inspecter} + AND INSPECTOR=#{ew.entity.inspector} AND ENTITY_LOCATION=#{ew.entity.entityLocation} AND REPORT_FROM=#{ew.entity.reportFrom} AND OBJECT_BO=#{ew.entity.objectBo} @@ -419,7 +426,7 @@ AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} AND CANCEL_USER=#{ew.entity.cancelUser} AND CREATED_USER=#{ew.entity.createdUser} - AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -458,7 +465,7 @@ PB_QTY, REPAIR_DATE_TIME, DISCOVER, - INSPECTER, + INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, @@ -468,7 +475,7 @@ CANCEL_DATE_TIME, CANCEL_USER, CREATED_USER, - CREATED_DATA_TIME, + CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, VALUES @@ -495,7 +502,7 @@ #{pbQty}, #{repairDateTime}, #{discover}, - #{inspecter}, + #{inspector}, #{entityLocation}, #{reportFrom}, #{objectBo}, @@ -505,7 +512,7 @@ #{cancelDateTime}, #{cancelUser}, #{createdUser}, - #{createdDataTime}, + #{createdDateTime}, #{modifiedUser}, #{modifiedDateTime}, @@ -539,7 +546,7 @@ #{pbQty}, #{repairDateTime}, #{discover}, - #{inspecter}, + #{inspector}, #{entityLocation}, #{reportFrom}, #{objectBo}, @@ -549,7 +556,7 @@ #{cancelDateTime}, #{cancelUser}, #{createdUser}, - #{createdDataTime}, + #{createdDateTime}, #{modifiedUser}, #{modifiedDateTime}, @@ -579,7 +586,7 @@ PB_QTY=#{et.pbQty}, REPAIR_DATE_TIME=#{et.repairDateTime}, DISCOVER=#{et.discover}, - INSPECTER=#{et.inspecter}, + INSPECTOR=#{et.inspector}, ENTITY_LOCATION=#{et.entityLocation}, REPORT_FROM=#{et.reportFrom}, OBJECT_BO=#{et.objectBo}, @@ -589,7 +596,7 @@ CANCEL_DATE_TIME=#{et.cancelDateTime}, CANCEL_USER=#{et.cancelUser}, CREATED_USER=#{et.createdUser}, - CREATED_DATA_TIME=#{et.createdDataTime}, + CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -619,7 +626,7 @@ PB_QTY=#{et.pbQty}, REPAIR_DATE_TIME=#{et.repairDateTime}, DISCOVER=#{et.discover}, - INSPECTER=#{et.inspecter}, + INSPECTOR=#{et.inspector}, ENTITY_LOCATION=#{et.entityLocation}, REPORT_FROM=#{et.reportFrom}, OBJECT_BO=#{et.objectBo}, @@ -629,7 +636,7 @@ CANCEL_DATE_TIME=#{et.cancelDateTime}, CANCEL_USER=#{et.cancelUser}, CREATED_USER=#{et.createdUser}, - CREATED_DATA_TIME=#{et.createdDataTime}, + CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -659,7 +666,7 @@ PB_QTY=#{et.pbQty}, REPAIR_DATE_TIME=#{et.repairDateTime}, DISCOVER=#{et.discover}, - INSPECTER=#{et.inspecter}, + INSPECTOR=#{et.inspector}, ENTITY_LOCATION=#{et.entityLocation}, REPORT_FROM=#{et.reportFrom}, OBJECT_BO=#{et.objectBo}, @@ -669,7 +676,7 @@ CANCEL_DATE_TIME=#{et.cancelDateTime}, CANCEL_USER=#{et.cancelUser}, CREATED_USER=#{et.createdUser}, - CREATED_DATA_TIME=#{et.createdDataTime}, + CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, @@ -698,7 +705,7 @@ AND PB_QTY=#{ew.entity.pbQty} AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} AND DISCOVER=#{ew.entity.discover} - AND INSPECTER=#{ew.entity.inspecter} + AND INSPECTOR=#{ew.entity.inspector} AND ENTITY_LOCATION=#{ew.entity.entityLocation} AND REPORT_FROM=#{ew.entity.reportFrom} AND OBJECT_BO=#{ew.entity.objectBo} @@ -708,7 +715,7 @@ AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} AND CANCEL_USER=#{ew.entity.cancelUser} AND CREATED_USER=#{ew.entity.createdUser} - AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -768,7 +775,7 @@ AND PB_QTY=#{ew.entity.pbQty} AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime} AND DISCOVER=#{ew.entity.discover} - AND INSPECTER=#{ew.entity.inspecter} + AND INSPECTOR=#{ew.entity.inspector} AND ENTITY_LOCATION=#{ew.entity.entityLocation} AND REPORT_FROM=#{ew.entity.reportFrom} AND OBJECT_BO=#{ew.entity.objectBo} @@ -778,7 +785,7 @@ AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime} AND CANCEL_USER=#{ew.entity.cancelUser} AND CREATED_USER=#{ew.entity.createdUser} - AND CREATED_DATA_TIME=#{ew.entity.createdDataTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} @@ -798,5 +805,48 @@ ) + From a11894728805082c8af16cecad2e2cb7d459fc11 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Mon, 5 Jul 2021 14:55:13 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meapi/controller/OperationController.java | 17 +++++++++++++++++ .../mesnac/meapi/mapper/OperationMapper.java | 3 +++ .../mesnac/meapi/service/OperationService.java | 2 ++ .../service/impl/OperationServiceImpl.java | 5 +++++ .../main/resources/mapper/OperationMapper.xml | 12 ++++++++++++ 5 files changed, 39 insertions(+) diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java index a8fa9919..cfb28765 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java @@ -74,4 +74,21 @@ public class OperationController { return R.ok(result); } + + @ResponseBody + @GetMapping("/getOperationStep") + public R getOperationStep(FrontPage frontPage, Operation operation){ + IPage result; + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + operation.setSite(CommonMethods.getSite()); + operation.setOperation(frontPage.getGlobalQuery()); + queryWrapper.setEntity(operation); + result = operationService.selectOperationStep(frontPage.getPagePlus(), queryWrapper); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + + return R.ok(result); + } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java index 612d7b3e..a6c8a600 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java @@ -25,4 +25,7 @@ public interface OperationMapper extends BaseMapper { Operation getCurrentRevisionRef(@Param("site") String site, @Param("operation") String operation); + IPage selectOperationStep( IPage page, @Param("locale") String locale,@Param("ew") Wrapper wrapper); + + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/OperationService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/OperationService.java index 35342dfe..8279ebd7 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/OperationService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/OperationService.java @@ -25,6 +25,8 @@ public interface OperationService extends IService { */ IPage selectPage(Page page, QueryWrapper operation); + IPage selectOperationStep(Page page, QueryWrapper queryWrapper); + List selectList(Operation operation); Operation getCurrentRevisionRef(String site, String operation); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/OperationServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/OperationServiceImpl.java index 71b6d230..797f114e 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/OperationServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/OperationServiceImpl.java @@ -40,6 +40,11 @@ public class OperationServiceImpl extends ServiceImpl selectOperationStep(Page page, QueryWrapper queryWrapper) { + Locale locale = LocaleContextHolder.getLocale(); + return operationMapper.selectOperationStep(page,locale.getLanguage(),queryWrapper); + } @Override public List selectList(Operation operation) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/meapi/src/main/resources/mapper/OperationMapper.xml b/meapi/src/main/resources/mapper/OperationMapper.xml index 83ba455f..25212d3a 100644 --- a/meapi/src/main/resources/mapper/OperationMapper.xml +++ b/meapi/src/main/resources/mapper/OperationMapper.xml @@ -615,4 +615,16 @@ AND OPERATION = #{operation} AND CURRENT_REVISION = 'true' +