|
|
|
@ -228,15 +228,25 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
|
|
|
|
|
//装车单明细
|
|
|
|
|
List<MesLoadingListDetail> vehiclesOrderDetailList = model.getDetailList();
|
|
|
|
|
vehiclesOrderDetailList.forEach(k -> {
|
|
|
|
|
// if(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue() == k.getStatus()){
|
|
|
|
|
// k.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.PUBLISHED.getValue()); // todo 不改变为发运状态
|
|
|
|
|
// }
|
|
|
|
|
k.setSystemSyncStatus(CommonEnumUtil.FALSE);
|
|
|
|
|
ConvertBean.serviceModelUpdate(k, userInfo);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
vehiclesOrderDetailRepository.saveAll(vehiclesOrderDetailList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<MesShippingOrderManagement> shippingOrderList = new ArrayList<>();
|
|
|
|
|
model.getDetailList().forEach(k -> {
|
|
|
|
|
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(k.getShippingId(),"id",packBean);
|
|
|
|
|
MesShippingOrderManagement orderManagement = shippingOrderManagementRepository.getByProperty(packBean);
|
|
|
|
|
if (orderManagement != null) {
|
|
|
|
|
orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.LOADING.getValue());
|
|
|
|
|
shippingOrderList.add(orderManagement);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
shippingOrderManagementRepository.saveAll(shippingOrderList);
|
|
|
|
|
|
|
|
|
|
update(loadingList);
|
|
|
|
|
}
|
|
|
|
|
return model;
|
|
|
|
|