From eb11ffa11fae4aaa42a607496c7f71b42cf7d950 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, 12 Jul 2021 13:52:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnormalBillController.java | 8 +++- .../anomaly/service/AbnormalBillService.java | 9 ++++- .../service/impl/AbnormalBillServiceImpl.java | 39 +++++++++++++------ .../resources/mapper/AbnormalBillMapper.xml | 6 +-- .../mesnac/common/constant/Constants.java | 14 +++++++ .../minth/generator/GeneratorApplication.java | 6 +-- .../meapi/controller/NwaUserController.java | 7 ++++ .../main/resources/mapper/NwaUserMapper.xml | 4 +- 8 files changed, 69 insertions(+), 24 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 093937dd..9ef3b5d6 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 @@ -220,8 +220,7 @@ public class AbnormalBillController { */ @GetMapping("/cancelBrowse") public R cancelBrowse(String handle, String cancelBrowse,String code){ - abnormalBillService.cancelBrowse(handle,cancelBrowse,code); - return R.ok(); + return R.ok( abnormalBillService.cancelBrowse(handle,cancelBrowse,code)); } @GetMapping("/backLog") @@ -313,4 +312,9 @@ public class AbnormalBillController { public R findUploadPictureByAbnormalBo(AbnormalBill abnormalBill){ return R.ok(abnormalBillService.findUploadPictureByAbnormalBo(abnormalBill)); } + + @GetMapping("/clear") + public R clear(String type){ + return R.ok(abnormalBillService.getNextNumber(type)); + } } \ 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 f47fc8f9..b490e7bb 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 @@ -49,7 +49,7 @@ public interface AbnormalBillService extends IService { */ String generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List dutyCauseType,List dutyType); - void cancelBrowse(String handle,String cancelBrowse,String code); + boolean cancelBrowse(String handle,String cancelBrowse,String code); String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose); @@ -112,4 +112,11 @@ public interface AbnormalBillService extends IService { */ public UploadPictures findUploadPictureByAbnormalBo(AbnormalBill abnormalBill); + /** + * 生成异常单 + * @param type + * @return + */ + String getNextNumber(String type); + } \ 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 a3533e55..677c0f30 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 @@ -13,7 +13,10 @@ import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.helper.NextNumberHelper; import com.foreverwin.mesnac.common.util.StringUtil; -import com.foreverwin.mesnac.meapi.mapper.*; +import com.foreverwin.mesnac.meapi.mapper.NcGroupMapper; +import com.foreverwin.mesnac.meapi.mapper.NwaUserMapper; +import com.foreverwin.mesnac.meapi.mapper.ResrceMapper; +import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper; import com.foreverwin.mesnac.meapi.model.*; import com.foreverwin.mesnac.meapi.service.*; import com.foreverwin.modular.core.exception.BusinessException; @@ -228,16 +231,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl @@ -863,7 +863,7 @@ SELECT ZAB.ABNORMAL_NO ABNORMAL_NO , ZAB.STATUS STATUS ,ZAB.REPORT_FROM REPORT_FROM ,WCT.DESCRIPTION WORK_CENTER_DESCRIPTION, ZAB.RESRCE RESRCE ,R.DESCRIPTION RESRCE_DESCRIPTION,ZNU.FULL_NAME REPORT_USER,ZAB.MESSAGE_TYPE MESSAGE_TYPE , ZAB.NC_CODE NC_CODE ,ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.SHUT_DOWN SHUT_DOWN ,ZAB.RESPONSE_USER RESPONSE_USER,ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME, - ZABD.ABNORMAL_METHOD ABNORMAL_METHOD,ZNU3.FULL_NAME CONFIRM_USER,ZABD.RESOLVE_REMARK RESOLVE_REMARK,ZAB.CANCEL_USER, + ZABD.ABNORMAL_METHOD ABNORMAL_METHOD,ZNU3.FULL_NAME CONFIRM_USER,ZABD.RESOLVE_REMARK RESOLVE_REMARK, ZAB.CANCEL_CODE CANCEL_CODE,ZAB.CANCEL_DATE_TIME CANCEL_DATE_TIME,ZNU4.FULL_NAME CANCEL_USER,ZAB.CANCEL_REASON CANCEL_REASON FROM Z_ABNORMAL_BILL ZAB @@ -873,7 +873,7 @@ LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZAB.CREATED_USER AND ZNU.SITE = ZAB.SITE LEFT JOIN Z_NWA_USER ZNU2 ON ZNU2.USER_NAME = ZAB.RESPONSE_USER AND ZNU2.SITE = ZAB.SITE LEFT JOIN Z_NWA_USER ZNU3 ON ZNU3.USER_NAME = ZABD.RESOLVE_USER AND ZNU3.SITE = ZAB.SITE - LEFT JOIN Z_NWA_USER ZNU4 ON ZNU4.USER_NAME = ZAB.CANCEL_CODE AND ZNU4.SITE = ZAB.SITE + LEFT JOIN Z_NWA_USER ZNU4 ON ZNU4.USER_NAME = ZAB.CANCEL_USER AND ZNU4.SITE = ZAB.SITE 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 1b3e4f95..800e599c 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 @@ -25,6 +25,20 @@ public interface Constants { String CANCEL = "Q"; String SHUT_DOWN = "G"; + //异常单上报来源 + String REPORT = "B"; // 自报 + String QUALITY_INSPECTION = "J"; //质检 + String DEVCICE_USER = "R";//设备人员 + String DEVICE_AUTO = "Z";//设备自动 + String REPAIR_CHECK = "C";// 维修自查 + String TECHNOLOGY = "Y";//工艺 + + //异常单发现环节 + String SELF_MADE = "Z";//自制 + String OUTSOURCING = "W";//外协 + String ARRIVAL = "D";//到货 + String CUSTOMER = "K";//客户 + //任务编号常量 String RESOURCE_INSPECT_TASK = "RESOURCE_INSPECT_TASK"; //报修任务单号 diff --git a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java index 7a8bf00d..b4ff0738 100644 --- a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java +++ b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java @@ -2,9 +2,7 @@ package com.foreverwin.minth.generator; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.generator.config.DataSourceConfig; -import com.foreverwin.minth.generator.converts.HanaTypeConvert; import com.foreverwin.minth.generator.converts.OracleTypeConvert; -import com.foreverwin.minth.generator.querys.HanaQuery; /** * @author Ervin Chen @@ -33,8 +31,8 @@ public class GeneratorApplication { dataSourceConfig.setTypeConvert( new OracleTypeConvert() ); MpGenerator mpGenerator = mpGeneratorBuilder.dataSourceConfig(dataSourceConfig) .tablePrefix( "APS_", "DS_", "Z_" ) - .packageName( "com.foreverwin.mesnac.dispatch" ) - .tables("Z_SURPLUS_ITEM_RETURN") + .packageName( "com.foreverwin.mesnac.anomaly" ) + .tables("Z_UPLOAD_PICTURES") .author("Leon.L") .uiAppId("com.foreverwin.me") .uiPackage("com.foreverwin.me.migration") diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java index 24c0c40e..7af5a7e8 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.meapi.model.NwaUser; import com.foreverwin.mesnac.meapi.service.NwaUserService; +import com.foreverwin.mesnac.meapi.util.StringUtils; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.R; @@ -48,6 +49,12 @@ public class NwaUserController { public R getNwaUserList(NwaUser nwaUser){ List result; QueryWrapper queryWrapper = new QueryWrapper<>(); + String site = CommonMethods.getSite(); + nwaUser.setSite(site); + if(!StringUtils.isBlank(nwaUser.getUserName())){ + queryWrapper.ne("USER_NAME",nwaUser.getUserName()); + nwaUser.setUserName(null); + } queryWrapper.setEntity(nwaUser); result = nwaUserService.list(queryWrapper); return R.ok(result); diff --git a/meapi/src/main/resources/mapper/NwaUserMapper.xml b/meapi/src/main/resources/mapper/NwaUserMapper.xml index d36891ce..aabdef65 100644 --- a/meapi/src/main/resources/mapper/NwaUserMapper.xml +++ b/meapi/src/main/resources/mapper/NwaUserMapper.xml @@ -152,12 +152,12 @@ AND EMAIL=#{ew.entity.email} - ${ew.sqlSegment} + AND ${ew.sqlSegment} - ${ew.sqlSegment} + AND ${ew.sqlSegment}