更新

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

@@ -133,14 +133,16 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                     paymentManagement1.setIdentityAuthenticationInfo(identityAuthenticationInfo);
                 }
                 WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                        .eq("relation_id", paymentManagement1.getRelationId()));
+                        .eq("relation_id", paymentManagement1.getRelationId())
+                        .eq("comp_id", paymentManagement1.getCompId()));
                 if (weighingManagement!=null){
                     paymentManagement1.setContractPrice(weighingManagement.getContractPrice());
                     paymentManagement1.setWeighingPictureAddress(weighingManagement.getPictureAddress());
                     paymentManagement1.setWeighingManagement(weighingManagement);
                 }
                 QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                        .eq("relation_id", paymentManagement1.getRelationId()));
+                        .eq("relation_id", paymentManagement1.getRelationId())
+                        .eq("comp_id", paymentManagement1.getCompId()));
                 if (qualityInspectionManagement!=null){
                     paymentManagement1.setQualityInspectionPictureAddress(qualityInspectionManagement.getPictureAddress());
                     paymentManagement1.setQualityInspectionManagement(qualityInspectionManagement);
@@ -173,10 +175,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         PaymentManagement paymentManagement=this.selectById(id);
         //质检信息
         QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                .eq("relation_id", paymentManagement.getRelationId()));
+                .eq("relation_id", paymentManagement.getRelationId())
+                .eq("comp_id", paymentManagement.getCompId()));
         //检斤信息
         WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                .eq("relation_id", paymentManagement.getRelationId()));
+                .eq("relation_id", paymentManagement.getRelationId())
+                .eq("comp_id", paymentManagement.getCompId()));
         CommonCompany commonCompany=commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()
                 .eq("comp_id",paymentManagement.getCompId()));
         //公司名
@@ -243,7 +247,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         this.openAuditFlow(paymentManagement1);
         //查询关联流转记录
         QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                .eq("relation_id",paymentManagement1.getRelationId()));
+                .eq("relation_id",paymentManagement1.getRelationId())
+                .eq("comp_id", paymentManagement1.getCompId()));
         WarehouseInOutInfo warehouseInOutInfo1 = new WarehouseInOutInfo();
         WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                 .eq("warehouse_name",paymentManagement1.getWarehouseName())
@@ -557,10 +562,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             this.deleteById(paymentManagement.getId());
             //质检信息
             QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                    .eq("relation_id", paymentManagement.getRelationId()));
+                    .eq("relation_id", paymentManagement.getRelationId())
+                    .eq("comp_id", paymentManagement.getCompId()));
             //检斤信息
             WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                    .eq("relation_id", paymentManagement.getRelationId()));
+                    .eq("relation_id", paymentManagement.getRelationId())
+                    .eq("comp_id", paymentManagement.getCompId()));
             qualityInspectionManagement.deleteById(qualityInspectionManagement.getId());
             weighingManagement.deleteById(weighingManagement.getId());
 

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

@@ -71,7 +71,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         List<QualityInspectionManagement> dataList = baseMapper.getListByCondition(pageView);
         for (QualityInspectionManagement qualityInspectionManagement1:dataList) {
             WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                    .eq("relation_id", qualityInspectionManagement1.getRelationId()));
+                    .eq("relation_id", qualityInspectionManagement1.getRelationId())
+                    .eq("comp_id", qualityInspectionManagement.getCompId()));
             if (weighingManagement != null) {
                 qualityInspectionManagement1.setWeighingManagement(weighingManagement);
             }
@@ -95,7 +96,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         if(qualityInspectionManagement != null){
             //检斤信息
             WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                    .eq("relation_id", qualityInspectionManagement.getRelationId()));
+                    .eq("relation_id", qualityInspectionManagement.getRelationId())
+                    .eq("comp_id", qualityInspectionManagement.getCompId()));
             if (weighingManagement!=null){
                 weighingManagementService.deleteById(weighingManagement.getId());
             }

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

@@ -81,12 +81,14 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     weighingManagement1.setCompName(commonCompany.getCompName());
                 }
                 PaymentManagement paymentManagement=paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()
-                        .eq("relation_id",weighingManagement1.getRelationId()));
+                        .eq("relation_id",weighingManagement1.getRelationId())
+                        .eq("comp_id", weighingManagement1.getCompId()));
                 if(paymentManagement!=null){
                     weighingManagement1.setPaymentManagement(paymentManagement);
                 }
                 QualityInspectionManagement qualityInspectionManagement=qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                        .eq("relation_id",weighingManagement1.getRelationId()));
+                        .eq("relation_id",weighingManagement1.getRelationId())
+                        .eq("comp_id", weighingManagement1.getCompId()));
                 if(qualityInspectionManagement!=null){
                     weighingManagement1.setQualityInspectionManagement(qualityInspectionManagement);
                 }
@@ -124,7 +126,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         weighingManagement.setSecretaryWeigher(commonStaff.getStaffName());
         //质检信息
         QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                .eq("relation_id", weighingManagement.getRelationId()));
+                .eq("relation_id", weighingManagement.getRelationId())
+                .eq("comp_id", commonStaff.getCompId()));
         if (qualityInspectionManagement!=null){
             //状态改为已称毛重
 //            qualityInspectionManagement.setStatus(StatusEnum.WEIGHED_GROSS_WEIGHT.getName());
@@ -194,7 +197,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         weighingManagement.setSkinInspector(commonStaff.getStaffName());
         //质检信息
         QualityInspectionManagement qualityInspectionManagement1 = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                .eq("relation_id", weighingManagement1.getRelationId()));
+                .eq("relation_id", weighingManagement1.getRelationId())
+                .eq("comp_id", weighingManagement1.getCompId()));
         if (qualityInspectionManagement1!=null){
             //状态改为已称皮重
 //            qualityInspectionManagement1.setStatus(StatusEnum.TARED.getName());
@@ -205,7 +209,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         if("1".equals(weighingManagement1.getManagementType())){
             //查关联的付款信息
             PaymentManagement paymentManagement=paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()
-                    .eq("relation_id",weighingManagement1.getRelationId()));
+                    .eq("relation_id",weighingManagement1.getRelationId())
+                    .eq("comp_id", weighingManagement1.getCompId()));
             if (paymentManagement!=null){
                 paymentManagement.setNetWeight(weighingManagement.getNetWeight());
                 paymentManagementService.updateById(paymentManagement);
@@ -241,7 +246,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 paymentManagement1.setWarehouseName(weighingManagement1.getWarehouseName());
                 //质检信息
                 QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                        .eq("relation_id", weighingManagement1.getRelationId()));
+                        .eq("relation_id", weighingManagement1.getRelationId())
+                        .eq("comp_id", weighingManagement1.getCompId()));
                 if (qualityInspectionManagement!=null){
                     if ("潮粮".equals(weighingManagement1.getType())) {
                         paymentManagement1.setTidalGrainPrice(qualityInspectionManagement.getTidalGrainPrice());
@@ -301,7 +307,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             }
             //质检信息
             QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                    .eq("relation_id", weighingManagement.getRelationId()));
+                    .eq("relation_id", weighingManagement.getRelationId())
+                    .eq("comp_id", weighingManagement.getCompId()));
             if (qualityInspectionManagement!=null) {
                 weighingManagement.setQualityInspectionManagement(qualityInspectionManagement);
             }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WeighingManagementMapper.xml

@@ -26,6 +26,7 @@
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement">
         SELECT
         id,
+        comp_id as compId,
         number,
         customer,
         type,