Jelajahi Sumber

查询面辅料接口调整

zengtx 2 tahun lalu
induk
melakukan
86fab01756

+ 3 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -428,7 +428,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			}
 		  }
 		  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1);
-		  queryWrapper.eq("a.is_Reference",0).eq("c.del_flag",0);
+		  queryWrapper.eq("a.is_Reference",0);
 		  queryWrapper.orderByDesc("a.document_No");
 		  queryWrapper.groupBy("a.document_No,b.sy_shipping_details_item_id");
 		  pageList = syShippingOrderService.queryFabric(page,queryWrapper);
@@ -1114,7 +1114,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 }
 					 //集合转map
 					 for (SyShippingOrderItem li : list) {
-					 	li.setTotalPrice(li.getNetWeight().multiply(li.getUnitPrice()));//重新计算金额 =  净重*单价
+					 	BigDecimal cc = li.getNetWeight().multiply(li.getUnitPrice());
+					 	li.setTotalPrice(cc.setScale(2,BigDecimal.ROUND_HALF_UP));//重新计算金额 =  净重*单价
 						 size++;
 						 Field[] fieldsList = li.getClass().getDeclaredFields();
 						 Map<String, Object> mapList = new HashMap<String, Object>();