diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/WCSDataDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/WCSDataDTO.java index 31c8690d..d6a1bce1 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/WCSDataDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/WCSDataDTO.java @@ -13,14 +13,14 @@ public class WCSDataDTO { private String stationNo; private int qty; - private String mode; + private String flag; - public String getMode() { - return mode; + public String getFlag() { + return flag; } - public void setMode(String mode) { - this.mode = mode; + public void setFlag(String flag) { + this.flag = flag; } public int getQty() { diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index e9f88af5..41967a6a 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -126,7 +126,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { Integer qty = proRfidProcessDetailMapper.getEquipNum(machineCode); wCSDataDTO.setQty(qty == null ? 0 : qty); String mode = proRfidProcessDetailMapper.getEquipMode(machineCode); - wCSDataDTO.setMode(mode); + wCSDataDTO.setFlag(mode); } stationNos.add(wCSDataDTO); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java index d91143f8..58698799 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java @@ -82,7 +82,16 @@ public class QcProCheckServiceImpl implements QcProCheckService { @Override public QcProCheck getInfoByRfid(QcProCheck qcProCheck) { DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode()); - return qcProCheckMapper.getInfoByRfid(qcProCheck); + QcProCheck dto = qcProCheckMapper.getInfoByRfid(qcProCheck); + if(dto==null || StringUtils.isEmpty(dto.getProductCode())){ + dto.setProductCode("EmptyPallet"); + }else{ + if(StringUtils.isNotEmpty(dto.getProductName())){ + dto.setProductSpc(dto.getProductName().split("mm")[0] + "mm"); + } + + } + return dto; } @Override diff --git a/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml index a8441cd8..a41e4987 100644 --- a/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml @@ -182,6 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and route_code = #{routeCode} + and route_code like concat('%',#{routeCode}, '%') and product_code like concat('%', #{productCode}, '%') and route_name like concat('%', #{routeName}, '%') and route_desc = #{routeDesc}