修物料库存为原料库存 去除type字段

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;
 }

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;
 }

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;
 }

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;
 }

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;
 
 }

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;
 }

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;
 }

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;
 }

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<MaterialInvento
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("r.name",query.getName());
         }
-        if(StringUtils.isNotBlank(query.getType())){
-            qw.like("r.type",query.getType());
-        }
         IPage<MaterialInventory> page = PagerUtil.queryToPage(pq);
         IPage<MaterialInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<MaterialInventoryVo> p = PagerUtil.pageToVo(pagging, null);

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<MaterialTypeMapper,
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("name",query.getName());
         }
-        if(StringUtils.isNotBlank(query.getType())){
-            qw.like("type",query.getType());
-        }
         IPage<MaterialType> page = PagerUtil.queryToPage(pq);
         IPage<MaterialTypeVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<MaterialTypeVo> p = PagerUtil.pageToVo(pagging, null);