Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/InOutWarehouseTask.java

@@ -219,7 +219,7 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
      * 累计退库量（吨）
      */
     @TableField(exist = false)
-    private String stockReturnCount;
+    private Float stockReturnCount;
 
     /**
      *查询类型

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

@@ -22,6 +22,7 @@ import com.yh.saas.plugin.yiliangyiyun.mapper.InOutWarehouseTaskMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
 import com.yh.saas.toolkit.workflow.service.IWorkflowService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +49,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     private ICommonBillOperateHisService billOperateHisService;
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private IWarehouseInOutInfoService warehouseInOutInfoService;
 
     /**
      * 出入库任务新增 编辑
@@ -314,25 +317,67 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
 
         if (!CollectionUtils.isEmpty(dataList)) {
             for (InOutWarehouseTask inOutWarehouseTaska : dataList) {
-
+                //定义入库
+                Float inNetWeight = 0.0f;
+                // 查询入库数量
+                List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                        .eq("contract_no", inOutWarehouseTaska.getMoveTaskNo()).eq("in_out_flag", "2")
+                        .eq("status_flag", "3"));
+                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                    Float netWeight = 0f;
+                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                        //潮粮累计纯重，干粮累计净重
+                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
+                    }
+                    inNetWeight = inNetWeight + netWeight;
+                    inOutWarehouseTaska.setStorageVolume(inNetWeight);
+                }
+                //定义出库
+                Float outNetWeight = 0.0f;
+                // 查询出库数量
+                List<WarehouseInOutInfo> warehouseInOutInfoAllList1 = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                        .eq("status_flag", "3").eq("contract_no", inOutWarehouseTaska.getMoveTaskNo()).eq("in_out_flag", "1"));
+                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList1)) {
+                    Float netWeight = 0f;
+                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList1) {
+                        //潮粮累计纯重，干粮累计净重
+                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
+                    }
+                    outNetWeight = outNetWeight + netWeight;
+                    inOutWarehouseTaska.setDeliveryVolume(outNetWeight);
+                }
                 //定义累计退库量
-                String stockReturnCount = "0";
-
-                //查询退库量
-                List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
-                        .eq("contract_no", inOutWarehouseTaska.getMoveTaskNo())
-                        .eq("in_out_type_key", "6")
-                        .eq("delete_flag", "0"));
-                if (!CollectionUtils.isEmpty(inOutWarehouseTaskList)) {
-                    for (InOutWarehouseTask inoutwarehouse : inOutWarehouseTaskList) {
-                        if (StringUtils.isEmpty(stockReturnCount)) {
-                            stockReturnCount = "0";
-                        }
-                        stockReturnCount = String.valueOf(Float.valueOf(stockReturnCount) + inoutwarehouse.getWeight());
+                Float stockReturnCount = 0.0f;
+                // 查询退库量
+                List<WarehouseInOutInfo> warehouseInOutInfoAllList2 = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                        .eq("status_flag", "3").eq("contract_no", inOutWarehouseTaska.getMoveTaskNo()).eq("in_out_type", "退库"));
+                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList2)) {
+                    Float netWeight = 0f;
+                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList2) {
+                        //潮粮累计纯重，干粮累计净重
+                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
                     }
+                    stockReturnCount = stockReturnCount + netWeight;
+                    inOutWarehouseTaska.setStockReturnCount(stockReturnCount);
                 }
-                inOutWarehouseTaska.setInOutWarehouseTaskList(inOutWarehouseTaskList);
-                inOutWarehouseTaska.setStockReturnCount(stockReturnCount);
+//                //定义累计退库量
+//                String stockReturnCount = "0";
+//
+//                //查询退库量
+//                List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
+//                        .eq("contract_no", inOutWarehouseTaska.getMoveTaskNo())
+//                        .eq("in_out_type_key", "6")
+//                        .eq("delete_flag", "0"));
+//                if (!CollectionUtils.isEmpty(inOutWarehouseTaskList)) {
+//                    for (InOutWarehouseTask inoutwarehouse : inOutWarehouseTaskList) {
+//                        if (StringUtils.isEmpty(stockReturnCount)) {
+//                            stockReturnCount = "0";
+//                        }
+//                        stockReturnCount = String.valueOf(Float.valueOf(stockReturnCount) + inoutwarehouse.getWeight());
+//                    }
+//                }
+//                inOutWarehouseTaska.setInOutWarehouseTaskList(inOutWarehouseTaskList);
+//                inOutWarehouseTaska.setStockReturnCount(stockReturnCount);
             }
         }
 
@@ -357,7 +402,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         if (!CollectionUtils.isEmpty(inOutWarehouseTaskList)) {
             for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
                 //定义累计退库量
-                String stockReturnCount = "";
+                Float stockReturnCount = 0f;
                 //查询退库量
                 List<InOutWarehouseTask> inOutWarehouseTaskList1 = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
                         .eq("in_out_type_key", "6")
@@ -365,10 +410,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                         .eq("delete_flag", "0"));
                 if (!CollectionUtils.isEmpty(inOutWarehouseTaskList1)) {
                     for (InOutWarehouseTask inoutwarehouse : inOutWarehouseTaskList1) {
-                        if (StringUtils.isEmpty(stockReturnCount)) {
-                            stockReturnCount = "0";
-                        }
-                        stockReturnCount = String.valueOf(Float.valueOf(stockReturnCount) + inoutwarehouse.getWeight());
+                        stockReturnCount = stockReturnCount + inoutwarehouse.getWeight();
                     }
                 }
                 inOutWarehouseTask.setInOutWarehouseTaskList(inOutWarehouseTaskList1);