diff --git a/production/src/main/java/com/foreverwin/mesnac/production/mapper/WorkShopTransferMapper.java b/production/src/main/java/com/foreverwin/mesnac/production/mapper/WorkShopTransferMapper.java index b1ca2d8b..e6d8f33c 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/mapper/WorkShopTransferMapper.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/mapper/WorkShopTransferMapper.java @@ -20,7 +20,7 @@ import java.util.List; @Repository public interface WorkShopTransferMapper extends BaseMapper { - List getOutList(@Param("site") String site, @Param("workCenter") String workCenter, @Param("transferWorkCenter") String transferWorkCenter, @Param("operation") String operation, @Param("status") String status, @Param("sfc") String sfc, @Param("stepId")String stepId); + List getOutList(@Param("site") String site, @Param("workCenter") String workCenter, @Param("transferWorkCenter") String transferWorkCenter, @Param("operation") String operation, @Param("operationDescription") String operationDescription,@Param("status") String status, @Param("sfc") String sfc, @Param("stepId")String stepId); WorkShopTransferDto getSfcData(@Param("site") String site,@Param("sfc") String sfc); diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/WorkShopTransferServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/WorkShopTransferServiceImpl.java index 663dc732..ee3ce1bd 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/WorkShopTransferServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/WorkShopTransferServiceImpl.java @@ -159,7 +159,7 @@ public class WorkShopTransferServiceImpl extends ServiceImpl list = workShopTransferMapper.getOutList(site, null, null, null, null, sfc,stepId); + List list = workShopTransferMapper.getOutList(site, null, null, null, null,null, sfc,stepId); WorkShopTransferDto transferDto = list.get(0); WorkShopTransfer transferLog = new WorkShopTransfer(); transferLog.setHandle(UUID.randomUUID().toString()); @@ -270,7 +270,7 @@ public class WorkShopTransferServiceImpl extends ServiceImpl getInList(WorkShopTransferDto workShopTransferDto) { diff --git a/production/src/main/resources/mapper/WorkShopTransferMapper.xml b/production/src/main/resources/mapper/WorkShopTransferMapper.xml index 8aa2a3ed..61d8dee8 100644 --- a/production/src/main/resources/mapper/WorkShopTransferMapper.xml +++ b/production/src/main/resources/mapper/WorkShopTransferMapper.xml @@ -631,7 +631,9 @@