1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -37,6 +37,8 @@ public enum YExceptionEnum {
 	TASK_NO_NOT_EXSITS_ERROR("ERROR", "移库任务编号不存在！"),
 	TASK_WEIGHT_EXCEEDED_ERROR("ERROR-001", "超出任务重量无法操作成功！"),
 	TRANTASK_NOT_CREATED_ERROR("ERROR-002", "内勤尚未创建运输任务！"),
+	PAYMENT_NOT_DELETED_ERROR("ERROR", "请先删除对应的付款信息！"),
+	WEIGHT_NOT_DELETED_ERROR("ERROR", "请先删除对应的检斤信息！"),
 	;
 	@Getter
 	private String value;

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

@@ -652,16 +652,16 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         PaymentManagement paymentManagement = this.selectById(id);
         if (paymentManagement != null) {
             this.deleteById(paymentManagement.getId());
-            //质检信息
-            QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
-                    .eq("relation_id", paymentManagement.getRelationId())
-                    .eq("comp_id", paymentManagement.getCompId()));
-            //检斤信息
-            WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                    .eq("relation_id", paymentManagement.getRelationId())
-                    .eq("comp_id", paymentManagement.getCompId()));
-            qualityInspectionManagement.deleteById(qualityInspectionManagement.getId());
-            weighingManagement.deleteById(weighingManagement.getId());
+//            //质检信息
+//            QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+//                    .eq("relation_id", paymentManagement.getRelationId())
+//                    .eq("comp_id", paymentManagement.getCompId()));
+//            //检斤信息
+//            WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
+//                    .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

@@ -11,6 +11,8 @@ import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.QualityInspectionManagementMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -107,15 +109,18 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         //查询质检管理信息
         QualityInspectionManagement qualityInspectionManagement = this.selectById(id);
         if(qualityInspectionManagement != null){
-            //检斤信息
+            //无检斤信息时可删除
             WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
                     .eq("relation_id", qualityInspectionManagement.getRelationId())
                     .eq("comp_id", qualityInspectionManagement.getCompId()));
-            if (weighingManagement!=null){
-                weighingManagementService.deleteById(weighingManagement.getId());
+            if (weighingManagement==null){
+                //删除质检管理信息
+                this.deleteById(qualityInspectionManagement.getId());
+//                weighingManagementService.deleteById(weighingManagement.getId());
+            }
+            else{
+                throw new YException(YExceptionEnum.WEIGHT_NOT_DELETED_ERROR);
             }
-            //删除质检管理信息
-            this.deleteById(qualityInspectionManagement.getId());
         }
     }
     /**

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

@@ -12,6 +12,8 @@ import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WeighingManagementMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -293,8 +295,17 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         //查询检斤管理信息
         WeighingManagement weighingManagement = this.selectById(id);
         if(weighingManagement != null){
-            //删除质检管理信息
-            this.deleteById(weighingManagement.getId());
+            //无关联的付款信息时可删除
+            PaymentManagement paymentManagement = paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()
+                    .eq("relation_id", weighingManagement.getRelationId())
+                    .eq("comp_id", weighingManagement.getCompId()));
+            if (paymentManagement==null){
+                //删除质检管理信息
+                this.deleteById(weighingManagement.getId());
+            }
+            else{
+                throw new YException(YExceptionEnum.PAYMENT_NOT_DELETED_ERROR);
+            }
         }
     }