蛋出库管理

SERVER/ChickenFarmV3/vb-modules/vb-breeding/src/main/java/cn/vber/breeding/domain/Incubation.java

@@ -34,7 +34,7 @@ public class Incubation extends BaseEntity {
      * 孵化批次号（唯一标识）
      */
     private String incubationBatchNum;
-
+    private String batchNum;
     /**
      * 家系配种ID（关联f_family）
      */

SERVER/ChickenFarmV3/vb-modules/vb-breeding/src/main/java/cn/vber/breeding/domain/bo/IncubationBo.java

@@ -42,10 +42,12 @@ public class IncubationBo extends BaseEntity {
      */
     private String familyNum;
 
+    private String batchNum;
+
     /**
      * 母系ID
      */
-    @NotNull(message = "母系ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "母系ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long femaleChickenId;
 
 
@@ -53,7 +55,7 @@ public class IncubationBo extends BaseEntity {
     /**
      * 批次名称
      */
-    @NotBlank(message = "批次名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "批次名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String batchName;
 
     /**

SERVER/ChickenFarmV3/vb-modules/vb-breeding/src/main/java/cn/vber/breeding/domain/vo/IncubationVo.java

@@ -45,6 +45,8 @@ public class IncubationVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "唯=一标识")
     private String incubationBatchNum;
 
+    private String batchNum;
+
     /**
      * 家系配种ID（关联f_family）
      */

SERVER/ChickenFarmV3/vb-modules/vb-breeding/src/main/java/cn/vber/breeding/service/impl/BreedingEggOutServiceImpl.java

@@ -134,6 +134,7 @@ public class BreedingEggOutServiceImpl implements IBreedingEggOutService {
                 String generateUniqueCode = generateUniqueCode("FH");
                 incubation.setIncubationBatchNum(generateUniqueCode);
                 incubation.setBatchName(generateUniqueCode);
+                incubation.setBatchNum(item.getBatchNum());
                 incubation.setFamilyNum(breedingEggIn.getFamilyNum());
                 incubation.setVarietyId(batch.getVarietyId());
                 incubation.setVarietyName(batch.getVarietyName());

UI/VB.VUE/src/views/breeding/incubation/index.vue

@@ -28,21 +28,21 @@ const opts = reactive({
 			tooltip: true
 		},
 		{
-			field: "femaleChickenWingTagNum",
-			name: "母系翅号",
+			field: "batchNum",
+			name: "批次号",
 			visible: true,
 			isSort: false,
 			width: "auto",
 			tooltip: true
 		},
-		{
-			field: "batchName",
-			name: "批次名",
-			visible: false,
-			isSort: false,
-			width: "auto",
-			tooltip: true
-		},
+		// {
+		// 	field: "batchName",
+		// 	name: "批次名",
+		// 	visible: false,
+		// 	isSort: false,
+		// 	width: "auto",
+		// 	tooltip: true
+		// },
 
 		{
 			field: "varietyName",
@@ -123,6 +123,7 @@ const opts = reactive({
 	queryParams: {
 		incubationBatchNum: undefined,
 		familyNum: undefined,
+		batchNum: undefined,
 		femaleChickenWingNum: undefined,
 		femaleChickenId: undefined,
 		batchName: undefined,
@@ -177,11 +178,11 @@ const opts = reactive({
 		// 	}
 		// },
 		{
-			field: "batchName",
-			label: "批次名称",
+			field: "batchNum",
+			label: "批次号",
 			class: "w-100",
 			required: false,
-			placeholder: "请输入批次名称",
+			placeholder: "请输入批次号",
 			component: "I",
 			listeners: {
 				keyup: (e: KeyboardEvent) => {
@@ -449,6 +450,7 @@ const opts = reactive({
 	emptyFormData: {
 		id: undefined,
 		incubationBatchNum: undefined,
+		batchNum: undefined,
 		familyNum: undefined,
 		femaleChickenWingTagNum: undefined,
 		femaleChickenId: undefined,