From 77ca239149608217f2ef2b0c830ef89b72f95d48 Mon Sep 17 00:00:00 2001 From: yangwl <1726150332@qq.com> Date: Thu, 11 Aug 2022 19:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/mapper/AbnormalBillMapper.java | 2 + .../service/impl/AbnormalBillServiceImpl.java | 41 ++- .../service/impl/AbnormalPlanServiceImpl.java | 5 +- .../resources/mapper/AbnormalBillMapper.xml | 22 ++ .../mesnac/common/constant/Constants.java | 4 + .../LogisticsTurnoverController.java | 120 +++++-- .../meapi/controller/NwaUserController.java | 21 ++ .../mesnac/meapi/dto/LogisticsDto.java | 55 ++++ .../meapi/mapper/LogisticsTurnoverMapper.java | 11 +- .../mesnac/meapi/model/LogisticsTurnover.java | 81 ++++- .../mesnac/meapi/model/NwaUser.java | 1 + .../service/LogisticsTurnoverService.java | 8 +- .../impl/LogisticsTurnoverServiceImpl.java | 16 +- .../mapper/LogisticsTurnoverMapper.xml | 296 +++++++++++++++++- .../service/impl/PodTemplateServiceImpl.java | 26 ++ .../impl/InspectionTaskManageServiceImpl.java | 21 ++ 16 files changed, 682 insertions(+), 48 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java index 2490aec9..75bc445f 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java @@ -50,4 +50,6 @@ public interface AbnormalBillMapper extends BaseMapper { Map findReplaceMessageByAbnormal(@Param("abnormalBill")AbnormalBill abnormalBill); List findScrapDtoList(String site); + + Map findReplaceMessageResrce(@Param("abnormalBill")AbnormalBill abnormalBill); } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index 1960cee8..9e0e3291 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 @@ -365,7 +365,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl nwaUsers = nwaUserService.checkUserGroup(site,abnormalMessage.getSendUserGroup()); + + //给设备处发企业微信消息 + + //给生产组 + List nwaUsers_sc = nwaUserService.checkUserGroup(site,"SBYCSB-SHENGCHAN"); + + if(nwaUsers_sc != null && nwaUsers_sc.size() <= 0){ + throw new BaseException("消息发送失败，生产用户组下面没有用户"); + } + if(nwaUsers != null && nwaUsers.size() <= 0){ throw new BaseException("消息发送失败，发送的用户组下面没有用户"); } List customFieldByUserId = usrMapper.findCustomFieldByUserId(site, nwaUsers); + + List customFieldByUserId_sc = usrMapper.findCustomFieldByUserId(site, nwaUsers_sc); + + if(customFieldByUserId != null && customFieldByUserId.size() <= 0){ throw new BaseException("消息发送失败，发送的用户组下面的用户的自定义数据没有维护"); } + + if(customFieldByUserId_sc != null && customFieldByUserId_sc.size() <= 0){ + throw new BaseException("消息发送失败，生产用户组下面的用户的自定义数据没有维护"); + } StringBuilder sendUsers = new StringBuilder(); for (int i = 0; i < Objects.requireNonNull(customFieldByUserId).size(); i++) { if(i == (customFieldByUserId.size() - 1)){ @@ -1227,6 +1245,17 @@ public class AbnormalBillServiceImpl extends ServiceImpl replaceMessage = abnormalBillMapper.findReplaceMessageByAbnormal(abnormalBill); + + + if (abnormalBill.getType().equals("S")){ + replaceMessage=abnormalBillMapper.findReplaceMessageResrce(abnormalBill); + } + String messageBody = sendMessageType.getBody(); //格式化之后的消息 return StringUtils.format(messageBody, replaceMessage); @@ -1450,6 +1485,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl + 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 0368507f..a6f395cd 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 @@ -219,4 +219,8 @@ public interface Constants { String LOGISTICS_NEW="NEW"; String LOGISTICS_TRANSPORT="LOGISTICS_TRANSPORT"; String LOGISTICS_COM="COM"; + + //入库 + + String RK="RK"; } 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 f28f9e28..1cdca4ab 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 @@ -3,8 +3,11 @@ package com.foreverwin.mesnac.meapi.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.foreverwin.mesnac.meapi.dto.LogisticsDto; +import com.foreverwin.mesnac.meapi.enums.HandleEnum; import com.foreverwin.mesnac.meapi.model.LogisticsBill; +import com.foreverwin.mesnac.meapi.model.UserGroup; import com.foreverwin.mesnac.meapi.service.LogisticsBillService; +import com.foreverwin.mesnac.meapi.service.UserGroupService; import com.foreverwin.modular.core.util.R; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.CommonMethods; @@ -25,7 +28,7 @@ import java.util.Optional; /** * * @author YANG.WL - * @since 2022-08-04 + * @since 2022-08-08 */ @RestController @RequestMapping("/Z-LOGISTICS-TURNOVER") @@ -35,7 +38,8 @@ public class LogisticsTurnoverController { public LogisticsTurnoverService logisticsTurnoverService; @Autowired public LogisticsBillService logisticsBillService; - + @Autowired + private UserGroupService userGroupService; /** * 根据id查询 * @@ -63,22 +67,6 @@ public class LogisticsTurnoverController { return R.ok(result); } - /** - * 查询所有数据 - * - * @return - */ - @ResponseBody - @GetMapping("/queryLogisticsTurnoverList") - public String queryLogisticsTurnoverList(LogisticsDto logisticsDto){ - List result; -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.setEntity(logisticsTurnover); - result = logisticsTurnoverService.queryLogisticsTurnoverList(logisticsDto); - return Optional.ofNullable(result) - .map(t -> JSONObject.toJSONString(t)).orElse("null"); - } - /** * 分页查询数据 * @@ -105,12 +93,34 @@ public class LogisticsTurnoverController { .or().like(LogisticsTurnover::getStorageLocation, frontPage.getGlobalQuery()) .or().like(LogisticsTurnover::getTurnoverWorkCenter, frontPage.getGlobalQuery()) .or().like(LogisticsTurnover::getIsReceive, frontPage.getGlobalQuery()) + .or().like(LogisticsTurnover::getTurnoutWorkcenter, frontPage.getGlobalQuery()) + .or().like(LogisticsTurnover::getTurnoutItem, frontPage.getGlobalQuery()) + .or().like(LogisticsTurnover::getOther4, frontPage.getGlobalQuery()) + .or().like(LogisticsTurnover::getOther5, frontPage.getGlobalQuery()) + .or().like(LogisticsTurnover::getOther6, frontPage.getGlobalQuery()) ); } result = logisticsTurnoverService.page(frontPage.getPagePlus(), queryWrapper); return R.ok(result); } + + + + /** + * 分页查询数据 + * + * @param logisticsDto 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/querylogisticsturnovelist") + public R logisticsturnoverpage(LogisticsDto logisticsDto){ + List result; + result = logisticsTurnoverService.selectlogisticsturnoverlist(logisticsDto); + return R.ok(result); + } + /** * 新增 * @param logisticsTurnover 传递的实体 @@ -153,6 +163,49 @@ public class LogisticsTurnoverController { return R.ok(logisticsTurnoverService.removeByIds(ids)); } + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("/queryLogisticsTurnoverList") + public String queryLogisticsTurnoverList(String login_name){ + //查询登录人员所在的用户组 + + String userBo = HandleEnum.USER.getHandle("1000", login_name); + List userGroupList = userGroupService.getUserGroupListByUserBo(userBo); + List result=new ArrayList<>(); + if (userGroupList != null && userGroupList.size() > 0) { + for (UserGroup userGroupModel: userGroupList) { + String userGroup = userGroupModel.getUserGroup(); + if ("WL-HJ-HJ".equals(userGroup)) { + result = logisticsTurnoverService.queryLogisticsTurnoverList(userGroup,null,null,null); + break; + } else if ("WL-HJ-XL".equals(userGroup)) { + result = logisticsTurnoverService.queryLogisticsTurnoverList(null,userGroup,null,null); + break; + } else if ("WL-JJ-JJ".equals(userGroup)) { + result = logisticsTurnoverService.queryLogisticsTurnoverList(null,null,userGroup,null); + break; + } else if ("WL-WX-WX".equals(userGroup)) { + result = logisticsTurnoverService.queryLogisticsTurnoverList(null,null,null,userGroup); + break; + } + } + return Optional.ofNullable(result) + .map(t -> JSONObject.toJSONString(t)).orElse("null"); + }else { + return null; + } + + +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.setEntity(logisticsTurnover); + + } + + /** * 批量修改对象 * @param list 实体集合ID @@ -160,28 +213,37 @@ public class LogisticsTurnoverController { */ @ResponseBody @RequestMapping(method = RequestMethod.POST, value = "/UPDATE-STATUS") - public R updateStatusById(String list,String location,String transportno){ - List logisticsDtoList = JSONArray.parseArray(list,LogisticsDto.class); - List logisticsTurnoverList=new ArrayList<>(); - LogisticsTurnover logisticsTurnover=new LogisticsTurnover(); - LogisticsBill logisticsBill=new LogisticsBill(); - if (!list.isEmpty() && location!=null && transportno!=null){ - for (LogisticsDto logisticsDto:logisticsDtoList) { + public R updateStatusById(String list,String location,String transportno,String user,String username) { + List logisticsDtoList = JSONArray.parseArray(list, LogisticsDto.class); + List logisticsTurnoverList = new ArrayList<>(); + LogisticsTurnover logisticsTurnover = new LogisticsTurnover(); + LogisticsBill logisticsBill = new LogisticsBill(); + List logisticsBillList = new ArrayList<>(); + if (!list.isEmpty() && location != null && transportno != null) { + for (LogisticsDto logisticsDto : logisticsDtoList) { logisticsTurnover.setHandle(logisticsDto.getHandle()); logisticsTurnover.setStatus("COM"); logisticsTurnover.setStorageLocation(location); logisticsTurnover.setComDateTime(LocalDateTime.now()); logisticsTurnover.setIsReceive("N"); + logisticsTurnover.setUser(user); + logisticsTurnover.setUserName(username); logisticsTurnoverList.add(logisticsTurnover); logisticsBill.setComTime(LocalDateTime.now()); logisticsBill.setLogisticsBillNo(transportno); logisticsBill.setLogisticsBo(logisticsDto.getHandle()); - logisticsBillService.save(logisticsBill); + logisticsBillList.add(logisticsBill); } - return R.ok(logisticsTurnoverService.updateById(logisticsTurnover)); - }else { - return R.failed(); + if (logisticsBillService.saveBatch(logisticsBillList) && 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/controller/NwaUserController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java index 5cc887bc..dee50940 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 @@ -52,6 +52,27 @@ public class NwaUserController { result = nwaUserService.list(queryWrapper); return R.ok(result); } + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("/login") + public R NwaUserLogin(NwaUser nwaUser){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(nwaUser); + result = nwaUserService.list(queryWrapper); + if (!result.isEmpty()){ + return R.ok(result.get(0).toString()); + }else { + return R.failed("登录失败"); + } + + } + + /** * 分页查询数据 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 f23997c5..cfb9b8ed 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 @@ -20,6 +20,61 @@ public class LogisticsDto { private String overOperation; private String employeeDescription; private String nextOperation; + private String status; + + private String shopOrder;; + private String texture; + private String qtyToBuild; + private String zlDescription; + private String comfirmUser; + + public String getComfirmUser() { + return comfirmUser; + } + + public void setComfirmUser(String comfirmUser) { + this.comfirmUser = comfirmUser; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getZlDescription() { + return zlDescription; + } + + public void setZlDescription(String zlDescription) { + this.zlDescription = zlDescription; + } + + public String getShopOrder() { + return shopOrder; + } + + public void setShopOrder(String shopOrder) { + this.shopOrder = shopOrder; + } + + public String getTexture() { + return texture; + } + + public void setTexture(String texture) { + this.texture = texture; + } + + public String getQtyToBuild() { + return qtyToBuild; + } + + public void setQtyToBuild(String qtyToBuild) { + this.qtyToBuild = qtyToBuild; + } public String getNextWorkCenter() { return nextWorkCenter; 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 cd49aedb..c2a610dc 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 @@ -1,8 +1,11 @@ package com.foreverwin.mesnac.meapi.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.meapi.dto.LogisticsDto; import com.foreverwin.mesnac.meapi.model.LogisticsTurnover; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.modular.core.util.FrontPage; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -13,12 +16,16 @@ import java.util.List; *

* * @author YANG.WL - * @since 2022-07-27 + * @since 2022-08-08 */ @Repository public interface LogisticsTurnoverMapper extends BaseMapper { - List queryLogisticsTurnoverList(LogisticsDto logisticsDto); + IPage selectLogisticsDtoPage(FrontPage frontPage, LogisticsDto logisticsDto); + + List queryLogisticsTurnoverList(@Param("HJHJ") String HJHJ,@Param("HJXL") String HJXL,@Param("JJ") String JJ,@Param("WX") String WX); LogisticsTurnover queryNewtistTurnoverTask(String InspectionTaskNo); + + List selectlogisticsturnoverlist(LogisticsDto logisticsDto); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/LogisticsTurnover.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/LogisticsTurnover.java index fb9f8bb8..1834e2a3 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/LogisticsTurnover.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/LogisticsTurnover.java @@ -4,6 +4,7 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; @@ -15,7 +16,7 @@ import com.baomidou.mybatisplus.annotation.IdType; *

* * @author YANG.WL - * @since 2022-08-04 + * @since 2022-08-08 */ @TableName("Z_LOGISTICS_TURNOVER") @@ -27,7 +28,7 @@ public class LogisticsTurnover extends Model { /** * 主键 */ - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; /** * 派工单主键 @@ -89,6 +90,27 @@ public class LogisticsTurnover extends Model { */ @TableField("IS_RECEIVE") private String isReceive; + /** + * 转出车间 + */ + @TableField("TURNOUT_WORKCENTER") + private String turnoutWorkcenter; + /** + * 转出物料 + */ + @TableField("TURNOUT_ITEM") + private String turnoutItem; + @TableField("OTHER4") + private LocalDateTime other4; + @TableField("OTHER5") + private String other5; + @TableField("OTHER6") + private String other6; + + + + + public String getHandle() { @@ -195,6 +217,46 @@ public class LogisticsTurnover extends Model { this.isReceive = isReceive; } + public String getTurnoutWorkcenter() { + return turnoutWorkcenter; + } + + public void setTurnoutWorkcenter(String turnoutWorkcenter) { + this.turnoutWorkcenter = turnoutWorkcenter; + } + + public String getTurnoutItem() { + return turnoutItem; + } + + public void setTurnoutItem(String turnoutItem) { + this.turnoutItem = turnoutItem; + } + + public LocalDateTime getOther4() { + return other4; + } + + public void setOther4(LocalDateTime other4) { + this.other4 = other4; + } + + public String getOther5() { + return other5; + } + + public void setOther5(String other5) { + this.other5 = other5; + } + + public String getOther6() { + return other6; + } + + public void setOther6(String other6) { + this.other6 = other6; + } + public static final String HANDLE = "HANDLE"; public static final String SFC_DISPATCH_BO = "SFC_DISPATCH_BO"; @@ -221,6 +283,16 @@ public static final String COM_DATE_TIME = "COM_DATE_TIME"; public static final String IS_RECEIVE = "IS_RECEIVE"; +public static final String TURNOUT_WORKCENTER = "TURNOUT_WORKCENTER"; + +public static final String TURNOUT_ITEM = "TURNOUT_ITEM"; + +public static final String OTHER4 = "OTHER4"; + +public static final String OTHER5 = "OTHER5"; + +public static final String OTHER6 = "OTHER6"; + @Override protected Serializable pkVal() { @@ -243,6 +315,11 @@ public static final String IS_RECEIVE = "IS_RECEIVE"; ", turnoverWorkCenter = " + turnoverWorkCenter + ", comDateTime = " + comDateTime + ", isReceive = " + isReceive + + ", turnoutWorkcenter = " + turnoutWorkcenter + + ", turnoutItem = " + turnoutItem + + ", other4 = " + other4 + + ", other5 = " + other5 + + ", other6 = " + other6 + "}"; } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NwaUser.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NwaUser.java index 98efd105..bfbd952f 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NwaUser.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NwaUser.java @@ -66,6 +66,7 @@ public class NwaUser extends Model { private String email; + public String getHandle() { return handle; } 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 df536799..370d4b72 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 @@ -14,7 +14,7 @@ import java.util.List; *

* * @author YANG.WL - * @since 2022-07-27 + * @since 2022-08-08 */ public interface LogisticsTurnoverService extends IService { @@ -27,10 +27,12 @@ public interface LogisticsTurnoverService extends IService { List selectList(LogisticsTurnover logisticsTurnover); - List queryLogisticsTurnoverList(LogisticsDto logisticsDto); - //根据派工单查最新的转运表数据 + List queryLogisticsTurnoverList(String HJHJ,String HJXL,String JJ,String WX); + LogisticsTurnover queryNewtistTurnoverTask(String InspectionTaskNo); + IPage selectLogisticsDtoPage(FrontPage frontPage, LogisticsDto logisticsDto); + List selectlogisticsturnoverlist(LogisticsDto logisticsDto); } \ 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 15d290f0..8b0dc96a 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 @@ -19,7 +19,7 @@ import java.util.List; *

* * @author YANG.WL - * @since 2022-07-27 + * @since 2022-08-08 */ @Service @Transactional(rollbackFor = Exception.class) @@ -44,8 +44,8 @@ public class LogisticsTurnoverServiceImpl extends ServiceImpl queryLogisticsTurnoverList(LogisticsDto logisticsDto) { - return logisticsTurnoverMapper.queryLogisticsTurnoverList(logisticsDto); + public List queryLogisticsTurnoverList(String HJHJ,String HJXL,String JJ,String WX) { + return logisticsTurnoverMapper.queryLogisticsTurnoverList(HJHJ,HJXL,JJ,WX); } @Override @@ -53,5 +53,15 @@ public class LogisticsTurnoverServiceImpl extends ServiceImpl selectLogisticsDtoPage(FrontPage frontPage, LogisticsDto logisticsDto) { + return logisticsTurnoverMapper.selectLogisticsDtoPage(frontPage,logisticsDto); + } + + @Override + public List selectlogisticsturnoverlist(LogisticsDto logisticsDto) { + return logisticsTurnoverMapper.selectlogisticsturnoverlist(logisticsDto); + } + } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml b/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml index 872a170c..be390040 100644 --- a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml +++ b/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml @@ -4,7 +4,7 @@ - + @@ -17,14 +17,33 @@ + + + + + + + + + + + + + + + + - HANDLE, SFC_DISPATCH_BO, STATUS, CREATED_DATE_TIME, USER, USER_NAME, OTHER1, OTHER2, OTHER3, STORAGE_LOCATION, TURNOVER_WORK_CENTER, COM_DATE_TIME, IS_RECEIVE + HANDLE, SFC_DISPATCH_BO, STATUS, CREATED_DATE_TIME, USER, USER_NAME, OTHER1, OTHER2, OTHER3, STORAGE_LOCATION, TURNOVER_WORK_CENTER, COM_DATE_TIME, IS_RECEIVE, TURNOUT_WORKCENTER, TURNOUT_ITEM, OTHER4, OTHER5, OTHER6 + + @@ -82,6 +112,11 @@ AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} AND COM_DATE_TIME=#{ew.entity.comDateTime} AND IS_RECEIVE=#{ew.entity.isReceive} + AND TURNOUT_WORKCENTER=#{ew.entity.turnoutWorkcenter} + AND TURNOUT_ITEM=#{ew.entity.turnoutItem} + AND OTHER4=#{ew.entity.other4} + AND OTHER5=#{ew.entity.other5} + AND OTHER6=#{ew.entity.other6} ${ew.sqlSegment} @@ -113,6 +148,11 @@ AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} AND COM_DATE_TIME=#{ew.entity.comDateTime} AND IS_RECEIVE=#{ew.entity.isReceive} + AND TURNOUT_WORKCENTER=#{ew.entity.turnoutWorkcenter} + AND TURNOUT_ITEM=#{ew.entity.turnoutItem} + AND OTHER4=#{ew.entity.other4} + AND OTHER5=#{ew.entity.other5} + AND OTHER6=#{ew.entity.other6} ${ew.sqlSegment} @@ -144,6 +184,11 @@ AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} AND COM_DATE_TIME=#{ew.entity.comDateTime} AND IS_RECEIVE=#{ew.entity.isReceive} + AND TURNOUT_WORKCENTER=#{ew.entity.turnoutWorkcenter} + AND TURNOUT_ITEM=#{ew.entity.turnoutItem} + AND OTHER4=#{ew.entity.other4} + AND OTHER5=#{ew.entity.other5} + AND OTHER6=#{ew.entity.other6} ${ew.sqlSegment} @@ -175,6 +220,11 @@ AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} AND COM_DATE_TIME=#{ew.entity.comDateTime} AND IS_RECEIVE=#{ew.entity.isReceive} + AND TURNOUT_WORKCENTER=#{ew.entity.turnoutWorkcenter} + AND TURNOUT_ITEM=#{ew.entity.turnoutItem} + AND OTHER4=#{ew.entity.other4} + AND OTHER5=#{ew.entity.other5} + AND OTHER6=#{ew.entity.other6} ${ew.sqlSegment} @@ -186,8 +236,24 @@ + + ZLT.HANDLE + WCT.DESCRIPTION NEXT_WORK_CENTER, + ZSD.SFC, + C1.VALUE WORK_ORDER, + IT.DESCRIPTION ITEM_DESCRIPTION, + ZSD.BLANKING_SIZE, + ZSD.DISPATCH_QTY, + OT1.DESCRIPTION OVER_OPERATION, + OT.DESCRIPTION NEXT_OPERATION, + ZSD.EMPLOYEE_DESCRIPTION, + ZLT.TURNOVER_WORK_CENTER, + ZLT.CREATED_DATE_TIME + + @@ -421,7 +577,9 @@ ZSD.DISPATCH_QTY, OT1.DESCRIPTION OVER_OPERATION, OT.DESCRIPTION NEXT_OPERATION, - ZSD.EMPLOYEE_DESCRIPTION + ZSD.EMPLOYEE_DESCRIPTION, + ZLT.TURNOVER_WORK_CENTER, + ZLT.CREATED_DATE_TIME FROM Z_LOGISTICS_TURNOVER ZLT LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZLT.TURNOVER_WORK_CENTER @@ -444,7 +602,133 @@ LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh' WHERE ZLT.STATUS = 'NEW' - + AND ZLT.TURNOUT_ITEM like '02%' AND ZLT.TURNOUT_WORKCENTER = 'HJ' + AND ZLT.TURNOUT_ITEM like '03%' AND ZLT.TURNOUT_WORKCENTER = 'HJ' + AND ZLT.TURNOUT_WORKCENTER = 'JJ' + AND ZLT.TURNOUT_WORKCENTER = 'WX' + GROUP BY WCT.DESCRIPTION, + ZSD.SFC, + C1.VALUE, + IT.DESCRIPTION, + ZSD.BLANKING_SIZE, + ZSD.DISPATCH_QTY, + OT1.DESCRIPTION, + OT.DESCRIPTION, + ZSD.EMPLOYEE_DESCRIPTION, + ZLT.TURNOVER_WORK_CENTER, + ZLT.CREATED_DATE_TIME + ORDER BY ZLT.CREATED_DATE_TIME DESC + + + WCT.DESCRIPTION NEXT_WORK_CENTER, + ZSD.SFC, + C1.VALUE WORK_ORDER, + IT.DESCRIPTION ITEM_DESCRIPTION, + ZSD.BLANKING_SIZE, + ZSD.DISPATCH_QTY, + OT1.DESCRIPTION OVER_OPERATION, + OT.DESCRIPTION NEXT_OPERATION, + ZSD.EMPLOYEE_DESCRIPTION, + ZLT.TURNOVER_WORK_CENTER, + ZLT.CREATED_DATE_TIME + + + 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 53ee8d93..4df02f03 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 @@ -463,6 +463,30 @@ public class PodTemplateServiceImpl implements PodTemplateService { //更改派工单状态 sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.COMPLETE.getCode(),workHour); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(SfcDispatch.SFC,sfcDispatchById.getSfc()); + 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())); + } + /** * 判断是否为返修工序、返修工序不报工 */ @@ -486,6 +510,8 @@ public class PodTemplateServiceImpl implements PodTemplateService { integrationLogService.saveIntegrationLog(log); } + + //报工 if (enabled&&falg){ SfcDispatchDto sfcdispatch = new SfcDispatchDto(); 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 66dcb032..d9fc8c66 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 @@ -234,9 +234,30 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ logisticsTurnover.setOther2(inspectionTaskModel.getStepId()); logisticsTurnover.setOther3(inspectionTaskModel.getHandle()); logisticsTurnover.setTurnoverWorkCenter(sfcDispatch.getWorkCenter()); + logisticsTurnover.setTurnoutItem(inspectionTaskManage.getItem()); + logisticsTurnover.setTurnoutWorkcenter(inspectionTaskManage.getWorkCenter()); logisticsTurnoverService.save(logisticsTurnover); } + else { + //判断此工序是否需要转入半成品库位 + if (Constants.RK.equals(sfcDispatchById.getOther2())){ + LogisticsTurnover logisticsTurnover=new LogisticsTurnover(); + logisticsTurnover.setHandle("LogisticsBO:1000"+","+UUID.randomUUID().toString()); + logisticsTurnover.setSfcDispatchBo(inspectionTaskModel.getSfcDispatchBo()); + logisticsTurnover.setStatus(Constants.LOGISTICS_NEW); + logisticsTurnover.setCreatedDateTime(LocalDateTime.now()); + logisticsTurnover.setOther1(sfcDispatchById.getOperation()); + logisticsTurnover.setOther2(inspectionTaskModel.getStepId()); + logisticsTurnover.setOther3(inspectionTaskModel.getHandle()); + logisticsTurnover.setTurnoverWorkCenter(sfcDispatchById.getWorkCenter()); + logisticsTurnover.setTurnoutItem(inspectionTaskManage.getItem()); + logisticsTurnover.setTurnoutWorkcenter(inspectionTaskManage.getWorkCenter()); + logisticsTurnoverService.save(logisticsTurnover); + } + + + } }