|
|
|
@ -1810,7 +1810,8 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
|
//根据订单id查询明细数据
|
|
|
|
|
List<OrderItemInfo> orderItemInfos = orderItemInfoMapper.selectAllByOrderId(Arrays.asList(orderInfoId), null); |
|
|
|
|
List<OrderItemInfo> orderItemInfoList = new ArrayList<>(); |
|
|
|
|
Boolean oilMark = true; |
|
|
|
|
Boolean oilMark = false; |
|
|
|
|
int i = 0; |
|
|
|
|
for (OrderItemInfo orderItemInfo : orderItemInfos) { |
|
|
|
|
// if(StringUtils.isNotBlank(orderItemInfo.getSpbm())){
|
|
|
|
|
// continue;
|
|
|
|
@ -1828,13 +1829,13 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
|
orderItemInfo.setZnfm(ConfigureConstant.STRING_0); |
|
|
|
|
orderItemInfo.setXmsl(null); |
|
|
|
|
orderItemInfo.setXmdj(null); |
|
|
|
|
if(StringUtils.isBlank(commodityCodeEntity.getCpy())|| "N".equals(commodityCodeEntity.getCpy())){ |
|
|
|
|
oilMark = false; |
|
|
|
|
if(StringUtils.isNotBlank(commodityCodeEntity.getCpy()) && "Y".equals(commodityCodeEntity.getCpy())){ |
|
|
|
|
i++; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
orderItemInfoList.add(orderItemInfo); |
|
|
|
|
} |
|
|
|
|
if(oilMark){ |
|
|
|
|
if(orderItemInfoList.size()==i){ |
|
|
|
|
//更新order_info 清单标志为4
|
|
|
|
|
OrderInfo orderInfo = new OrderInfo(); |
|
|
|
|
orderInfo.setId(orderInfoId); |
|
|
|
|