From 79fba83a377e09b266cfce3bb46e09bcd4f91167 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Sun, 22 Aug 2021 21:53:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8D=95=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prd.yml | 4 +- .../controller/UserResourceController.java | 6 +- .../service/impl/SfcDispatchServiceImpl.java | 109 +++++++++++++----- .../resources/mapper/SfcDispatchMapper.xml | 2 +- .../meapi/controller/NwaUserController.java | 3 +- .../meapi/controller/ResrceController.java | 9 +- .../mesnac/meapi/mapper/NwaUserMapper.java | 2 +- .../mesnac/meapi/service/NwaUserService.java | 2 +- .../service/impl/NwaUserServiceImpl.java | 3 +- .../main/resources/mapper/NwaUserMapper.xml | 2 +- 10 files changed, 92 insertions(+), 50 deletions(-) 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/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/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index 61e9b61c..873aa34f 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 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/NwaUserMapper.xml b/meapi/src/main/resources/mapper/NwaUserMapper.xml index 2c98a8d2..380ca1a0 100644 --- a/meapi/src/main/resources/mapper/NwaUserMapper.xml +++ b/meapi/src/main/resources/mapper/NwaUserMapper.xml @@ -321,7 +321,7 @@