jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

产品首检，产品末检可以只扫描一个产品条码

Browse Source
master
jun 6 months ago
parent c7c39b4212
commit 8d689bc828
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File

22
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
Unescape Escape View File

@ -208,12 +208,11 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
//校验点检单 //校验点检单
checkSpotCheckOrder(model.getSpotCheckOrder()); checkSpotCheckOrder(model.getSpotCheckOrder());
//点检单类型为产品首检时 需要判断单据的条码是否都扫描完成 //点检单类型为产品首检，产品末检时 需要判断单据的条码是否都扫描完成
if (model.getSpotCheckOrder().getSpotCheckOrderType() == MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.FIRST_PRODUCT_INSPECTION.getValue()) { if (Stream.of(MesExtEnumUtil.EQUIPMENT_CHECK_ORDER_TYPE.FIRST_INSPECTION.getValue(),MesExtEnumUtil.EQUIPMENT_CHECK_ORDER_TYPE.END_INSPECTION.getValue()).collect(Collectors.toList()).contains(model.getSpotCheckOrder().getSpotCheckOrderType())) {
Optional<MesSpotCheckOrderPart> orderPartOptional = model.getOrderPartList().stream().filter(k -> !StringUtils.isEmpty(k.getSn())).findFirst();
List<String> partNoList = model.getOrderPartList().stream().filter(k -> StringUtils.isEmpty(k.getSn())).map(k -> k.getPartNo()).collect(Collectors.toList()); if (!orderPartOptional.isPresent()) {
if (!CollectionUtils.isEmpty(partNoList)) { throw new ImppBusiException("未扫描条码，请扫描条码后再查询设备数据，请检查数据");
throw new ImppBusiException(String.format("剩余物料号【%s】对应的条码未扫描，请扫描完成后再完成质检", partNoList));
} }
} }
//根据设备代码获取EQUIP_ID //根据设备代码获取EQUIP_ID
@ -313,12 +312,11 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
//校验点检单 //校验点检单
MesSpotCheckOrder spotCheckOrder = checkSpotCheckOrder(model.getSpotCheckOrder()); MesSpotCheckOrder spotCheckOrder = checkSpotCheckOrder(model.getSpotCheckOrder());
//点检单类型为产品首检时 需要判断单据的条码是否都扫描完成 //点检单类型为产品首检，产品末检时 需要判断单据的条码是否都扫描完成
if (model.getSpotCheckOrder().getSpotCheckOrderType() == MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.FIRST_PRODUCT_INSPECTION.getValue()) { if (Stream.of(MesExtEnumUtil.EQUIPMENT_CHECK_ORDER_TYPE.FIRST_INSPECTION.getValue(),MesExtEnumUtil.EQUIPMENT_CHECK_ORDER_TYPE.END_INSPECTION.getValue()).collect(Collectors.toList()).contains(model.getSpotCheckOrder().getSpotCheckOrderType())) {
Optional<MesSpotCheckOrderPart> orderPartOptional = model.getOrderPartList().stream().filter(k -> !StringUtils.isEmpty(k.getSn())).findFirst();
List<String> partNoList = model.getOrderPartList().stream().filter(k -> StringUtils.isEmpty(k.getSn())).map(k -> k.getPartNo()).collect(Collectors.toList()); if (!orderPartOptional.isPresent()) {
if (!CollectionUtils.isEmpty(partNoList)) { throw new ImppBusiException("未扫描条码，请扫描条码后再查询设备数据，请检查数据");
throw new ImppBusiException(String.format("剩余物料号【%s】对应的条码未扫描，请扫描完成后再完成质检", partNoList));
} }
} }
model.getOrderPartList().forEach(k -> { model.getOrderPartList().forEach(k -> {

Write Preview
Loading…
Cancel
Save