1

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

@@ -2508,17 +2508,27 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                         .eq("in_out_task_no", warehouseInOutInfo.getInOutTaskNo()));
                 if (inOutWarehouseTask != null) {
+                    //更新货源实际出库重量
+//                    List<SourceRelationInfo> sourceRelationInfoList=sourceRelationInfoService.selectList(new EntityWrapper<SourceRelationInfo>()
+//                            .eq("task_id",inOutWarehouseTask.getId()));
+//                    if (!CollectionUtils.isEmpty(sourceRelationInfoList)){
+//                        for (SourceRelationInfo sourceRelationInfo:sourceRelationInfoList){
+//                            //实际重量
+//                            sourceRelationInfo.setActualOutWarehouseWeight(sourceRelationInfo.getActualOutWarehouseWeight()+Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()*sourceRelationInfo.getProportion())));
+//                            sourceRelationInfoService.updateById(sourceRelationInfo);
+//                        }
+//                    }
                     //可超出重量
                     Float overNeight = 0.0f;
                     ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                             .eq("comp_id", inOutWarehouseTask.getCompId())
                             .eq("contract_no", inOutWarehouseTask.getContractNo()));
-                    //入库
-                    if (contractManagementInfo != null && "2".equals(inOutWarehouseTask.getInOutFlag())) {
+                    //出入库有合同
+                    if (contractManagementInfo != null) {
                         overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
                     }
-                    //出库
-                    else if ("1".equals(inOutWarehouseTask.getInOutFlag())) {
+                    //出库无合同情况
+                    else if (contractManagementInfo == null &&"1".equals(inOutWarehouseTask.getInOutFlag())) {
                         overNeight = inOutWarehouseTask.getWeight() * 0.05f;
                     } else {
                         contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
@@ -2551,19 +2561,29 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                         .eq("in_out_task_no", warehouseInOutInfo.getInOutTaskNo()));
                 if (inOutWarehouseTask != null) {
+                    //更新货源实际出库重量
+//                    List<SourceRelationInfo> sourceRelationInfoList=sourceRelationInfoService.selectList(new EntityWrapper<SourceRelationInfo>()
+//                            .eq("task_id",inOutWarehouseTask.getId()));
+//                    if (!CollectionUtils.isEmpty(sourceRelationInfoList)){
+//                        for (SourceRelationInfo sourceRelationInfo:sourceRelationInfoList){
+//                            //实际重量
+//                            sourceRelationInfo.setActualOutWarehouseWeight(sourceRelationInfo.getActualOutWarehouseWeight()+Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()*sourceRelationInfo.getProportion())));
+//                            sourceRelationInfoService.updateById(sourceRelationInfo);
+//                        }
+//                    }
                     //可超出重量
                     Float overNeight = 0.0f;
                     ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                             .eq("comp_id", inOutWarehouseTask.getCompId())
                             .eq("contract_no", inOutWarehouseTask.getContractNo()));
-                    //入库
-                    if (contractManagementInfo != null && "2".equals(inOutWarehouseTask.getInOutFlag())) {
+                    //出入库有合同
+                    if (contractManagementInfo != null) {
                         overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
                     }
-                    //出库
-                    else if ("1".equals(inOutWarehouseTask.getInOutFlag())) {
+                    //出库无合同情况
+                    else if (contractManagementInfo == null &&"1".equals(inOutWarehouseTask.getInOutFlag())) {
                         overNeight = inOutWarehouseTask.getWeight() * 0.05f;
-                    }else {
+                    } else {
                         contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("comp_id", inOutWarehouseTask.getCompId())
                                 .eq("contract_no", inOutWarehouseTask.getWarehouseName()));