From 52099503c66eafb779ac26d8f30aadd225906d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Thu, 15 Jul 2021 10:22:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnormalBillController.java | 27 +++------ .../anomaly/dto/AbnormalBillDisposeDto.java | 27 +++++++++ .../mapper/AbnormalBillDisposeMapper.java | 1 - .../anomaly/mapper/AbnormalBillMapper.java | 9 ++- .../mesnac/anomaly/model/AbnormalBill.java | 25 +++++++- .../anomaly/service/AbnormalBillService.java | 10 ++-- .../service/impl/AbnormalBillServiceImpl.java | 45 +++++--------- .../service/impl/FileUploadedServiceImpl.java | 26 ++++----- .../mapper/AbnormalBillDisposeMapper.xml | 13 +++-- .../resources/mapper/AbnormalBillMapper.xml | 58 ++++++++++++------- dataimport/pom.xml | 4 ++ .../controller/DataImportController.java | 26 ++++++--- .../minth/generator/GeneratorApplication.java | 4 +- .../meapi/controller/NcCodeController.java | 7 ++- .../meapi/controller/NcGroupController.java | 6 ++ .../meapi/controller/OperationController.java | 2 + .../meapi/controller/SfcController.java | 5 ++ .../mesnac/meapi/mapper/NcCodeMapper.java | 2 + .../mesnac/meapi/mapper/NcGroupMapper.java | 7 ++- .../mesnac/meapi/mapper/OperationMapper.java | 2 + .../mesnac/meapi/mapper/SfcMapper.java | 2 + .../mesnac/meapi/service/NcCodeService.java | 2 + .../mesnac/meapi/service/NcGroupService.java | 5 +- .../meapi/service/OperationService.java | 1 + .../mesnac/meapi/service/SfcService.java | 4 +- .../meapi/service/impl/NcCodeServiceImpl.java | 7 +++ .../service/impl/NcGroupServiceImpl.java | 7 +++ .../service/impl/OperationServiceImpl.java | 2 + .../meapi/service/impl/SfcServiceImpl.java | 7 +++ .../main/resources/mapper/NcCodeMapper.xml | 19 ++++++ .../main/resources/mapper/NcGroupMapper.xml | 21 +++++++ .../main/resources/mapper/OperationMapper.xml | 2 + meapi/src/main/resources/mapper/SfcMapper.xml | 11 ++++ 33 files changed, 285 insertions(+), 111 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 489eb985..3f8512c6 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 @@ -21,15 +21,15 @@ import java.util.List; /** * - * @author robert - * @since 2021-07-05 + * @author 赵嘉伟 + * @since 2021-07-14 */ @RestController @RequestMapping("/Z-ABNORMAL-BILL") public class AbnormalBillController { @Autowired - private AbnormalBillService abnormalBillService; + public AbnormalBillService abnormalBillService; @Autowired private SfcDispatchCommonService sfcDispatchCommonService; @@ -41,10 +41,6 @@ public class AbnormalBillController { public AnomalyService anomalyService; - - - - /** * 根据id查询 * @@ -94,6 +90,7 @@ public class AbnormalBillController { .or().like(AbnormalBill::getType, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getItemBo, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getSfc, frontPage.getGlobalQuery()) + .or().like(AbnormalBill::getOperation, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getWorkCenter, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getShopOrder, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getMessageType, frontPage.getGlobalQuery()) @@ -176,10 +173,6 @@ public class AbnormalBillController { return R.ok(abnormalBillService.init(messageType,type)); } -// @GetMapping("/findAllUserByUserGroup") -// public R findAllUserByUserGroup(String site, String userGroups){ -// return R.ok(); -// } /** * 其他异常提报 @@ -313,7 +306,9 @@ public class AbnormalBillController { @PostMapping("/delete") public R delete(String ftpPath,String fileName){ - return R.ok(fileUploadedService.deleteFile(ftpPath,fileName)); + fileUploadedService.deleteFile(ftpPath,fileName); +// abnormalBillService.deleteFileInDatabase(ftpPath,fileName); + return R.ok(); } @GetMapping("/findUploadPictureByAbnormalBo") @@ -326,14 +321,10 @@ public class AbnormalBillController { return R.ok(abnormalBillService.getNextNumber(type)); } -// @GetMapping("/test") -// public R test(String category, String resource, String shopOrder, String sfc, String ncCodes ){ -// anomalyService.createAnomalyTask(category,resource,shopOrder,sfc,ncCodes); -// return R.ok(); -// } @GetMapping("/anomalyReveseRepair") - public R anomalyReveseRepair(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose){ + public R anomalyReveseRepair(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose){ return R.ok(abnormalBillService.anomalyReveseRepair(abnormalBill,abnormalBillDispose)); } + } \ 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 index 7cf0fc25..e436e261 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java @@ -154,6 +154,17 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose { */ private String fullName; + /** + * 工序编码 + */ + private String operation; + + /** + * + * @return + */ + private String ncCodeDescription; + public String getAbnormalNo() { return abnormalNo; } @@ -385,4 +396,20 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose { public void setFullName(String fullName) { this.fullName = fullName; } + + public String getNcCodeDescription() { + return ncCodeDescription; + } + + public void setNcCodeDescription(String ncCodeDescription) { + this.ncCodeDescription = ncCodeDescription; + } + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } } 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 9ba80afa..426d30ab 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 @@ -2,7 +2,6 @@ package com.foreverwin.mesnac.anomaly.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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; import org.apache.ibatis.annotations.Param; 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 5db8d7bb..6d48d989 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 @@ -10,14 +10,16 @@ import java.util.List; /** *

- * 异常单 Mapper 接口 + * Mapper 接口 *

* - * @author robert - * @since 2021-07-05 + * @author 赵嘉伟 + * @since 2021-07-14 */ @Repository public interface AbnormalBillMapper extends BaseMapper { + + List backLog(@Param("abnormalBill")AbnormalBillDto abnormalBillDto, @Param("language")String language); /** @@ -30,4 +32,5 @@ public interface AbnormalBillMapper extends BaseMapper { List findCountBySfc(@Param("site")String site,@Param("type")String type,@Param("sfc")String sfc,@Param("status")List status); + } \ No newline at end of file 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 148aaa4b..b6ed9688 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 @@ -11,11 +11,11 @@ import java.time.LocalDateTime; /** *

- * 异常单 + * *

* - * @author robert - * @since 2021-07-05 + * @author 赵嘉伟 + * @since 2021-07-14 */ @TableName("Z_ABNORMAL_BILL") @@ -59,6 +59,11 @@ public class AbnormalBill extends Model { */ @TableField("SFC") private String sfc; + /** + * 操作 + */ + @TableField("OPERATION") + private String operation; /** * 异常车间 */ @@ -146,6 +151,7 @@ public class AbnormalBill extends Model { private String entityLocation; /** * 上报来源 B｜自保。 J｜质检 R｜设备人员 Z｜设备自动 +维修自查 | C Y | 工艺 */ @TableField("REPORT_FROM") private String reportFrom; @@ -209,6 +215,8 @@ public class AbnormalBill extends Model { @TableField(exist = false) private String fileNum; + + public String getHandle() { return handle; } @@ -265,6 +273,14 @@ public class AbnormalBill extends Model { this.sfc = sfc; } + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } + public String getWorkCenter() { return workCenter; } @@ -527,6 +543,8 @@ public static final String ITEM_BO = "ITEM_BO"; public static final String SFC = "SFC"; +public static final String OPERATION = "OPERATION"; + public static final String WORK_CENTER = "WORK_CENTER"; public static final String SHOP_ORDER = "SHOP_ORDER"; @@ -599,6 +617,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; ", type = " + type + ", itemBo = " + itemBo + ", sfc = " + sfc + + ", operation = " + operation + ", workCenter = " + workCenter + ", shopOrder = " + shopOrder + ", messageType = " + messageType + 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 4cc182df..b45f972f 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 @@ -14,11 +14,11 @@ import java.util.List; /** *

- * 异常单 服务类 + * 服务类 *

* - * @author robert - * @since 2021-07-05 + * @author 赵嘉伟 + * @since 2021-07-14 */ public interface AbnormalBillService extends IService { @@ -56,7 +56,7 @@ public interface AbnormalBillService extends IService { /** * 初始化 */ - HashMap init(String messageType,String type); + HashMap init(String messageType, String type); /** * 待办事项 * @param abnormalBillDto @@ -121,4 +121,6 @@ public interface AbnormalBillService extends IService { HashMap anomalyReveseRepair(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose); +// void deleteFileInDatabase(String ftpPath,String fileName); + } \ 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 624e7312..16d911d7 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 @@ -17,10 +17,10 @@ import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.mapper.*; import com.foreverwin.mesnac.meapi.model.*; import com.foreverwin.mesnac.meapi.service.*; +import com.foreverwin.modular.core.exception.BaseException; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; -import com.visiprise.common.exception.BaseException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; @@ -31,18 +31,17 @@ import java.util.*; /** *

- * 异常单 服务实现类 + * 服务实现类 *

* - * @author robert - * @since 2021-07-05 + * @author 赵嘉伟 + * @since 2021-07-14 */ @Service @Transactional(rollbackFor = Exception.class) public class AbnormalBillServiceImpl extends ServiceImpl implements AbnormalBillService, AnomalyService { - @Autowired private AbnormalBillMapper abnormalBillMapper; @@ -100,8 +99,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, AbnormalBill abnormalBill) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -116,6 +113,7 @@ 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); @@ -208,22 +202,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl init(String messageType,String type) { + public HashMap init(String messageType, String type) { HashMap hashMap = new HashMap<>(); String site = CommonMethods.getSite(); //消息类型 - if("Z".equals(type)){ - List category = ncCodeService.findNcByCategory(messageType,null); - hashMap.put("ncByNG",category); - } +// if("Z".equals(type)){ +// List category = ncCodeService.findNcByCategory(messageType,null); +// hashMap.put("ncByNG",category); +// } //工作中心 WorkCenter workCenter = new WorkCenter(); workCenter.setWcCategory("LEVEL4"); @@ -231,10 +221,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl workCenterList = workCenterService.selectList(workCenter); hashMap.put("workCenter",workCenterList); //原因分类 - NcCode ncCode = new NcCode(); + DataField ncCode = new DataField(); ncCode.setSite(site); - ncCode.setNcCategory("REPAIR"); - List ncCodeList = ncCodeService.selectList(ncCode); + ncCode.setDataField("REASON_CATEGORY"); + List ncCodeList = dataFieldListService.findDataFieldListById(ncCode); hashMap.put("causeType",ncCodeList); //责任部门 DataField dataField = new DataField(); @@ -668,6 +658,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl + @@ -63,6 +64,7 @@ + @@ -617,14 +619,15 @@ SELECT ZAB.ABNORMAL_NO ABNORMAL_NO ,ZAB.STATUS STATUS,I.ITEM ITEM,IT.DESCRIPTION ITEM_DESCRIPTION, ZAB."TYPE" "TYPE" ,ZAB.SFC SFC,ZAB.MESSAGE_TYPE MESSAGE_TYPE,ZAB.SHOP_ORDER SHOP_ORDER, ZAB.WORK_CENTER WORK_CENTER,ZAB.RESRCE RESRCE, WORKORDER.VALUE WORK_ORDER,ITEMNUMBER.VALUE ITEM_NUMBER, - PRODUCTCATEGORY.VALUE PRODUCT_CATEGORY,listagg(NCT2.DESCRIPTION || '/'||NCT.DESCRIPTION || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE , ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.NC_QTY NC_QTY, + PRODUCTCATEGORY.VALUE PRODUCT_CATEGORY,listagg(NG.DESCRIPTION || '/'||NCT.DESCRIPTION || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE_DESCRIPTION, + ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.NC_QTY NC_QTY, ZAB.PB_GRADE PB_GRADE ,NWA.FULL_NAME PB_USER ,ZAB.PB_QTY PB_QTY ,ZAB.DISCOVER DISCOVER , ZAB.INSPECTOR INSPECTOR ,ZAB.ENTITY_LOCATION ENTITY_LOCATION ,ZAB.REPORT_FROM REPORT_FROM ,ZAB.OBJECT_BO OBJECT_BO , ZAB.PB_PHOTOSHOP PB_PHOTOSHOP,ZABD.DUTY_CAUSE_DESCRIPTION DUTY_CAUSE_DESCRIPTION,ZABD.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,ZABD.DUTY_DEPART DUTY_DEPART, ZABD.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,ZABD.DUTY_TYPE DUTY_TYPE,ZABD.PRINCIPAL_USER PRINCIPAL_USER,ZABD.ABNORMAL_METHOD ABNORMAL_METHOD, R.ROUTER ROUTER,ZABD.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,ZABD.RESOLVE_REMARK RESOLVE_REMARK,ZABD.RESOLVE_SEND_USER RESOLVE_SEND_USER, - ZABD.ABNORMAL_REASON ABNORMAL_REASON,ZABD.BEFORE_MEASURE BEFORE_MEASURE,"MAP".VALUE "MAP", - ZABD.ROUTER_BO ROUTER_BO + ZABD.ABNORMAL_REASON ABNORMAL_REASON,ZABD.BEFORE_MEASURE BEFORE_MEASURE,"MAP".VALUE "MAP",listagg(ZANC.NC_CODE_GROUP || '/'||ZANC.NC_CODE || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE, + ZABD.ROUTER_BO ROUTER_BO,ZAB.OPERATION OPERATION FROM Z_ABNORMAL_BILL ZAB LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE = ZABD.ABNORMAL_BILL_BO INNER JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO @@ -637,7 +640,7 @@ LEFT JOIN Z_ABNORMAL_NC_CODE ZANC ON ZAB.HANDLE = ZANC.ABNORMAL_BILL_BO LEFT JOIN NC_CODE_T NCT ON ('NCCodeBO:' || ZAB.SITE || ',' || ZANC.NC_CODE) = NCT.NC_CODE_BO AND NCT.LOCALE = #{language} INNER JOIN Z_NWA_USER NWA ON NWA.USER_NAME = ZAB.PB_USER AND NWA.SITE = ZAB.SITE - LEFT JOIN NC_CODE_T NCT2 ON ('NCCodeBO:' || ZAB.SITE || ',' || ZANC.NC_CODE_GROUP) = NCT2.NC_CODE_BO AND NCT2.LOCALE = #{language} + LEFT JOIN NC_GROUP NG ON NG.NC_GROUP = ZANC.NC_CODE_GROUP AND NG.SITE = ZAB.SITE LEFT JOIN ROUTER R ON SUBSTR(R.HANDLE,1,INSTR(R.HANDLE,',',-1)-1) = SUBSTR(ZABD.ROUTER_BO,1,INSTR(ZABD.ROUTER_BO,',',-1)-1) AND R.CURRENT_REVISION = 'true' @@ -659,7 +662,7 @@ ZAB.PB_PHOTOSHOP ,ZABD.DUTY_CAUSE_DESCRIPTION ,ZABD.DUTY_CAUSE_TYPE ,ZABD.DUTY_DEPART , ZABD.DUTY_SEND_USER_GROUP ,ZABD.DUTY_TYPE ,ZABD.PRINCIPAL_USER ,ZABD.ABNORMAL_METHOD , R.ROUTER ,ZABD.RESOLVE_SHOP_ORDER ,ZABD.RESOLVE_REMARK ,ZABD.RESOLVE_SEND_USER , - ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO + ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index a24e04ea..0381dd1b 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -11,6 +11,7 @@ + @@ -49,17 +50,14 @@ - - - - HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME + HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME @@ -100,6 +98,7 @@ AND TYPE=#{ew.entity.type} AND ITEM_BO=#{ew.entity.itemBo} AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} AND WORK_CENTER=#{ew.entity.workCenter} AND SHOP_ORDER=#{ew.entity.shopOrder} AND MESSAGE_TYPE=#{ew.entity.messageType} @@ -145,6 +144,7 @@ AND TYPE=#{ew.entity.type} AND ITEM_BO=#{ew.entity.itemBo} AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} AND WORK_CENTER=#{ew.entity.workCenter} AND SHOP_ORDER=#{ew.entity.shopOrder} AND MESSAGE_TYPE=#{ew.entity.messageType} @@ -198,6 +198,7 @@ AND TYPE=#{ew.entity.type} AND ITEM_BO=#{ew.entity.itemBo} AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} AND WORK_CENTER=#{ew.entity.workCenter} AND SHOP_ORDER=#{ew.entity.shopOrder} AND MESSAGE_TYPE=#{ew.entity.messageType} @@ -251,6 +252,7 @@ AND TYPE=#{ew.entity.type} AND ITEM_BO=#{ew.entity.itemBo} AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} AND WORK_CENTER=#{ew.entity.workCenter} AND SHOP_ORDER=#{ew.entity.shopOrder} AND MESSAGE_TYPE=#{ew.entity.messageType} @@ -304,6 +306,7 @@ AND TYPE=#{ew.entity.type} AND ITEM_BO=#{ew.entity.itemBo} AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} AND WORK_CENTER=#{ew.entity.workCenter} AND SHOP_ORDER=#{ew.entity.shopOrder} AND MESSAGE_TYPE=#{ew.entity.messageType} @@ -357,6 +360,7 @@ AND TYPE=#{ew.entity.type} AND ITEM_BO=#{ew.entity.itemBo} AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} AND WORK_CENTER=#{ew.entity.workCenter} AND SHOP_ORDER=#{ew.entity.shopOrder} AND MESSAGE_TYPE=#{ew.entity.messageType} @@ -410,6 +414,7 @@ AND TYPE=#{ew.entity.type} AND ITEM_BO=#{ew.entity.itemBo} AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} AND WORK_CENTER=#{ew.entity.workCenter} AND SHOP_ORDER=#{ew.entity.shopOrder} AND MESSAGE_TYPE=#{ew.entity.messageType} @@ -459,6 +464,7 @@ TYPE, ITEM_BO, SFC, + OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, @@ -496,6 +502,7 @@ #{type}, #{itemBo}, #{sfc}, + #{operation}, #{workCenter}, #{shopOrder}, #{messageType}, @@ -540,6 +547,7 @@ #{type}, #{itemBo}, #{sfc}, + #{operation}, #{workCenter}, #{shopOrder}, #{messageType}, @@ -580,6 +588,7 @@ TYPE=#{et.type}, ITEM_BO=#{et.itemBo}, SFC=#{et.sfc}, + OPERATION=#{et.operation}, WORK_CENTER=#{et.workCenter}, SHOP_ORDER=#{et.shopOrder}, MESSAGE_TYPE=#{et.messageType}, @@ -620,6 +629,7 @@ TYPE=#{et.type}, ITEM_BO=#{et.itemBo}, SFC=#{et.sfc}, + OPERATION=#{et.operation}, WORK_CENTER=#{et.workCenter}, SHOP_ORDER=#{et.shopOrder}, MESSAGE_TYPE=#{et.messageType}, @@ -660,6 +670,7 @@ TYPE=#{et.type}, ITEM_BO=#{et.itemBo}, SFC=#{et.sfc}, + OPERATION=#{et.operation}, WORK_CENTER=#{et.workCenter}, SHOP_ORDER=#{et.shopOrder}, MESSAGE_TYPE=#{et.messageType}, @@ -699,6 +710,7 @@ AND TYPE=#{ew.entity.type} AND ITEM_BO=#{ew.entity.itemBo} AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} AND WORK_CENTER=#{ew.entity.workCenter} AND SHOP_ORDER=#{ew.entity.shopOrder} AND MESSAGE_TYPE=#{ew.entity.messageType} @@ -769,6 +781,7 @@ AND TYPE=#{ew.entity.type} AND ITEM_BO=#{ew.entity.itemBo} AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} AND WORK_CENTER=#{ew.entity.workCenter} AND SHOP_ORDER=#{ew.entity.shopOrder} AND MESSAGE_TYPE=#{ew.entity.messageType} @@ -861,19 +874,19 @@ + diff --git a/dataimport/pom.xml b/dataimport/pom.xml index bff4cf5f..b317b82c 100644 --- a/dataimport/pom.xml +++ b/dataimport/pom.xml @@ -59,6 +59,10 @@ commons-lang3 3.7 + + com.foreverwin.mesnac + anomaly + com.foreverwin.mesnac meapi diff --git a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/controller/DataImportController.java b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/controller/DataImportController.java index 53b33285..19ea9456 100644 --- a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/controller/DataImportController.java +++ b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/controller/DataImportController.java @@ -1,17 +1,21 @@ package com.foreverwin.mesnac.dataimport.controller; -import com.foreverwin.mesnac.dataimport.util.APResult; -import com.foreverwin.mesnac.dataimport.util.ImportRequest; +import com.foreverwin.mesnac.anomaly.service.FileUploadedService; import com.foreverwin.mesnac.common.model.ExportTemplate; import com.foreverwin.mesnac.common.service.ExportTemplateService; import com.foreverwin.mesnac.dataimport.service.impl.MasterDataImportServiceImpl; +import com.foreverwin.mesnac.dataimport.util.APResult; +import com.foreverwin.mesnac.dataimport.util.ImportRequest; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.R; import com.foreverwin.modular.core.util.SpringUtil; import com.sap.me.frame.Utils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.websocket.server.PathParam; @@ -27,18 +31,26 @@ public class DataImportController { @Autowired private MasterDataImportServiceImpl masterDataImportService; - @PostMapping("/import") - public String importFile(@PathParam("fileType") String fileType, @PathParam("site") String site, @PathParam("user") String user, @PathParam("handleType") final String handleType, @PathParam("mode") final String mode, @RequestParam("file") MultipartFile multipartFile) { + @Autowired + FileUploadedService fileUploadedService; + + + @RequestMapping("/import") + public String importFile(@PathParam("fileType") String fileType, @PathParam("site") String site, + @PathParam("user") String user, @PathParam("handleType") final String handleType, + @PathParam("mode") final String mode, @RequestParam("file") MultipartFile multipartFile,@PathParam("taskNo")String taskNo) { ImportRequest importRequest = new ImportRequest(); importRequest.setFileType(fileType); importRequest.setSite(site); importRequest.setUser(user); importRequest.setMode(mode); importRequest.setMasterType(handleType); + //----------------------------------------------------------------------------------------------------------------------------------------- try { - String transInfo = masterDataImportService.importFile(multipartFile, importRequest); - return new APResult().getResult(0, transInfo, transInfo); + // String transInfo = masterDataImportService.importFile(multipartFile, importRequest); + fileUploadedService.uploadAttachment(multipartFile,site,taskNo,fileType); + return new APResult().getResult(0,"上传成功",null); } catch (Exception e) { e.printStackTrace(); return new APResult().getResult(9999, e.getMessage(), e.getMessage()); 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 b4ff0738..e7e7c283 100644 --- a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java +++ b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java @@ -32,8 +32,8 @@ public class GeneratorApplication { MpGenerator mpGenerator = mpGeneratorBuilder.dataSourceConfig(dataSourceConfig) .tablePrefix( "APS_", "DS_", "Z_" ) .packageName( "com.foreverwin.mesnac.anomaly" ) - .tables("Z_UPLOAD_PICTURES") - .author("Leon.L") + .tables("Z_ABNORMAL_BILL") + .author("赵嘉伟") .uiAppId("com.foreverwin.me") .uiPackage("com.foreverwin.me.migration") .build(); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java index 9fb677dc..951fc9b2 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java @@ -140,10 +140,15 @@ public class NcCodeController { return R.ok(ncCodeService.findNcByCategory(category,code)); } - @GetMapping("findSecondaryNcByNc") + @GetMapping("/findSecondaryNcByNc") public R findSecondaryNcByNcI(String ncCode){ return R.ok(ncCodeService.findSecondaryNcByNc(ncCode)); } + + @GetMapping("/findNcCodeByNcGroup") + public R findNcCodeByNcGroup(NcGroup ncGroup){ + return R.ok(ncCodeService.findNcCodeByNcGroup(ncGroup)); + } } diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java index b5a452cc..4b3dff76 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java @@ -3,6 +3,7 @@ package com.foreverwin.mesnac.meapi.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.meapi.model.NcGroup; +import com.foreverwin.mesnac.meapi.model.Operation; import com.foreverwin.mesnac.meapi.service.NcGroupService; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; @@ -129,4 +130,9 @@ public class NcGroupController { public R removeByIds(List ids){ return R.ok(ncGroupService.removeByIds(ids)); } + + @GetMapping("/findNgGroupByOperationBo") + public R findNgGroupByOperationBo(Operation operation){ + return R.ok(ncGroupService.findNgGroupByOperationBo(operation)); + } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java index cfb28765..a0516d54 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java @@ -91,4 +91,6 @@ public class OperationController { return R.ok(result); } + + } \ No newline at end of file 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 3199bd5a..eb436400 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 @@ -160,4 +160,9 @@ public class SfcController { return R.ok(sfcService.removeByIds(ids)); } + @GetMapping("/findOperationBySfc") + public R findOperationBySfc(String sfc){ + return R.ok(sfcService.findOperationBySfc(sfc)); + } + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java index 6527e30f..5cc7b576 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java @@ -34,4 +34,6 @@ public interface NcCodeMapper extends BaseMapper { * @return */ Integer checkNcCode(@Param("NcCodeList")List ncCodes,@Param("site")String site,@Param("category")String category); + + List findNcCodeByNcGroup(@Param("ncGroup")NcGroup ncGroup); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java index c1151d51..68be48f3 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java @@ -1,12 +1,15 @@ package com.foreverwin.mesnac.meapi.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.foreverwin.mesnac.meapi.model.NcGroup; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.meapi.model.Operation; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* Mapper 接口 @@ -19,4 +22,6 @@ import org.springframework.stereotype.Repository; public interface NcGroupMapper extends BaseMapper { IPage selectPageByOperation(Page frontPage, @Param("site") String site, @Param("operationBO") String operationBO,@Param("globalQuery") String globalQuery); + + List findNgGroupByOperationBo(@Param("operation") Operation operation); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java index 479d1cf4..125724c8 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java @@ -28,4 +28,6 @@ public interface OperationMapper extends BaseMapper { Operation queryOperationByErpWorkCenter(@Param("site") String site, @Param("erpWorkCenter") String erpWorkCenter); IPage selectOperationStep( IPage page, @Param("locale") String locale,@Param("ew") Wrapper wrapper); + + } \ No newline at end of file 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 021b01b0..aeb7d606 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 @@ -31,4 +31,6 @@ public interface SfcMapper extends BaseMapper { Sfc findBySfc(@Param("sfc") Sfc sfc); IPage pageByResrce(Page pagePlus,@Param("ew") QueryWrapper queryWrapper,@Param("locale")String locale); + + String findOperationBySfc(@Param("site")String site,@Param("sfc")String sfc); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java index bed1fd1d..e1814694 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java @@ -33,4 +33,6 @@ public interface NcCodeService extends IService { List findSecondaryNcByNc(String ncCode); IPage selectPageByNcGroup(Page pagePlus, String globalQuery, String ncGroup); + + List findNcCodeByNcGroup(NcGroup ncGroup); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java index a7f31ada..a4891d13 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java @@ -2,8 +2,9 @@ package com.foreverwin.mesnac.meapi.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.foreverwin.mesnac.meapi.model.NcGroup; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.meapi.model.NcGroup; +import com.foreverwin.mesnac.meapi.model.Operation; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -28,4 +29,6 @@ public interface NcGroupService extends IService { List selectList(NcGroup ncGroup); IPage selectPageByOperation(Page pagePlus, String globalQuery, String operation); + + List findNgGroupByOperationBo(Operation operation); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/OperationService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/OperationService.java index 821c6b87..c641d3fe 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/OperationService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/OperationService.java @@ -39,4 +39,5 @@ public interface OperationService extends IService { * @return */ Operation queryOperationByErpWorkCenter(String site, String erpWorkCenter); + } \ No newline at end of file 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 c89430ad..d4ab900d 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 @@ -2,7 +2,6 @@ package com.foreverwin.mesnac.meapi.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.foreverwin.mesnac.meapi.dto.SfcDto; @@ -50,4 +49,7 @@ public interface SfcService extends IService { */ SfcDto findSfcData(String site, String sfc); + + String findOperationBySfc(String sfc); + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java index 7ddc9ed7..cb076984 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java @@ -74,5 +74,12 @@ public class NcCodeServiceImpl extends ServiceImpl impleme return ncCodeMapper.selectPageByNcGroup(pagePlus, ncGroupBO, globalQuery,LocaleContextHolder.getLocale().getLanguage()); } + @Override + public List findNcCodeByNcGroup(NcGroup ncGroup) { + String site = CommonMethods.getSite(); + ncGroup.setSite(site); + return ncCodeMapper.findNcCodeByNcGroup(ncGroup); + } + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java index de6959b8..f8213039 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.meapi.mapper.NcGroupMapper; import com.foreverwin.mesnac.meapi.model.NcGroup; +import com.foreverwin.mesnac.meapi.model.Operation; import com.foreverwin.mesnac.meapi.service.NcGroupService; import com.foreverwin.mesnac.meapi.util.StringUtils; import com.foreverwin.modular.core.exception.BaseException; @@ -58,5 +59,11 @@ public class NcGroupServiceImpl extends ServiceImpl impl return ncGroupMapper.selectPageByOperation(frontPage, site, operationBO, globalQuery); } + @Override + public List findNgGroupByOperationBo(Operation operation) { + String site = CommonMethods.getSite(); + operation.setSite(site); + return ncGroupMapper.findNgGroupByOperationBo(operation); + } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/OperationServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/OperationServiceImpl.java index 2cc00f3f..93215114 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/OperationServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/OperationServiceImpl.java @@ -67,4 +67,6 @@ public class OperationServiceImpl extends ServiceImpl implements SfcSe public SfcDto findSfcData(String site, String sfc) { return sfcMapper.findSfcData(site, sfc); } + + @Override + public String findOperationBySfc(String sfc) { + String site = CommonMethods.getSite(); + return sfcMapper.findOperationBySfc(site,sfc); + } } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/NcCodeMapper.xml b/meapi/src/main/resources/mapper/NcCodeMapper.xml index 1a14cb98..5107aedf 100644 --- a/meapi/src/main/resources/mapper/NcCodeMapper.xml +++ b/meapi/src/main/resources/mapper/NcCodeMapper.xml @@ -396,4 +396,23 @@ AND NC_CATEGORY = #{category} + + diff --git a/meapi/src/main/resources/mapper/NcGroupMapper.xml b/meapi/src/main/resources/mapper/NcGroupMapper.xml index d0708a0a..ad3c26ea 100644 --- a/meapi/src/main/resources/mapper/NcGroupMapper.xml +++ b/meapi/src/main/resources/mapper/NcGroupMapper.xml @@ -19,6 +19,9 @@ HANDLE, CHANGE_STAMP, SITE, NC_GROUP, DESCRIPTION, VALID_AT_ALL_OPERATIONS, PRIORITY, CREATED_DATE_TIME, MODIFIED_DATE_TIME + + NG.HANDLE, NG.CHANGE_STAMP, NG.SITE, NG.NC_GROUP, NG.DESCRIPTION, NG.VALID_AT_ALL_OPERATIONS, NG.PRIORITY, NG.CREATED_DATE_TIME, NG.MODIFIED_DATE_TIME + @@ -350,4 +353,22 @@ AND (ng.NC_GROUP LIKE '%${globalQuery}%' or NG.DESCRIPTION LIKE '%${globalQuery}%') + + diff --git a/meapi/src/main/resources/mapper/OperationMapper.xml b/meapi/src/main/resources/mapper/OperationMapper.xml index 89da4fd5..5b8c146d 100644 --- a/meapi/src/main/resources/mapper/OperationMapper.xml +++ b/meapi/src/main/resources/mapper/OperationMapper.xml @@ -634,4 +634,6 @@ ORDER BY RS.STEP_ID + + diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 5abc2826..144aed17 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -673,4 +673,15 @@ 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' + + +