diff --git a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/client/OperationWSClient.java b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/client/OperationWSClient.java index 4906910e..87fc93c7 100644 --- a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/client/OperationWSClient.java +++ b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/client/OperationWSClient.java @@ -71,15 +71,15 @@ public class OperationWSClient { if (StringUtil.notEmpty(status)) { status = status.substring(0, status.indexOf(":")); String statusRef = "StatusBO:" + site + "," + "201"; - if ("201".equalsIgnoreCase(status)) { + if ("201".equalsIgnoreCase(status) || "1".equals(status)) { statusRef = "StatusBO:" + site + "," + "201"; } else if ("202".equalsIgnoreCase(status)) { statusRef = "StatusBO:" + site + "," + "202"; } else if ("203".equalsIgnoreCase(status)) { statusRef = "StatusBO:" + site + "," + "203"; - } else if ("204".equalsIgnoreCase(status)) { + } else if ("204".equalsIgnoreCase(status) || "2".equals(status)) { statusRef = "StatusBO:" + site + "," + "204"; - } else if ("205".equalsIgnoreCase(status)) { + } else if ("205".equalsIgnoreCase(status) || "0".equals(status)) { statusRef = "StatusBO:" + site + "," + "205"; } request.setStatusRef(statusRef); diff --git a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/UserResourceHandler.java b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/UserResourceHandler.java index ba1e049d..7e52648c 100644 --- a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/UserResourceHandler.java +++ b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/UserResourceHandler.java @@ -79,6 +79,12 @@ public class UserResourceHandler extends BaseHandler { @Override public int visit(long index, JSONObject jsonObject) { + Object[] params = new Object[10]; + params[0] = index; + params[1] = jsonObject.getString("resrce"); + + String resultMessage = null; + LocalDateTime now = LocalDateTime.now(); String user = CommonMethods.getUser(); String resrce = StringUtil.toString(jsonObject.getString("resrce")); @@ -95,13 +101,13 @@ public class UserResourceHandler extends BaseHandler { // userResource.setResrceDescription(resrceDescription); userResource.setUserId(userId); userResource.setUserDescription(userDescription); - if("Y".equals(temporaryUser)){ + if("是".equals(temporaryUser)){ userResource.setTemporaryUser("true"); }else { userResource.setTemporaryUser("false"); } - if("N".equals(status)){ + if("否".equals(status)){ userResource.setStatus("false"); }else { userResource.setStatus("true"); @@ -115,19 +121,23 @@ public class UserResourceHandler extends BaseHandler { } userResource.setModifiedUser(user); userResource.setModifiedDateTime(now); - try { - //如果资源为空或者员工编号为空，则直接跳过 - if (StringUtil.notEmpty(resrce) && StringUtil.notEmpty(userId)) { - //站点 - jsonObject.put("site", site); - //不管用户选啥模式，都是更新和插入 - this.updateAndInsert(userResource,index); - userResourceService.saveOrUpdate(userResource); + //如果资源为空或者员工编号为空，则直接跳过 + if (StringUtil.notEmpty(resrce) && StringUtil.notEmpty(userId)) { + //站点 + jsonObject.put("site", site); + //不管用户选啥模式，都是更新和插入 + resultMessage = this.updateAndInsert(userResource,index); + + if (resultMessage != null) { + params[2] = resultMessage; + failedNumber[0]++; + buffer.append("第" + index + "行：" + I18nUtil.getI18nText("MaterData.import.update.fail", params) + "\n"); + return 0; } + userResourceService.saveOrUpdate(userResource); return 1; - } catch (Exception e) { - throw BusinessException.build(e.getMessage()); } + return 0; } @Override @@ -135,12 +145,12 @@ public class UserResourceHandler extends BaseHandler { return null; } - boolean updateAndInsert(UserResource userResource,Long index){ + String updateAndInsert(UserResource userResource,Long index){ //判断资源是否存在 Resrce resrce = resrceMapper.selectById(userResource.getResourceBo()); if(resrce == null){ - throw BusinessException.build("第"+index+"行的资源不存在"); + return "第"+index+"行的资源不存在"; } //设置资源描述 userResource.setResrceDescription(resrce.getDescription()); @@ -151,9 +161,9 @@ public class UserResourceHandler extends BaseHandler { }else if("true".equals(userResource.getTemporaryUser())){ //不做任何操作 }else{ - throw BusinessException.build("第"+index+"行的用户不存在，必须为临时员工"); + return "第"+index+"行的用户不存在，必须为临时员工"; } - return true; + return null; } }; diff --git a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java index 853136d5..9aa4d097 100644 --- a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java +++ b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java @@ -177,6 +177,7 @@ public class MasterObjectDefine { break; case "USER_RESOURCE": + cvsHeadsMapping = new HashMap<>(); cvsHeadsMapping.put("resrce","资源编码"); cvsHeadsMapping.put("resrceDescription","资源描述"); cvsHeadsMapping.put("userId","员工编号"); 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 a92e48d2..5fb59ea8 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 @@ -153,10 +153,10 @@ public class UserResourceController { @ResponseBody @GetMapping("/findEmployeeList") - public R findEmployeeList(String resource) { + public R findEmployeeList() { try { String site = CommonMethods.getSite(); - return R.ok(userResourceService.findEmployeeList(site, resource)); + return R.ok(userResourceService.findEmployeeList(site)); } catch (Exception e) { return R.failed(e.getMessage()); } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusInventoryMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusInventoryMapper.java index b89872bc..1406bc3c 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusInventoryMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusInventoryMapper.java @@ -18,5 +18,5 @@ import java.util.List; @Repository public interface SurplusInventoryMapper extends BaseMapper { - + List selectSurplusLWList(@Param("site") String site, @Param("inventory") String inventory); } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java index ab1dd271..f3f1d528 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java @@ -20,7 +20,7 @@ import java.util.List; @Repository public interface UserResourceMapper extends BaseMapper { - List findEmployeeList(@Param("site") String site, @Param("resource") String resource); + List findEmployeeList(@Param("site") String site); List findEnableList(@Param("site") String site, @Param("resource") String resource, @Param("user") String user); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusInventoryService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusInventoryService.java index d132317d..ea2d9ae7 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusInventoryService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusInventoryService.java @@ -1,9 +1,7 @@ package com.foreverwin.mesnac.dispatch.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.dispatch.model.SurplusInventory; import com.baomidou.mybatisplus.extension.service.IService; -import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -18,11 +16,11 @@ import java.util.List; public interface SurplusInventoryService extends IService { /** - * 分页查询 - * @param frontPage + * 查询库存对应的余料 长和宽清单 + * + * @param site + * @param inventory * @return */ - IPage selectPage(FrontPage frontPage, SurplusInventory surplusInventory); - - List selectList(SurplusInventory surplusInventory); + List selectSurplusLWList(String site, String inventory); } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java index 35fb6aef..729cc04d 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java @@ -20,16 +20,7 @@ import java.util.List; */ public interface UserResourceService extends IService { - /** - * 分页查询 - * @param frontPage - * @return - */ - IPage selectPage(FrontPage frontPage, UserResource userResource); - - List selectList(UserResource userResource); - - List findEmployeeList(String site, String resource); + List findEmployeeList(String site); List findEnableList(String site, String resource, String user); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java index 9a7f9a18..bf25e531 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java @@ -72,7 +72,7 @@ public class IssueItemServiceImpl extends ServiceImpl queryMap = new HashMap<>(); - queryMap.put(SurplusInventory.SITE, site); - queryMap.put(SurplusInventory.PARENT_INVENTORY, inventory); - List list = (List) surplusInventoryService.listByMap(queryMap); + List list = surplusInventoryService.selectSurplusLWList(site, inventory); + if (list == null || list.size() <= 0) { + throw BusinessException.build("物料条码【" +inventory+ "】没有可用余料"); + } map.put("wlList", list); } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ItemBatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ItemBatchServiceImpl.java index af662e01..70881586 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ItemBatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ItemBatchServiceImpl.java @@ -41,7 +41,7 @@ public class ItemBatchServiceImpl extends ServiceImpl> resourceList = resourceService.getResourceTypeResourceList(site); if (resourceList == null || resourceList.size() <= 0) { - throw BusinessException.build("资源与资源类型关系数据未维护"); + throw BusinessException.build("资源与资源类型关系主数据未维护"); } Map>> map = resourceList.stream().collect(Collectors.groupingBy(item -> (String)item.get("RESRCE"))); //员工资源对应关系 List userResourceList = userResourceService.findEnableList(site, null, null); if (userResourceList == null || userResourceList.size() <= 0) { - throw BusinessException.build("员工与资源关系没有维护"); + throw BusinessException.build("员工与资源关系主数据未维护"); } Map> usMap = userResourceList.stream().collect(Collectors.groupingBy(UserResource::getUserId)); @@ -428,8 +428,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl singleUserResourceList = usMap.get(employee); - if (singleUserResourceList == null || singleUserResourceList.size() <= 0) { - flag = false; - message.append(seq++ % 3 == 0 ? "\n" : "| |"); - message.append("派工单[" + dispatchNo + "]分配的操作者[" + employee + "]没有维护资源关系"); - continue; + //派工人员为多个 + String [] employeeArray = new String[]{}; + if (!employees.contains(",")) { + employeeArray[0] = employees; + } else { + employeeArray = employees.split(","); } - Boolean isMatch = false; - for (int i = 0; i < singleUserResourceList.size(); i++) { - UserResource userResource = singleUserResourceList.get(i); - if (resource.equals(userResource.getResrce())) { - isMatch = true; break; + + for (int m = 0; m < employeeArray.length; m++) { + String employee = employeeArray[m]; + List singleUserResourceList = usMap.get(employee); + if (singleUserResourceList == null || singleUserResourceList.size() <= 0) { + flag = false; + message.append(seq++ % 3 == 0 ? "\n" : "| |"); + message.append("派工单[" + dispatchNo + "]分配的操作者[" + employee + "]没有维护资源关系"); + continue; + } + + + Boolean isMatch = false; + for (int i = 0; i < singleUserResourceList.size(); i++) { + UserResource userResource = singleUserResourceList.get(i); + if (resource.equals(userResource.getResrce())) { + isMatch = true; + break; + } + } + if (!isMatch) { + flag = false; + message.append(seq++ % 3 == 0 ? "\n" : "| |"); + message.append("派工单[" + dispatchNo + "]分配的操作员[" + employee + "]与资源[" + resource + "]不匹配"); + continue; } - } - if (!isMatch) { - flag = false; - message.append(seq++%3 == 0 ? "\n" : "| |"); - message.append("派工单[" + dispatchNo + "]分配的操作员[" + employee + "]与资源[" + resource +"]不匹配"); - continue; } } sfcDispatch.setResrce(resource); - sfcDispatch.setEmployee(employee); + sfcDispatch.setEmployee(employees); sfcDispatch.setRemark(sfcDispatchDto.getRemark()); sfcDispatch.setBlankingSize(sfcDispatchDto.getBlankingSize()); sfcDispatch.setPlannedStartDate(sfcDispatchDto.getPlannedStartDate()); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusInventoryServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusInventoryServiceImpl.java index 825f40f4..80507064 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusInventoryServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusInventoryServiceImpl.java @@ -29,16 +29,7 @@ public class SurplusInventoryServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, SurplusInventory surplusInventory) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(surplusInventory); - return super.page(frontPage.getPagePlus(), queryWrapper); - } - - @Override - public List selectList(SurplusInventory surplusInventory) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(surplusInventory); - return super.list(queryWrapper); + public List selectSurplusLWList(String site, String inventory) { + return surplusInventoryMapper.selectSurplusLWList(site, inventory); } } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java index b65bdc1c..b1a578b6 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java @@ -150,6 +150,7 @@ public class SurplusReturnServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, UserResource userResource) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(userResource); - return super.page(frontPage.getPagePlus(), queryWrapper); - } - - @Override - public List selectList(UserResource userResource) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(userResource); - return super.list(queryWrapper); - } - - @Override - public List findEmployeeList(String site, String resource) { - return userResourceMapper.findEmployeeList(site, resource); + public List findEmployeeList(String site) { + return userResourceMapper.findEmployeeList(site); } @Override diff --git a/dispatch/src/main/resources/mapper/SurplusInventoryMapper.xml b/dispatch/src/main/resources/mapper/SurplusInventoryMapper.xml index 934ee794..5fbf6004 100644 --- a/dispatch/src/main/resources/mapper/SurplusInventoryMapper.xml +++ b/dispatch/src/main/resources/mapper/SurplusInventoryMapper.xml @@ -430,4 +430,17 @@ ) + + diff --git a/dispatch/src/main/resources/mapper/UserResourceMapper.xml b/dispatch/src/main/resources/mapper/UserResourceMapper.xml index 14a1d594..54bee48f 100644 --- a/dispatch/src/main/resources/mapper/UserResourceMapper.xml +++ b/dispatch/src/main/resources/mapper/UserResourceMapper.xml @@ -465,10 +465,10 @@ - +