From 61f8f8543f308a18af8e02d4884710562c0f01e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Wed, 7 Jul 2021 09:26:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=B4=A8=E9=87=8F=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=8F=90=E4=BA=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnormalBillController.java | 7 +- .../anomaly/dto/AbnormalBillDisposeDto.java | 353 ++++++++++++++++++ .../mesnac/anomaly/dto/AbnormalBillDto.java | 4 +- .../mapper/AbnormalBillDisposeMapper.java | 8 +- .../anomaly/mapper/AbnormalBillMapper.java | 1 + .../anomaly/service/AbnormalBillService.java | 6 + .../service/impl/AbnormalBillServiceImpl.java | 30 +- .../mapper/AbnormalBillDisposeMapper.xml | 29 ++ .../resources/mapper/AbnormalBillMapper.xml | 2 + 9 files changed, 435 insertions(+), 5 deletions(-) create mode 100644 anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.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 dcf00be5..4f1b7fe3 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 @@ -174,7 +174,7 @@ public class AbnormalBillController { String site = CommonMethods.getSite(); //消息类型 if(!StringUtil.isBlank(messageType)){ - List ncByNG = ncCodeService.findNcByNG(messageType); + List ncByNG = ncCodeService.findNcByNG(messageType,null); hashMap.put("ncByNG",ncByNG); } @@ -264,4 +264,9 @@ public class AbnormalBillController { return R.ok(abnormalBillService.backLog(abnormalBillDto)); } + @GetMapping("/findAllByAbnormalNo") + public R findAllByAbnormalNo(AbnormalBill abnormalBill){ + return R.ok(abnormalBillService.findAllByAbnormalNo(abnormalBill)); + } + } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java new file mode 100644 index 00000000..a9a6bd12 --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java @@ -0,0 +1,353 @@ +package com.foreverwin.mesnac.anomaly.dto; + +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; + +import java.util.List; + +/** + * @Description 作异常响应检索用的 + * @Author zhaojiawei + * @Since 2021-07-06 + */ +public class AbnormalBillDisposeDto extends AbnormalBillDispose { + + /** + * 异常单 + */ + private String abnormalNo; + + /** + * 异常状态 + */ + private String status; + + /** + * 物料编号 + */ + private String item; + + /** + * 物料描述 + */ + private String itemDescription; + + /** + * 异常类型 + */ + private String type; + + /** + * 产品条码 + */ + private String sfc; + + /** + * 消息类型 + */ + private String messageType; + + /** + * 工单 + */ + private String shopOrder; + + /** + * 异常车间 + */ + private String workCenter; + + /** + * 设备编号 + */ + private String resrce; + + /** + * 工作令 + */ + private String workOrder; + + /** + * 项目号 + */ + private String itemNumber; + + /** + * 产品类别 + */ + private String productCategory; + + /** + * 图号 + */ + private String map; + + /** + * 不良明细 + */ + private List ncCode; + + /** + * 问题描述 + */ + private String pbDescription; + + /** + * 不良品数量 + */ + private String ncQty; + + /** + * 问题等级 + */ + private String pbGrade; + + /** + * 问题提报人 + */ + private String pbUser; + + /** + * 问题数量 + */ + private String pbQty; + + /** + * 发现环节 + */ + private String discover; + + /** + * 检验人员 + */ + private String inspector; + + /** + * 实物位置 + */ + private String entityLocation; + + /** + * 上报来源 + */ + private String reportFrom; + + /** + * 关联来源 + */ + private String objectBo; + + /** + * 问题照片 + */ + private String pbPhotoShop; + + public String getAbnormalNo() { + return abnormalNo; + } + + public void setAbnormalNo(String abnormalNo) { + this.abnormalNo = abnormalNo; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getItem() { + return item; + } + + public void setItem(String item) { + this.item = item; + } + + public String getItemDescription() { + return itemDescription; + } + + public void setItemDescription(String itemDescription) { + this.itemDescription = itemDescription; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getSfc() { + return sfc; + } + + public void setSfc(String sfc) { + this.sfc = sfc; + } + + public String getMessageType() { + return messageType; + } + + public void setMessageType(String messageType) { + this.messageType = messageType; + } + + public String getShopOrder() { + return shopOrder; + } + + public void setShopOrder(String shopOrder) { + this.shopOrder = shopOrder; + } + + public String getWorkCenter() { + return workCenter; + } + + public void setWorkCenter(String workCenter) { + this.workCenter = workCenter; + } + + public String getResrce() { + return resrce; + } + + public void setResrce(String resrce) { + this.resrce = resrce; + } + + public String getWorkOrder() { + return workOrder; + } + + public void setWorkOrder(String workOrder) { + this.workOrder = workOrder; + } + + public String getItemNumber() { + return itemNumber; + } + + public void setItemNumber(String itemNumber) { + this.itemNumber = itemNumber; + } + + public String getProductCategory() { + return productCategory; + } + + public void setProductCategory(String productCategory) { + this.productCategory = productCategory; + } + + public String getMap() { + return map; + } + + public void setMap(String map) { + this.map = map; + } + + public List getNcCode() { + return ncCode; + } + + public void setNcCode(List ncCode) { + this.ncCode = ncCode; + } + + public String getPbDescription() { + return pbDescription; + } + + public void setPbDescription(String pbDescription) { + this.pbDescription = pbDescription; + } + + public String getNcQty() { + return ncQty; + } + + public void setNcQty(String ncQty) { + this.ncQty = ncQty; + } + + public String getPbGrade() { + return pbGrade; + } + + public void setPbGrade(String pbGrade) { + this.pbGrade = pbGrade; + } + + public String getPbUser() { + return pbUser; + } + + public void setPbUser(String pbUser) { + this.pbUser = pbUser; + } + + public String getPbQty() { + return pbQty; + } + + public void setPbQty(String pbQty) { + this.pbQty = pbQty; + } + + public String getDiscover() { + return discover; + } + + public void setDiscover(String discover) { + this.discover = discover; + } + + public String getInspector() { + return inspector; + } + + public void setInspector(String inspector) { + this.inspector = inspector; + } + + public String getEntityLocation() { + return entityLocation; + } + + public void setEntityLocation(String entityLocation) { + this.entityLocation = entityLocation; + } + + public String getReportFrom() { + return reportFrom; + } + + public void setReportFrom(String reportFrom) { + this.reportFrom = reportFrom; + } + + public String getObjectBo() { + return objectBo; + } + + public void setObjectBo(String objectBo) { + this.objectBo = objectBo; + } + + public String getPbPhotoShop() { + return pbPhotoShop; + } + + public void setPbPhotoShop(String pbPhotoShop) { + this.pbPhotoShop = pbPhotoShop; + } + + +} 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 index 617bd715..2c4062fd 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java @@ -14,11 +14,11 @@ public class AbnormalBillDto extends AbnormalBill { /** * seq */ - String seq; + private String seq; /** * 物料描述 */ - String itemDescription; + private String itemDescription; /** * 开始时间 diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java index 84555a7f..a3873c07 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java @@ -1,7 +1,10 @@ package com.foreverwin.mesnac.anomaly.mapper; -import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; /** @@ -15,4 +18,7 @@ import org.springframework.stereotype.Repository; @Repository public interface AbnormalBillDisposeMapper extends BaseMapper { + AbnormalBillDisposeDto findAllByAbnormalNo(@Param("abnormalBill") AbnormalBill abnormalBill, @Param("language")String language); + + } \ No newline at end of file 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 3b49f7d4..75e5fd6f 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 @@ -19,4 +19,5 @@ import java.util.List; @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/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java index b7ff9c2c..f8e63d3a 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.AbnormalBillDisposeDto; import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto; import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; @@ -57,4 +58,9 @@ public interface AbnormalBillService extends IService { */ List backLog(AbnormalBillDto abnormalBillDto); + /** + * 跳转到异常响应**界面所带出的数据 + */ + AbnormalBillDisposeDto findAllByAbnormalNo(AbnormalBill abnormalBill); + } \ 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 8088fb12..055b0523 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,7 +3,9 @@ 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.AbnormalBillDisposeDto; import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto; +import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillDisposeMapper; import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillMapper; import com.foreverwin.mesnac.anomaly.model.*; import com.foreverwin.mesnac.anomaly.service.*; @@ -12,8 +14,10 @@ import com.foreverwin.mesnac.common.helper.NextNumberHelper; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.mapper.NcGroupMapper; import com.foreverwin.mesnac.meapi.mapper.ResrceMapper; +import com.foreverwin.mesnac.meapi.model.NcCode; import com.foreverwin.mesnac.meapi.model.NcGroup; import com.foreverwin.mesnac.meapi.model.Resrce; +import com.foreverwin.mesnac.meapi.service.NcCodeService; import com.foreverwin.mesnac.meapi.service.NwaUserService; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; @@ -60,6 +64,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, AbnormalBill abnormalBill) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -152,6 +162,11 @@ public class AbnormalBillServiceImpl extends ServiceImpl ncByNG = ncCodeService.findNcByNG(abnormalBill.getMessageType(), abnormalBill.getNcCode()); + if(ncByNG == null || ncByNG.size() <= 0){ + throw BusinessException.build("该消息类型下没有该不良代码"); + } this.saveOrUpdate(abnormalBill); abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose); return abnormalBill.getAbnormalNo(); @@ -164,6 +179,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl dutyCauseType,List dutyType) { String site = CommonMethods.getSite(); @@ -255,7 +282,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, ABNORMAL_BILL_BO, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, DUTY_TYPE, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index a0d83a39..8ea13891 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -848,5 +848,7 @@ + +