|
|
|
@ -2,7 +2,6 @@ package com.foreverwin.mesnac.production.service.impl;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import com.foreverwin.mesnac.common.enums.DispatchStatusEnum;
|
|
|
|
|
import com.foreverwin.mesnac.common.enums.HandleEnum;
|
|
|
|
|
import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
|
|
|
|
|
import com.foreverwin.mesnac.common.util.DateUtil;
|
|
|
|
@ -29,7 +28,6 @@ import org.springframework.context.i18n.LocaleContextHolder;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.List;
|
|
|
|
@ -147,11 +145,11 @@ public class WorkShopTransferServiceImpl extends ServiceImpl<WorkShopTransferMap
|
|
|
|
|
String sfcBO = HandleEnum.SFC.getHandle(site, sfc);
|
|
|
|
|
if (StringUtil.notBlank(isOutSource) && isOutSource.equals("Y")) {
|
|
|
|
|
try {
|
|
|
|
|
Operation currentRevisionRef = operationService.getCurrentRevisionRef(site, dto.getOperation());
|
|
|
|
|
/*Operation currentRevisionRef = operationService.getCurrentRevisionRef(site, dto.getOperation());
|
|
|
|
|
sfcCrossService.startAction(site, currentRevisionRef.getHandle(), dto.getResrce(), sfcBO, dto.getQty());
|
|
|
|
|
//更改派工单状态
|
|
|
|
|
sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dto.getDispatchNo(), DispatchStatusEnum.START.getCode(),null);
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
ExceptionUtil.throwException(e);
|
|
|
|
|
}
|
|
|
|
@ -216,11 +214,11 @@ public class WorkShopTransferServiceImpl extends ServiceImpl<WorkShopTransferMap
|
|
|
|
|
if (StringUtil.notBlank(isOutSource) && isOutSource.equals("Y")) {
|
|
|
|
|
//转出开始
|
|
|
|
|
try {
|
|
|
|
|
//转入完成
|
|
|
|
|
/* //转入完成
|
|
|
|
|
sfcCrossService.completeAction(site, currentRevisionRef.getHandle(), dto.getResrce(), sfcBO, dto.getQty());
|
|
|
|
|
//更改派工单状态
|
|
|
|
|
sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dto.getDispatchNo(), DispatchStatusEnum.COMPLETE.getCode(), BigDecimal.ZERO);
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
ExceptionUtil.throwException(e);
|
|
|
|
|
}
|
|
|
|
|