diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageInExcelVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageInExcelVO.java index a752106a..9626f064 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageInExcelVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageInExcelVO.java @@ -17,7 +17,7 @@ import java.time.LocalDate; @ExcelIgnoreUnannotated public class WmsStorageInExcelVO { @ExcelProperty("系统编号") - private Long systemID = 1L; + private Long id = 1L; @ExcelProperty("业务类型") private String busiType; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageOutExcelVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageOutExcelVO.java index 13af615f..576f72ad 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageOutExcelVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageOutExcelVO.java @@ -17,7 +17,7 @@ import java.time.LocalDate; @ExcelIgnoreUnannotated public class WmsStorageOutExcelVO { @ExcelProperty("系统编号") - private Long systemID = 1L; + private Long id = 1L; @ExcelProperty("仓库") private String whName; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailInExcelVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailInExcelVO.java index 00ac76f6..63abe02d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailInExcelVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailInExcelVO.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; @ExcelIgnoreUnannotated public class DetailInExcelVO { @ExcelProperty("系统编号") - private Long systemID = 1L; + private Long id = 1L; @ExcelProperty("物料编码") private String matCode; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailOutExcelVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailOutExcelVO.java index adf7a0cf..bd03ad28 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailOutExcelVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailOutExcelVO.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; public class DetailOutExcelVO { @ExcelProperty("系统编号") - private Long systemID = 1L; + private Long id = 1L; @ExcelProperty("物料编码") private String matCode; diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/WmsStorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/WmsStorageForm.vue index 23e617ac..d09be8a0 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/WmsStorageForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/WmsStorageForm.vue @@ -1,64 +1,38 @@ +