From 79b339893e26c2bd9dc29e4f5213b7fb682b4b51 Mon Sep 17 00:00:00 2001 From: yangwl <1726150332@qq.com> Date: Fri, 5 Aug 2022 11:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=91=A8=E8=BD=AC=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E3=80=81=E6=9F=A5=E7=9C=8B=E5=B7=A5=E8=89=BA=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AbnormalBillServiceImpl.java | 2 + .../common/controller/FileController.java | 44 +++-- .../common/ftp/WorkmanshipCardFtpClient.java | 9 +- .../service/SfcDispatchCommonService.java | 2 + .../dispatch/mapper/SfcDispatchMapper.java | 2 + .../service/impl/SfcDispatchServiceImpl.java | 5 + .../resources/mapper/SfcDispatchMapper.xml | 11 ++ .../LogisticsTurnoverController.java | 45 ++++- .../mesnac/meapi/dto/LogisticsDto.java | 13 +- .../meapi/mapper/LogisticsTurnoverMapper.java | 2 + .../mesnac/meapi/mapper/SfcMapper.java | 1 + .../mesnac/meapi/model/LogisticsTurnover.java | 46 ++++- .../service/LogisticsTurnoverService.java | 5 + .../mesnac/meapi/service/SfcService.java | 1 + .../impl/LogisticsTurnoverServiceImpl.java | 5 + .../meapi/service/impl/SfcServiceImpl.java | 5 + .../mapper/LogisticsTurnoverMapper.xml | 164 +++++++++--------- meapi/src/main/resources/mapper/SfcMapper.xml | 10 ++ .../controller/PodTemplateController.java | 32 +++- .../service/PodTemplateService.java | 7 + .../service/impl/PodTemplateServiceImpl.java | 52 +++++- .../impl/InspectionTaskManageServiceImpl.java | 5 +- 22 files changed, 344 insertions(+), 124 deletions(-) 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 f5f49d27..1960cee8 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 @@ -912,6 +912,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl { * @param splitQty */ void updateSfcDispatchQty(@Param("site") String site, @Param("sfc") String sfc, @Param("currentSeq") int currentSeq, @Param("splitQty") Float splitQty); + + SfcDispatchDto findNewtistSfcDispatchBySfc(String sfc); } \ No newline at end of file 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 f55aad76..4f6504ce 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 @@ -822,6 +822,11 @@ public class SfcDispatchServiceImpl extends ServiceImpl>> processWorkCenterWorkTimes(String site, Set workCenterList, Date startDate, Date endDate) { // 设备对应的工作中心 diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index e481da0d..82e09872 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -810,6 +810,9 @@ SD.RESRCE LEFT JOIN WORK_CENTER WR ON WR.HANDLE = WCM.WORK_CENTER_BO WHERE SD.SITE = #{site} + + AND SD.HANDLE = #{HANDLE} + AND SD.OPERATION LIKE #{workCenter}||'%' @@ -963,6 +966,14 @@ AND ACTUAL_COMPLETE_DATE IS NOT NULL AND ROWNUM=1 ORDER BY ACTUAL_COMPLETE_DATE DESC + 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 605bd3b8..f28f9e28 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 @@ -1,9 +1,13 @@ 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.model.LogisticsBill; +import com.foreverwin.mesnac.meapi.service.LogisticsBillService; 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; @@ -12,13 +16,16 @@ import org.springframework.web.bind.annotation.*; import com.foreverwin.mesnac.meapi.service.LogisticsTurnoverService; import com.foreverwin.mesnac.meapi.model.LogisticsTurnover; + +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import java.util.Optional; /** * * @author YANG.WL - * @since 2022-07-27 + * @since 2022-08-04 */ @RestController @RequestMapping("/Z-LOGISTICS-TURNOVER") @@ -26,6 +33,8 @@ public class LogisticsTurnoverController { @Autowired public LogisticsTurnoverService logisticsTurnoverService; + @Autowired + public LogisticsBillService logisticsBillService; /** * 根据id查询 @@ -69,6 +78,7 @@ public class LogisticsTurnoverController { return Optional.ofNullable(result) .map(t -> JSONObject.toJSONString(t)).orElse("null"); } + /** * 分页查询数据 * @@ -94,6 +104,7 @@ public class LogisticsTurnoverController { .or().like(LogisticsTurnover::getOther3, frontPage.getGlobalQuery()) .or().like(LogisticsTurnover::getStorageLocation, frontPage.getGlobalQuery()) .or().like(LogisticsTurnover::getTurnoverWorkCenter, frontPage.getGlobalQuery()) + .or().like(LogisticsTurnover::getIsReceive, frontPage.getGlobalQuery()) ); } result = logisticsTurnoverService.page(frontPage.getPagePlus(), queryWrapper); @@ -141,4 +152,36 @@ public class LogisticsTurnoverController { public R removeByIds(List ids){ return R.ok(logisticsTurnoverService.removeByIds(ids)); } + + /** + * 批量修改对象 + * @param list 实体集合ID + * @return 0 失败 1 成功 + */ + @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) { + logisticsTurnover.setHandle(logisticsDto.getHandle()); + logisticsTurnover.setStatus("COM"); + logisticsTurnover.setStorageLocation(location); + logisticsTurnover.setComDateTime(LocalDateTime.now()); + logisticsTurnover.setIsReceive("N"); + logisticsTurnoverList.add(logisticsTurnover); + logisticsBill.setComTime(LocalDateTime.now()); + logisticsBill.setLogisticsBillNo(transportno); + logisticsBill.setLogisticsBo(logisticsDto.getHandle()); + logisticsBillService.save(logisticsBill); + } + return R.ok(logisticsTurnoverService.updateById(logisticsTurnover)); + }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 752f1af3..f23997c5 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 @@ -1,6 +1,16 @@ package com.foreverwin.mesnac.meapi.dto; public class LogisticsDto { + private String handle; + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + private String nextWorkCenter; private String sfc; private String workOrder; @@ -86,7 +96,8 @@ public class LogisticsDto { @Override public String toString() { return "LogisticsDto{" + - "nextWorkCenter='" + nextWorkCenter + '\'' + + "handle='" + handle + '\'' + + ", nextWorkCenter='" + nextWorkCenter + '\'' + ", sfc='" + sfc + '\'' + ", workOrder='" + workOrder + '\'' + ", itemDescription='" + itemDescription + '\'' + 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 d0ea6822..cd49aedb 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 @@ -19,4 +19,6 @@ import java.util.List; public interface LogisticsTurnoverMapper extends BaseMapper { List queryLogisticsTurnoverList(LogisticsDto logisticsDto); + + LogisticsTurnover queryNewtistTurnoverTask(String InspectionTaskNo); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java index b3ca5138..abd5dc31 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java @@ -36,4 +36,5 @@ public interface SfcMapper extends BaseMapper { String findSfcByResrce(@Param("site")String site,@Param("resource")String resource,@Param("sfc")Sfc sfc); + String findInspectionTask_sfcdispatch_no(String sfc); } \ 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 f9c22fe8..fb9f8bb8 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,7 +4,6 @@ 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; @@ -16,7 +15,7 @@ import com.baomidou.mybatisplus.annotation.IdType; *

* * @author YANG.WL - * @since 2022-07-27 + * @since 2022-08-04 */ @TableName("Z_LOGISTICS_TURNOVER") @@ -28,7 +27,7 @@ public class LogisticsTurnover extends Model { /** * 主键 */ - @TableId(value = "HANDLE", type = IdType.INPUT) + @TableField("HANDLE") private String handle; /** * 派工单主键 @@ -55,10 +54,19 @@ public class LogisticsTurnover extends Model { */ @TableField("USER_NAME") private String userName; + /** + * 下道工序 + */ @TableField("OTHER1") private String other1; + /** + * 步骤 + */ @TableField("OTHER2") private String other2; + /** + * 检验任务主键 + */ @TableField("OTHER3") private String other3; /** @@ -71,6 +79,16 @@ public class LogisticsTurnover extends Model { */ @TableField("TURNOVER_WORK_CENTER") private String turnoverWorkCenter; + /** + * 转运完成时间 + */ + @TableField("COM_DATE_TIME") + private LocalDateTime comDateTime; + /** + * 车间是否接收Y/接收N/未接收 + */ + @TableField("IS_RECEIVE") + private String isReceive; public String getHandle() { @@ -161,6 +179,22 @@ public class LogisticsTurnover extends Model { this.turnoverWorkCenter = turnoverWorkCenter; } + public LocalDateTime getComDateTime() { + return comDateTime; + } + + public void setComDateTime(LocalDateTime comDateTime) { + this.comDateTime = comDateTime; + } + + public String getIsReceive() { + return isReceive; + } + + public void setIsReceive(String isReceive) { + this.isReceive = isReceive; + } + public static final String HANDLE = "HANDLE"; public static final String SFC_DISPATCH_BO = "SFC_DISPATCH_BO"; @@ -183,6 +217,10 @@ public static final String STORAGE_LOCATION = "STORAGE_LOCATION"; public static final String TURNOVER_WORK_CENTER = "TURNOVER_WORK_CENTER"; +public static final String COM_DATE_TIME = "COM_DATE_TIME"; + +public static final String IS_RECEIVE = "IS_RECEIVE"; + @Override protected Serializable pkVal() { @@ -203,6 +241,8 @@ public static final String TURNOVER_WORK_CENTER = "TURNOVER_WORK_CENTER"; ", other3 = " + other3 + ", storageLocation = " + storageLocation + ", turnoverWorkCenter = " + turnoverWorkCenter + + ", comDateTime = " + comDateTime + + ", isReceive = " + isReceive + "}"; } } \ 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 0abb6e92..df536799 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,4 +28,9 @@ public interface LogisticsTurnoverService extends IService { List selectList(LogisticsTurnover logisticsTurnover); List queryLogisticsTurnoverList(LogisticsDto logisticsDto); + + //根据派工单查最新的转运表数据 + LogisticsTurnover queryNewtistTurnoverTask(String InspectionTaskNo); + + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java index e85c3a75..3adfdfd0 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java @@ -56,4 +56,5 @@ public interface SfcService extends IService { List findSfcByResrce(String resource,Sfc sfc); + String findInspectionTask_sfcdispatch_no(String sfc); } \ 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 90a9ec82..15d290f0 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 @@ -48,5 +48,10 @@ public class LogisticsTurnoverServiceImpl extends ServiceImpl implements SfcSe sfcMapper.findSfcByResrce(site,resource,sfc); return null; } + + @Override + public String findInspectionTask_sfcdispatch_no(String sfc) { + return sfcMapper.findInspectionTask_sfcdispatch_no(sfc); + } } \ 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 dbb34680..872a170c 100644 --- a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml +++ b/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml @@ -4,7 +4,7 @@ - + @@ -15,22 +15,16 @@ - - - - - + + - HANDLE, SFC_DISPATCH_BO, STATUS, CREATED_DATE_TIME, USER, USER_NAME, OTHER1, OTHER2, OTHER3, STORAGE_LOCATION, TURNOVER_WORK_CENTER + HANDLE, SFC_DISPATCH_BO, STATUS, CREATED_DATE_TIME, USER, USER_NAME, OTHER1, OTHER2, OTHER3, STORAGE_LOCATION, TURNOVER_WORK_CENTER, COM_DATE_TIME, IS_RECEIVE - - @@ -90,6 +80,8 @@ AND OTHER3=#{ew.entity.other3} AND STORAGE_LOCATION=#{ew.entity.storageLocation} AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} + AND COM_DATE_TIME=#{ew.entity.comDateTime} + AND IS_RECEIVE=#{ew.entity.isReceive} ${ew.sqlSegment} @@ -119,6 +111,8 @@ AND OTHER3=#{ew.entity.other3} AND STORAGE_LOCATION=#{ew.entity.storageLocation} AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} + AND COM_DATE_TIME=#{ew.entity.comDateTime} + AND IS_RECEIVE=#{ew.entity.isReceive} ${ew.sqlSegment} @@ -148,6 +142,8 @@ AND OTHER3=#{ew.entity.other3} AND STORAGE_LOCATION=#{ew.entity.storageLocation} AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} + AND COM_DATE_TIME=#{ew.entity.comDateTime} + AND IS_RECEIVE=#{ew.entity.isReceive} ${ew.sqlSegment} @@ -177,6 +173,8 @@ AND OTHER3=#{ew.entity.other3} AND STORAGE_LOCATION=#{ew.entity.storageLocation} AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} + AND COM_DATE_TIME=#{ew.entity.comDateTime} + AND IS_RECEIVE=#{ew.entity.isReceive} ${ew.sqlSegment} @@ -206,6 +204,8 @@ AND OTHER3=#{ew.entity.other3} AND STORAGE_LOCATION=#{ew.entity.storageLocation} AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} + AND COM_DATE_TIME=#{ew.entity.comDateTime} + AND IS_RECEIVE=#{ew.entity.isReceive} ${ew.sqlSegment} @@ -235,6 +235,8 @@ AND OTHER3=#{ew.entity.other3} AND STORAGE_LOCATION=#{ew.entity.storageLocation} AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} + AND COM_DATE_TIME=#{ew.entity.comDateTime} + AND IS_RECEIVE=#{ew.entity.isReceive} ${ew.sqlSegment} @@ -245,39 +247,6 @@ ${ew.sqlSegment} - INSERT INTO Z_LOGISTICS_TURNOVER @@ -293,6 +262,8 @@ OTHER3, STORAGE_LOCATION, TURNOVER_WORK_CENTER, + COM_DATE_TIME, + IS_RECEIVE, VALUES #{handle}, @@ -306,6 +277,8 @@ #{other3}, #{storageLocation}, #{turnoverWorkCenter}, + #{comDateTime}, + #{isReceive}, @@ -326,44 +299,19 @@ #{other3}, #{storageLocation}, #{turnoverWorkCenter}, + #{comDateTime}, + #{isReceive}, - - UPDATE Z_LOGISTICS_TURNOVER - SFC_DISPATCH_BO=#{et.sfcDispatchBo}, - STATUS=#{et.status}, - CREATED_DATE_TIME=#{et.createdDateTime}, - USER=#{et.user}, - USER_NAME=#{et.userName}, - OTHER1=#{et.other1}, - OTHER2=#{et.other2}, - OTHER3=#{et.other3}, - STORAGE_LOCATION=#{et.storageLocation}, - TURNOVER_WORK_CENTER=#{et.turnoverWorkCenter}, - WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} - - - UPDATE Z_LOGISTICS_TURNOVER - SFC_DISPATCH_BO=#{et.sfcDispatchBo}, - STATUS=#{et.status}, - CREATED_DATE_TIME=#{et.createdDateTime}, - USER=#{et.user}, - USER_NAME=#{et.userName}, - OTHER1=#{et.other1}, - OTHER2=#{et.other2}, - OTHER3=#{et.other3}, - STORAGE_LOCATION=#{et.storageLocation}, - TURNOVER_WORK_CENTER=#{et.turnoverWorkCenter}, - WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} - UPDATE Z_LOGISTICS_TURNOVER + HANDLE=#{et.handle}, SFC_DISPATCH_BO=#{et.sfcDispatchBo}, STATUS=#{et.status}, CREATED_DATE_TIME=#{et.createdDateTime}, @@ -374,6 +322,8 @@ OTHER3=#{et.other3}, STORAGE_LOCATION=#{et.storageLocation}, TURNOVER_WORK_CENTER=#{et.turnoverWorkCenter}, + COM_DATE_TIME=#{et.comDateTime}, + IS_RECEIVE=#{et.isReceive}, @@ -389,6 +339,8 @@ AND OTHER3=#{ew.entity.other3} AND STORAGE_LOCATION=#{ew.entity.storageLocation} AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} + AND COM_DATE_TIME=#{ew.entity.comDateTime} + AND IS_RECEIVE=#{ew.entity.isReceive} ${ew.sqlSegment} @@ -400,9 +352,6 @@ - - DELETE FROM Z_LOGISTICS_TURNOVER WHERE HANDLE=#{handle} - DELETE FROM Z_LOGISTICS_TURNOVER @@ -435,6 +384,8 @@ AND OTHER3=#{ew.entity.other3} AND STORAGE_LOCATION=#{ew.entity.storageLocation} AND TURNOVER_WORK_CENTER=#{ew.entity.turnoverWorkCenter} + AND COM_DATE_TIME=#{ew.entity.comDateTime} + AND IS_RECEIVE=#{ew.entity.isReceive} ${ew.sqlSegment} @@ -446,11 +397,54 @@ - - DELETE FROM Z_LOGISTICS_TURNOVER WHERE HANDLE IN ( - #{item} - ) - + + + + diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 92323b79..7c3b8bd8 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -726,5 +726,15 @@ + diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java b/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java index 625ff144..f28c50be 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java @@ -1,11 +1,18 @@ package com.foreverwin.mesnac.production.controller; +import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import com.foreverwin.mesnac.common.dto.SfcDispatchDto; +import com.foreverwin.mesnac.common.model.InspectionTask; import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.mesnac.meapi.dto.LogisticsDto; import com.foreverwin.mesnac.meapi.dto.SfcDto; import com.foreverwin.mesnac.meapi.dto.WorkCenterDto; +import com.foreverwin.mesnac.meapi.enums.HandleEnum; +import com.foreverwin.mesnac.meapi.model.Router; import com.foreverwin.mesnac.meapi.model.Sfc; +import com.foreverwin.mesnac.meapi.service.RouterService; import com.foreverwin.mesnac.production.service.PodTemplateService; import com.foreverwin.modular.core.exception.BaseException; import com.foreverwin.modular.core.util.R; @@ -13,9 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; @Controller @RequestMapping("/sfcDataMains") @@ -23,6 +28,8 @@ public class PodTemplateController { @Autowired public PodTemplateService podTemplateService; + @Autowired + private RouterService routerService; /** * 资源回车 @@ -53,11 +60,20 @@ public class PodTemplateController { */ @ResponseBody @GetMapping("/Androidsfc") - public R Androidsfc(@RequestParam("sfc") String sfc,@RequestParam("site")String site) { - SfcDto sfcDto=new SfcDto(); - sfcDto.setSfc(sfc); - sfcDto.setSite(site); - return R.ok(podTemplateService.sfcEnter(sfcDto)); + public String Androidsfc(@RequestParam("sfc") String sfc, @RequestParam("site")String site) { + + + + //通过SFC+StepID获取检验信息 + + + LogisticsDto result; + Map paramMap=new HashMap(); + paramMap.put("site",site); + paramMap.put("sfc",sfc); + result=podTemplateService.Scansfc(paramMap); + return Optional.ofNullable(result) + .map(t -> JSONObject.toJSONString(t)).orElse("null"); } diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java b/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java index 5f7974ea..518067f8 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java @@ -1,10 +1,13 @@ package com.foreverwin.mesnac.production.service; +import com.foreverwin.mesnac.common.dto.SfcDispatchDto; +import com.foreverwin.mesnac.meapi.dto.LogisticsDto; import com.foreverwin.mesnac.meapi.dto.SfcDto; import com.foreverwin.mesnac.meapi.dto.WorkCenterDto; import com.foreverwin.mesnac.meapi.model.Sfc; import java.math.BigDecimal; +import java.util.List; import java.util.Map; public interface PodTemplateService { @@ -12,6 +15,7 @@ public interface PodTemplateService { Map sfcEnter(SfcDto workCenterDto); + Object getSfcInfo(SfcDto sfcDto); void sfcStart(Map map); @@ -22,4 +26,7 @@ public interface PodTemplateService { SfcDto getInfoBySfc(Sfc sfc); + LogisticsDto Scansfc(Map paramMap); + + // Map Scansfc(SfcDto sfcDto); } 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 67aa763f..53ee8d93 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 @@ -21,15 +21,13 @@ import com.foreverwin.mesnac.common.service.*; import com.foreverwin.mesnac.common.util.ERPAPI; import com.foreverwin.mesnac.common.util.ExceptionUtil; import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.mesnac.dispatch.mapper.SfcDispatchMapper; import com.foreverwin.mesnac.dispatch.model.SfcDispatch; import com.foreverwin.mesnac.dispatch.model.UserResource; import com.foreverwin.mesnac.dispatch.service.SfcDispatchService; import com.foreverwin.mesnac.dispatch.service.UserResourceService; -import com.foreverwin.mesnac.meapi.dto.BomComponentDto; -import com.foreverwin.mesnac.meapi.dto.RouterStepDto; -import com.foreverwin.mesnac.meapi.dto.SfcDto; -import com.foreverwin.mesnac.meapi.dto.WorkCenterDto; +import com.foreverwin.mesnac.meapi.dto.*; import com.foreverwin.mesnac.meapi.mapper.ResrceMapper; import com.foreverwin.mesnac.meapi.model.*; import com.foreverwin.mesnac.meapi.service.*; @@ -117,6 +115,12 @@ public class PodTemplateServiceImpl implements PodTemplateService { @Autowired private RouterStepService routerStepService; + @Autowired + private SfcDispatchMapper sfcDispatchMapper; + + @Autowired + public LogisticsTurnoverService logisticsTurnoverService; + @Override @@ -673,4 +677,44 @@ public class PodTemplateServiceImpl implements PodTemplateService { sfc.setSite(site); return sfcCrossMapper.getInfoBySfc(sfc); } + + @Override + public LogisticsDto Scansfc(Map paramMap) { + String sfc = (String) paramMap.get("sfc"); + String site = (String) paramMap.get("site"); + + + + //校验产品条码是否存在 + Sfc sfcById = sfcService.getById(HandleEnum.SFC.getHandle(site, sfc)); + if (sfcById == null) { + throw new BaseException("产品条码" + sfc + "不存在"); + } + + //当前工序 + SfcDispatchDto dispatchDto=sfcDispatchCommonService.findNewtistSfcDispatchBySfc(sfc); + + + Operation operationBySfcBo = commonService.getOperationBySfcBo(sfcById.getHandle()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + + InspectionTask inspectionTask=new InspectionTask(); + inspectionTask.setSfc(sfc); + inspectionTask.setStepId(dispatchDto.getStepId()); + queryWrapper.setEntity(inspectionTask); + InspectionTask inspectionTaskServiceOne=inspectionTaskService.getOne(queryWrapper); + paramMap.put("HANDLE",inspectionTaskServiceOne.getSfcDispatchBo()); + LogisticsDto logisticsDto=new LogisticsDto(); + + List list = sfcDispatchMapper.findSfcDispatchList(paramMap); + LogisticsTurnover logisticsTurnover=logisticsTurnoverService.queryNewtistTurnoverTask(inspectionTaskServiceOne.getHandle()); + if (!list.isEmpty()){ + logisticsDto.setHandle(logisticsTurnover.getHandle()); + logisticsDto.setItemDescription(list.get(0).getItemDescription()); + logisticsDto.setSfc(sfc); + logisticsDto.setNextWorkCenter(logisticsTurnover.getTurnoverWorkCenter()); + } + //转运任务 + return logisticsDto; + } } 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 e3151a54..66dcb032 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 @@ -213,6 +213,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ * 2、根据派工表里的派工序号查找下道工序 * 3、如果两个工作中心不一样，就会生成转运待办任务 */ + SfcDispatch sfcDispatchById = sfcDispatchService.getById(inspectionTaskManage.getSfcdispatchBo()); QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -226,10 +227,12 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ //生成周转任务的同时发送消息提示到手持设备 LogisticsTurnover logisticsTurnover=new LogisticsTurnover(); logisticsTurnover.setHandle("LogisticsBO:1000"+","+UUID.randomUUID().toString()); - logisticsTurnover.setSfcDispatchBo(sfcDispatchById.getHandle()); + logisticsTurnover.setSfcDispatchBo(inspectionTaskModel.getSfcDispatchBo()); logisticsTurnover.setStatus(Constants.LOGISTICS_NEW); logisticsTurnover.setCreatedDateTime(LocalDateTime.now()); logisticsTurnover.setOther1(sfcDispatch.getOperation()); + logisticsTurnover.setOther2(inspectionTaskModel.getStepId()); + logisticsTurnover.setOther3(inspectionTaskModel.getHandle()); logisticsTurnover.setTurnoverWorkCenter(sfcDispatch.getWorkCenter()); logisticsTurnoverService.save(logisticsTurnover);