|
|
|
@ -874,7 +874,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public IPage<DistributionStockArticleVO> handlePackage(IPage<DistributionStockArticleVO> pageVO) { |
|
|
|
|
|
|
|
|
@ -1939,7 +1938,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = this.findStockArticleByOrderCodeAndWarehouseId(s, warehouseId); |
|
|
|
|
DistributionStockArticleEntity t = new DistributionStockArticleEntity(); |
|
|
|
|
if (Func.isEmpty(stockArticleEntity)) { |
|
|
|
|
t.setId(stockArticleEntity.getId()); |
|
|
|
|
log.error(method + "订单不存在orderCode:{}", s); |
|
|
|
|
throw new RuntimeException("订单不存在"); |
|
|
|
|
} |
|
|
|
@ -2028,7 +2026,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 这里在和原始对象进行比较
|
|
|
|
|
check2ObjSome(t, stockArticleEntity); |
|
|
|
|
t = check2ObjSome(t, stockArticleEntity); |
|
|
|
|
log.info("维护订单信息,t:{}",t); |
|
|
|
|
if (!cn.hutool.core.util.ObjectUtil.isAllEmpty(t.getGenre(), t.getReservationStatus(), |
|
|
|
|
t.getHandQuantity(), t.getDeliveryQuantity(), t.getOrderStatus(), t.getSigninQuantity())) { |
|
|
|
|
baseMapper.updateDistributionStockArticleEntityById(t); |
|
|
|
@ -2110,7 +2109,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void check2ObjSome(DistributionStockArticleEntity t, DistributionStockArticleEntity stockArticleEntity) { |
|
|
|
|
private DistributionStockArticleEntity check2ObjSome(DistributionStockArticleEntity t, DistributionStockArticleEntity stockArticleEntity) { |
|
|
|
|
t.setId(stockArticleEntity.getId()); |
|
|
|
|
|
|
|
|
|
if (t.getOrderStatus() != null && t.getOrderStatus().equals(stockArticleEntity.getOrderStatus())) { |
|
|
|
@ -2132,7 +2131,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
t.setSigninQuantity(null); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return t; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@ -2794,10 +2793,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @param orderIds |
|
|
|
|
* @return |
|
|
|
|