|
|
|
@ -409,7 +409,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
|
|
|
|
|
shippingOrderManagementDetailRepository.saveAll(orderManagementDetailList);
|
|
|
|
|
//1.更新装车单明细对应的发运单状态=发运
|
|
|
|
|
DdlPackBean vehiclesOrderDetailPackBean = DdlPackBean.getDdlPackBean(org);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(orderManagement.getShippingCode(), "shippingCode", vehiclesOrderDetailPackBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(orderManagement.getShippingCode(), "shippingCode", vehiclesOrderDetailPackBean);
|
|
|
|
|
MesLoadingListDetail vehiclesOrderDetail = vehiclesOrderDetailRepository.getByProperty(vehiclesOrderDetailPackBean);
|
|
|
|
|
if(!StringUtil.isEmpty(vehiclesOrderDetail)){
|
|
|
|
|
vehiclesOrderDetail.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
|
|
|
|
@ -419,7 +419,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
|
|
|
|
|
|
|
|
|
|
DdlPackBean orderManagementPackBean = DdlPackBean.getDdlPackBean(org);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", orderManagementPackBean);
|
|
|
|
|
DdlPreparedPack.getNotInPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "shippingCode", orderManagementPackBean);
|
|
|
|
|
DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "status", orderManagementPackBean);
|
|
|
|
|
boolean exitByHql = shippingOrderManagementRepository.isExitByHql(orderManagementPackBean);
|
|
|
|
|
//2.装车单中所有发运单全部变成发运回传
|
|
|
|
|
if(!exitByHql){
|
|
|
|
|