Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

异常方案：返修、让步放行、配作

Browse Source
master
赵嘉伟 3 years ago
parent 1d11bd9602
commit 7143e5c15c
5 changed files with 167 additions and 17 deletions
Show Stats Download Patch File Download Diff File

10
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
import com.foreverwin.mesnac.anomaly.model.UploadPictures; import com.foreverwin.mesnac.anomaly.model.UploadPictures;
import com.foreverwin.mesnac.meapi.dto.SfcDto;
import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.FrontPage;
import java.util.HashMap; import java.util.HashMap;
@ -142,4 +143,13 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
IPage getAbnormalByConditionalPage(IPage page,Map paramMap,String keyword); IPage getAbnormalByConditionalPage(IPage page,Map paramMap,String keyword);
/**
* @param sfcDto 以下是传递的参数
* sfc
* abnormalNo
* qty
* stepId
* */
void batchRepair(SfcDto sfcDto);
} }

153
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
Unescape Escape View File

@ -18,6 +18,7 @@ import com.foreverwin.mesnac.common.dto.ScrapDto;
import com.foreverwin.mesnac.common.dto.SfcDispatchDto; import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
import com.foreverwin.mesnac.common.dto.UsrDto; import com.foreverwin.mesnac.common.dto.UsrDto;
import com.foreverwin.mesnac.common.enums.AnomalyConstant; import com.foreverwin.mesnac.common.enums.AnomalyConstant;
import com.foreverwin.mesnac.common.enums.DispatchStatusEnum;
import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.helper.NextNumberHelper; import com.foreverwin.mesnac.common.helper.NextNumberHelper;
import com.foreverwin.mesnac.common.mapper.MessageMapper; import com.foreverwin.mesnac.common.mapper.MessageMapper;
@ -26,26 +27,36 @@ import com.foreverwin.mesnac.common.model.Message;
import com.foreverwin.mesnac.common.service.*; import com.foreverwin.mesnac.common.service.*;
import com.foreverwin.mesnac.common.util.ActiveMQUtil; import com.foreverwin.mesnac.common.util.ActiveMQUtil;
import com.foreverwin.mesnac.common.util.DateUtil; import com.foreverwin.mesnac.common.util.DateUtil;
import com.foreverwin.mesnac.common.util.ExceptionUtil;
import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.listener.mapper.UsrMapper; import com.foreverwin.mesnac.listener.mapper.UsrMapper;
import com.foreverwin.mesnac.meapi.dto.NcCodeDto; import com.foreverwin.mesnac.meapi.dto.NcCodeDto;
import com.foreverwin.mesnac.meapi.dto.RouterStepDto;
import com.foreverwin.mesnac.meapi.dto.SfcDto;
import com.foreverwin.mesnac.meapi.mapper.*; import com.foreverwin.mesnac.meapi.mapper.*;
import com.foreverwin.mesnac.meapi.model.*; import com.foreverwin.mesnac.meapi.model.*;
import com.foreverwin.mesnac.meapi.service.*; import com.foreverwin.mesnac.meapi.service.*;
import com.foreverwin.mesnac.meapi.util.StringUtils; import com.foreverwin.mesnac.meapi.util.StringUtils;
import com.foreverwin.mesnac.production.dto.SplitSfcDto;
import com.foreverwin.mesnac.production.mapper.SplitSfcMapper;
import com.foreverwin.mesnac.production.model.SplitSfc; import com.foreverwin.mesnac.production.model.SplitSfc;
import com.foreverwin.mesnac.production.service.SplitSfcService; import com.foreverwin.mesnac.production.service.SplitSfcService;
import com.foreverwin.mesnac.quality.service.SelfReportService; import com.foreverwin.mesnac.quality.service.SelfReportService;
import com.foreverwin.modular.core.exception.BaseException; import com.foreverwin.modular.core.exception.BaseException;
import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.meext.MEServices;
import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.FrontPage;
import com.sap.me.nonconformance.*;
import com.sap.me.production.SplitSerializeServiceInterface;
import com.sap.me.production.SplitSfcRequest;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
@ -159,6 +170,15 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
@Autowired @Autowired
private UsrMapper usrMapper; private UsrMapper usrMapper;
@Autowired
private SplitSfcMapper splitSfcMapper;
@Autowired
private RouterStepService routerStepService;
@Autowired
private CommonService commonService;
@Override @Override
public IPage<AbnormalBill> selectPage(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill) { public IPage<AbnormalBill> selectPage(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill) {
@ -199,8 +219,17 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
String message = this.generateAbnormalBill(abnormalBill, abnormalBillDispose, dutyCauseType, dutyType); String message = this.generateAbnormalBill(abnormalBill, abnormalBillDispose, dutyCauseType, dutyType);
//获取当前时间 //获取当前时间
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String site = CommonMethods.getSite();
if(StringUtils.isBlank(abnormalBill.getStepId())){
throw new BaseException("根据SFC找不到StepId");
}
if(!StringUtils.isBlank(abnormalBill.getObjectBo())){
if("J".equals(abnormalBill.getReportFrom())){
abnormalBill.setObjectBo(HandleEnum.INSPECTION_TASK.getHandle(site,abnormalBill.getObjectBo()));
}else if("B".equals(abnormalBill.getReportFrom())){
abnormalBill.setObjectBo(HandleEnum.SELF_REPORT.getHandle(site,abnormalBill.getObjectBo()));
}
}
//生成不良代码和不良代码组,并把它放到hashMap里面，ncCode是存放在异常单里面的ncCode //生成不良代码和不良代码组,并把它放到hashMap里面，ncCode是存放在异常单里面的ncCode
List<String> ncCode = new ArrayList<>(); List<String> ncCode = new ArrayList<>();
List<String> ncGroup = new ArrayList<>(); List<String> ncGroup = new ArrayList<>();
@ -301,7 +330,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
* XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX * XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
*/ */
//发送消息 //发送消息
if(Constants.NEW.equals(abnormalBill.getStatus())){ if(Constants.NEW.equals(abnormalBill.getStatus())){
this.anomalyCreatedAndSendMessage(abnormalBill,null); this.anomalyCreatedAndSendMessage(abnormalBill,null);
@ -321,7 +349,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
List<WorkCenter> workCenterList = workCenterService.selectList(workCenter); List<WorkCenter> workCenterList = workCenterService.selectList(workCenter);
hashMap.put("workCenter",workCenterList); hashMap.put("workCenter",workCenterList);
/** /**
* 发现环节 * 发现环节
*/ */
@ -434,7 +461,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
String site = CommonMethods.getSite(); String site = CommonMethods.getSite();
String user = CommonMethods.getUser(); String user = CommonMethods.getUser();
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String locale = LocaleContextHolder.getLocale().getLanguage();
abnormalBillDispose.setHandle(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo())); abnormalBillDispose.setHandle(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()));
AbnormalBill abnormalBill1 = abnormalBillMapper.selectById(HandleEnum.ABNORMAL_BILL.getHandle(site, abnormalBill.getAbnormalNo())); AbnormalBill abnormalBill1 = abnormalBillMapper.selectById(HandleEnum.ABNORMAL_BILL.getHandle(site, abnormalBill.getAbnormalNo()));
@ -477,6 +503,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
abnormalBill.setStatus(Constants.PROGRAM_CONFIRM); abnormalBill.setStatus(Constants.PROGRAM_CONFIRM);
abnormalBill.setProgram("true"); abnormalBill.setProgram("true");
abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose); abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
this.saveOrUpdate(abnormalBill); this.saveOrUpdate(abnormalBill);
@ -486,6 +514,34 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
AbnormalBillDispose abnormalBillDispose1 = abnormalBillDisposeMapper.selectById(abnormalBillDispose.getHandle()); AbnormalBillDispose abnormalBillDispose1 = abnormalBillDisposeMapper.selectById(abnormalBillDispose.getHandle());
abnormalPlanService.saveAbnormalPlan(abnormalBill2,abnormalBillDispose1,now); abnormalPlanService.saveAbnormalPlan(abnormalBill2,abnormalBillDispose1,now);
} }
//判断该异常解决方案是否是让步放行、配作,如果是，就调用孙豪的方法
if(Constants.CONCESSION.equals(abnormalBillDispose.getAbnormalMethod()) ||
Constants.MATCH.equals(abnormalBillDispose.getAbnormalMethod())){
try{
this.creatInspectionTask(site,abnormalBill2.getObjectBo(),abnormalBill2.getSfc(),abnormalBill2.getStepId());
}catch (Exception e){
throw new BaseException("createInspectionTask方法报错,"+e.getMessage());
}
}else if(Constants.REPAIR.equals(abnormalBillDispose.getAbnormalMethod()) && StringUtil.isBlank(abnormalBillDispose.getResolveShopOrder())){
Sfc sfc = sfcMapper.selectById(HandleEnum.SFC.getHandle(site, abnormalBill2.getSfc()));
if(sfc.getQty() > Double.parseDouble(abnormalBill2.getNcQty())){
//跳过啥都不做
}else if(sfc.getQty() == Double.parseDouble(abnormalBill2.getNcQty())){
//整批返修、批量返修
SfcDto sfcDto = new SfcDto();
sfcDto.setSfc(sfc.getSfc());
sfcDto.setAbnormalNo(abnormalBill2.getAbnormalNo());
sfcDto.setQty(sfc.getQty());
Map map = sfcMapper.findOperationBySfc(site, sfc.getSfc());
if(StringUtils.isBlank((String)map.get("STEP_ID"))){
throw new BaseException("整批返修失败，根据该产品条码找不到STEP_ID");
}
sfcDto.setStepId((String) map.get("STEP_ID"));
this.batchRepair(sfcDto);
}
}
this.anomalyCreatedAndSendMessage(abnormalBill2,abnormalBillDispose); this.anomalyCreatedAndSendMessage(abnormalBill2,abnormalBillDispose);
} }
@ -586,7 +642,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
/** /**
* 取消异常提报的更新 * 取消异常提报的更新
*/ */
//更新的时候，判断该异常单的状态是否为新建，如果为新建，则可以修改，否则就不能进行修改 //更新的时候，判断该异常单的状态是否为新建，如果为新建，则可以修改，否则就不能进行修改
// AbnormalBill abnormalBill1 = abnormalBillMapper.selectById(abnormalBill.getHandle()); // AbnormalBill abnormalBill1 = abnormalBillMapper.selectById(abnormalBill.getHandle());
// if(abnormalBill1 != null){ // if(abnormalBill1 != null){
@ -626,7 +681,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
} }
} }
//判断设备异常提报传递的不良代码是否有误 //判断设备异常提报传递的不良代码是否有误
if(!StringUtil.isBlank(abnormalBill.getNcCode()) && Constants.ABNORMAL_RESRCE.equals(abnormalBill.getType())){ if(!StringUtil.isBlank(abnormalBill.getNcCode()) && Constants.ABNORMAL_RESRCE.equals(abnormalBill.getType())){
List<String> ncCodes = Arrays.asList(abnormalBill.getNcCode().split(",")); List<String> ncCodes = Arrays.asList(abnormalBill.getNcCode().split(","));
@ -636,7 +690,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
} }
} }
/** /**
* 判断SFC ，设备异常提交，sfc可以为空，质量异常提报sfc和物料编号其中一个不能为空 * 判断SFC ，设备异常提交，sfc可以为空，质量异常提报sfc和物料编号其中一个不能为空
* 设备编号 * 设备编号
@ -725,7 +778,11 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
if (abnormalBillList.size() >= 1) { if (abnormalBillList.size() >= 1) {
throw BusinessException.build(abnormalType + "有未处理完成的产品条码（SFC）"); throw BusinessException.build(abnormalType + "有未处理完成的产品条码（SFC）");
} }
//根据sfc找出STEP_ID //判断不良品数量是否大于SFC的数量
Sfc sfc = sfcMapper.selectById(HandleEnum.SFC.getHandle(site, abnormalBill.getSfc()));
if(Integer.parseInt(abnormalBill.getNcQty()) > sfc.getQty()){
throw BusinessException.build("质量异常提报的不良品数量不能大于SFC的数量，SFC的数量为:"+sfc.getQty());
}
} }
@ -1195,6 +1252,83 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
return abnormalBillMapper.getAbnormalByConditional(page,paramMap,keyword); return abnormalBillMapper.getAbnormalByConditional(page,paramMap,keyword);
} }
/**
* @param sfcDto 以下是传递的参数
* sfc
* abnormalNo
* qty
* stepId
* */
@Override
public void batchRepair(SfcDto sfcDto) {
String site = CommonMethods.getSite();
String sfc = sfcDto.getSfc();
String abnormalNo = sfcDto.getAbnormalNo();
String handle = HandleEnum.SFC.getHandle(site, sfc);
BigDecimal splitQty = new BigDecimal(sfcDto.getQty());
//根据sfc找工单等信息
SfcDto sfcData = splitSfcMapper.getSfcData(handle);
String operation = sfcData.getOperation();
if (sfcData==null){
throw new BaseException("未找到产品条码信息");
}
SfcDispatchDto sfcDispatchDto = new SfcDispatchDto();
sfcDispatchDto.setSite(site);
sfcDispatchDto.setSfc(sfc);
sfcDispatchDto.setStepId(sfcData.getStepId());
SfcDispatchDto sfcDispatchBySfc = sfcDispatchCommonService.findSfcDispatchBySfc(sfcDispatchDto);
if (sfcDispatchBySfc.equals(DispatchStatusEnum.CANCEL.getCode())){
throw new BaseException("产品已取消派工");
}
//查询质量异常记录数量 处置工艺路线及不良代码
SplitSfcDto splitSfcDto=splitSfcMapper.getAbnormalQty(site,sfc,operation, abnormalNo);
String routerBo = splitSfcDto.getRouterBo();
String ncCode = splitSfcDto.getNcCode();
String[] splitNcCode = ncCode.split(",");
SplitSfcRequest splitSfcRequest=new SplitSfcRequest();
try{
SplitSerializeServiceInterface splitService = MEServices.create("com.sap.me.production", "SplitSerializeService",site);
NCProductionServiceInterface ncProductionService = MEServices.create("com.sap.me.nonconformance", "NCProductionService",site);
//记录不合格
CreateNCRequest createNCRequest=new CreateNCRequest();
createNCRequest.setQty(splitQty);
createNCRequest.setSfcRef(HandleEnum.SFC.getHandle(site,sfc));
ProductionContext productionContext=new ProductionContext();
StepIdentifier stepIdentifier=new StepIdentifier();
stepIdentifier.setStepId(sfcData.getStepId());
stepIdentifier.setOperationId(sfcData.getOperation());
productionContext.setStepIdentifier(stepIdentifier);
productionContext.setResourceRef(commonService.getResrceByOperation(sfcData.getOperation()));
createNCRequest.setProdCtx(productionContext);
createNCRequest.setNcCodeRef(HandleEnum.NC_CODE.getHandle(site,splitNcCode[0]));
ncProductionService.createNC(createNCRequest);
//不合格处置特殊工艺路线
DispositionMultipleSfcsRequest dispositionSfcsRequest=new DispositionMultipleSfcsRequest();
List<String> sfcs=new ArrayList<>();
sfcs.add(HandleEnum.SFC.getHandle(site,sfc));
dispositionSfcsRequest.setSfcs(sfcs);
dispositionSfcsRequest.setBypassStepValidation(true);
DispositionSelection dispositionSelection=new DispositionSelection();
Router maxRevisionRouter = routerService.getMaxRevisionRouter(site, StringUtil.trimHandle(routerBo));
dispositionSelection.setRouterRef(maxRevisionRouter.getHandle());
dispositionSfcsRequest.setDispositionSelection(dispositionSelection);
dispositionSfcsRequest.setProdCtx(new ProductionContext());
ncProductionService.dispositionMultipleSfcs(dispositionSfcsRequest);
List<RouterStepDto> routerOperationByRouterBo = routerStepService.findRouterOperationByRouterBo(site, maxRevisionRouter.getHandle());
if (routerOperationByRouterBo.isEmpty()){
throw new BaseException("处置工艺路线没有步骤");
}
sfcDispatchCommonService.saveSplitSfcDispatch(site, CommonMethods.getUser(),"A", sfcData.getShopOrder(), sfc, operation, sfcDispatchBySfc.getStepId(),sfc, maxRevisionRouter.getHandle(), sfcData.getStepSequence());
}catch (Exception e){
ExceptionUtil.throwException(e);
}
}
@Override @Override
public Map<String, String> jgProductionIsScrap(String abnormalNo, String site, String sfc) { public Map<String, String> jgProductionIsScrap(String abnormalNo, String site, String sfc) {
//查询该sfc在质量异常异常方案是否是报废,如果是，则大于1 //查询该sfc在质量异常异常方案是否是报废,如果是，则大于1
@ -1279,7 +1413,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
void creatInspectionTask(String site,String inspectionTaskBo,String sfc,String stepId){ void creatInspectionTask(String site,String inspectionTaskBo,String sfc,String stepId){
InspectionTask byId = inspectionTaskService.getById(inspectionTaskBo); InspectionTask byId = inspectionTaskService.getById(inspectionTaskBo);
InspectionTask newInspectionTask = new InspectionTask(); InspectionTask newInspectionTask = new InspectionTask();
if (StringUtil.notBlank(inspectionTaskBo)){ if (StringUtil.notBlank(inspectionTaskBo)){
if (byId==null){ if (byId==null){
throw new BaseException("不存在的专检任务"); throw new BaseException("不存在的专检任务");

17
anomaly/src/main/resources/mapper/ReportMapper.xml
Unescape Escape View File

@ -41,7 +41,8 @@
<select id="partsManufacturing" resultType="Map"> <select id="partsManufacturing" resultType="Map">
SELECT CF.VALUE ITEM_NUMBER,ZSD.SHOP_ORDER SHOP_ORDER,I.ITEM ITEM,IT.DESCRIPTION ITEM_DESCRIPTION, SELECT CF.VALUE ITEM_NUMBER,ZSD.SHOP_ORDER SHOP_ORDER,I.ITEM ITEM,IT.DESCRIPTION ITEM_DESCRIPTION,
SO.QTY_TO_BUILD SHOP_ORDER_QTY , ZSD.OPERATION ,OT.DESCRIPTION OPERATION_DESCRIPTION, SO.QTY_TO_BUILD SHOP_ORDER_QTY , ZSD.OPERATION ,OT.DESCRIPTION OPERATION_DESCRIPTION,
ZNU.FULL_NAME OPERATION_USER,ZSD.SFC SFC,ZSD.DISPATCH_STATUS , ZNU.FULL_NAME OPERATION_USER,ZSD.SFC SFC,
CASE WHEN S2.STATUS = '405' THEN '是' ELSE '否' END DISPATCH_STATUS,
ZSD.EARLIEST_START_DATE EARLIEST_START_DATE,ZSD.LATEST_END_DATE LATEST_END_DATE, ZSD.EARLIEST_START_DATE EARLIEST_START_DATE,ZSD.LATEST_END_DATE LATEST_END_DATE,
ZSD.ACTUAL_START_DATE ACTUAL_START_DATE,ZSD.ACTUAL_COMPLETE_DATE ACTUAL_COMPLETE_DATE ZSD.ACTUAL_START_DATE ACTUAL_START_DATE,ZSD.ACTUAL_COMPLETE_DATE ACTUAL_COMPLETE_DATE
FROM SFC S FROM SFC S
@ -49,13 +50,13 @@
INNER JOIN ITEM I ON I.HANDLE = SO.ITEM_BO INNER JOIN ITEM I ON I.HANDLE = SO.ITEM_BO
LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = #{locale} LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = #{locale}
INNER JOIN Z_SFC_DISPATCH ZSD ON S.SFC = ZSD.SFC AND S.SITE = ZSD.SITE INNER JOIN Z_SFC_DISPATCH ZSD ON S.SFC = ZSD.SFC AND S.SITE = ZSD.SITE
AND ZSD.DISPATCH_SEQ = (
SELECT MAX(ZSD2.DISPATCH_SEQ) FROM Z_SFC_DISPATCH ZSD2 WHERE S.SFC = ZSD2.SFC AND S.SITE = ZSD2.SITE
)
INNER JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION AND O.SITE = S.SITE AND O.CURRENT_REVISION = 'true' INNER JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION AND O.SITE = S.SITE AND O.CURRENT_REVISION = 'true'
INNER JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = #{locale} INNER JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = #{locale}
INNER JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZSD.EMPLOYEE LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZSD.EMPLOYEE AND ZSD.DISPATCH_SEQ = (
SELECT MAX(ZSD2.DISPATCH_SEQ) FROM Z_SFC_DISPATCH ZSD2 WHERE S.SFC = ZSD2.SFC AND S.SITE = ZSD2.SITE
)
LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = S.SHOP_ORDER_BO AND CF."ATTRIBUTE" = 'ITEM_NUMBER' LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = S.SHOP_ORDER_BO AND CF."ATTRIBUTE" = 'ITEM_NUMBER'
INNER JOIN STATUS S2 ON S2.HANDLE = S.STATUS_BO
<where> <where>
S.SITE = #{site} S.SITE = #{site}
<if test="param != null"> <if test="param != null">
@ -75,6 +76,12 @@
AND ZSD.ACTUAL_START_DATE &gt;= TO_DATE(#{param.startDateTime}, 'YYYY-MM-DD HH24:MI:SS') AND ZSD.ACTUAL_START_DATE &gt;= TO_DATE(#{param.startDateTime}, 'YYYY-MM-DD HH24:MI:SS')
</if> </if>
<if test="param.endDateTime != null"> <if test="param.endDateTime != null">
AND ZSD.ACTUAL_START_DATE &lt;= TO_DATE(#{param.endDateTime}, 'YYYY-MM-DD HH24:MI:SS')
</if>
<if test="param.completeStartDateTime != null">
AND ZSD.ACTUAL_COMPLETE_DATE &gt;= TO_DATE(#{param.completeStartDateTime}, 'YYYY-MM-DD HH24:MI:SS')
</if>
<if test="param.completeEndDateTime != null">
AND ZSD.ACTUAL_COMPLETE_DATE &lt;= TO_DATE(#{param.endDateTime}, 'YYYY-MM-DD HH24:MI:SS') AND ZSD.ACTUAL_COMPLETE_DATE &lt;= TO_DATE(#{param.endDateTime}, 'YYYY-MM-DD HH24:MI:SS')
</if> </if>
</if> </if>

2
dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
Unescape Escape View File

@ -799,7 +799,7 @@
</update> </update>
<select id="findResrceAndWorkCenterBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto"> <select id="findResrceAndWorkCenterBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto">
SELECT ZSD2.RESRCE,ZSD2.WORK_CENTER WORK_CENTER FROM SELECT ZSD2.RESRCE RESRCE,ZSD2.WORK_CENTER WORK_CENTER FROM
SFC S SFC S
INNER JOIN SFC_ROUTING SR ON SR.SFC_BO = S.HANDLE INNER JOIN SFC_ROUTING SR ON SR.SFC_BO = S.HANDLE
INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO = SR.HANDLE INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO = SR.HANDLE

2
production/src/main/resources/mapper/SplitSfcMapper.xml
Unescape Escape View File

@ -380,7 +380,7 @@
<select id="getAbnormalQty" resultType="com.foreverwin.mesnac.production.dto.SplitSfcDto"> <select id="getAbnormalQty" resultType="com.foreverwin.mesnac.production.dto.SplitSfcDto">
SELECT zab.NC_QTY,zsbd.ROUTER_BO,zab.NC_CODE,zab.ABNORMAL_NO,zsbd.ABNORMAL_METHOD,zab.STEP_ID FROM Z_ABNORMAL_BILL zab SELECT zab.NC_QTY,zsbd.ROUTER_BO,zab.NC_CODE,zab.ABNORMAL_NO,zsbd.ABNORMAL_METHOD,zab.STEP_ID FROM Z_ABNORMAL_BILL zab
JOIN Z_ABNORMAL_BILL_DISPOSE zsbd ON zab.HANDLE=ZSBD.ABNORMAL_BILL_BO JOIN Z_ABNORMAL_BILL_DISPOSE zsbd ON zab.HANDLE=ZSBD.ABNORMAL_BILL_BO
WHERE ZAB.SFC=#{sfc} AND zab.ABNORMAL_NO=#{abnormalNo} AND zab.SITE=#{site} AND ZAB.OPERATION=#{operation} AND zab.STATUS='G' AND zab."TYPE"='Z' AND (zsbd.ABNORMAL_METHOD='F' OR zsbd.ABNORMAL_METHOD='C') WHERE ZAB.SFC=#{sfc} AND zab.ABNORMAL_NO=#{abnormalNo} AND zab.SITE=#{site} AND ZAB.OPERATION=#{operation} AND (zab.STATUS='G' OR zab.STATUS='F') AND zab."TYPE"='Z' AND (zsbd.ABNORMAL_METHOD='F' OR zsbd.ABNORMAL_METHOD='C')
</select> </select>

Write Preview
Loading…
Cancel
Save