From 1819d8f44c61a5dc9c5164eb8adc05af8fdae5bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 7 Sep 2021 14:01:31 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- production/src/main/resources/mapper/SfcScrapMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/production/src/main/resources/mapper/SfcScrapMapper.xml b/production/src/main/resources/mapper/SfcScrapMapper.xml index e83a2974..2fe19166 100644 --- a/production/src/main/resources/mapper/SfcScrapMapper.xml +++ b/production/src/main/resources/mapper/SfcScrapMapper.xml @@ -439,13 +439,13 @@ NVL(SO.SHOP_ORDER,' ') SHOP_ORDER,NVL(ZNU.FULL_NAME,' ') DUTY_USER FROM SHOP_ORDER SO - LEFT JOIN WORK_CENTER WC ON SO.PLANNED_WORK_CENTER_BO = WC.HANDLE - LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = #{locale} LEFT JOIN CUSTOM_FIELDS WO ON WO.HANDLE = SO.HANDLE AND WO."ATTRIBUTE" = 'WORK_ORDER' INNER JOIN SFC S ON S.SFC = #{sfc} AND S.SITE = #{site} LEFT JOIN Z_SFC_SCRAP ZSS ON ZSS.SFC = S.SFC LEFT JOIN OPERATION O ON O.OPERATION = ZSS.OPERATION AND O.SITE = SO.SITE LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = #{locale} + LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = SUBSTR(O.OPERATION,1,INSTR(O.OPERATION,'_')-1) + LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = #{locale} LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO LEFT JOIN CUSTOM_FIELDS WO2 ON WO2.HANDLE = I.HANDLE AND WO2."ATTRIBUTE" = 'DWG_NO' LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZSS.DUTY_USER From a02fd7927b6e1406d05762dfcac74b06245cc839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 7 Sep 2021 14:49:09 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E8=B4=A3=E4=BB=BB=E4=BA=BA/?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SfcScrapController.java | 22 +------- .../main/resources/mapper/SfcScrapMapper.xml | 55 +++++++++++++------ 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java b/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java index 4158f1a5..3442dcec 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java @@ -17,8 +17,8 @@ import java.util.List; /** * - * @author zjw - * @since 2021-07-30 + * @author Leon.L + * @since 2021-09-07 */ @RestController @RequestMapping("/Z-SFC-SCRAP") @@ -30,8 +30,6 @@ public class SfcScrapController { @Autowired private AnomalyService anomalyService; - - /** * 根据id查询 * @@ -83,6 +81,7 @@ public class SfcScrapController { .or().like(SfcScrap::getReason, frontPage.getGlobalQuery()) .or().like(SfcScrap::getCreatedUser, frontPage.getGlobalQuery()) .or().like(SfcScrap::getModifiedUser, frontPage.getGlobalQuery()) + .or().like(SfcScrap::getDutyUser, frontPage.getGlobalQuery()) ); } result = sfcScrapService.page(frontPage.getPagePlus(), queryWrapper); @@ -168,19 +167,4 @@ public class SfcScrapController { sfcScrapService.generatorWord(shopOrder,sfc,response,request); return R.ok(); } - - -// @PostMapping("/import") -// public String importFile(@PathParam("shopOrder") String shopOrder,@PathParam("sfc")String sfc, @RequestParam("file") MultipartFile multipartFile) { -// -// //----------------------------------------------------------------------------------------------------------------------------------------- -// try { -// String transInfo = masterDataImportService.importFile(multipartFile, importRequest); -// return new APResult().getResult(0, transInfo, transInfo); -// } catch (Exception e) { -// e.printStackTrace(); -// return new APResult().getResult(9999, e.getMessage(), e.getMessage()); -// } -// } - } \ No newline at end of file diff --git a/production/src/main/resources/mapper/SfcScrapMapper.xml b/production/src/main/resources/mapper/SfcScrapMapper.xml index 2fe19166..e9f85cf5 100644 --- a/production/src/main/resources/mapper/SfcScrapMapper.xml +++ b/production/src/main/resources/mapper/SfcScrapMapper.xml @@ -16,11 +16,12 @@ + - HANDLE, SITE, SFC, OPERATION, STEP_ID, QTY, TYPE, REASON, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME + HANDLE, SITE, SFC, OPERATION, STEP_ID, QTY, TYPE, REASON, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, DUTY_USER @@ -66,6 +67,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} @@ -88,6 +90,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -118,6 +121,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -148,6 +152,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -178,6 +183,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -208,6 +214,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -238,6 +245,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -264,6 +272,7 @@ CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, + DUTY_USER, VALUES #{handle}, @@ -278,6 +287,7 @@ #{createdDateTime}, #{modifiedUser}, #{modifiedDateTime}, + #{dutyUser}, @@ -299,6 +309,7 @@ #{createdDateTime}, #{modifiedUser}, #{modifiedDateTime}, + #{dutyUser}, @@ -316,6 +327,7 @@ CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + DUTY_USER=#{et.dutyUser}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -333,6 +345,7 @@ CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + DUTY_USER=#{et.dutyUser}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -350,6 +363,7 @@ CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + DUTY_USER=#{et.dutyUser}, @@ -366,6 +380,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -413,6 +428,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND DUTY_USER=#{ew.entity.dutyUser} ${ew.sqlSegment} @@ -430,28 +446,31 @@ ) + + + From d4508f42eaf2fc29df3fdf4ea02027ac419c1020 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 7 Sep 2021 14:51:11 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=91=98=E9=9D=A2?= =?UTF-8?q?=E6=9D=BFsfc=E5=BC=B9=E5=87=BA=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/foreverwin/mesnac/meapi/controller/SfcController.java | 2 +- .../java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java | 2 +- .../java/com/foreverwin/mesnac/meapi/service/SfcService.java | 2 +- .../foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java | 4 ++-- meapi/src/main/resources/mapper/SfcMapper.xml | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java index 0bb5ea72..f37c1e84 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java @@ -77,7 +77,7 @@ public class SfcController { sfc.setSite(site); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(sfc); - result = sfcService.pageByResrce(frontPage.getPagePlus(), queryWrapper); + result = sfcService.pageByResrce(frontPage.getPagePlus(), queryWrapper,frontPage.getGlobalQuery()); } catch (Exception e) { return R.failed(e.getMessage()); } diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java index e686cd90..b3ca5138 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java @@ -30,7 +30,7 @@ public interface SfcMapper extends BaseMapper { SfcDto findSfcData(@Param("site") String site, @Param("sfc") String sfc); - IPage pageByResrce(Page pagePlus,@Param("ew") QueryWrapper queryWrapper,@Param("locale")String locale); + IPage pageByResrce(Page pagePlus, @Param("ew") QueryWrapper queryWrapper, @Param("locale") String locale, @Param("globalQuery") String globalQuery); Map findOperationBySfc(@Param("site")String site, @Param("sfc")String sfc); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java index 90152b7c..e85c3a75 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java @@ -21,7 +21,7 @@ import java.util.Map; * @since 2021-06-02 */ public interface SfcService extends IService { - IPage pageByResrce(Page pagePlus, QueryWrapper queryWrapper); + IPage pageByResrce(Page pagePlus, QueryWrapper queryWrapper, String globalQuery); /** * 分页查询 diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java index b4a63915..ab5069c6 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java @@ -36,8 +36,8 @@ public class SfcServiceImpl extends ServiceImpl implements SfcSe private SfcMapper sfcMapper; @Override - public IPage pageByResrce(Page pagePlus, QueryWrapper queryWrapper) { - return sfcMapper.pageByResrce(pagePlus, queryWrapper, LocaleContextHolder.getLocale().getLanguage()); + public IPage pageByResrce(Page pagePlus, QueryWrapper queryWrapper, String globalQuery) { + return sfcMapper.pageByResrce(pagePlus, queryWrapper, LocaleContextHolder.getLocale().getLanguage(),globalQuery); } @Override diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 91c0c4e8..1dda6858 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -682,6 +682,9 @@ WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND (ZSD.DISPATCH_STATUS='RELEASE' OR ZSD.DISPATCH_STATUS='START') AND S.STATUS_BO IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404') AND zprt.STATUS='FINISH' AND ZPRT."RESULT"='OK' + + AND S.SFC like '%${globalQuery}%' + From 54dc1c63166d8b9036ca16d400ce233088441520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 7 Sep 2021 15:13:09 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- production/src/main/resources/mapper/SfcScrapMapper.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/production/src/main/resources/mapper/SfcScrapMapper.xml b/production/src/main/resources/mapper/SfcScrapMapper.xml index e9f85cf5..13c0c2ab 100644 --- a/production/src/main/resources/mapper/SfcScrapMapper.xml +++ b/production/src/main/resources/mapper/SfcScrapMapper.xml @@ -454,7 +454,7 @@ CASE WHEN I1.VALUE != NULL THEN NVL(I1.VALUE * I.QTY_MULTIPLIER,0) WHEN I2.VALUE != NULL THEN NVL(I2.VALUE * I.QTY_MULTIPLIER,0) ELSE NVL(I.QTY_MULTIPLIER,0) END WEIGHT,NVL(I.ITEM,' ') ITEM,NVL(S.SFC,' ') SFC,NVL(it.DESCRIPTION,' ') ITEM_DESCRIPTION, - NVL(SO.SHOP_ORDER,' ') SHOP_ORDER,NVL(ZNU.FULL_NAME,' ') DUTY_USER + NVL(SO.SHOP_ORDER,' ') SHOP_ORDER,NVL(ZSS.DUTY_USER,' ') DUTY_USER FROM SHOP_ORDER SO LEFT JOIN CUSTOM_FIELDS WO ON WO.HANDLE = SO.HANDLE AND WO."ATTRIBUTE" = 'WORK_ORDER' @@ -466,7 +466,6 @@ LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = #{locale} LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO LEFT JOIN CUSTOM_FIELDS WO2 ON WO2.HANDLE = I.HANDLE AND WO2."ATTRIBUTE" = 'DWG_NO' - LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZSS.DUTY_USER LEFT JOIN ITEM_T it ON it.ITEM_BO = I.HANDLE AND it.LOCALE = #{locale} LEFT JOIN CUSTOM_FIELDS I1 ON I1.HANDLE = I.HANDLE AND I1."ATTRIBUTE" = 'PER_METER' LEFT JOIN CUSTOM_FIELDS I2 ON I2.HANDLE = I.HANDLE AND I2."ATTRIBUTE" = 'PER_SQUARE_METER' From 605be0725ed61b41f40322a32809eb10b2447466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 7 Sep 2021 15:16:04 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- console/src/main/resources/application-local.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/console/src/main/resources/application-local.yml b/console/src/main/resources/application-local.yml index 920c8b7f..6c9cb5ca 100644 --- a/console/src/main/resources/application-local.yml +++ b/console/src/main/resources/application-local.yml @@ -113,6 +113,6 @@ activeMq: sendWeChatMessage: tcp://localhost:61616?wireFormat.maxInactivityDuration=0 queue: send.weChat.notice exportDocument: - filePath: /Users/zhaojiawei/Desktop/青岛项目后台/mesnac5.biz/production/src/main/resources/ + filePath: /Users/zhaojiawei/Desktop/青岛项目后台/mesnac6.biz/production/src/main/resources/ outputPath: /Users/zhaojiawei/Desktop/ - template: scrap.ftl \ No newline at end of file + template: SFC_SCRAP_TEMPLATE.ftl \ No newline at end of file From a97d0fb1ceb8520fbcbdcacaf9483a0c548853e0 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 7 Sep 2021 15:43:49 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/aspect/ExportAspect.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java b/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java index 8bcf3198..761a0370 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java @@ -1,22 +1,17 @@ package com.foreverwin.mesnac.common.aspect; -import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.foreverwin.mesnac.common.export.ColumnConvert; -import com.foreverwin.mesnac.common.export.DateConvert; import com.foreverwin.mesnac.common.model.ExportTemplate; import com.foreverwin.mesnac.common.service.ExportTemplateService; -import com.foreverwin.mesnac.common.util.DateUtil; 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 com.foreverwin.modular.core.util.SpringUtil; -import org.apache.commons.lang.time.DateFormatUtils; -import org.apache.commons.lang.time.DateUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.util.HSSFColor; import org.aspectj.lang.ProceedingJoinPoint; @@ -32,7 +27,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.text.SimpleDateFormat; import java.util.*; @Aspect @@ -55,7 +49,7 @@ public class ExportAspect { String exportCode = ""; //------------------------------------------------------------------------------------------------------------------- if (paramtes == null || args == null || args.length == 0) return joinPoint.proceed(); - Boolean isDuoDuo = (args != null && args.length == 1) ? false : true; + Boolean isDuoDuo = (args != null && (args.length == 1 && args[0].getClass() != String.class)) ? false : true; //------------------------------------------------------------------------------------------------------------------- request.setCharacterEncoding("UTF-8"); //------------------------------------------------------------------------------------------------------------------- @@ -73,9 +67,12 @@ public class ExportAspect { while (paramtes.hasMoreElements()) { String param = paramtes.nextElement(); String value = request.getParameter(param); - if (param != null && param.equals("export")) export = true; - if (param != null && param.equals("exportCode")) exportCode = value; - + if (param != null && param.equals("export")) { + export = true; + } + if (param != null && param.equals("exportCode")) { + exportCode = value; + } paramMap.put(param, value); }//while args[0] = paramMap; From 8cf9d57efe84c96a64b0aa72496545a425f72561 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 7 Sep 2021 15:44:56 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReportDataController.java | 11 ++++ .../common/mapper/ReportDataMapper.java | 2 + .../common/service/ReportDataService.java | 2 + .../service/impl/ReportDataServiceImpl.java | 5 ++ .../resources/mapper/ReportDataMapper.xml | 51 ++++++++++++++++++- 5 files changed, 70 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java index b5131170..45b13862 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java @@ -132,4 +132,15 @@ public class ReportDataController { } } + @GetMapping("/userPassRate") + public R findUserPassRate(@RequestParam(required = false) Map paramMap) { + try { + paramMap.put("site", CommonMethods.getSite()); + List> result = reportDataService.findUserPassRate(paramMap); + return R.ok(result); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java index 50905c4b..e90cbccd 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java @@ -27,4 +27,6 @@ public interface ReportDataMapper { List> findCheckUserPassRate(Map paramMap); + List> findUserPassRate(Map paramMap); + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java index fabb864c..a7819bb3 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java @@ -47,4 +47,6 @@ public interface ReportDataService { List> findCheckUserPassRate(Map paramMap); + List> findUserPassRate(Map paramMap); + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java index 9d58629d..cb4de8b1 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java @@ -72,4 +72,9 @@ public class ReportDataServiceImpl implements ReportDataService{ public List> findCheckUserPassRate(Map paramMap) { return reportDataMapper.findCheckUserPassRate(paramMap); } + + @Override + public List> findUserPassRate(Map paramMap) { + return reportDataMapper.findUserPassRate(paramMap); + } } diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 6bb7deec..5b3b8fb1 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -262,6 +262,8 @@ GROUP BY zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY, WT.DESCRIPTION,ZSD.DISPATCH_QTY ) GROUP BY DESCRIPTION, "MONTH" + ORDER BY DESCRIPTION,"MONTH" + + + \ No newline at end of file From d6de287e5cf7683dc09bf7c398d77a838caadcc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 7 Sep 2021 16:10:42 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/ReportMapper.xml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index ad4e9c45..9ef25062 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -44,7 +44,8 @@ ZNU.FULL_NAME OPERATION_USER,ZSD.SFC SFC, CASE WHEN S2.STATUS = '405' THEN '是' ELSE '否' END DISPATCH_STATUS, ZSD.EARLIEST_START_DATE EARLIEST_START_DATE,ZSD.LATEST_END_DATE LATEST_END_DATE, - ZSD.ACTUAL_START_DATE ACTUAL_START_DATE,ZSD.ACTUAL_COMPLETE_DATE ACTUAL_COMPLETE_DATE + ZSD.ACTUAL_START_DATE ACTUAL_START_DATE,ZSD.ACTUAL_COMPLETE_DATE ACTUAL_COMPLETE_DATE, + CF2.VALUE WORK_ORDER FROM SFC S INNER JOIN SHOP_ORDER SO ON SO.HANDLE = S.SHOP_ORDER_BO INNER JOIN ITEM I ON I.HANDLE = SO.ITEM_BO @@ -56,6 +57,7 @@ SELECT MAX(ZSD2.DISPATCH_SEQ) FROM Z_SFC_DISPATCH ZSD2 WHERE S.SFC = ZSD2.SFC AND S.SITE = ZSD2.SITE ) LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = S.SHOP_ORDER_BO AND CF."ATTRIBUTE" = 'ITEM_NUMBER' + LEFT JOIN CUSTOM_FIELDS CF2 ON CF2.HANDLE = S.SHOP_ORDER_BO AND CF2."ATTRIBUTE" = 'WORK_ORDER' INNER JOIN STATUS S2 ON S2.HANDLE = S.STATUS_BO S.SITE = #{site} @@ -72,6 +74,21 @@ AND IT.DESCRIPTION LIKE '%${param.itemDescription}%' + + AND (O.OPERATION LIKE '%${param.operation}%' + OR OT.DESCRIPTION LIKE '%${param.operation}%') + + + AND CF2.VALUE = #{param.workOrder} + + + + AND S2.STATUS = '405' + + + AND S2.STATUS != '405' + + AND ZSD.ACTUAL_START_DATE >= TO_DATE(#{param.startDateTime}, 'YYYY-MM-DD HH24:MI:SS') @@ -84,6 +101,7 @@ AND ZSD.ACTUAL_COMPLETE_DATE <= TO_DATE(#{param.endDateTime}, 'YYYY-MM-DD HH24:MI:SS') + From f01c46f31e1c23a735aa5276c86ac387d89b7c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 7 Sep 2021 16:34:58 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/quality/model/InspectionTaskManage.java | 9 +++++++++ .../main/resources/mapper/InspectionTaskManageMapper.xml | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java b/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java index 50a8e14c..9932210d 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java @@ -30,6 +30,7 @@ public class InspectionTaskManage implements Serializable { private String modifyUser; private LocalDateTime modifiedDateTime; private String fullName; + private String resrceDescription; private List inspectionTaskDetailList; @@ -224,4 +225,12 @@ public class InspectionTaskManage implements Serializable { public void setFullName(String fullName) { this.fullName = fullName; } + + public String getResrceDescription() { + return resrceDescription; + } + + public void setResrceDescription(String resrceDescription) { + this.resrceDescription = resrceDescription; + } } diff --git a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml index 9fc0b6da..3fcc2c18 100644 --- a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml +++ b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml @@ -26,11 +26,12 @@ + + \ No newline at end of file