From 29b5d3cbd8fe1de4d3bc605c8df6e34a24f1e840 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Wed, 28 Jul 2021 17:14:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8A=A5=E8=B7=B3=E8=BD=AC=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/constant/Constants.java | 2 ++ .../service/MasterObjectDefine.java | 4 +-- meapi/src/main/resources/mapper/SfcMapper.xml | 2 +- .../controller/SelfReportController.java | 3 +- .../quality/mapper/SelfReportMapper.java | 2 +- .../quality/service/SelfReportService.java | 2 +- .../service/impl/SelfReportServiceImpl.java | 25 ++++++------- .../resources/mapper/SelfReportMapper.xml | 35 +++++++++++++++++++ 8 files changed, 54 insertions(+), 21 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 bc61f2e5..eef644ea 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 @@ -9,6 +9,8 @@ package com.foreverwin.mesnac.common.constant; public interface Constants { String STATUS_NEW = "NEW"; + String STATE_CONFIRM ="CONF"; + String STATE_REJECT="REJ"; String BOOL_TRUE = "true"; String BOOL_FALSE = "false"; diff --git a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java index bd9fc385..b13734a2 100644 --- a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java +++ b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java @@ -154,8 +154,8 @@ public class MasterObjectDefine { cvsHeadsMapping.put("paramDescription","参数描述"); cvsHeadsMapping.put("inspectionMethod","检验方法"); cvsHeadsMapping.put("paramType","数据类型"); - cvsHeadsMapping.put("decimalNum","单位"); - cvsHeadsMapping.put("paramUnit","小数位数"); + cvsHeadsMapping.put("decimalNum","小数位数"); + cvsHeadsMapping.put("paramUnit","单位"); cvsHeadsMapping.put("maxValue","规格上限"); cvsHeadsMapping.put("standardValue","目标规格"); cvsHeadsMapping.put("minValue","规格下限"); diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 47cda5a3..208ae7de 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -669,7 +669,7 @@ LEFT JOIN ITEM_T IT ON S.ITEM_BO=IT.ITEM_BO AND IT.LOCALE=#{locale} JOIN Z_SFC_DISPATCH zsd ON S.SFC=zsd.SFC AND S.SITE=zsd.SITE JOIN Z_PROD_READY_TASK zprt ON ZPRT.SFC_DISPATCH_BO=zsd.HANDLE - WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND ZSD.DISPATCH_STATUS!='CANCEL' + WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND ZSD.DISPATCH_STATUS!='CANCEL' AND ZSD.DISPATCH_STATUS!='COMPLETE' AND S.STATUS_BO IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403') AND zprt.STATUS='FINISH' AND ZPRT."RESULT"='OK' diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java index 0a150696..7484eccd 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java @@ -2,6 +2,7 @@ package com.foreverwin.mesnac.quality.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.quality.model.SelfReport; import com.foreverwin.mesnac.quality.service.SelfReportService; import com.foreverwin.modular.core.util.CommonMethods; @@ -66,7 +67,7 @@ public class SelfReportController { @ResponseBody @RequestMapping("/reject") public R updateById(String handle){ - return R.ok(selfReportService.reject(handle)); + return R.ok(selfReportService.updateState(handle, Constants.STATE_REJECT)); } /** * 分页查询数据 diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java b/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java index ecd2a0d3..168023de 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java @@ -20,5 +20,5 @@ import java.util.List; @Repository public interface SelfReportMapper extends BaseMapper { - List selectList(@Param("ew") QueryWrapper ew, @Param("locale") String locale,@Param("startTime") LocalDate startTime,@Param("endTime") LocalDate endTime); + List selectListByCondition(@Param("ew") QueryWrapper ew, @Param("locale") String locale,@Param("startTime") LocalDate startTime,@Param("endTime") LocalDate endTime); } \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/SelfReportService.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/SelfReportService.java index ca94901f..035867f8 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/SelfReportService.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/SelfReportService.java @@ -29,7 +29,7 @@ public interface SelfReportService extends IService { List selectList(SelfReport selfReport); - Object reject(String handle); + Object updateState(String handle, String state); List selectList(QueryWrapper queryWrapper, String locale, LocalDate startTime, LocalDate endTime); diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java index 33eacd04..b09fddf6 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.quality.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -54,11 +55,6 @@ public class SelfReportServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, SelfReport selfReport) { @@ -75,7 +71,7 @@ public class SelfReportServiceImpl extends ServiceImpl selectList(QueryWrapper queryWrapper, String locale, LocalDate startTime, LocalDate endTime) { - return selfReportMapper.selectList(queryWrapper,locale,startTime,endTime); + return selfReportMapper.selectListByCondition(queryWrapper,locale,startTime,endTime); } @Override @@ -116,10 +112,10 @@ public class SelfReportServiceImpl extends ServiceImpl0){ anomalyService.createAnomalyTask(Constants.ABNORMAL_OTHER,resrce,shopOrder,sfc,"",location,ncQty,comments,userGroup); } - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.eq(SelfReport.SFC,sfc); - queryWrapper.eq(SelfReport.OP_STEP,operationStep); - queryWrapper.eq(SelfReport.STATE,Constants.NEW); + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(SelfReport::getSfc,sfc); + queryWrapper.eq(SelfReport::getOpStep,operationStep); + queryWrapper.eq(SelfReport::getState,Constants.NEW); List selfReports = list(queryWrapper); if (selfReports.size()>0){ throw new BaseException("存在未处理的自报任务"); @@ -150,7 +146,7 @@ public class SelfReportServiceImpl extends ServiceImpl +