From 2cc10239044dd1b34f034ce533fdba274c8dfc6b 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, 30 Jun 2021 15:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=BC=82=E5=B8=B8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnormalBillController.java | 57 ++++++++++-- .../AbnormalBillDisposeController.java | 11 +-- .../mesnac/anomaly/model/AbnormalBill.java | 3 +- .../anomaly/model/AbnormalBillDispose.java | 20 +++- .../anomaly/service/AbnormalBillService.java | 12 +++ .../service/impl/AbnormalBillServiceImpl.java | 92 ++++++++++++++++++- .../mapper/AbnormalBillDisposeMapper.xml | 16 +++- .../mesnac/common/enums/HandleEnum.java | 7 +- .../meapi/controller/DataFieldController.java | 12 +-- .../controller/DataFieldListController.java | 20 ++-- .../meapi/controller/ShopOrderController.java | 20 +++- .../mesnac/meapi/dto/ShopOrderDto.java | 49 ++++++++++ .../meapi/mapper/DataFieldListMapper.java | 8 +- .../mesnac/meapi/mapper/DataFieldMapper.java | 4 + .../mesnac/meapi/mapper/ShopOrderMapper.java | 3 + .../mesnac/meapi/model/DataFieldList.java | 22 +++-- .../meapi/service/DataFieldListService.java | 5 +- .../meapi/service/DataFieldService.java | 2 + .../meapi/service/ShopOrderService.java | 5 + .../impl/DataFieldListServiceImpl.java | 16 +++- .../service/impl/DataFieldServiceImpl.java | 2 + .../service/impl/ShopOrderServiceImpl.java | 6 ++ .../resources/mapper/DataFieldListMapper.xml | 21 ++++- .../main/resources/mapper/DataFieldMapper.xml | 1 + .../main/resources/mapper/NcCodeMapper.xml | 6 +- .../main/resources/mapper/ShopOrderMapper.xml | 16 ++++ 26 files changed, 386 insertions(+), 50 deletions(-) create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/ShopOrderDto.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 df10842b..439383b8 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 @@ -4,9 +4,13 @@ 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.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.foreverwin.mesnac.anomaly.service.AbnormalBillService; import com.foreverwin.mesnac.common.helper.NextNumberHelper; +import com.foreverwin.mesnac.meapi.controller.DataFieldListController; +import com.foreverwin.mesnac.meapi.controller.NcCodeController; import com.foreverwin.mesnac.meapi.controller.WorkCenterController; +import com.foreverwin.mesnac.meapi.model.DataField; import com.foreverwin.mesnac.meapi.model.NcCode; import com.foreverwin.mesnac.meapi.model.WorkCenter; import com.foreverwin.mesnac.meapi.service.NcCodeService; @@ -29,16 +33,22 @@ import java.util.List; public class AbnormalBillController { @Autowired - public AbnormalBillService abnormalBillService; + private AbnormalBillService abnormalBillService; @Autowired - public NcCodeService ncCodeService; + private NcCodeService ncCodeService; @Autowired - public WorkCenterController workCenterController; + private WorkCenterController workCenterController; @Autowired - public NextNumberHelper nextNumberHelper; + private NextNumberHelper nextNumberHelper; + + @Autowired + private NcCodeController ncCodeController; + + @Autowired + private DataFieldListController dataFieldListController; /** * 根据id查询 @@ -162,13 +172,32 @@ 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); + //工作中心 WorkCenter workCenter = new WorkCenter(); workCenter.setWcCategory("LEVEL4"); R workCenterList = workCenterController.getWorkCenterList(workCenter); - HashMap hashMap = new HashMap<>(); - hashMap.put("ncByNG",ncByNG); hashMap.put("workCenter",workCenterList); + //原因分类 + NcCode ncCode = new NcCode(); + ncCode.setSite(site); + ncCode.setNcCategory("REPAIR"); + R causeType = ncCodeController.getNcCodeList(ncCode); + hashMap.put("causeType",causeType); + //责任部门 + DataField dataField = new DataField(); + dataField.setSite(site); + dataField.setDataField("RESPONSIBILITY_DEPARTMENT"); + R dutyDepart = dataFieldListController.findDataFieldListById(dataField); + hashMap.put("dutyDepart",dutyDepart); + //责任分类 + dataField.setDataField("RESPONSIBILITY_TYPE"); + R dutyType = dataFieldListController.findDataFieldListById(dataField); + hashMap.put("dutyType",dutyType); return R.ok(hashMap); } @@ -182,4 +211,20 @@ public class AbnormalBillController { List nextNumber = nextNumberHelper.getNextNumber(site, numberType, 1, null); return R.ok(nextNumber.get(0)); } + + /** + * 异常提报 + * @param abnormalBill + * @return + */ + @GetMapping("/anomalyReportOther") + public R anomalyReportOther(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose){ + return R.ok(abnormalBillService.anomalyReportOther(abnormalBill, abnormalBillDispose)); + } + + @GetMapping("/cancelBrowse") + public R cancelBrowse(String handle, String cancelBrowse){ + abnormalBillService.cancelBrowse(handle,cancelBrowse); + return R.ok(); + } } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java index 3289225c..3856c3e3 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java @@ -1,16 +1,14 @@ package com.foreverwin.mesnac.anomaly.controller; -import com.foreverwin.modular.core.util.R; -import com.foreverwin.modular.core.util.FrontPage; -import com.foreverwin.modular.core.util.CommonMethods; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.web.bind.annotation.RequestMapping; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.foreverwin.mesnac.anomaly.service.AbnormalBillDisposeService; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.foreverwin.mesnac.anomaly.service.AbnormalBillDisposeService; -import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import java.util.List; /** @@ -72,6 +70,7 @@ public class AbnormalBillDisposeController { .or().like(AbnormalBillDispose::getAbnormalBillBo, frontPage.getGlobalQuery()) .or().like(AbnormalBillDispose::getDutyUser, frontPage.getGlobalQuery()) .or().like(AbnormalBillDispose::getDutyDepart, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getDutyType, frontPage.getGlobalQuery()) .or().like(AbnormalBillDispose::getPrincipalUser, frontPage.getGlobalQuery()) .or().like(AbnormalBillDispose::getDutyCauseDescription, frontPage.getGlobalQuery()) .or().like(AbnormalBillDispose::getDutyCauseType, frontPage.getGlobalQuery()) 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 458eb7fd..6f6e852f 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 @@ -200,7 +200,6 @@ public class AbnormalBill extends Model { @TableField("MODIFIED_DATE_TIME") private LocalDateTime modifiedDateTime; - public String getHandle() { return handle; } @@ -481,7 +480,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"; diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java index 7ffe574c..beae589f 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java @@ -1,6 +1,8 @@ package com.foreverwin.mesnac.anomaly.model; +import com.baomidou.mybatisplus.annotation.IdType; 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; @@ -25,7 +27,7 @@ public class AbnormalBillDispose extends Model { /** * 主键 */ - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; /** * 站点 @@ -52,6 +54,11 @@ public class AbnormalBillDispose extends Model { */ @TableField("DUTY_DEPART") private String dutyDepart; + /** + * 责任分类 + */ + @TableField("DUTY_TYPE") + private String dutyType; /** * 责任人 */ @@ -197,6 +204,14 @@ public class AbnormalBillDispose extends Model { this.dutyDepart = dutyDepart; } + public String getDutyType() { + return dutyType; + } + + public void setDutyType(String dutyType) { + this.dutyType = dutyType; + } + public String getPrincipalUser() { return principalUser; } @@ -361,6 +376,8 @@ public static final String DUTY_DATE_TIME = "DUTY_DATE_TIME"; public static final String DUTY_DEPART = "DUTY_DEPART"; +public static final String DUTY_TYPE = "DUTY_TYPE"; + public static final String PRINCIPAL_USER = "PRINCIPAL_USER"; public static final String DUTY_CAUSE_DESCRIPTION = "DUTY_CAUSE_DESCRIPTION"; @@ -414,6 +431,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; ", dutyUser = " + dutyUser + ", dutyDateTime = " + dutyDateTime + ", dutyDepart = " + dutyDepart + + ", dutyType = " + dutyType + ", principalUser = " + principalUser + ", dutyCauseDescription = " + dutyCauseDescription + ", dutyCauseType = " + dutyCauseType + 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 8a9cf423..ed085def 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 @@ -3,6 +3,7 @@ package com.foreverwin.mesnac.anomaly.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -25,4 +26,15 @@ public interface AbnormalBillService extends IService { IPage selectPage(FrontPage frontPage, AbnormalBill abnormalBill); List selectList(AbnormalBill abnormalBill); + + String anomalyReportOther(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose); + + /** + * 生成异常单号、创建时间和更新时间 + * @param abnormalBill + * @param abnormalBillDispose + */ + void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose); + + void cancelBrowse(String handle,String cancelBrowse); } \ 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 118aec75..4ce6491a 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 @@ -1,16 +1,25 @@ package com.foreverwin.mesnac.anomaly.service.impl; -import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillDisposeMapper; import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillMapper; +import com.foreverwin.mesnac.anomaly.model.AbnormalBill; +import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; +import com.foreverwin.mesnac.anomaly.service.AbnormalBillDisposeService; import com.foreverwin.mesnac.anomaly.service.AbnormalBillService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; +import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.helper.NextNumberHelper; +import com.foreverwin.mesnac.common.util.StringUtil; +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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.List; /** *

@@ -28,6 +37,15 @@ public class AbnormalBillServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, AbnormalBill abnormalBill) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -42,5 +60,71 @@ public class AbnormalBillServiceImpl extends ServiceImpl + @@ -33,7 +34,7 @@ - HANDLE, SITE, ABNORMAL_BILL_BO, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, 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 + 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 @@ -64,6 +65,7 @@ AND DUTY_USER=#{ew.entity.dutyUser} AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND DUTY_TYPE=#{ew.entity.dutyType} AND PRINCIPAL_USER=#{ew.entity.principalUser} AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} @@ -99,6 +101,7 @@ AND DUTY_USER=#{ew.entity.dutyUser} AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND DUTY_TYPE=#{ew.entity.dutyType} AND PRINCIPAL_USER=#{ew.entity.principalUser} AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} @@ -142,6 +145,7 @@ AND DUTY_USER=#{ew.entity.dutyUser} AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND DUTY_TYPE=#{ew.entity.dutyType} AND PRINCIPAL_USER=#{ew.entity.principalUser} AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} @@ -185,6 +189,7 @@ AND DUTY_USER=#{ew.entity.dutyUser} AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND DUTY_TYPE=#{ew.entity.dutyType} AND PRINCIPAL_USER=#{ew.entity.principalUser} AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} @@ -228,6 +233,7 @@ AND DUTY_USER=#{ew.entity.dutyUser} AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND DUTY_TYPE=#{ew.entity.dutyType} AND PRINCIPAL_USER=#{ew.entity.principalUser} AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} @@ -271,6 +277,7 @@ AND DUTY_USER=#{ew.entity.dutyUser} AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND DUTY_TYPE=#{ew.entity.dutyType} AND PRINCIPAL_USER=#{ew.entity.principalUser} AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} @@ -314,6 +321,7 @@ AND DUTY_USER=#{ew.entity.dutyUser} AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND DUTY_TYPE=#{ew.entity.dutyType} AND PRINCIPAL_USER=#{ew.entity.principalUser} AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} @@ -353,6 +361,7 @@ DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, + DUTY_TYPE, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, @@ -380,6 +389,7 @@ #{dutyUser}, #{dutyDateTime}, #{dutyDepart}, + #{dutyType}, #{principalUser}, #{dutyCauseDescription}, #{dutyCauseType}, @@ -414,6 +424,7 @@ #{dutyUser}, #{dutyDateTime}, #{dutyDepart}, + #{dutyType}, #{principalUser}, #{dutyCauseDescription}, #{dutyCauseType}, @@ -449,6 +460,7 @@ DUTY_USER=#{et.dutyUser}, DUTY_DATE_TIME=#{et.dutyDateTime}, DUTY_DEPART=#{et.dutyDepart}, + DUTY_TYPE=#{et.dutyType}, PRINCIPAL_USER=#{et.principalUser}, DUTY_CAUSE_DESCRIPTION=#{et.dutyCauseDescription}, DUTY_CAUSE_TYPE=#{et.dutyCauseType}, @@ -478,6 +490,7 @@ AND DUTY_USER=#{ew.entity.dutyUser} AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND DUTY_TYPE=#{ew.entity.dutyType} AND PRINCIPAL_USER=#{ew.entity.principalUser} AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} @@ -535,6 +548,7 @@ AND DUTY_USER=#{ew.entity.dutyUser} AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime} AND DUTY_DEPART=#{ew.entity.dutyDepart} + AND DUTY_TYPE=#{ew.entity.dutyType} AND PRINCIPAL_USER=#{ew.entity.principalUser} AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription} AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType} 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 bb699136..fadbd34a 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 @@ -89,8 +89,13 @@ public enum HandleEnum { PROD_READY_TASK_DETAIL("ProdReadyTaskDetailBO", "ProdReadyTaskDetailBO:{0},{1}"), /**设备检验任务的检验项**/ - RESOURCE_INSPECT_TASK_PARAM("ResourceInspectTaskParamBo","ResourceInspectTaskParamBo:{0},{1}"); + RESOURCE_INSPECT_TASK_PARAM("ResourceInspectTaskParamBo","ResourceInspectTaskParamBo:{0},{1}"), + /**异常单**/ + Z_ABNORMAL_BILL("AbnormalBillBo","AbnormalBillBo:{0},{1}"), + + /**异常单详细表**/ + Z_ABNORMAL_BILL_DISPOSE("AbnormalBillDisposeBo","AbnormalBillDisposeBo:{0},{1}"); private String prefix; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java index e3c65c62..715281ee 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java @@ -1,16 +1,14 @@ package com.foreverwin.mesnac.meapi.controller; -import com.foreverwin.modular.core.util.R; -import com.foreverwin.modular.core.util.FrontPage; -import com.foreverwin.modular.core.util.CommonMethods; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.web.bind.annotation.RequestMapping; +import com.foreverwin.mesnac.meapi.model.DataField; +import com.foreverwin.mesnac.meapi.service.DataFieldService; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.foreverwin.mesnac.meapi.service.DataFieldService; -import com.foreverwin.mesnac.meapi.model.DataField; import java.util.List; /** @@ -128,4 +126,6 @@ public class DataFieldController { public R removeByIds(List ids){ return R.ok(dataFieldService.removeByIds(ids)); } + + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java index f704488a..c577a8c0 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java @@ -1,16 +1,15 @@ package com.foreverwin.mesnac.meapi.controller; -import com.foreverwin.modular.core.util.R; -import com.foreverwin.modular.core.util.FrontPage; -import com.foreverwin.modular.core.util.CommonMethods; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.web.bind.annotation.RequestMapping; +import com.foreverwin.mesnac.meapi.model.DataField; +import com.foreverwin.mesnac.meapi.model.DataFieldList; +import com.foreverwin.mesnac.meapi.service.DataFieldListService; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.foreverwin.mesnac.meapi.service.DataFieldListService; -import com.foreverwin.mesnac.meapi.model.DataFieldList; import java.util.List; /** @@ -120,4 +119,13 @@ public class DataFieldListController { public R removeByIds(List ids){ return R.ok(dataFieldListService.removeByIds(ids)); } + + /** + * 根据handle找到数据字段定义维护中的数据字段列表 + * @return + */ + @GetMapping("findDataFieldListById") + public R findDataFieldListById(DataField dataField){ + return R.ok(dataFieldListService.findDataFieldListById(dataField)); + } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java index a856ffe0..9223c940 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java @@ -73,4 +73,22 @@ public class ShopOrderController { public R findByIdAndPlannedItemBo(String handle,String plannedItemBo){ return R.ok(shopOrderService.findByIdAndPlannedItemBo(handle,plannedItemBo)); } -} \ No newline at end of file + + /** + * 根据工单找出工作令号，项目号，产品类别 + */ + @GetMapping("/findByShopOrderBo") + public R findByShopOrderBo(String handle){ + return R.ok(shopOrderService.findByShopOrderBo(handle)); + } +} + + + + + + + + + + diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/ShopOrderDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/ShopOrderDto.java new file mode 100644 index 00000000..5013a0ba --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/ShopOrderDto.java @@ -0,0 +1,49 @@ +package com.foreverwin.mesnac.meapi.dto; + +import com.foreverwin.mesnac.meapi.model.ShopOrder; + +/** + * @Description TODO + * @Author zhaojiawei + * @Since 2021-06-30 + */ +public class ShopOrderDto extends ShopOrder { + /** + * 工作令号 + */ + private String workOrder; + + /** + * 项目号 + */ + private String itemNumber; + + /** + * 产品类别 + */ + private String productCategory; + + 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; + } +} diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java index c810a7fc..708f68e0 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java @@ -1,9 +1,13 @@ package com.foreverwin.mesnac.meapi.mapper; -import com.foreverwin.mesnac.meapi.model.DataFieldList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.meapi.model.DataField; +import com.foreverwin.mesnac.meapi.model.DataFieldList; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* Mapper 接口 @@ -15,4 +19,6 @@ import org.springframework.stereotype.Repository; @Repository public interface DataFieldListMapper extends BaseMapper { + List findDataFieldListById(@Param("dataField") DataField dataField,@Param("locale")String locale); + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java index 4bbb8ef3..64ee90f4 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java @@ -2,8 +2,11 @@ package com.foreverwin.mesnac.meapi.mapper; import com.foreverwin.mesnac.meapi.model.DataField; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* Mapper 接口 @@ -15,4 +18,5 @@ import org.springframework.stereotype.Repository; @Repository public interface DataFieldMapper extends BaseMapper { + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java index 9d886a83..46d94767 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.meapi.mapper; +import com.foreverwin.mesnac.meapi.dto.ShopOrderDto; import com.foreverwin.mesnac.meapi.model.ShopOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,6 @@ public interface ShopOrderMapper extends BaseMapper { ShopOrder findByIdAndPlannedItemBo(@Param("handle")String handle, @Param("plannedItemBo")String plannedItemBo, @Param("status501")String status501); + + ShopOrderDto findByShopOrderBo(@Param("handle")String handle); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java index d1e35879..9b4fdc48 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java @@ -1,13 +1,11 @@ package com.foreverwin.mesnac.meapi.model; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; /** *

@@ -42,6 +40,8 @@ public class DataFieldList extends Model { private LocalDateTime createdDateTime; @TableField("MODIFIED_DATE_TIME") private LocalDateTime modifiedDateTime; + @TableField(exist = false) + private String description; public String getHandle() { @@ -116,7 +116,15 @@ public class DataFieldList extends Model { this.modifiedDateTime = modifiedDateTime; } -public static final String HANDLE = "HANDLE"; + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public static final String HANDLE = "HANDLE"; public static final String SEQUENCE = "SEQUENCE"; @@ -134,6 +142,8 @@ public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; +public static final String DESCRIPTION = "DESCRIPTION"; + @Override protected Serializable pkVal() { diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java index 70518101..96184dc2 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java @@ -1,8 +1,9 @@ package com.foreverwin.mesnac.meapi.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.meapi.model.DataFieldList; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.meapi.model.DataField; +import com.foreverwin.mesnac.meapi.model.DataFieldList; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -25,4 +26,6 @@ public interface DataFieldListService extends IService { IPage selectPage(FrontPage frontPage, DataFieldList dataFieldList); List selectList(DataFieldList dataFieldList); + + List findDataFieldListById(DataField dataField); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java index b61eb63a..dc5de264 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java @@ -25,4 +25,6 @@ public interface DataFieldService extends IService { IPage selectPage(FrontPage frontPage, DataField dataField); List selectList(DataField dataField); + + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java index f5ab0789..a4c3b472 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java @@ -2,6 +2,7 @@ package com.foreverwin.mesnac.meapi.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.meapi.dto.ShopOrderDto; import com.foreverwin.mesnac.meapi.model.ShopOrder; import com.foreverwin.modular.core.util.FrontPage; @@ -27,4 +28,8 @@ public interface ShopOrderService extends IService { List selectList(ShopOrder shopOrder); ShopOrder findByIdAndPlannedItemBo(String handle,String plannedItemBo); + + ShopOrderDto findByShopOrderBo(String handle); + + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java index 146ed9c2..dbe2bfe4 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java @@ -1,14 +1,16 @@ package com.foreverwin.mesnac.meapi.service.impl; -import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.meapi.model.DataFieldList; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.meapi.mapper.DataFieldListMapper; +import com.foreverwin.mesnac.meapi.model.DataField; +import com.foreverwin.mesnac.meapi.model.DataFieldList; import com.foreverwin.mesnac.meapi.service.DataFieldListService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; +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.util.List; @@ -42,5 +44,9 @@ public class DataFieldListServiceImpl extends ServiceImpl findDataFieldListById(DataField dataField) { + String locale = LocaleContextHolder.getLocale().getLanguage(); + return dataFieldListMapper.findDataFieldListById(dataField,locale); + } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java index 9b3602c3..98d95737 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java @@ -43,4 +43,6 @@ public class DataFieldServiceImpl extends ServiceImpl + @@ -342,5 +343,23 @@ - + diff --git a/meapi/src/main/resources/mapper/DataFieldMapper.xml b/meapi/src/main/resources/mapper/DataFieldMapper.xml index debaa0e1..22e20f3f 100644 --- a/meapi/src/main/resources/mapper/DataFieldMapper.xml +++ b/meapi/src/main/resources/mapper/DataFieldMapper.xml @@ -272,6 +272,7 @@ + INSERT INTO DATA_FIELD diff --git a/meapi/src/main/resources/mapper/NcCodeMapper.xml b/meapi/src/main/resources/mapper/NcCodeMapper.xml index c73916cb..cc3dc449 100644 --- a/meapi/src/main/resources/mapper/NcCodeMapper.xml +++ b/meapi/src/main/resources/mapper/NcCodeMapper.xml @@ -18,7 +18,7 @@ - HANDLE, CHANGE_STAMP, SITE, NC_CODE, STATUS_BO, CREATED_DATE_TIME, MODIFIED_DATE_TIME, NC_CATEGORY, DPMO_CATEGORY_BO + HANDLE, CHANGE_STAMP, SITE, NC_CODE, STATUS_BO, CREATED_DATE_TIME, MODIFIED_DATE_TIME, NC_CATEGORY, DPMO_CATEGORY_BO,DESCRIPTION @@ -83,7 +83,9 @@ + + +