1

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

@@ -91,12 +91,6 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 if (commonCompany != null) {
                     weighingManagement1.setCompName(commonCompany.getCompName());
                 }
-                ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                        .eq("comp_id",weighingManagement1.getCompId())
-                        .eq("contract_no",weighingManagement1.getContractNo()));
-                if (contractManagementInfo!=null){
-                    weighingManagement1.setContractManagement(contractManagementInfo);
-                }
                 PaymentManagement paymentManagement = paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()
                         .eq("relation_id", weighingManagement1.getRelationId())
                         .eq("comp_id", weighingManagement1.getCompId()));
@@ -318,6 +312,12 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             if (commonCompany!=null){
                 weighingManagement.setCompName(commonCompany.getCompName());
             }
+            ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                    .eq("comp_id",weighingManagement.getCompId())
+                    .eq("contract_no",weighingManagement.getContractNo()));
+            if (contractManagementInfo!=null){
+                weighingManagement.setContractManagement(contractManagementInfo);
+            }
             WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                     .eq("comp_id",weighingManagement.getCompId())
                     .eq("warehouse_name",weighingManagement.getWarehouseName()));