diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/Report.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/Report.java new file mode 100644 index 00000000..e4437d96 --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/Report.java @@ -0,0 +1,49 @@ +package com.foreverwin.mesnac.anomaly.controller; + +/** + * @Description TODO + * @Author zhaojiawei + * @Since 2021-08-23 + */ + +import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing; +import com.foreverwin.mesnac.anomaly.service.ReportService; +import com.foreverwin.mesnac.integration.model.IntegrationLog; +import com.foreverwin.modular.core.util.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/REPORT") +public class Report { + + @Autowired + public ReportService reportService; + + @PostMapping("/findIntegrationLog") + public R findIntegrationLog(@RequestBody IntegrationLog integration){ + try{ + return R.ok(reportService.findIntegrationLog(integration)); + }catch(Exception e){ + return R.failed(e.getMessage()); + } + } + + @PostMapping("/partsManufacturing") + public R partsManufacturing(@RequestBody PartsManufacturing PartsManufacturing){ + try{ + return R.ok(reportService.partsManufacturing(PartsManufacturing)); + }catch(Exception e){ + return R.failed(e.getMessage()); + } + } + + @GetMapping("/surplusReturnTable") + public R surplusReturnTable(String item,String itemDescription){ + try{ + return R.ok(reportService.surplusReturnTable(item,itemDescription)); + }catch(Exception e){ + return R.failed(e.getMessage()); + } + } +} diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/PartsManufacturing.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/PartsManufacturing.java new file mode 100644 index 00000000..5c3d5abc --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/PartsManufacturing.java @@ -0,0 +1,65 @@ +package com.foreverwin.mesnac.anomaly.dto; + +import java.time.LocalDateTime; + +/** + * @Description TODO + * @Author zhaojiawei + * @Since 2021-08-23 + */ +public class PartsManufacturing { + private String itemNumber; + private String shopOrder; + private String item; + private String itemDescription; + private LocalDateTime startDateTime; + private LocalDateTime endDateTime; + + public String getItemNumber() { + return itemNumber; + } + + public void setItemNumber(String itemNumber) { + this.itemNumber = itemNumber; + } + + public String getShopOrder() { + return shopOrder; + } + + public void setShopOrder(String shopOrder) { + this.shopOrder = shopOrder; + } + + public String getItem() { + return item; + } + + public void setItem(String item) { + this.item = item; + } + + public String getItemDescription() { + return itemDescription; + } + + public void setItemDescription(String itemDescription) { + this.itemDescription = itemDescription; + } + + public LocalDateTime getStartDateTime() { + return startDateTime; + } + + public void setStartDateTime(LocalDateTime startDateTime) { + this.startDateTime = startDateTime; + } + + public LocalDateTime getEndDateTime() { + return endDateTime; + } + + public void setEndDateTime(LocalDateTime endDateTime) { + this.endDateTime = endDateTime; + } +} diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java new file mode 100644 index 00000000..059c60ee --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java @@ -0,0 +1,26 @@ +package com.foreverwin.mesnac.anomaly.mapper; + +import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing; +import com.foreverwin.mesnac.integration.model.IntegrationLog; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * @Description TODO + * @Author zhaojiawei + * @Since 2021-08-23 + */ +@Repository +public interface ReportMapper { + + List> findIntegrationLog(@Param("integration") IntegrationLog integration); + + List> partsManufacturing(@Param("site")String site,@Param("locale")String locale, @Param("partsManufacturing") PartsManufacturing partsManufacturing); + + List> surplusReturnTable(@Param("site")String site, @Param("locale")String locale, + @Param("item")String item, @Param("itemDescription")String itemDescription); + +} diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java index 674daf00..e868e054 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java @@ -38,4 +38,6 @@ public interface AbnormalPlanService extends IService { List findAbnormalPlan(AbnormalPlanDto abnormalPlanDto); void processes(List abnormalPlanList); + + void sendMessage(AbnormalBill abnormalBill,AbnormalPlan abnormalPlan); } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java new file mode 100644 index 00000000..d59d2103 --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java @@ -0,0 +1,20 @@ +package com.foreverwin.mesnac.anomaly.service; + +import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing; +import com.foreverwin.mesnac.integration.model.IntegrationLog; + +import java.util.List; +import java.util.Map; + +/** + * @Description TODO + * @Author zhaojiawei + * @Since 2021-08-23 + */ +public interface ReportService { + List> findIntegrationLog(IntegrationLog integration); + + List> partsManufacturing(PartsManufacturing partsManufacturing); + + List> surplusReturnTable(String item, String itemDescription); +} 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 c7d57e57..f2596b46 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 @@ -273,6 +273,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl abnormalBillList = abnormalBillMapper.findCountBySfc(abnormalBill.getSite(), abnormalBill.getType(), abnormalBill.getSfc(), status); - String abnormalType = abnormalBill.getType().equals(Constants.ABNORMAL_QUALITY) ? "质量异常" : - abnormalBill.getType().equals(Constants.ABNORMAL_OTHER) ? "其他异常" : "设备异常" ; - if(abnormalBillList.size() >= 1 ){ - throw BusinessException.build(abnormalType + "有未处理完成的产品条码（SFC）"); + if(!StringUtil.isBlank(abnormalBill.getSfc())) { + List abnormalBillList = abnormalBillMapper.findCountBySfc(abnormalBill.getSite(), abnormalBill.getType(), abnormalBill.getSfc(), status); + String abnormalType = abnormalBill.getType().equals(Constants.ABNORMAL_QUALITY) ? "质量异常" : + abnormalBill.getType().equals(Constants.ABNORMAL_OTHER) ? "其他异常" : "设备异常"; + if (abnormalBillList.size() >= 1) { + throw BusinessException.build(abnormalType + "有未处理完成的产品条码（SFC）"); + } } @@ -779,18 +799,33 @@ public class AbnormalBillServiceImpl extends ServiceImpl hashMap = new HashMap<>(); + hashMap.put("abnormalBill",abnormalBillMapper.selectById(abnormalBill.getHandle())); + hashMap.put("abnormalBillDispose",abnormalBillDisposeMapper.selectById(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()))); + return hashMap; + } + @Override + public void anomalyReveseRepairShutDown(String abnormalNo){ + String site = CommonMethods.getSite(); + String user = CommonMethods.getUser(); + LocalDateTime now = LocalDateTime.now(); + AbnormalBill abnormalBill = getById(HandleEnum.ABNORMAL_BILL.getHandle(site, abnormalNo)); + if(!Constants.RESPONSE.equals(abnormalBill.getStatus())){ + throw new BaseException("状态不在响应中，请重新检索"); + } abnormalBill.setHandle(HandleEnum.ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo())); abnormalBill.setStatus(Constants.SHUT_DOWN); + AbnormalBillDispose abnormalBillDispose = abnormalBillDisposeMapper.selectById(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site, abnormalBill.getAbnormalNo())); abnormalBillDispose.setResolveUser(user); abnormalBillDispose.setResolveDateTime(now); abnormalBillDispose.setHandle(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo())); this.saveOrUpdate(abnormalBill); abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose); - HashMap hashMap = new HashMap<>(); - hashMap.put("abnormalBill",abnormalBillMapper.selectById(abnormalBill.getHandle())); - hashMap.put("abnormalBillDispose",abnormalBillDisposeMapper.selectById(abnormalBillDispose.getHandle())); - return hashMap; } @Override @@ -980,9 +1015,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl nwaUsers = nwaUserService.checkUserGroup(site,abnormalMessage.getSendUserGroup()); - + if(nwaUsers != null && nwaUsers.size() <= 0){ + throw new BaseException("消息发送失败，发送的用户组下面没有用户"); + } StringBuilder sendUsers = new StringBuilder(); - for (int i = 0; i < nwaUsers.size(); i++) { if(i == (nwaUsers.size() - 1)){ sendUsers.append(nwaUsers.get(i).getUserName()); @@ -1050,7 +1086,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl scrapDtoBySfc = abnormalBillMapper.findScrapDtoBySfc(site, sfc); + return scrapDtoBySfc; } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java index 91ccd5ef..527d61dc 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java @@ -16,8 +16,13 @@ import com.foreverwin.mesnac.anomaly.service.AbnormalPlanService; import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.mapper.MessageMapper; +import com.foreverwin.mesnac.common.model.Message; import com.foreverwin.mesnac.common.service.MessageService; import com.foreverwin.mesnac.common.util.ActiveMQUtil; +import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.mesnac.meapi.mapper.UserGroupMapper; +import com.foreverwin.mesnac.meapi.model.NwaUser; +import com.foreverwin.mesnac.meapi.model.UserGroup; import com.foreverwin.mesnac.meapi.service.NwaUserService; import com.foreverwin.modular.core.exception.BaseException; import com.foreverwin.modular.core.util.CommonMethods; @@ -28,7 +33,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.UUID; /** *

@@ -67,6 +75,9 @@ public class AbnormalPlanServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, AbnormalPlan abnormalPlan) { @@ -98,7 +109,9 @@ public class AbnormalPlanServiceImpl extends ServiceImpl abnormalPlans = new ArrayList<>(); + List abnormalBills = new ArrayList<>(); for (AbnormalPlan abnormalPlan : abnormalPlanList){ AbnormalBill abnormalBill = abnormalBillMapper.selectById(HandleEnum.ABNORMAL_BILL.getHandle(site, abnormalPlan.getAbnormalNo())); - AbnormalBillDispose abnormalBillDispose = abnormalBillDisposeMapper.selectById(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site, abnormalPlan.getAbnormalNo())); - //发送消息 - // abnormalBillService.anomalyCreatedAndSendMessage(abnormalBill,abnormalBillDispose); + //设置handle + abnormalPlan.setHandle(HandleEnum.ABNORMAL_PLAN.getHandle(site,abnormalPlan.getAbnormalNo())); + if(Constants.PROCESSED.equals(abnormalPlan.getStatus())){ throw new BaseException("异常单："+abnormalPlan.getAbnormalNo()+"已经处理，不能再次处理"); } @@ -152,11 +168,66 @@ public class AbnormalPlanServiceImpl extends ServiceImpl nwaUsers = nwaUserService.checkUserGroup(site,message.getSendUserGroup()); + if(nwaUsers != null && nwaUsers.size() <= 0){ + throw new BaseException("消息发送失败，发送的用户组下面没有用户"); + } + StringBuilder sendUsers = new StringBuilder(); + for (int i = 0; i < Objects.requireNonNull(nwaUsers).size(); i++) { + if(i == (nwaUsers.size() - 1)){ + sendUsers.append(nwaUsers.get(i).getUserName()); + }else{ + sendUsers.append(nwaUsers.get(i).getUserName()).append("|"); + } } + activeMQUtil.wechatSendMessage(sendUsers.toString(),message.getContent()); + messageService.saveOrUpdate(message); } } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java new file mode 100644 index 00000000..d463cc23 --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -0,0 +1,58 @@ +package com.foreverwin.mesnac.anomaly.service.impl; + +import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing; +import com.foreverwin.mesnac.anomaly.mapper.ReportMapper; +import com.foreverwin.mesnac.anomaly.service.ReportService; +import com.foreverwin.mesnac.integration.model.IntegrationLog; +import com.foreverwin.modular.core.util.CommonMethods; +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; +import java.util.Map; + +/** + * @Description TODO + * @Author zhaojiawei + * @Since 2021-08-23 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class ReportServiceImpl implements ReportService { + + @Autowired + private ReportMapper reportMapper; + + /** + * 接口日志表 + * @param integration + * @return + */ + @Override + public List> findIntegrationLog(IntegrationLog integration) { + String site = CommonMethods.getSite(); + integration.setSite(site); + return reportMapper.findIntegrationLog(integration); + } + + /** + * 零件加工报表 + * @param partsManufacturing + * @return + */ + @Override + public List> partsManufacturing(PartsManufacturing partsManufacturing) { + String site = CommonMethods.getSite(); + String locale = LocaleContextHolder.getLocale().getLanguage(); + return reportMapper.partsManufacturing(site,locale,partsManufacturing); + } + + @Override + public List> surplusReturnTable(String item, String itemDescription) { + String locale = LocaleContextHolder.getLocale().getLanguage(); + String site = CommonMethods.getSite(); + return reportMapper.surplusReturnTable(site,locale,item,itemDescription); + } +} diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index 2ceb97ef..110d9dc5 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -1091,7 +1091,7 @@ SELECT S.SFC SFC, S2.STATUS STATUS, SUBSTR(SS.OPERATION_BO ,INSTR(SS.OPERATION_BO ,',',1)+1,(INSTR(SS.OPERATION_BO ,'#',1)-1)-(INSTR(SS.OPERATION_BO ,',',1)+1)) || '/' || SS.STEP_ID OPERATION, - ZSD2.RESRCE RESRCE,ZSD.SHOP_ORDER SHOP_ORDER, + ZSD2.RESRCE RESRCE,ZSD2.SHOP_ORDER SHOP_ORDER, CASE WHEN I.ITEM != 'NULL' THEN I.ITEM || '/' || I.REVISION END ITEM, CASE WHEN R.ROUTER != 'NULL' THEN R.ROUTER || '/' || R.REVISION END ROUTER , CASE WHEN B.BOM != 'NULL' THEN B.BOM || '/' || B.REVISION END BOM, @@ -1102,14 +1102,13 @@ FROM SFC S INNER JOIN SFC_ROUTING SR ON SR.SFC_BO = S.HANDLE INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO = SR.HANDLE - INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0) + INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE/* AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0)*/ INNER JOIN STATUS S2 ON S2.HANDLE = S.STATUS_BO - INNER JOIN Z_SFC_DISPATCH ZSD ON ZSD.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID LEFT JOIN Z_SFC_DISPATCH ZSD2 ON ZSD2.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID - AND ZSD2.DISPATCH_STATUS IN ('START','COMPLETE') - LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER AND SO.SITE = S.SITE + AND ZSD2.DISPATCH_STATUS IN ('START','COMPLETE') + LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD2.SHOP_ORDER AND SO.SITE = S.SITE LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO - LEFT JOIN ROUTER R ON R.HANDLE = ZSD.ROUTER_BO + LEFT JOIN ROUTER R ON R.HANDLE = ZSD2.ROUTER_BO LEFT JOIN Z_SFC_SCRAP ZSS ON ZSS.SFC = S.SFC AND ZSS.SITE = S.SITE LEFT JOIN BOM B ON B.HANDLE = SO.PLANNED_BOM_BO INNER JOIN ( SELECT * FROM Z_ABNORMAL_BILL_VIEW ZABV WHERE ZABV.HANDLE = (SELECT MAX(HANDLE) FROM Z_ABNORMAL_BILL_VIEW ZABV2 diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml new file mode 100644 index 00000000..d020e5ec --- /dev/null +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + \ No newline at end of file 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 abc43d4b..0eff2fef 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 @@ -124,6 +124,7 @@ public interface Constants { String ABNORMAL_QUALITY = "Z"; String ABNORMAL_OTHER = "Q"; String ABNORMAL_RESRCE = "S"; + String ABNORMAL_PLAN = "P"; /** * 设备维修 diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java index a4bcf13d..b3481371 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.common.dto; +import com.baomidou.mybatisplus.annotation.TableField; import com.foreverwin.mesnac.common.model.ExcelColumn; import java.io.Serializable; @@ -171,6 +172,11 @@ public class SfcDispatchDto implements Serializable{ * 工单自定义字段-项目号 */ private String itemNumber; + + /**实际时间**/ + private LocalDateTime actualStartDate; + private LocalDateTime actualCompleteDate; + /** * 工单组件信息 */ @@ -566,6 +572,22 @@ public class SfcDispatchDto implements Serializable{ this.itemNumber = itemNumber; } + public LocalDateTime getActualStartDate() { + return actualStartDate; + } + + public void setActualStartDate(LocalDateTime actualStartDate) { + this.actualStartDate = actualStartDate; + } + + public LocalDateTime getActualCompleteDate() { + return actualCompleteDate; + } + + public void setActualCompleteDate(LocalDateTime actualCompleteDate) { + this.actualCompleteDate = actualCompleteDate; + } + public String getComponent() { return component; } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java index 5424f0e1..f3a65186 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java @@ -37,4 +37,6 @@ public interface AnomalyService { */ List getScrapDtoBysfc(String site, String sfc); + void anomalyReveseRepairShutDown(String abnormalNo); + } diff --git a/console/src/main/resources/application-prd.yml b/console/src/main/resources/application-prd.yml index caf9f021..b635d791 100644 --- a/console/src/main/resources/application-prd.yml +++ b/console/src/main/resources/application-prd.yml @@ -38,8 +38,8 @@ ws: ftp: host: 172.16.251.165 port: 21 - username: - password: + username: mesftp + password: mesnac1@3 #打印服务 print: diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java index 21209cd4..30571271 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java @@ -1,16 +1,12 @@ package com.foreverwin.mesnac.dispatch.controller; import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.common.enums.DispatchStatusEnum; import com.foreverwin.mesnac.common.util.StringUtil; -import com.foreverwin.mesnac.dispatch.model.SfcDispatch; import com.foreverwin.mesnac.dispatch.service.SfcDispatchService; 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.R; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; @@ -303,4 +299,6 @@ public class SfcDispatchController { return R.ok(result); } + + } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusReturnController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusReturnController.java index 6831ec47..b90e4a15 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusReturnController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusReturnController.java @@ -1,21 +1,14 @@ package com.foreverwin.mesnac.dispatch.controller; import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.mesnac.dispatch.service.SurplusReturnService; import com.foreverwin.modular.core.exception.BusinessException; -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.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.foreverwin.mesnac.dispatch.service.SurplusReturnService; -import com.foreverwin.mesnac.dispatch.model.SurplusReturn; - import java.math.BigDecimal; -import java.util.List; import java.util.Map; /** diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java index c383a4a4..19c374f4 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java @@ -141,7 +141,11 @@ public class UserResourceController { @ResponseBody @GetMapping("/findAll") public R findAll(UserResourceDto userResourceDto){ - return R.ok(userResourceService.findAll(userResourceDto)); + try { + return R.ok(userResourceService.findAll(userResourceDto)); + } catch (Exception e) { + return R.failed(e.getMessage()); + } } @PostMapping("/saveAll") diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java index b8e37b8c..d755ce71 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java @@ -1,8 +1,8 @@ package com.foreverwin.mesnac.dispatch.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.dispatch.model.SfcDispatch; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -48,4 +48,5 @@ public interface SfcDispatchMapper extends BaseMapper { SfcDispatchDto findResrceBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site, @Param("array") String[] array); SfcDispatchDto findSfcDispatchBySfc(@Param("site")String site, @Param("dto")SfcDispatchDto sfcDispatch); + } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusReturnMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusReturnMapper.java index 7a0f413d..d67763ba 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusReturnMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusReturnMapper.java @@ -1,7 +1,7 @@ package com.foreverwin.mesnac.dispatch.mapper; -import com.foreverwin.mesnac.dispatch.model.SurplusReturn; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.dispatch.model.SurplusReturn; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -26,4 +26,5 @@ public interface SurplusReturnMapper extends BaseMapper { * @return */ Map selectInventoryData(@Param("inventoryBo") String inventoryBo); -} \ No newline at end of file + + } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusReturn.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusReturn.java index dac979de..b5c2b587 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusReturn.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusReturn.java @@ -1,16 +1,14 @@ package com.foreverwin.mesnac.dispatch.model; -import java.io.Serializable; - +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; -import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; /** *

@@ -92,6 +90,9 @@ public class SurplusReturn extends Model { @TableField("MODIFIED_DATE_TIME") private LocalDateTime modifiedDateTime; + @TableField(exist = false) + private String itemDescription; + public String getHandle() { return handle; @@ -197,7 +198,15 @@ public class SurplusReturn extends Model { this.modifiedDateTime = modifiedDateTime; } -public static final String HANDLE = "HANDLE"; + public String getItemDescription() { + return itemDescription; + } + + public void setItemDescription(String itemDescription) { + this.itemDescription = itemDescription; + } + + public static final String HANDLE = "HANDLE"; public static final String SITE = "SITE"; diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java index 5da332d7..e6ddae8b 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java @@ -1,9 +1,8 @@ package com.foreverwin.mesnac.dispatch.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.dispatch.model.SfcDispatch; -import com.baomidou.mybatisplus.extension.service.IService; -import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -110,4 +109,6 @@ public interface SfcDispatchService extends IService { * @return */ Map ganttList(String site, SfcDispatchDto sfcDispatchDto); + + } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusReturnService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusReturnService.java index bfc41fe4..14f3e36c 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusReturnService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusReturnService.java @@ -1,7 +1,8 @@ package com.foreverwin.mesnac.dispatch.service; -import com.foreverwin.mesnac.dispatch.model.SurplusReturn; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.dispatch.model.SurplusReturn; + import java.math.BigDecimal; import java.util.Map; diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index 61e9b61c..091485ca 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -18,14 +18,10 @@ import com.foreverwin.mesnac.dispatch.dto.WorkCenterWorkTimeDTO; import com.foreverwin.mesnac.dispatch.mapper.SfcDispatchMapper; import com.foreverwin.mesnac.dispatch.model.CallItem; import com.foreverwin.mesnac.dispatch.model.SfcDispatch; -import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease; import com.foreverwin.mesnac.dispatch.model.UserResource; import com.foreverwin.mesnac.dispatch.service.*; import com.foreverwin.mesnac.meapi.dto.WorkCenterLinkDTO; -import com.foreverwin.mesnac.meapi.model.Router; -import com.foreverwin.mesnac.meapi.model.Sfc; -import com.foreverwin.mesnac.meapi.model.ShopOrder; -import com.foreverwin.mesnac.meapi.model.UserGroup; +import com.foreverwin.mesnac.meapi.model.*; import com.foreverwin.mesnac.meapi.service.*; import com.foreverwin.mesnac.meapi.util.StringUtils; import com.foreverwin.modular.core.exception.BaseException; @@ -37,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import sun.awt.geom.AreaOp; import javax.servlet.http.HttpServletRequest; import java.io.IOException; @@ -61,8 +56,12 @@ public class SfcDispatchServiceImpl extends ServiceImpl list = new ArrayList<>(); + //如果导入-查询所有用户 + Map> userMap = new HashMap<>(); + if (DispatchStatusEnum.IMPORT.getCode().equals(type)) { + List nwaUserList = nwaUserService.findAllUser(site); + if (nwaUserList != null && nwaUserList.size() > 0) { + userMap = nwaUserList.stream().collect(Collectors.groupingBy(NwaUser::getFullName)); + } + } + int seq = 0; //状态标识，表示本次派工成功或是失败 Boolean flag = true; @@ -385,24 +393,6 @@ public class SfcDispatchServiceImpl extends ServiceImpl _list = userMap.get(_employeeDescription); + if (_list != null && _list.size() > 0) { + String userName = _list.get(0).getUserName(); + employee += (i == 0) ? userName : "," + userName; + employeeArray[i] = userName; + } + } + + + //查询匹配的设备 + List emResourceList = resrceService.getResourceListByUT(site, resourceType, employeeArray); + if (emResourceList != null && emResourceList.size() > 0) { + resource = emResourceList.get(0).getResrce(); + } + } + + + //派工人员赋值 + sfcDispatch.setIsDispatch("true"); + sfcDispatch.setResrce(resource); + sfcDispatch.setEmployee(employee); + sfcDispatch.setEmployeeDescription(employeeDescription); + sfcDispatch.setRemark(sfcDispatchDto.getRemark()); + sfcDispatch.setBlankingSize(sfcDispatchDto.getBlankingSize()); + sfcDispatch.setPlannedStartDate(sfcDispatchDto.getPlannedStartDate()); + sfcDispatch.setPlannedCompDate(sfcDispatchDto.getPlannedCompDate()); + sfcDispatch.setEarliestStartDate(sfcDispatchDto.getEarliestStartDate()); + sfcDispatch.setLatestEndDate(sfcDispatchDto.getLatestEndDate()); + + list.add(sfcDispatch); + + continue; } + //派工保存 + if (DispatchStatusEnum.SAVE.getCode().equals(type)) { + //校验派工状态 + String originalStatus = sfcDispatchDto.getDispatchStatus(); + if (!DispatchStatusEnum.NEW.getCode().equals(originalStatus)) { + flag = false; + message.append(seq++ % 3 == 0 ? "\n" : "| |"); + message.append("派工单[" + dispatchNo + "]的派工状态不是新建，不允许保存"); + continue; + } + + //时间 + if (Constants.USER_GROUP_ZJH.equals(sfcDispatchDto.getRole())) { + sfcDispatchDto.setEarliestStartDate(sfcDispatchDto.getPlannedStartDate()); + sfcDispatchDto.setLatestEndDate(sfcDispatchDto.getPlannedCompDate()); + } + } + + + //派工发布 if (DispatchStatusEnum.RELEASE.getCode().equals(type)) { //校验派工状态 @@ -486,13 +539,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl @@ -800,4 +800,5 @@ AND RESRCE=#{dto.resrce} AND HANDLE=#{dto.handle} + diff --git a/dispatch/src/main/resources/mapper/SurplusReturnMapper.xml b/dispatch/src/main/resources/mapper/SurplusReturnMapper.xml index ce8f1eab..8380da3e 100644 --- a/dispatch/src/main/resources/mapper/SurplusReturnMapper.xml +++ b/dispatch/src/main/resources/mapper/SurplusReturnMapper.xml @@ -17,6 +17,7 @@ + @@ -456,4 +457,5 @@ LEFT JOIN CUSTOM_FIELDS CS2 ON CS2.HANDLE = IM.HANDLE AND CS2.ATTRIBUTE = 'PER_SQUARE_METER' WHERE IV.HANDLE = #{inventoryBo} + diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java index cf05e5cb..0d852bb8 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java @@ -1,10 +1,17 @@ package com.foreverwin.mesnac.equip.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.service.AnomalyService; +import com.foreverwin.mesnac.equip.mapper.ResourceRepairTaskMapper; import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare; +import com.foreverwin.mesnac.equip.model.ResourceRepairTask; import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService; +import com.foreverwin.mesnac.equip.service.ResourceRepairTaskService; import com.foreverwin.mesnac.meapi.dto.NcCodeDto; import com.foreverwin.mesnac.meapi.mapper.NwaUserMapper; import com.foreverwin.mesnac.meapi.model.DataField; @@ -16,19 +23,16 @@ import com.foreverwin.mesnac.meapi.service.ResrceService; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; 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.equip.model.ResourceRepairTask; -import com.foreverwin.mesnac.equip.mapper.ResourceRepairTaskMapper; -import com.foreverwin.mesnac.equip.service.ResourceRepairTaskService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.Duration; import java.time.LocalDateTime; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.UUID; /** *

@@ -60,6 +64,8 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl init() { @@ -133,6 +139,10 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl * Mapper 接口 @@ -18,5 +15,4 @@ import java.util.List; @Repository public interface IntegrationLogMapper extends BaseMapper { - List findIntegrationLog(@Param("integration") IntegrationLog integration); } \ No newline at end of file diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/service/IntegrationLogService.java b/integration/src/main/java/com/foreverwin/mesnac/integration/service/IntegrationLogService.java index 6a2fa12c..4d8b2503 100644 --- a/integration/src/main/java/com/foreverwin/mesnac/integration/service/IntegrationLogService.java +++ b/integration/src/main/java/com/foreverwin/mesnac/integration/service/IntegrationLogService.java @@ -3,8 +3,6 @@ package com.foreverwin.mesnac.integration.service; import com.baomidou.mybatisplus.extension.service.IService; import com.foreverwin.mesnac.integration.model.IntegrationLog; -import java.util.List; - /** *

* 服务类 @@ -17,5 +15,4 @@ public interface IntegrationLogService extends IService { void saveIntegrationLog(IntegrationLog integrationLog); - List findIntegrationLog(IntegrationLog integration); } \ No newline at end of file diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/IntegrationLogServiceImpl.java b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/IntegrationLogServiceImpl.java index 7ed02be8..32e1b2cf 100644 --- a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/IntegrationLogServiceImpl.java +++ b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/IntegrationLogServiceImpl.java @@ -4,14 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.integration.mapper.IntegrationLogMapper; import com.foreverwin.mesnac.integration.model.IntegrationLog; import com.foreverwin.mesnac.integration.service.IntegrationLogService; -import com.foreverwin.modular.core.util.CommonMethods; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - /** *

* 服务实现类 @@ -34,10 +31,5 @@ public class IntegrationLogServiceImpl extends ServiceImpl findIntegrationLog(IntegrationLog integration) { - String site = CommonMethods.getSite(); - integration.setSite(site); - return integrationLogMapper.findIntegrationLog(integration); - } + } \ No newline at end of file diff --git a/integration/src/main/resources/mapper/IntegrationLogMapper.xml b/integration/src/main/resources/mapper/IntegrationLogMapper.xml index ddd2bc08..15258c76 100644 --- a/integration/src/main/resources/mapper/IntegrationLogMapper.xml +++ b/integration/src/main/resources/mapper/IntegrationLogMapper.xml @@ -462,30 +462,4 @@ ) - 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 7af5a7e8..647d8b34 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 @@ -149,11 +149,10 @@ public class NwaUserController { /** * 不分页查询 - * @param user * @return */ @GetMapping("findAllUser") public R findAllUser(){ - return R.ok(nwaUserService.findAllUser()); + return R.ok(nwaUserService.findAllUser(CommonMethods.getSite())); } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java index 5ac59e01..a29ae89d 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java @@ -178,14 +178,7 @@ public class ResrceController { List result; try { String site = CommonMethods.getSite(); - String [] userArray = new String[1]; - if (StringUtils.notBlank(user)) { - if (user.contains(",")) { - userArray = user.split(","); - } else { - userArray[0] = user; - } - } + String []userArray = user.split(","); result = resrceService.getResourceListByUT(site, resourceType, userArray); } catch (Exception e) { return R.failed(e.getMessage()); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java index 379b7e72..4228e67b 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java @@ -19,7 +19,7 @@ import java.util.List; public interface NwaUserMapper extends BaseMapper { NwaUser findUserByUserName(@Param("site")String site, @Param("user")String user); - List findAllUser(@Param("site")String site);; + List findAllUser(@Param("site")String site); List selectAllByUserGroups(@Param("site")String site,@Param("list")List list); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java index aee47346..8d6322f9 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java @@ -28,7 +28,7 @@ public interface NwaUserService extends IService { NwaUser findUserByUserName(String id); - List findAllUser(); + List findAllUser(String site); /** diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java index a2449279..31dbfd18 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java @@ -58,8 +58,7 @@ public class NwaUserServiceImpl extends ServiceImpl impl } @Override - public List findAllUser() { - String site = CommonMethods.getSite(); + public List findAllUser(String site) { return nwaUserMapper.findAllUser(site); } diff --git a/meapi/src/main/resources/mapper/ItemMapper.xml b/meapi/src/main/resources/mapper/ItemMapper.xml index f9c59c4a..e8a074aa 100644 --- a/meapi/src/main/resources/mapper/ItemMapper.xml +++ b/meapi/src/main/resources/mapper/ItemMapper.xml @@ -455,7 +455,7 @@ diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 44cd8950..bc378ec8 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -669,7 +669,8 @@ SELECT PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL WHEN SS.STEP_SEQUENCE>TO_NUMBER(zsd.DISPATCH_SEQ)-1 THEN '完成' ELSE '未完成' END LAST_OPERATION_STATUS, - S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION FROM SFC S + S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION,S.ITEM_BO,S.SHOP_ORDER_BO + FROM SFC S 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 LEFT JOIN Z_SFC_DISPATCH PREZSD ON zsd.SFC=PREZSD.SFC AND PREZSD.DISPATCH_SEQ=TO_NUMBER(zsd.DISPATCH_SEQ)-1 diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java b/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java index 9f7b5e9f..ad6274f8 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -76,9 +77,16 @@ public class PodTemplateController { if (StringUtil.isBlank(resrce)) { throw new BaseException("资源不能为空"); } - for (SfcDto sfcDto : sfcDtoList) { - podTemplateService.sfcComplete(sfcDto,resrce); + ArrayList sfcList = new ArrayList<>(); + try { + for (SfcDto sfcDto : sfcDtoList) { + String completeSfc = podTemplateService.sfcComplete(sfcDto, resrce); + sfcList.add(completeSfc); + } + }catch (Exception e){ + return R.failed(sfcList,e.getMessage()); } + return R.ok(); } diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java b/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java index 14cd85eb..23bb03bd 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java @@ -16,7 +16,7 @@ public interface PodTemplateService { void sfcStart(Map map); - void sfcComplete(SfcDto sfcDto, String resrce); + String sfcComplete(SfcDto sfcDto, String resrce); void sendErp(String sfc, String stepId, BigDecimal qty, BigDecimal scrapQty, BigDecimal workHour); diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index 142b35a4..03869e30 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -237,7 +237,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { } @Override - public void sfcComplete(SfcDto sfcDto, String resrce) { + public String sfcComplete(SfcDto sfcDto, String resrce) { String site = CommonMethods.getSite(); String operation = sfcDto.getOperation(); Operation currentRevisionRef = operationService.getCurrentRevisionRef(site, operation); @@ -309,6 +309,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { } catch (Exception e) { ExceptionUtil.throwException(e); } + return sfc; }