1

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

@@ -515,12 +515,14 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 if (contractManagementInfo==null){
                     InOutWarehouseTask inOutWarehouseTask =  inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                             .eq("comp_id",weighingManagement.getCompId())
-                            .eq("in_out_task_no",qualityInspectionManagement.getInOutTaskNo()));
-                    contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                            .eq("comp_id",weighingManagement.getCompId())
-                            .eq("contract_no",inOutWarehouseTask.getSendWarehouse()));
-                    if (contractManagementInfo!=null){
-                        weighingManagement.setContractManagement(contractManagementInfo);
+                            .eq("in_out_task_no",qualityInspectionManagement.getInOutTaskNo()!=null?qualityInspectionManagement.getInOutTaskNo():weighingManagement.getInOutTaskNo()));
+                    if (inOutWarehouseTask!=null) {
+                        contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                                .eq("comp_id", weighingManagement.getCompId())
+                                .eq("contract_no", inOutWarehouseTask.getSendWarehouse()));
+                        if (contractManagementInfo != null) {
+                            weighingManagement.setContractManagement(contractManagementInfo);
+                        }
                     }
                 }
             }