根据实际数量计算金额

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -157,13 +157,12 @@ public class IoOrderController extends BaseController {
             List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest);
             BigDecimal amount = new BigDecimal(0.00);
             for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
-                if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
+                if (ioOrderDetailCodeRespons.getReCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
-                    amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
+                    amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getReCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
                 }
             }
             ioOrderResponse.setAllAmount(amount);
 
-
         }
 
 
@@ -305,8 +304,6 @@ public class IoOrderController extends BaseController {
         if (checkInoutService.checkManual(addOrderRequest.getBillNo())) {
             if (CollUtil.isNotEmpty(orderDetailBizEntities)) {
                 String errMsg = checkInoutService.bizOrderCheck(orderDetailBizEntities, orderDetailCodeEntities);
-
-
                 if (StrUtil.isNotEmpty(errMsg)) {
                     return ResultVOUtils.error(500, errMsg);
                 }

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -193,7 +193,7 @@ public class IoOrderDetailResultController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/resultDetail/filterOrderPrint")
     public BaseResponse filterOrderPrint(@RequestBody FilterOrderDetailResultRequest filterOrderDetailResultRequest, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException {
-        List<IoOrderDetailResultResponse> ioOrderDetailResultResponseList=new ArrayList<>();
+        List<IoOrderDetailResultResponse> ioOrderDetailResultResponseList = new ArrayList<>();
         SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailResultRequest.getTemplateId());
         //打印单号标签
         Map<String, Object> data = new HashMap<>(1);
@@ -201,9 +201,9 @@ public class IoOrderDetailResultController extends BaseController {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式
 
         //按选入打印
-        if(filterOrderDetailResultRequest.getList() != null && filterOrderDetailResultRequest.getList().size()>0){
+        if (filterOrderDetailResultRequest.getList() != null && filterOrderDetailResultRequest.getList().size() > 0) {
-            ioOrderDetailResultResponseList =filterOrderDetailResultRequest.getList();
+            ioOrderDetailResultResponseList = filterOrderDetailResultRequest.getList();
-        }else{
+        } else {
             //按查询打印
             FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
             filterOrderRequest.setVueType(filterOrderDetailResultRequest.getActionType());
@@ -223,7 +223,7 @@ public class IoOrderDetailResultController extends BaseController {
                 }
             }
         }
-        int i=1;
+        int i = 1;
         for (IoOrderDetailResultResponse ioOrderDetailResultResponse : ioOrderDetailResultResponseList) {
             //组装数据
             Map<String, Object> ioOrderDetailResultData = new HashMap<>();
@@ -240,7 +240,7 @@ public class IoOrderDetailResultController extends BaseController {
             ioOrderDetailResultData.put("spec", ioOrderDetailResultResponse.getSpec() == null ? ' ' : ioOrderDetailResultResponse.getSpec());
             ioOrderDetailResultData.put("price", ioOrderDetailResultResponse.getPrice() == null ? ' ' : ioOrderDetailResultResponse.getPrice());
             ioOrderDetailResultData.put("count", ioOrderDetailResultResponse.getCount());
-            ioOrderDetailResultData.put("reCount",ioOrderDetailResultResponse.getReCount());
+            ioOrderDetailResultData.put("reCount", ioOrderDetailResultResponse.getReCount());
             ioOrderDetailResultData.put("inCount", ioOrderDetailResultResponse.getInCount());
             ioOrderDetailResultData.put("acceptCount", ioOrderDetailResultResponse.getAcceptCount());
             ioOrderDetailResultData.put("fromCorpName", ioOrderDetailResultResponse.getFromCorpName() == null ? ' ' : ioOrderDetailResultResponse.getFromCorpName());
@@ -252,7 +252,7 @@ public class IoOrderDetailResultController extends BaseController {
         }
 
         String param = JSON.toJSONString(list);
-        JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
+        JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
         return ResultVOUtils.success();
     }
 

src/main/java/com/glxp/api/util/IntUtil.java

@@ -15,4 +15,11 @@ public class IntUtil {
         else return value.longValue();
 
     }
+
+
+    public static boolean value(Boolean value) {
+        if (value == null)
+            return false;
+        else return value;
+    }
 }