diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventory.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventory.java index 8ba98d99..d783df0e 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventory.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventory.java @@ -23,6 +23,4 @@ public class MaterialInventory extends BaseEntity { private double initialInventory=0; //物料类型 private String typeSid; - //1 原料 2 包装物 - private String type; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryDto.java index 5d978c6f..cc59102c 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryDto.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryDto.java @@ -23,6 +23,4 @@ public class MaterialInventoryDto implements Dto { private double initialInventory=0; //物料类型 private String typeSid; - //1 原料 2 包装物 - private String type; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryQuery.java index 453f2d46..cef6c251 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryQuery.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryQuery.java @@ -24,6 +24,4 @@ public class MaterialInventoryQuery implements Query { private double initialInventory=0; //物料类型 private String typeSid; - //1:物料 2包装物 - private String type; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryVo.java index a2b91a1b..ec22ca23 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryVo.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryVo.java @@ -26,6 +26,4 @@ public class MaterialInventoryVo implements Vo { private String typeSid; //物料类名称 private String typeName; - //1 原料 2 包装物 - private String type; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialType.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialType.java index 30ad6cb3..9d6bc05f 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialType.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialType.java @@ -19,6 +19,5 @@ public class MaterialType extends BaseEntity { private String name; //物料code private String code; - private String type; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeDto.java index 69ff001c..5493643a 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeDto.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeDto.java @@ -20,6 +20,4 @@ public class MaterialTypeDto implements Dto { private String name; //物料code private String code; - //1 原料 2 包装物 - private String type; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeQuery.java index 775eb81a..c8f0a242 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeQuery.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeQuery.java @@ -20,6 +20,4 @@ public class MaterialTypeQuery implements Query { private String name; //物料code private String code; - //1:物料 2包装物 - private String type; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeVo.java index d361d0ee..0e004410 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeVo.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeVo.java @@ -20,6 +20,4 @@ public class MaterialTypeVo implements Vo { private String name; //物料code private String code; - //1 原料 2 包装物 - private String type; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryService.java index e7015ba6..1c429c77 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryService.java @@ -31,9 +31,6 @@ public class MaterialInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeService.java index d857be22..64464158 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeService.java @@ -31,9 +31,6 @@ public class MaterialTypeService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null);