From f2fc8f89648054dabd16f5c481d1cdf3b88d7650 Mon Sep 17 00:00:00 2001 From: yangwl <1726150332@qq.com> Date: Thu, 18 Aug 2022 16:26:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=91=A8=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnormalBillController.java | 41 ++- .../mesnac/anomaly/model/AbnormalBill.java | 20 +- .../anomaly/service/AbnormalBillService.java | 9 + .../service/impl/AbnormalBillServiceImpl.java | 16 +- .../service/impl/AbnormalPlanServiceImpl.java | 6 +- .../resources/mapper/AbnormalBillMapper.xml | 18 +- .../service/impl/SfcDispatchServiceImpl.java | 103 +++--- .../meapi/controller/LocationController.java | 132 ++++++++ .../controller/LogisticsBillController.java | 122 +++++++ .../LogisticsTurnoverController.java | 49 ++- .../mesnac/meapi/dto/LogisticsDto.java | 27 ++ .../mesnac/meapi/mapper/LocationMapper.java | 19 ++ .../meapi/mapper/LogisticsBillMapper.java | 18 ++ .../meapi/mapper/LogisticsTurnoverMapper.java | 2 +- .../mesnac/meapi/model/Location.java | 120 +++++++ .../mesnac/meapi/model/LogisticsBill.java | 124 +++++++ .../mesnac/meapi/service/LocationService.java | 30 ++ .../meapi/service/LogisticsBillService.java | 28 ++ .../service/LogisticsTurnoverService.java | 2 +- .../service/impl/LocationServiceImpl.java | 51 +++ .../impl/LogisticsBillServiceImpl.java | 46 +++ .../impl/LogisticsTurnoverServiceImpl.java | 4 +- .../main/resources/mapper/LocationMapper.xml | 293 +++++++++++++++++ .../resources/mapper/LogisticsBillMapper.xml | 304 ++++++++++++++++++ .../mapper/LogisticsTurnoverMapper.xml | 19 +- .../service/impl/PodTemplateServiceImpl.java | 34 +- .../impl/InspectionTaskManageServiceImpl.java | 23 +- 27 files changed, 1563 insertions(+), 97 deletions(-) create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LocationController.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LogisticsBillController.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LocationMapper.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsBillMapper.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Location.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/model/LogisticsBill.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LocationService.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsBillService.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LocationServiceImpl.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsBillServiceImpl.java create mode 100644 meapi/src/main/resources/mapper/LocationMapper.xml create mode 100644 meapi/src/main/resources/mapper/LogisticsBillMapper.xml 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 f7afbff4..7931782a 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 @@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -279,6 +281,42 @@ public class AbnormalBillController { }catch(Exception e){ return R.failed("检索失败:"+e.getMessage()); } + } + + @GetMapping("/backLogDevice") + public R backLogDevice(AbnormalBillDto abnormalBillDto){ + try{ + return R.ok(abnormalBillService.backLogByDeviceUser(abnormalBillDto)); + }catch(Exception e){ + return R.failed("检索失败:"+e.getMessage()); + } + } + + @ResponseBody + @PostMapping("/saveDevice") + public R saveDevice(@RequestBody List abnormalBillList) { + Boolean flag; + StringBuffer message = new StringBuffer(); + List abnormalBills=new ArrayList<>(); + try { + for (AbnormalBillDto ab:abnormalBillList) { + AbnormalBill abnormalBill = new AbnormalBill(); + abnormalBill.setHandle("AbnormalBillBo:1000,"+ab.getAbnormalNo()); + abnormalBill.setUserConTime(LocalDateTime.now()); + abnormalBill.setUserIsCon("true"); + abnormalBills.add(abnormalBill); + } + flag=abnormalBillService.updateBatchById(abnormalBills); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + if (flag) { + message.insert(0, "确认维修成功"); + return R.ok(message.toString()); + } else { + message.insert(0, "确认维修失败："); + return R.failed(message.toString()); + } } @@ -294,9 +332,10 @@ public class AbnormalBillController { }catch (Exception e){ return R.failed("检索失败:"+e.getMessage()); } - } + + /** * 设备异常响应检索 */ 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 300c2fea..b956c9da 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 @@ -254,10 +254,28 @@ public class AbnormalBill extends Model { @TableField(exist = false) private String fileNum; + @TableField("USER_CON_TIME") + private LocalDateTime userConTime; + @TableField("USER_IS_CON") + private String userIsCon; + public LocalDateTime getUserConTime() { + return userConTime; + } + public void setUserConTime(LocalDateTime userConTime) { + this.userConTime = userConTime; + } - public String getHandle() { + public String getUserIsCon() { + return userIsCon; + } + + public void setUserIsCon(String userIsCon) { + this.userIsCon = userIsCon; + } + + public String getHandle() { return handle; } 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 d72167ce..24f38998 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 @@ -69,6 +69,15 @@ public interface AbnormalBillService extends IService { */ List backLog(AbnormalBillDto abnormalBillDto); + /** + * 设备异常 + * @param abnormalBillDto + * @return + */ + + List backLogByDeviceUser(AbnormalBillDto abnormalBillDto); + + /** * 跳转到异常响应**界面所带出的数据 */ 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 9e0e3291..58df5ad3 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 @@ -449,6 +449,16 @@ public class AbnormalBillServiceImpl extends ServiceImpl backLogByDeviceUser(AbnormalBillDto abnormalBillDto) { + String user = CommonMethods.getUser(); + String site = CommonMethods.getSite(); + List userGroupList = userGroupMapper.findUserGroupListByUser(site, user); + abnormalBillDto.setCreatedUser(user); + String language = LocaleContextHolder.getLocale().getLanguage(); + return abnormalBillMapper.backLog(abnormalBillDto, language,userGroupList); + } + @Override public AbnormalBillDisposeDto findAllByAbnormalNo(AbnormalBill abnormalBill) { String site = CommonMethods.getSite(); @@ -1216,7 +1226,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl nwaUsers_sc = nwaUserService.checkUserGroup(site,"SBYCSB-SHENGCHAN"); + List nwaUsers_sc = nwaUserService.checkUserGroup(site,"ZHANGHAN"); if(nwaUsers_sc != null && nwaUsers_sc.size() <= 0){ throw new BaseException("消息发送失败，生产用户组下面没有用户"); @@ -1254,8 +1264,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl + + + @@ -729,6 +732,8 @@ STEP_ID=#{et.stepId}, WORK_ORDER=#{et.workOrder}, ITEM_NUMBER=#{et.itemNumber}, + USER_CON_TIME=#{et.userConTime}, + USER_IS_CON=#{et.userIsCon}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -974,13 +979,13 @@ 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 4f6504ce..2241cf7f 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 @@ -457,64 +457,61 @@ 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; - } - } + sfcDispatch.setHandle(handle); + //是否导入 + sfcDispatch.setIsImport(Constants.BOOL_TRUE); + + + //导入的是人员名称-查找人员编号，设备 + String employee = ""; + String employeeDescription = sfcDispatchDto.getEmployeeDescription(); + if (StringUtil.notBlank(employeeDescription)) { + String _employeeDescription; + + String []employeeDescriptionArray = employeeDescription.split(","); + employeeArray = new String[employeeDescriptionArray.length]; + for (int i = 0; i < employeeDescriptionArray.length; i++) { + _employeeDescription = employeeDescriptionArray[i]; + List _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(); + //查询匹配的设备 + 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()); - sfcDispatch.setOther2(sfcDispatchDto.getOther2()); - sfcDispatch.setIsUpdateZJHComplete(sfcDispatchDto.getIsUpdateZJHComplete()); - list.add(sfcDispatch); - - - //记录派工人员 - if (employeeArray != null && employeeArray.length > 0) { - SfcDispatchEmployeeDto sfcDispatchEmployee = new SfcDispatchEmployeeDto(); - sfcDispatchEmployee.setSite(site); - sfcDispatchEmployee.setSfcDispatchBo(handle); - sfcDispatchEmployee.setDispatchEmployee(employeeArray); - sfcDispatchEmployeeList.add(sfcDispatchEmployee); - } - - continue; + //派工人员赋值 + 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()); + sfcDispatch.setOther2(sfcDispatchDto.getOther2()); + sfcDispatch.setIsUpdateZJHComplete(sfcDispatchDto.getIsUpdateZJHComplete()); + list.add(sfcDispatch); + //记录派工人员 + if (employeeArray != null && employeeArray.length > 0) { + SfcDispatchEmployeeDto sfcDispatchEmployee = new SfcDispatchEmployeeDto(); + sfcDispatchEmployee.setSite(site); + sfcDispatchEmployee.setSfcDispatchBo(handle); + sfcDispatchEmployee.setDispatchEmployee(employeeArray); + sfcDispatchEmployeeList.add(sfcDispatchEmployee); + } + continue; } //派工保存 diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LocationController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LocationController.java new file mode 100644 index 00000000..edb5c414 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LocationController.java @@ -0,0 +1,132 @@ +package com.foreverwin.mesnac.meapi.controller; + +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.meapi.service.LocationService; +import com.foreverwin.mesnac.meapi.model.Location; +import java.util.List; + +/** + * + * @author YANG.WL + * @since 2022-08-04 + */ +@RestController +@RequestMapping("/Z-LOCATION") +public class LocationController { + + @Autowired + public LocationService locationService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getLocationById(@PathVariable String id) { + return R.ok( locationService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getLocationList(Location location){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(location); + result = locationService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, Location location){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(location); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(Location::getHandle, frontPage.getGlobalQuery()) + .or().like(Location::getLocationCode, frontPage.getGlobalQuery()) + .or().like(Location::getWorkCenter, frontPage.getGlobalQuery()) + .or().like(Location::getDescription, frontPage.getGlobalQuery()) + ); + } + result = locationService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param location 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody Location location) { + return R.ok(locationService.save(location)); + } + + /** + * 修改 + * @param location 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody Location location) { + return R.ok(locationService.updateById(location)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(locationService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(locationService.removeByIds(ids)); + } + + @ResponseBody + @GetMapping("/LOCATION") + public Location getLocation(String code){ + Location location=new Location(); + location.setLocationCode(code); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(location); + location = locationService.getOne(queryWrapper); + return location; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LogisticsBillController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LogisticsBillController.java new file mode 100644 index 00000000..e446d03e --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LogisticsBillController.java @@ -0,0 +1,122 @@ +package com.foreverwin.mesnac.meapi.controller; + +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.meapi.service.LogisticsBillService; +import com.foreverwin.mesnac.meapi.model.LogisticsBill; +import java.util.List; + +/** + * + * @author YANG.WL + * @since 2022-08-05 + */ +@RestController +@RequestMapping("/Z-LOGISTICS-BILL") +public class LogisticsBillController { + + @Autowired + public LogisticsBillService logisticsBillService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getLogisticsBillById(@PathVariable String id) { + return R.ok( logisticsBillService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getLogisticsBillList(LogisticsBill logisticsBill){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(logisticsBill); + result = logisticsBillService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, LogisticsBill logisticsBill){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(logisticsBill); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(LogisticsBill::getLogisticsBillNo, frontPage.getGlobalQuery()) + .or().like(LogisticsBill::getLogisticsBo, frontPage.getGlobalQuery()) + .or().like(LogisticsBill::getOther1, frontPage.getGlobalQuery()) + .or().like(LogisticsBill::getOther2, frontPage.getGlobalQuery()) + .or().like(LogisticsBill::getOther3, frontPage.getGlobalQuery()) + ); + } + result = logisticsBillService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param logisticsBill 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody LogisticsBill logisticsBill) { + return R.ok(logisticsBillService.save(logisticsBill)); + } + + /** + * 修改 + * @param logisticsBill 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody LogisticsBill logisticsBill) { + return R.ok(logisticsBillService.updateById(logisticsBill)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(logisticsBillService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(logisticsBillService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LogisticsTurnoverController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LogisticsTurnoverController.java index 1cdca4ab..fb422bc4 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LogisticsTurnoverController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/LogisticsTurnoverController.java @@ -108,14 +108,14 @@ public class LogisticsTurnoverController { /** - * 分页查询数据 + * 查询数据 * - * @param logisticsDto 分页信息 + * @param logisticsDto * @return */ @ResponseBody @GetMapping("/querylogisticsturnovelist") - public R logisticsturnoverpage(LogisticsDto logisticsDto){ + public R querylogisticsturnovelist(LogisticsDto logisticsDto){ List result; result = logisticsTurnoverService.selectlogisticsturnoverlist(logisticsDto); return R.ok(result); @@ -180,18 +180,25 @@ public class LogisticsTurnoverController { for (UserGroup userGroupModel: userGroupList) { String userGroup = userGroupModel.getUserGroup(); if ("WL-HJ-HJ".equals(userGroup)) { - result = logisticsTurnoverService.queryLogisticsTurnoverList(userGroup,null,null,null); + result = logisticsTurnoverService.queryLogisticsTurnoverList(userGroup,null,null,null,null,null); break; } else if ("WL-HJ-XL".equals(userGroup)) { - result = logisticsTurnoverService.queryLogisticsTurnoverList(null,userGroup,null,null); + result = logisticsTurnoverService.queryLogisticsTurnoverList(null,userGroup,null,null,null,null); break; } else if ("WL-JJ-JJ".equals(userGroup)) { - result = logisticsTurnoverService.queryLogisticsTurnoverList(null,null,userGroup,null); + result = logisticsTurnoverService.queryLogisticsTurnoverList(null,null,userGroup,null,null,null); break; } else if ("WL-WX-WX".equals(userGroup)) { - result = logisticsTurnoverService.queryLogisticsTurnoverList(null,null,null,userGroup); + result = logisticsTurnoverService.queryLogisticsTurnoverList(null,null,null,userGroup,null,null); + break; + } else if ("WL-RC-RC".equals(userGroup)) { + result = logisticsTurnoverService.queryLogisticsTurnoverList(null,null,null,null,userGroup,null); + break; + } else if ("WL-ZP-ZP".equals(userGroup)) { + result = logisticsTurnoverService.queryLogisticsTurnoverList(null,null,null,null,null,userGroup); break; } + } return Optional.ofNullable(result) .map(t -> JSONObject.toJSONString(t)).orElse("null"); @@ -246,4 +253,32 @@ public class LogisticsTurnoverController { } + /** + * 批量修改对象 + * @param logisticsDtoList 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @PostMapping("/updatelogisticsTurnover") + public R updatelogisticsTurnover(@RequestBody List logisticsDtoList) { + List logisticsTurnoverList = new ArrayList<>(); + LogisticsTurnover logisticsTurnover = new LogisticsTurnover(); + if (!logisticsDtoList.isEmpty()) { + for (LogisticsDto logisticsDto : logisticsDtoList) { + logisticsTurnover.setHandle(logisticsDto.getHandle()); + logisticsTurnover.setIsReceive("Y"); + logisticsTurnover.setOther4(LocalDateTime.now()); + logisticsTurnover.setOther5(CommonMethods.getUser()); + logisticsTurnoverList.add(logisticsTurnover); + } + if (logisticsTurnoverService.updateBatchById(logisticsTurnoverList)) { + return R.ok("接收成功"); + }else { + return R.failed("接收出错"); + } + } else { + return R.failed("接收出错"); + } + } + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/LogisticsDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/LogisticsDto.java index cfb9b8ed..6b06d52b 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/LogisticsDto.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/LogisticsDto.java @@ -27,6 +27,33 @@ public class LogisticsDto { private String qtyToBuild; private String zlDescription; private String comfirmUser; + private String turnoutItem; + private String isReceive; + private String storageLocation; + + public String getTurnoutItem() { + return turnoutItem; + } + + public void setTurnoutItem(String turnoutItem) { + this.turnoutItem = turnoutItem; + } + + public String getIsReceive() { + return isReceive; + } + + public void setIsReceive(String isReceive) { + this.isReceive = isReceive; + } + + public String getStorageLocation() { + return storageLocation; + } + + public void setStorageLocation(String storageLocation) { + this.storageLocation = storageLocation; + } public String getComfirmUser() { return comfirmUser; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LocationMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LocationMapper.java new file mode 100644 index 00000000..842d92eb --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LocationMapper.java @@ -0,0 +1,19 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.foreverwin.mesnac.meapi.model.Location; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * Mapper 接口 + *

+ * + * @author YANG.WL + * @since 2022-08-04 + */ +@Repository +public interface LocationMapper extends BaseMapper { + + Location getLocation(String locationcode); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsBillMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsBillMapper.java new file mode 100644 index 00000000..ebae2978 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsBillMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.foreverwin.mesnac.meapi.model.LogisticsBill; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * Mapper 接口 + *

+ * + * @author YANG.WL + * @since 2022-08-05 + */ +@Repository +public interface LogisticsBillMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsTurnoverMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsTurnoverMapper.java index c2a610dc..c082bdeb 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsTurnoverMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/LogisticsTurnoverMapper.java @@ -23,7 +23,7 @@ public interface LogisticsTurnoverMapper extends BaseMapper { IPage selectLogisticsDtoPage(FrontPage frontPage, LogisticsDto logisticsDto); - List queryLogisticsTurnoverList(@Param("HJHJ") String HJHJ,@Param("HJXL") String HJXL,@Param("JJ") String JJ,@Param("WX") String WX); + List queryLogisticsTurnoverList(@Param("HJHJ") String HJHJ,@Param("HJXL") String HJXL,@Param("JJ") String JJ,@Param("WX") String WX,@Param("RC") String RC,@Param("ZP") String ZP); LogisticsTurnover queryNewtistTurnoverTask(String InspectionTaskNo); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Location.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Location.java new file mode 100644 index 00000000..80aadbb6 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Location.java @@ -0,0 +1,120 @@ +package com.foreverwin.mesnac.meapi.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; + +/** + *

+ * + *

+ * + * @author YANG.WL + * @since 2022-08-04 + */ + +@TableName("Z_LOCATION") + +public class Location extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableField("HANDLE") + private String handle; + /** + * 库位码 + */ + @TableField("LOCATION_CODE") + private String locationCode; + /** + * 所属车间 + */ + @TableField("WORK_CENTER") + private String workCenter; + /** + * 创建时间 + */ + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + /** + * 库位描述 + */ + @TableField("DESCRIPTION") + private String description; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getLocationCode() { + return locationCode; + } + + public void setLocationCode(String locationCode) { + this.locationCode = locationCode; + } + + public String getWorkCenter() { + return workCenter; + } + + public void setWorkCenter(String workCenter) { + this.workCenter = workCenter; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + +public static final String HANDLE = "HANDLE"; + +public static final String LOCATION_CODE = "LOCATION_CODE"; + +public static final String WORK_CENTER = "WORK_CENTER"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String DESCRIPTION = "DESCRIPTION"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "Location{" + + "handle = " + handle + + ", locationCode = " + locationCode + + ", workCenter = " + workCenter + + ", createdDateTime = " + createdDateTime + + ", description = " + description + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/LogisticsBill.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/LogisticsBill.java new file mode 100644 index 00000000..de6441ee --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/LogisticsBill.java @@ -0,0 +1,124 @@ +package com.foreverwin.mesnac.meapi.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; + +/** + *

+ * + *

+ * + * @author YANG.WL + * @since 2022-08-05 + */ + +@TableName("Z_LOGISTICS_BILL") + +public class LogisticsBill extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 转运单号 + */ + @TableField("LOGISTICS_BILL_NO") + private String logisticsBillNo; + /** + * 转运任务主键 + */ + @TableField("LOGISTICS_BO") + private String logisticsBo; + /** + * 转运完成时间 + */ + @TableField("COM_TIME") + private LocalDateTime comTime; + @TableField("OTHER1") + private String other1; + @TableField("OTHER2") + private String other2; + @TableField("OTHER3") + private String other3; + + + public String getLogisticsBillNo() { + return logisticsBillNo; + } + + public void setLogisticsBillNo(String logisticsBillNo) { + this.logisticsBillNo = logisticsBillNo; + } + + public String getLogisticsBo() { + return logisticsBo; + } + + public void setLogisticsBo(String logisticsBo) { + this.logisticsBo = logisticsBo; + } + + public LocalDateTime getComTime() { + return comTime; + } + + public void setComTime(LocalDateTime comTime) { + this.comTime = comTime; + } + + public String getOther1() { + return other1; + } + + public void setOther1(String other1) { + this.other1 = other1; + } + + public String getOther2() { + return other2; + } + + public void setOther2(String other2) { + this.other2 = other2; + } + + public String getOther3() { + return other3; + } + + public void setOther3(String other3) { + this.other3 = other3; + } + +public static final String LOGISTICS_BILL_NO = "LOGISTICS_BILL_NO"; + +public static final String LOGISTICS_BO = "LOGISTICS_BO"; + +public static final String COM_TIME = "COM_TIME"; + +public static final String OTHER1 = "OTHER1"; + +public static final String OTHER2 = "OTHER2"; + +public static final String OTHER3 = "OTHER3"; + + + + + @Override + public String toString() { + return "LogisticsBill{" + + "logisticsBillNo = " + logisticsBillNo + + ", logisticsBo = " + logisticsBo + + ", comTime = " + comTime + + ", other1 = " + other1 + + ", other2 = " + other2 + + ", other3 = " + other3 + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LocationService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LocationService.java new file mode 100644 index 00000000..5afd278d --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LocationService.java @@ -0,0 +1,30 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.Location; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author YANG.WL + * @since 2022-08-04 + */ +public interface LocationService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, Location location); + + List selectList(Location location); + + Location getLocation(String locationcode); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsBillService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsBillService.java new file mode 100644 index 00000000..0c56852f --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsBillService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.LogisticsBill; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author YANG.WL + * @since 2022-08-05 + */ +public interface LogisticsBillService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, LogisticsBill logisticsBill); + + List selectList(LogisticsBill logisticsBill); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsTurnoverService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsTurnoverService.java index 370d4b72..1e3dc33e 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsTurnoverService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/LogisticsTurnoverService.java @@ -28,7 +28,7 @@ public interface LogisticsTurnoverService extends IService { List selectList(LogisticsTurnover logisticsTurnover); - List queryLogisticsTurnoverList(String HJHJ,String HJXL,String JJ,String WX); + List queryLogisticsTurnoverList(String HJHJ,String HJXL,String JJ,String WX,String RC,String ZP); LogisticsTurnover queryNewtistTurnoverTask(String InspectionTaskNo); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LocationServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LocationServiceImpl.java new file mode 100644 index 00000000..b1cf0931 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LocationServiceImpl.java @@ -0,0 +1,51 @@ +package com.foreverwin.mesnac.meapi.service.impl; + +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.meapi.model.Location; +import com.foreverwin.mesnac.meapi.mapper.LocationMapper; +import com.foreverwin.mesnac.meapi.service.LocationService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 服务实现类 + *

+ * + * @author YANG.WL + * @since 2022-08-04 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class LocationServiceImpl extends ServiceImpl implements LocationService { + + + @Autowired + private LocationMapper locationMapper; + + @Override + public IPage selectPage(FrontPage frontPage, Location location) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(location); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(Location location) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(location); + return super.list(queryWrapper); + } + + @Override + public Location getLocation(String locationcode) { + return locationMapper.getLocation(locationcode); + } + + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsBillServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsBillServiceImpl.java new file mode 100644 index 00000000..f32efc9a --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsBillServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.meapi.service.impl; + +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.meapi.model.LogisticsBill; +import com.foreverwin.mesnac.meapi.mapper.LogisticsBillMapper; +import com.foreverwin.mesnac.meapi.service.LogisticsBillService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 服务实现类 + *

+ * + * @author YANG.WL + * @since 2022-08-05 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class LogisticsBillServiceImpl extends ServiceImpl implements LogisticsBillService { + + + @Autowired + private LogisticsBillMapper logisticsBillMapper; + + @Override + public IPage selectPage(FrontPage frontPage, LogisticsBill logisticsBill) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(logisticsBill); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(LogisticsBill logisticsBill) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(logisticsBill); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsTurnoverServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsTurnoverServiceImpl.java index 8b0dc96a..97e78f64 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsTurnoverServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/LogisticsTurnoverServiceImpl.java @@ -44,8 +44,8 @@ public class LogisticsTurnoverServiceImpl extends ServiceImpl queryLogisticsTurnoverList(String HJHJ,String HJXL,String JJ,String WX) { - return logisticsTurnoverMapper.queryLogisticsTurnoverList(HJHJ,HJXL,JJ,WX); + public List queryLogisticsTurnoverList(String HJHJ,String HJXL,String JJ,String WX,String RC,String ZP) { + return logisticsTurnoverMapper.queryLogisticsTurnoverList(HJHJ,HJXL,JJ,WX,RC,ZP); } @Override diff --git a/meapi/src/main/resources/mapper/LocationMapper.xml b/meapi/src/main/resources/mapper/LocationMapper.xml new file mode 100644 index 00000000..02d63cb3 --- /dev/null +++ b/meapi/src/main/resources/mapper/LocationMapper.xml @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + HANDLE, LOCATION_CODE, WORK_CENTER, CREATED_DATE_TIME, DESCRIPTION + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_LOCATION + + HANDLE, + LOCATION_CODE, + WORK_CENTER, + CREATED_DATE_TIME, + DESCRIPTION, + VALUES + + #{handle}, + #{locationCode}, + #{workCenter}, + #{createdDateTime}, + #{description}, + + + + + INSERT INTO Z_LOCATION + + + VALUES + + #{handle}, + #{locationCode}, + #{workCenter}, + #{createdDateTime}, + #{description}, + + + + + + + + + + UPDATE Z_LOCATION + HANDLE=#{et.handle}, + LOCATION_CODE=#{et.locationCode}, + WORK_CENTER=#{et.workCenter}, + CREATED_DATE_TIME=#{et.createdDateTime}, + DESCRIPTION=#{et.description}, + + + + + HANDLE=#{ew.entity.handle} + AND LOCATION_CODE=#{ew.entity.locationCode} + AND WORK_CENTER=#{ew.entity.workCenter} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND DESCRIPTION=#{ew.entity.description} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM Z_LOCATION + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_LOCATION + + + + + HANDLE=#{ew.entity.handle} + + AND LOCATION_CODE=#{ew.entity.locationCode} + AND WORK_CENTER=#{ew.entity.workCenter} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND DESCRIPTION=#{ew.entity.description} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + diff --git a/meapi/src/main/resources/mapper/LogisticsBillMapper.xml b/meapi/src/main/resources/mapper/LogisticsBillMapper.xml new file mode 100644 index 00000000..3baf9add --- /dev/null +++ b/meapi/src/main/resources/mapper/LogisticsBillMapper.xml @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + LOGISTICS_BILL_NO, LOGISTICS_BO, COM_TIME, OTHER1, OTHER2, OTHER3 + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_LOGISTICS_BILL + + LOGISTICS_BILL_NO, + LOGISTICS_BO, + COM_TIME, + OTHER1, + OTHER2, + OTHER3, + VALUES + + #{logisticsBillNo}, + #{logisticsBo}, + #{comTime}, + #{other1}, + #{other2}, + #{other3}, + + + + + INSERT INTO Z_LOGISTICS_BILL + + + VALUES + + #{logisticsBillNo}, + #{logisticsBo}, + #{comTime}, + #{other1}, + #{other2}, + #{other3}, + + + + + + + + + + UPDATE Z_LOGISTICS_BILL + LOGISTICS_BILL_NO=#{et.logisticsBillNo}, + LOGISTICS_BO=#{et.logisticsBo}, + COM_TIME=#{et.comTime}, + OTHER1=#{et.other1}, + OTHER2=#{et.other2}, + OTHER3=#{et.other3}, + + + + + LOGISTICS_BILL_NO=#{ew.entity.logisticsBillNo} + AND LOGISTICS_BO=#{ew.entity.logisticsBo} + AND COM_TIME=#{ew.entity.comTime} + AND OTHER1=#{ew.entity.other1} + AND OTHER2=#{ew.entity.other2} + AND OTHER3=#{ew.entity.other3} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM Z_LOGISTICS_BILL + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_LOGISTICS_BILL + + + + + LOGISTICS_BILL_NO=#{ew.entity.logisticsBillNo} + + AND LOGISTICS_BO=#{ew.entity.logisticsBo} + AND COM_TIME=#{ew.entity.comTime} + AND OTHER1=#{ew.entity.other1} + AND OTHER2=#{ew.entity.other2} + AND OTHER3=#{ew.entity.other3} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + diff --git a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml b/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml index be390040..7bf36e5b 100644 --- a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml +++ b/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml @@ -606,6 +606,8 @@ AND ZLT.TURNOUT_ITEM like '03%' AND ZLT.TURNOUT_WORKCENTER = 'HJ' AND ZLT.TURNOUT_WORKCENTER = 'JJ' AND ZLT.TURNOUT_WORKCENTER = 'WX' + AND ZLT.TURNOUT_WORKCENTER = 'RC' + AND ZLT.TURNOUT_WORKCENTER = 'ZP' GROUP BY WCT.DESCRIPTION, ZSD.SFC, @@ -688,8 +690,9 @@ - + SELECT distinct + ZLT.HANDLE, WCT.DESCRIPTION NEXT_WORK_CENTER, ZSD.SFC, C1.VALUE WORK_ORDER, @@ -706,6 +709,7 @@ SO.SHOP_ORDER, ZL.DESCRIPTION ZL_DESCRIPTION, CASE WHEN ZLT.STATUS = 'NEW' THEN '待转运' ELSE '转运完成' END STATUS, + CASE WHEN ZLT.IS_RECEIVE = 'Y' THEN '已接收' ELSE '未接收' END IS_RECEIVE, ZLT.OTHER5 COMFIRM_USER FROM Z_LOGISTICS_TURNOVER ZLT @@ -730,5 +734,16 @@ AND O.CURRENT_REVISION = 'true' LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh' + + + AND STATUS=#{status} + AND TURNOVER_WORK_CENTER=#{nextWorkCenter} + AND IS_RECEIVE=#{isReceive} + AND TURNOUT_ITEM=#{turnoutItem} + AND IT.DESCRIPTION LIKE '%'||#{itemDescription}||'%' + AND C1.VALUE LIKE '%'||#{workOrder}||'%' + + + 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 4df02f03..e1efcac1 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 @@ -469,23 +469,23 @@ public class PodTemplateServiceImpl implements PodTemplateService { queryWrapper.eq(SfcDispatch.SHOP_ORDER,sfcDispatchById.getShopOrder()); queryWrapper.eq(SfcDispatch.DISPATCH_SEQ,String.valueOf(Integer.parseInt(sfcDispatchById.getDispatchSeq())+1)); SfcDispatch sfcDispatch=sfcDispatchService.getOne(queryWrapper); - if (sfcDispatch!=null && sfcDispatch.getOperation().equals("HJ_6106JYGX")){ - Operation nextcurrentRevisionRef = operationService.getCurrentRevisionRef(site, sfcDispatch.getOperation()); - BigDecimal workHours=BigDecimal.ZERO; - sfcCrossService.completeAction(site, nextcurrentRevisionRef.getHandle(), resrce, sfcServiceById.getHandle(), qty); - sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), sfcDispatch.getDispatchNo(), DispatchStatusEnum.COMPLETE.getCode(),workHours); - } - - if (sfcDispatch!=null && sfcDispatch.getOperation().equals("HJ_6106JRGX")){ - Operation nextcurrentRevisionRef = operationService.getCurrentRevisionRef(site, sfcDispatch.getOperation()); - BigDecimal workHours=BigDecimal.ZERO; - sfcCrossService.completeAction(site, nextcurrentRevisionRef.getHandle(), resrce, sfcServiceById.getHandle(), qty); - sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), sfcDispatch.getDispatchNo(), DispatchStatusEnum.COMPLETE.getCode(),workHours); - SfcDispatchDto sfcdispatchs = new SfcDispatchDto(); - sfcdispatchs.setHandle(HandleEnum.SFC_DISPATCH.getHandle(site, sfcDispatch.getHandle())); - sfcdispatchs = sfcDispatchCommonService.findSfcDispatchBySfc(sfcdispatchs); - sendErp(sfc, stepId, qty, BigDecimal.ZERO, qty.multiply(sfcdispatchs.getProdHours())); - } +// if (sfcDispatch!=null && sfcDispatch.getOperation().equals("HJ_6106JYGX")){ +// Operation nextcurrentRevisionRef = operationService.getCurrentRevisionRef(site, sfcDispatch.getOperation()); +// BigDecimal workHours=BigDecimal.ZERO; +// sfcCrossService.completeAction(site, nextcurrentRevisionRef.getHandle(), resrce, sfcServiceById.getHandle(), qty); +// sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), sfcDispatch.getDispatchNo(), DispatchStatusEnum.COMPLETE.getCode(),workHours); +// } +// +// if (sfcDispatch!=null && sfcDispatch.getOperation().equals("HJ_6106JRGX")){ +// Operation nextcurrentRevisionRef = operationService.getCurrentRevisionRef(site, sfcDispatch.getOperation()); +// BigDecimal workHours=BigDecimal.ZERO; +// sfcCrossService.completeAction(site, nextcurrentRevisionRef.getHandle(), resrce, sfcServiceById.getHandle(), qty); +// sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), sfcDispatch.getDispatchNo(), DispatchStatusEnum.COMPLETE.getCode(),workHours); +// SfcDispatchDto sfcdispatchs = new SfcDispatchDto(); +// sfcdispatchs.setHandle(HandleEnum.SFC_DISPATCH.getHandle(site, sfcDispatch.getHandle())); +// sfcdispatchs = sfcDispatchCommonService.findSfcDispatchBySfc(sfcdispatchs); +// sendErp(sfc, stepId, qty, BigDecimal.ZERO, qty.multiply(sfcdispatchs.getProdHours())); +// } /** * 判断是否为返修工序、返修工序不报工 diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java index d9fc8c66..4e04e642 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java @@ -2,11 +2,14 @@ package com.foreverwin.mesnac.quality.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.foreverwin.mesnac.common.constant.Constants; +import com.foreverwin.mesnac.common.constant.IntegrationTypeConstant; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.model.InspectionTask; import com.foreverwin.mesnac.common.model.InspectionTaskDetail; +import com.foreverwin.mesnac.common.model.IntegrationLog; import com.foreverwin.mesnac.common.service.InspectionTaskDetailService; import com.foreverwin.mesnac.common.service.InspectionTaskService; +import com.foreverwin.mesnac.common.service.IntegrationLogService; import com.foreverwin.mesnac.common.util.DateUtil; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.dispatch.model.SfcDispatch; @@ -26,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -44,6 +48,8 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ private SfcDispatchService sfcDispatchService; @Autowired private LogisticsTurnoverService logisticsTurnoverService; + @Autowired + private IntegrationLogService integrationLogService; @Override @@ -222,8 +228,23 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ queryWrapper.eq(SfcDispatch.DISPATCH_SEQ,String.valueOf(Integer.parseInt(sfcDispatchById.getDispatchSeq())+1)); SfcDispatch sfcDispatch=sfcDispatchService.getOne(queryWrapper); + if (sfcDispatch!=null&&!sfcDispatchById.getWorkCenter().equals(sfcDispatch.getWorkCenter())){ + IntegrationLog log = new IntegrationLog(); + log.setHandle(UUID.randomUUID().toString()); + log.setSite(site); + log.setIntegrationType("LOGISTICS"); + log.setCategory("RESPONSE"); + log.setIntegrationWay("LOGISTICS"); + log.setIntegrationMethod("InterfaceService.LOGISTICS"); + log.setParam(sfcDispatch.toString()); + log.setStatus("SUCCESS"); + log.setResultMessage("SUCCESS"); + log.setCreatedDateTime(LocalDateTime.now()); + integrationLogService.saveIntegrationLog(log); + + //生成周转任务的同时发送消息提示到手持设备 LogisticsTurnover logisticsTurnover=new LogisticsTurnover(); logisticsTurnover.setHandle("LogisticsBO:1000"+","+UUID.randomUUID().toString()); @@ -255,8 +276,6 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ logisticsTurnover.setTurnoutWorkcenter(inspectionTaskManage.getWorkCenter()); logisticsTurnoverService.save(logisticsTurnover); } - - } }