更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -1626,38 +1626,38 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
 
         Double requestFundsTotal = 0d;//请款合计
         Double inWarehouseWeightTotal = 0d;//重量合计
-//        for (int i = 0; i < dataList.size(); i++) {
-//            WarehousingOrder warehousingOrder1 = dataList.get(i);
-//            //请款累计和
-//            requestFundsTotal = requestFundsTotal + warehousingOrder1.getRequestFunds();
-//            inWarehouseWeightTotal = inWarehouseWeightTotal + warehousingOrder1.getInWarehouseWeight();
-//            //查询详细数据
-//            Map<String, Object> pageView1 = new HashMap<>();
-//            //  关联ID
-//            pageView1.put("batchId", warehousingOrder1.getBatchId());
-//            // 查询付款数据
-//            List<PaymentManagement> dataList1 = baseMapper.getListByConditionOut(pageView1);
-//            if (!CollectionUtils.isEmpty(dataList1)) {
-//                for (int j = 0; j < dataList1.size(); j++) {
-//                    warehousingOrder1.setNetWeight(dataList1.get(j).getNetWeight() / 1000);
-//                    warehousingOrder1.setGrossWeight(dataList1.get(j).getGrossWeight() / 1000);
-//                    warehousingOrder1.setTare(dataList1.get(j).getTare() / 1000);
-//                    warehousingOrder1.setGrade(dataList1.get(j).getGrade());
-//                    warehousingOrder1.setBulkDensity(dataList1.get(j).getBulkDensity());
-//                    warehousingOrder1.setMildewGrain(dataList1.get(j).getMildewGrain());
-//                    warehousingOrder1.setImpurity(dataList1.get(j).getImpurity());
-//                    warehousingOrder1.setImperfectGrain(dataList1.get(j).getImperfectGrain());
-//                    warehousingOrder1.setJiaorenli(dataList1.get(j).getJiaorenli());
-//                    warehousingOrder1.setWaterContent(dataList1.get(j).getWaterContent());
-//                    if ("潮粮".contains(dataList1.get(j).getGoodsName())) {
-//                        //单价=（潮粮单价-扣单价）*1000
-//                        warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
-//                    } else {
-//                        warehousingOrder1.setPrice((dataList1.get(j).getSolidGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
-//                    }
-//                }
-//            }
-//        }
+        for (int i = 0; i < dataList.size(); i++) {
+            WarehousingOrder warehousingOrder1 = dataList.get(i);
+            //请款累计和
+            requestFundsTotal = requestFundsTotal + warehousingOrder1.getRequestFunds();
+            inWarehouseWeightTotal = inWarehouseWeightTotal + warehousingOrder1.getInWarehouseWeight();
+            //查询详细数据
+            Map<String, Object> pageView1 = new HashMap<>();
+            //  关联ID
+            pageView1.put("batchId", warehousingOrder1.getBatchId());
+            // 查询付款数据
+            List<PaymentManagement> dataList1 = baseMapper.getListByConditionOut(pageView1);
+            if (!CollectionUtils.isEmpty(dataList1)) {
+                for (int j = 0; j < dataList1.size(); j++) {
+                    warehousingOrder1.setNetWeight(dataList1.get(j).getNetWeight() / 1000);
+                    warehousingOrder1.setGrossWeight(dataList1.get(j).getGrossWeight() / 1000);
+                    warehousingOrder1.setTare(dataList1.get(j).getTare() / 1000);
+                    warehousingOrder1.setGrade(dataList1.get(j).getGrade());
+                    warehousingOrder1.setBulkDensity(dataList1.get(j).getBulkDensity());
+                    warehousingOrder1.setMildewGrain(dataList1.get(j).getMildewGrain());
+                    warehousingOrder1.setImpurity(dataList1.get(j).getImpurity());
+                    warehousingOrder1.setImperfectGrain(dataList1.get(j).getImperfectGrain());
+                    warehousingOrder1.setJiaorenli(dataList1.get(j).getJiaorenli());
+                    warehousingOrder1.setWaterContent(dataList1.get(j).getWaterContent());
+                    if ("潮粮".contains(dataList1.get(j).getGoodsName())) {
+                        //单价=（潮粮单价-扣单价）*1000
+                        warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
+                    } else {
+                        warehousingOrder1.setPrice((dataList1.get(j).getSolidGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
+                    }
+                }
+            }
+        }
 
         // 返回数据
         WarehousingOrder warehousingOrder1 = new WarehousingOrder();