|
|
@ -75,6 +75,10 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
|
|
|
|
//根据扫描的发运单找到是否装车配置,若是,则根据发运单查询是否生成装车单,若没生成装车单则提示此发运单配置是否装车为是,但没生成装车单,请检查数据!
|
|
|
|
//根据扫描的发运单找到是否装车配置,若是,则根据发运单查询是否生成装车单,若没生成装车单则提示此发运单配置是否装车为是,但没生成装车单,请检查数据!
|
|
|
|
if (orderManagement.getIsLoading() == MesCommonConstant.TRUE_INTEGER) {
|
|
|
|
if (orderManagement.getIsLoading() == MesCommonConstant.TRUE_INTEGER) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isEmpty(orderManagement.getLoadingOrderNo())) {
|
|
|
|
|
|
|
|
throw new ImppBusiException(String.format("【%s】此发运单配置是否装车为是,但没绑定装车单号,请检查数据!", shippingOrderManagement.getShippingOrderNo()));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
DdlPackBean orderDetailPackBean = DdlPackBean.getDdlPackBean(shippingOrderManagement.organizeCode);
|
|
|
|
DdlPackBean orderDetailPackBean = DdlPackBean.getDdlPackBean(shippingOrderManagement.organizeCode);
|
|
|
|
DdlPreparedPack.getStringEqualPack(shippingOrderManagement.getShippingOrderNo(), "shippingOrderNo", orderDetailPackBean);
|
|
|
|
DdlPreparedPack.getStringEqualPack(shippingOrderManagement.getShippingOrderNo(), "shippingOrderNo", orderDetailPackBean);
|
|
|
|
MesLoadingVehiclesOrderDetail vehiclesOrderDetail = vehiclesOrderDetailRepository.getByProperty(orderDetailPackBean);
|
|
|
|
MesLoadingVehiclesOrderDetail vehiclesOrderDetail = vehiclesOrderDetailRepository.getByProperty(orderDetailPackBean);
|
|
|
@ -94,7 +98,6 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
|
|
|
|
throw new ImppBusiException(String.format("【%s】此发运单对应的【%s】此装车单状态为【%s】,请选择状态为【%s】的数据!", shippingOrderManagement.getShippingOrderNo(),
|
|
|
|
throw new ImppBusiException(String.format("【%s】此发运单对应的【%s】此装车单状态为【%s】,请选择状态为【%s】的数据!", shippingOrderManagement.getShippingOrderNo(),
|
|
|
|
vehiclesOrder.getLoadingOrderNo(), vehiclesOrder.getStatus(), MesPcnExtEnumUtil.LOADING_ORDER_STATUS.LOADED.getDescription()));
|
|
|
|
vehiclesOrder.getLoadingOrderNo(), vehiclesOrder.getStatus(), MesPcnExtEnumUtil.LOADING_ORDER_STATUS.LOADED.getDescription()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -288,7 +291,6 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
|
|
|
|
DdlPackBean producePackBean = DdlPackBean.getDdlPackBean(org);
|
|
|
|
DdlPackBean producePackBean = DdlPackBean.getDdlPackBean(org);
|
|
|
|
DdlPreparedPack.getInPackList(snList, "serialNumber", producePackBean);
|
|
|
|
DdlPreparedPack.getInPackList(snList, "serialNumber", producePackBean);
|
|
|
|
List<MesProduceSn> produceSnList = produceSnRepository.findByHqlWhere(producePackBean);
|
|
|
|
List<MesProduceSn> produceSnList = produceSnRepository.findByHqlWhere(producePackBean);
|
|
|
|
//todo
|
|
|
|
|
|
|
|
//条码校验完成
|
|
|
|
//条码校验完成
|
|
|
|
produceSnList.forEach(k -> k.setSnStatus(MesPcnExtEnumUtil.PRODUCE_SN_STATUS.CHECKED.getValue()));
|
|
|
|
produceSnList.forEach(k -> k.setSnStatus(MesPcnExtEnumUtil.PRODUCE_SN_STATUS.CHECKED.getValue()));
|
|
|
|
|
|
|
|
|
|
|
|