|
|
|
@ -566,6 +566,8 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
|
|
|
|
|
DdlPreparedPack.getNumberSmallerEqualPack(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SKIP.getValue(),"status",orderManagementPackBean);
|
|
|
|
|
List<MesLoadingListDetail> listDetails = vehiclesOrderDetailRepository.findByHqlWhere(orderManagementPackBean);
|
|
|
|
|
if(CollectionUtils.isEmpty(listDetails)) return;
|
|
|
|
|
|
|
|
|
|
List<String> shippingCodeList = listDetails.stream().map(MesLoadingListDetail::getShippingCode).collect(Collectors.toList());
|
|
|
|
|
orderManagementPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
|
DdlPreparedPack.getInPackList(listDetails.stream().map(MesLoadingListDetail::getShippingCode).collect(Collectors.toList()), "shippingCode", orderManagementPackBean);
|
|
|
|
|
DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "status", orderManagementPackBean);
|
|
|
|
@ -574,6 +576,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
|
|
|
|
|
if (!exitByHql) {
|
|
|
|
|
DdlPackBean jisBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", jisBean);
|
|
|
|
|
DdlPreparedPack.getInPackList(shippingCodeList, "shippingCode", jisBean);
|
|
|
|
|
List<MesShippingOrderManagement> shippingOrderManagementList = shippingOrderManagementRepository.findByHqlWhere(jisBean);
|
|
|
|
|
for (MesShippingOrderManagement mesShippingOrderManagement : shippingOrderManagementList) {
|
|
|
|
|
//保存当前发运单明细
|
|
|
|
@ -589,6 +592,11 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
|
|
|
|
|
ConvertBean.serviceModelUpdate(loadingList, userInfo);
|
|
|
|
|
shippingLoadingCheckService.update(loadingList);
|
|
|
|
|
}
|
|
|
|
|
listDetails.stream().forEach(mesLoadingListDetail -> {
|
|
|
|
|
mesLoadingListDetail.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SYNC.getValue());
|
|
|
|
|
ConvertBean.serviceModelUpdate(mesLoadingListDetail, userInfo);
|
|
|
|
|
});
|
|
|
|
|
vehiclesOrderDetailRepository.saveAll(listDetails);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//发运结果回传
|
|
|
|
|