|
|
@@ -1924,6 +1924,11 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
|
|
|
listid = listid.stream().distinct().collect(Collectors.toList());
|
|
|
|
|
|
List<SyPackingList> list = syShippingOrderMapper.syShippingOrderMerge(listid);
|
|
|
+ for (SyPackingList li:list){
|
|
|
+ if (oConvertUtils.isEmpty(li.getPrice())){
|
|
|
+ li.setPrice(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
result.setSuccess(true);
|
|
|
result.setMessage("查询成功!");
|