|
|
@ -334,10 +334,7 @@ public class OrderServiceImpl implements OrderService {
|
|
|
|
stockOrderEntityList.forEach(stockOrderEntity -> {
|
|
|
|
stockOrderEntityList.forEach(stockOrderEntity -> {
|
|
|
|
StockOrderResponse response = new StockOrderResponse();
|
|
|
|
StockOrderResponse response = new StockOrderResponse();
|
|
|
|
BeanUtil.copyProperties(stockOrderEntity, response);
|
|
|
|
BeanUtil.copyProperties(stockOrderEntity, response);
|
|
|
|
String supplementOrderType = bussinessTypeDao.selectEnableSupplementOrder(stockOrderEntity.getOrderIdFk());
|
|
|
|
if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER)) {
|
|
|
|
if (StrUtil.isBlank(supplementOrderType) || StrUtil.isNotBlank(stockOrderEntity.getSupplementNo())) {
|
|
|
|
|
|
|
|
response.setEnableSupplementOrder(false);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
response.setEnableSupplementOrder(true);
|
|
|
|
response.setEnableSupplementOrder(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
result.add(response);
|
|
|
|
result.add(response);
|
|
|
|