222

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BreedController.java

@@ -79,12 +79,17 @@ public class BreedController {
 
 
 
+
         if (ObjectUtil.isNotEmpty(duckInfo)) {
             if (duckInfo.getDuckSex() == 0) {
                 breed.setMaleNum(maleNum);
             } else {
                 return new Result(10001, "雌鸭编号不能填入雄鸭配种中！", false);
             }
+            if (duckInfo.getIsCage() == 1) {
+                return new Result(10001, "该鸭只已离场", false);
+            }
+
             if (duckInfo.getDayAge() < 100) {
                 return new Result(10001, "父亲（或母亲）鸭只日龄小于100天！", false);
             }
@@ -93,12 +98,14 @@ public class BreedController {
         }
 
         if (ObjectUtil.isNotEmpty(duckInfo1)) {
-            if (duckInfo1.getDuckSex() == 0) {
+            if (duckInfo1.getDuckSex() == 1) {
                 breed.setFemaleNum(femaleNum);
             } else {
                 return new Result(10001, "雄鸭编号不能填入雌鸭配种中！", false);
             }
-
+            if (duckInfo1.getIsCage() == 1) {
+                return new Result(10001, "该鸭只已离场", false);
+            }
             if (duckInfo1.getDayAge() < 100) {
 
                 return new Result(10001, "父亲（或母亲）鸭只日龄小于100天！", false);