tijiapo

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>RMS_CAPACITY_CARRIER</param>
+                        <param>RMS_MATERIAL_TYPE</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/RmsMaterialTypeController.java

@@ -53,42 +53,50 @@ public class RmsMaterialTypeController extends BaseRESTfulController {
         if (mapValue==null){
             mapValue=new HashMap<>();
         }
-
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_material_type_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = rmsMaterialTypeService.getMaterialTypeList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_material_type_list");
-            //添加id
-            map.put("indexId", "materialTypeId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = rmsMaterialTypeService.getMaterialTypeList(mapValue);
+        if (con != null && !"null".equals(con)){
+            mapValue.put("con","%" + con + "%");
         }
-        PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsMaterialTypeService.getMaterialTypeList(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        return success(data);
+    }
 
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "376", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getInwardContractMaterial")
+    public RESTfulResult getInwardContractMaterial(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        if(con != null){
+            mapValue.put("con","%" + con + "%");
+        }
+        //分页查询数据
+        List<Map<String, Object>> columnList = rmsMaterialTypeService.getInwardContractMaterial(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
+
+    /**
+     * 新增货物品名
+     * @param mapValue
+     * @return
+     */
+    @PostMapping("/insertMaterialType")
+    public RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String,Object> mapValue){
+        int i = rmsMaterialTypeService.insertMaterialType(mapValue);
+        return success(i);
+    }
+
+
 }

src/main/java/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.RmsMaterialType;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -15,4 +16,10 @@ public interface RmsMaterialTypeMapper extends IBaseMapper<RmsMaterialType, BigD
     List<RmsMaterialType> selectByParameters(Map<String, Object> parameters);
 
     List<Map<String, Object>> getMaterialTypeList(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getInwardContractMaterial(Map<String, Object> mapValue);
+
+    @Select("select seq__RMS_MATERIAL_TYPE.nextval from dual")
+    BigDecimal getMaterialTypeId();
+
 }

src/main/java/com/steerinfo/dil/model/RmsMaterialType.java

@@ -16,28 +16,28 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
     private BigDecimal materialTypeId;
 
     /**
-     * 物资类型名称（钢材、铸管、危化品、钢渣、水渣、废旧物资、焦炭）(MATERIAL_TYPE_NAME,VARCHAR,20)
+     * 物资类型名称（钢材、铸管、危化品、钢渣、水渣、废旧物资、焦炭）(MATERIAL_TYPE_NAME,VARCHAR,100)
      */
     @ApiModelProperty(value="物资类型名称（钢材、铸管、危化品、钢渣、水渣、废旧物资、焦炭）",required=false)
     private String materialTypeName;
 
     /**
-     * 数量单位（件、支）(MATERIAL_UNIT,VARCHAR,20)
+     * 物资类型编码(MATERIAL_TYPE_CODE,VARCHAR,50)
      */
-    @ApiModelProperty(value="数量单位（件、支）",required=false)
-    private String materialUnit;
+    @ApiModelProperty(value="物资类型编码",required=false)
+    private String materialTypeCode;
 
     /**
-     * 装卸货次序(MATERIAL_ORDER,DECIMAL,0)
+     * 物资类型全称(MATERIAL_TYPE_SHOWNAME,VARCHAR,200)
      */
-    @ApiModelProperty(value="装卸货次序",required=false)
-    private BigDecimal materialOrder;
-    /*
-    * 物资状态
-    * */
-    @ApiModelProperty(value="物资状态",required =false )
-    private String materialTypeStatus;
+    @ApiModelProperty(value="物资类型全称",required=false)
+    private String materialTypeShowname;
 
+    /**
+     * 物资类型层级(MATERIAL_TYPE_CLASSIS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资类型层级",required=false)
+    private BigDecimal materialTypeClassis;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
@@ -69,12 +69,36 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
-    /*
-    * 逻辑删除
-    * */
-    @ApiModelProperty(value = "逻辑删除",required = false)
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 数量单位(MATERIAL_UNIT,VARCHAR,20)
+     */
+    @ApiModelProperty(value="数量单位",required=false)
+    private String materialUnit;
+
+    /**
+     * 装卸货次序(MATERIAL_ORDER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="装卸货次序",required=false)
+    private BigDecimal materialOrder;
+
+    /**
+     * 物资状态（是否停产）(MATERIAL_TYPE_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资状态（是否停产）",required=false)
+    private BigDecimal materialTypeStatus;
+
+    /**
+     * 是否内转(1:是)(MATERIAL_ISINWARD,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否内转(1:是)",required=false)
+    private BigDecimal materialIsinward;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -103,36 +127,28 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
         this.materialTypeName = materialTypeName == null ? null : materialTypeName.trim();
     }
 
-    public String getMaterialUnit() {
-        return materialUnit;
-    }
-
-    public void setMaterialUnit(String materialUnit) {
-        this.materialUnit = materialUnit == null ? null : materialUnit.trim();
-    }
-
-    public BigDecimal getMaterialOrder() {
-        return materialOrder;
+    public String getMaterialTypeCode() {
+        return materialTypeCode;
     }
 
-    public void setMaterialOrder(BigDecimal materialOrder) {
-        this.materialOrder = materialOrder;
+    public void setMaterialTypeCode(String materialTypeCode) {
+        this.materialTypeCode = materialTypeCode == null ? null : materialTypeCode.trim();
     }
 
-    public String getMaterialTypeStatus() {
-        return materialTypeStatus;
+    public String getMaterialTypeShowname() {
+        return materialTypeShowname;
     }
 
-    public void setMaterialTypeStatus(String materialTypeStatus) {
-        this.materialTypeStatus = materialTypeStatus;
+    public void setMaterialTypeShowname(String materialTypeShowname) {
+        this.materialTypeShowname = materialTypeShowname == null ? null : materialTypeShowname.trim();
     }
 
-    public BigDecimal getDeleted() {
-        return deleted;
+    public BigDecimal getMaterialTypeClassis() {
+        return materialTypeClassis;
     }
 
-    public void setDeleted(BigDecimal deleted) {
-        this.deleted = deleted;
+    public void setMaterialTypeClassis(BigDecimal materialTypeClassis) {
+        this.materialTypeClassis = materialTypeClassis;
     }
 
     public String getInsertUsername() {
@@ -175,6 +191,46 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getMaterialUnit() {
+        return materialUnit;
+    }
+
+    public void setMaterialUnit(String materialUnit) {
+        this.materialUnit = materialUnit == null ? null : materialUnit.trim();
+    }
+
+    public BigDecimal getMaterialOrder() {
+        return materialOrder;
+    }
+
+    public void setMaterialOrder(BigDecimal materialOrder) {
+        this.materialOrder = materialOrder;
+    }
+
+    public BigDecimal getMaterialTypeStatus() {
+        return materialTypeStatus;
+    }
+
+    public void setMaterialTypeStatus(BigDecimal materialTypeStatus) {
+        this.materialTypeStatus = materialTypeStatus;
+    }
+
+    public BigDecimal getMaterialIsinward() {
+        return materialIsinward;
+    }
+
+    public void setMaterialIsinward(BigDecimal materialIsinward) {
+        this.materialIsinward = materialIsinward;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -183,15 +239,19 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
         sb.append("Hash = ").append(hashCode());
         sb.append(", materialTypeId=").append(materialTypeId);
         sb.append(", materialTypeName=").append(materialTypeName);
-        sb.append(", materialUnit=").append(materialUnit);
-        sb.append(", materialOrder=").append(materialOrder);
-        sb.append(", materialTypeStatus=").append(materialTypeStatus);
+        sb.append(", materialTypeCode=").append(materialTypeCode);
+        sb.append(", materialTypeShowname=").append(materialTypeShowname);
+        sb.append(", materialTypeClassis=").append(materialTypeClassis);
         sb.append(", insertUsername=").append(insertUsername);
         sb.append(", insertTime=").append(insertTime);
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
-        sb.append(",deleted=").append(deleted);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", materialUnit=").append(materialUnit);
+        sb.append(", materialOrder=").append(materialOrder);
+        sb.append(", materialTypeStatus=").append(materialTypeStatus);
+        sb.append(", materialIsinward=").append(materialIsinward);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/IRmsMaterialTypeService.java

@@ -12,4 +12,8 @@ import java.util.Map;
 public interface IRmsMaterialTypeService {
 
     List<Map<String, Object>> getMaterialTypeList(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getInwardContractMaterial(Map<String, Object> mapValue);
+
+    int insertMaterialType(Map<String, Object> mapValue);
 }

src/main/java/com/steerinfo/dil/service/impl/RmsMaterialTypeServiceImpl.java

@@ -1,10 +1,12 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsMaterialTypeMapper;
+import com.steerinfo.dil.model.RmsMaterialType;
 import com.steerinfo.dil.service.IRmsMaterialTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -24,4 +26,21 @@ public class RmsMaterialTypeServiceImpl implements IRmsMaterialTypeService {
     public List<Map<String, Object>> getMaterialTypeList(Map<String, Object> mapValue) {
         return rmsMaterialTypeMapper.getMaterialTypeList(mapValue);
     }
+
+    @Override
+    public List<Map<String, Object>> getInwardContractMaterial(Map<String, Object> mapValue) {
+        return rmsMaterialTypeMapper.getInwardContractMaterial(mapValue);
+    }
+
+    @Override
+    public int insertMaterialType(Map<String, Object> mapValue) {
+        String materialTypeName = (String) mapValue.get("materialTypeName");
+        BigDecimal materialTypeId = rmsMaterialTypeMapper.getMaterialTypeId();
+        RmsMaterialType rmsMaterialType = new RmsMaterialType();
+        rmsMaterialType.setMaterialTypeId(materialTypeId);
+        rmsMaterialType.setMaterialTypeName(materialTypeName);
+        rmsMaterialType.setMaterialIsinward(new BigDecimal(1));
+        rmsMaterialTypeMapper.insertSelective(rmsMaterialType);
+        return 1;
+    }
 }

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -28,7 +28,7 @@ public class ColumnDataUtil {
     public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data) {
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
         for (Map<String, Object> columnData : columnDataList) {
-            //每个表头字段的过滤条件
+            //每个表头字段的过滤条
             columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
         }
         PageListAdd pageList = new PageListAdd(data);

src/main/resources/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.xml

@@ -4,21 +4,31 @@
   <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsMaterialType">
     <id column="MATERIAL_TYPE_ID" jdbcType="DECIMAL" property="materialTypeId" />
     <result column="MATERIAL_TYPE_NAME" jdbcType="VARCHAR" property="materialTypeName" />
-    <result column="MATERIAL_UNIT" jdbcType="VARCHAR" property="materialUnit" />
-    <result column="MATERIAL_ORDER" jdbcType="DECIMAL" property="materialOrder" />
+    <result column="MATERIAL_TYPE_CODE" jdbcType="VARCHAR" property="materialTypeCode" />
+    <result column="MATERIAL_TYPE_SHOWNAME" jdbcType="VARCHAR" property="materialTypeShowname" />
+    <result column="MATERIAL_TYPE_CLASSIS" jdbcType="DECIMAL" property="materialTypeClassis" />
     <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
     <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="MATERIAL_UNIT" jdbcType="VARCHAR" property="materialUnit" />
+    <result column="MATERIAL_ORDER" jdbcType="DECIMAL" property="materialOrder" />
+    <result column="MATERIAL_TYPE_STATUS" jdbcType="DECIMAL" property="materialTypeStatus" />
+    <result column="MATERIAL_ISINWARD" jdbcType="DECIMAL" property="materialIsinward" />
   </resultMap>
   <sql id="columns">
-    MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+    MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, MATERIAL_TYPE_CODE, MATERIAL_TYPE_SHOWNAME, 
+    MATERIAL_TYPE_CLASSIS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+    INSERT_UPDATE_REMARK, DELETED, MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_TYPE_STATUS, 
+    MATERIAL_ISINWARD
   </sql>
   <sql id="columns_alias">
-    t.MATERIAL_TYPE_ID, t.MATERIAL_TYPE_NAME, t.MATERIAL_UNIT, t.MATERIAL_ORDER, t.MATERIAL_PACKING_TYPE, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+    t.MATERIAL_TYPE_ID, t.MATERIAL_TYPE_NAME, t.MATERIAL_TYPE_CODE, t.MATERIAL_TYPE_SHOWNAME, 
+    t.MATERIAL_TYPE_CLASSIS, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.MATERIAL_UNIT, t.MATERIAL_ORDER, t.MATERIAL_TYPE_STATUS, 
+    t.MATERIAL_ISINWARD
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_MATERIAL_TYPE
@@ -27,21 +37,21 @@
     SELECT <include refid="columns_alias" /> FROM RMS_MATERIAL_TYPE t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="materialTypeId != null">
         and MATERIAL_TYPE_ID = #{materialTypeId}
       </if>
       <if test="materialTypeName != null and materialTypeName != ''">
         and MATERIAL_TYPE_NAME = #{materialTypeName}
       </if>
-      <if test="materialUnit != null and materialUnit != ''">
-        and MATERIAL_UNIT = #{materialUnit}
+      <if test="materialTypeCode != null and materialTypeCode != ''">
+        and MATERIAL_TYPE_CODE = #{materialTypeCode}
       </if>
-      <if test="materialOrder != null">
-        and MATERIAL_ORDER = #{materialOrder}
+      <if test="materialTypeShowname != null and materialTypeShowname != ''">
+        and MATERIAL_TYPE_SHOWNAME = #{materialTypeShowname}
       </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        and MATERIAL_PACKING_TYPE = #{materialPackingType}
+      <if test="materialTypeClassis != null">
+        and MATERIAL_TYPE_CLASSIS = #{materialTypeClassis}
       </if>
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME = #{insertUsername}
@@ -58,24 +68,39 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
       </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="materialUnit != null and materialUnit != ''">
+        and MATERIAL_UNIT = #{materialUnit}
+      </if>
+      <if test="materialOrder != null">
+        and MATERIAL_ORDER = #{materialOrder}
+      </if>
+      <if test="materialTypeStatus != null">
+        and MATERIAL_TYPE_STATUS = #{materialTypeStatus}
+      </if>
+      <if test="materialIsinward != null">
+        and MATERIAL_ISINWARD = #{materialIsinward}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="materialTypeId != null">
         and MATERIAL_TYPE_ID = #{materialTypeId}
       </if>
       <if test="materialTypeName != null and materialTypeName != ''">
         and MATERIAL_TYPE_NAME LIKE '%${materialTypeName}%'
       </if>
-      <if test="materialUnit != null and materialUnit != ''">
-        and MATERIAL_UNIT LIKE '%${materialUnit}%'
+      <if test="materialTypeCode != null and materialTypeCode != ''">
+        and MATERIAL_TYPE_CODE LIKE '%${materialTypeCode}%'
       </if>
-      <if test="materialOrder != null">
-        and MATERIAL_ORDER = #{materialOrder}
+      <if test="materialTypeShowname != null and materialTypeShowname != ''">
+        and MATERIAL_TYPE_SHOWNAME LIKE '%${materialTypeShowname}%'
       </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        and MATERIAL_PACKING_TYPE LIKE '%${materialPackingType}%'
+      <if test="materialTypeClassis != null">
+        and MATERIAL_TYPE_CLASSIS = #{materialTypeClassis}
       </if>
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME LIKE '%${insertUsername}%'
@@ -92,52 +117,86 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
       </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
-    delete from RMS_MATERIAL_TYPE
-    where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RMS_MATERIAL_TYPE
-    where 1!=1 
-      <if test="materialTypeName != null and materialTypeName != ''">
-        or MATERIAL_TYPE_NAME = #{materialTypeName}
+      <if test="deleted != null">
+        and DELETED = #{deleted}
       </if>
       <if test="materialUnit != null and materialUnit != ''">
-        or MATERIAL_UNIT = #{materialUnit}
+        and MATERIAL_UNIT LIKE '%${materialUnit}%'
       </if>
       <if test="materialOrder != null">
-        or MATERIAL_ORDER = #{materialOrder}
-      </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        or MATERIAL_PACKING_TYPE = #{materialPackingType}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
+        and MATERIAL_ORDER = #{materialOrder}
       </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      <if test="materialTypeStatus != null">
+        and MATERIAL_TYPE_STATUS = #{materialTypeStatus}
       </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      <if test="materialIsinward != null">
+        and MATERIAL_ISINWARD = #{materialIsinward}
       </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+    delete from RMS_MATERIAL_TYPE
+    where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_MATERIAL_TYPE
+    where 1!=1
+    <if test="materialTypeName != null and materialTypeName != ''">
+      or MATERIAL_TYPE_NAME = #{materialTypeName}
+    </if>
+    <if test="materialTypeCode != null and materialTypeCode != ''">
+      or MATERIAL_TYPE_CODE = #{materialTypeCode}
+    </if>
+    <if test="materialTypeShowname != null and materialTypeShowname != ''">
+      or MATERIAL_TYPE_SHOWNAME = #{materialTypeShowname}
+    </if>
+    <if test="materialTypeClassis != null">
+      or MATERIAL_TYPE_CLASSIS = #{materialTypeClassis}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="materialUnit != null and materialUnit != ''">
+      or MATERIAL_UNIT = #{materialUnit}
+    </if>
+    <if test="materialOrder != null">
+      or MATERIAL_ORDER = #{materialOrder}
+    </if>
+    <if test="materialTypeStatus != null">
+      or MATERIAL_TYPE_STATUS = #{materialTypeStatus}
+    </if>
+    <if test="materialIsinward != null">
+      or MATERIAL_ISINWARD = #{materialIsinward}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsMaterialType">
-    insert into RMS_MATERIAL_TYPE (MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, 
-      MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{materialTypeId,jdbcType=DECIMAL}, #{materialTypeName,jdbcType=VARCHAR}, 
-      #{materialUnit,jdbcType=VARCHAR}, #{materialOrder,jdbcType=DECIMAL}, #{materialPackingType,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+    insert into RMS_MATERIAL_TYPE (MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME,
+                                   MATERIAL_TYPE_CODE, MATERIAL_TYPE_SHOWNAME,
+                                   MATERIAL_TYPE_CLASSIS, INSERT_USERNAME, INSERT_TIME,
+                                   UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+                                   DELETED, MATERIAL_UNIT, MATERIAL_ORDER,
+                                   MATERIAL_TYPE_STATUS, MATERIAL_ISINWARD)
+    values (#{materialTypeId,jdbcType=DECIMAL}, #{materialTypeName,jdbcType=VARCHAR},
+            #{materialTypeCode,jdbcType=VARCHAR}, #{materialTypeShowname,jdbcType=VARCHAR},
+            #{materialTypeClassis,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+            #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+            #{deleted,jdbcType=DECIMAL}, #{materialUnit,jdbcType=VARCHAR}, #{materialOrder,jdbcType=DECIMAL},
+            #{materialTypeStatus,jdbcType=DECIMAL}, #{materialIsinward,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsMaterialType">
     insert into RMS_MATERIAL_TYPE
@@ -148,14 +207,14 @@
       <if test="materialTypeName != null">
         MATERIAL_TYPE_NAME,
       </if>
-      <if test="materialUnit != null">
-        MATERIAL_UNIT,
+      <if test="materialTypeCode != null">
+        MATERIAL_TYPE_CODE,
       </if>
-      <if test="materialOrder != null">
-        MATERIAL_ORDER,
+      <if test="materialTypeShowname != null">
+        MATERIAL_TYPE_SHOWNAME,
       </if>
-      <if test="materialPackingType != null">
-        MATERIAL_PACKING_TYPE,
+      <if test="materialTypeClassis != null">
+        MATERIAL_TYPE_CLASSIS,
       </if>
       <if test="insertUsername != null">
         INSERT_USERNAME,
@@ -172,6 +231,21 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK,
       </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="materialUnit != null">
+        MATERIAL_UNIT,
+      </if>
+      <if test="materialOrder != null">
+        MATERIAL_ORDER,
+      </if>
+      <if test="materialTypeStatus != null">
+        MATERIAL_TYPE_STATUS,
+      </if>
+      <if test="materialIsinward != null">
+        MATERIAL_ISINWARD,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="materialTypeId != null">
@@ -180,14 +254,14 @@
       <if test="materialTypeName != null">
         #{materialTypeName,jdbcType=VARCHAR},
       </if>
-      <if test="materialUnit != null">
-        #{materialUnit,jdbcType=VARCHAR},
+      <if test="materialTypeCode != null">
+        #{materialTypeCode,jdbcType=VARCHAR},
       </if>
-      <if test="materialOrder != null">
-        #{materialOrder,jdbcType=DECIMAL},
+      <if test="materialTypeShowname != null">
+        #{materialTypeShowname,jdbcType=VARCHAR},
       </if>
-      <if test="materialPackingType != null">
-        #{materialPackingType,jdbcType=VARCHAR},
+      <if test="materialTypeClassis != null">
+        #{materialTypeClassis,jdbcType=DECIMAL},
       </if>
       <if test="insertUsername != null">
         #{insertUsername,jdbcType=VARCHAR},
@@ -204,19 +278,39 @@
       <if test="insertUpdateRemark != null">
         #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="materialUnit != null">
+        #{materialUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="materialOrder != null">
+        #{materialOrder,jdbcType=DECIMAL},
+      </if>
+      <if test="materialTypeStatus != null">
+        #{materialTypeStatus,jdbcType=DECIMAL},
+      </if>
+      <if test="materialIsinward != null">
+        #{materialIsinward,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsMaterialType">
     update RMS_MATERIAL_TYPE
     set MATERIAL_TYPE_NAME = #{materialTypeName,jdbcType=VARCHAR},
-      MATERIAL_UNIT = #{materialUnit,jdbcType=VARCHAR},
-      MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
-      MATERIAL_PACKING_TYPE = #{materialPackingType,jdbcType=VARCHAR},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+        MATERIAL_TYPE_CODE = #{materialTypeCode,jdbcType=VARCHAR},
+        MATERIAL_TYPE_SHOWNAME = #{materialTypeShowname,jdbcType=VARCHAR},
+        MATERIAL_TYPE_CLASSIS = #{materialTypeClassis,jdbcType=DECIMAL},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        MATERIAL_UNIT = #{materialUnit,jdbcType=VARCHAR},
+        MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
+        MATERIAL_TYPE_STATUS = #{materialTypeStatus,jdbcType=DECIMAL},
+        MATERIAL_ISINWARD = #{materialIsinward,jdbcType=DECIMAL}
     where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsMaterialType">
@@ -225,14 +319,14 @@
       <if test="materialTypeName != null">
         MATERIAL_TYPE_NAME = #{materialTypeName,jdbcType=VARCHAR},
       </if>
-      <if test="materialUnit != null">
-        MATERIAL_UNIT = #{materialUnit,jdbcType=VARCHAR},
+      <if test="materialTypeCode != null">
+        MATERIAL_TYPE_CODE = #{materialTypeCode,jdbcType=VARCHAR},
       </if>
-      <if test="materialOrder != null">
-        MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
+      <if test="materialTypeShowname != null">
+        MATERIAL_TYPE_SHOWNAME = #{materialTypeShowname,jdbcType=VARCHAR},
       </if>
-      <if test="materialPackingType != null">
-        MATERIAL_PACKING_TYPE = #{materialPackingType,jdbcType=VARCHAR},
+      <if test="materialTypeClassis != null">
+        MATERIAL_TYPE_CLASSIS = #{materialTypeClassis,jdbcType=DECIMAL},
       </if>
       <if test="insertUsername != null">
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
@@ -249,10 +343,25 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="materialUnit != null">
+        MATERIAL_UNIT = #{materialUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="materialOrder != null">
+        MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
+      </if>
+      <if test="materialTypeStatus != null">
+        MATERIAL_TYPE_STATUS = #{materialTypeStatus,jdbcType=DECIMAL},
+      </if>
+      <if test="materialIsinward != null">
+        MATERIAL_ISINWARD = #{materialIsinward,jdbcType=DECIMAL},
+      </if>
     </set>
     where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="decimal" resultMap="BaseResultMap">
     <include refid="select" />
     where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
   </select>
@@ -265,74 +374,100 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into RMS_MATERIAL_TYPE 
-      (MATERIAL_TYPE_ID, 
-      MATERIAL_TYPE_NAME, MATERIAL_UNIT, 
-      MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.materialTypeId,jdbcType=DECIMAL}, 
-      #{item.materialTypeName,jdbcType=VARCHAR}, #{item.materialUnit,jdbcType=VARCHAR}, 
-      #{item.materialOrder,jdbcType=DECIMAL}, #{item.materialPackingType,jdbcType=VARCHAR}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
-   </foreach> )
+    insert into RMS_MATERIAL_TYPE
+    (MATERIAL_TYPE_ID,
+    MATERIAL_TYPE_NAME, MATERIAL_TYPE_CODE,
+    MATERIAL_TYPE_SHOWNAME, MATERIAL_TYPE_CLASSIS,
+    INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, DELETED,
+    MATERIAL_UNIT, MATERIAL_ORDER,
+    MATERIAL_TYPE_STATUS, MATERIAL_ISINWARD
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.materialTypeId,jdbcType=DECIMAL},
+    #{item.materialTypeName,jdbcType=VARCHAR}, #{item.materialTypeCode,jdbcType=VARCHAR},
+    #{item.materialTypeShowname,jdbcType=VARCHAR}, #{item.materialTypeClassis,jdbcType=DECIMAL},
+    #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+    #{item.materialUnit,jdbcType=VARCHAR}, #{item.materialOrder,jdbcType=DECIMAL},
+    #{item.materialTypeStatus,jdbcType=DECIMAL}, #{item.materialIsinward,jdbcType=DECIMAL}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_MATERIAL_TYPE
-     set
-       MATERIAL_TYPE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_TYPE_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeName,jdbcType=VARCHAR}
-       </foreach>
-       ,MATERIAL_UNIT=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialUnit,jdbcType=VARCHAR}
-       </foreach>
-       ,MATERIAL_ORDER=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialOrder,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_PACKING_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialPackingType,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where MATERIAL_TYPE_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.materialTypeId,jdbcType=DECIMAL}
-     </foreach> 
+    update RMS_MATERIAL_TYPE
+    set
+    MATERIAL_TYPE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_TYPE_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeName,jdbcType=VARCHAR}
+    </foreach>
+    ,MATERIAL_TYPE_CODE=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeCode,jdbcType=VARCHAR}
+    </foreach>
+    ,MATERIAL_TYPE_SHOWNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeShowname,jdbcType=VARCHAR}
+    </foreach>
+    ,MATERIAL_TYPE_CLASSIS=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeClassis,jdbcType=DECIMAL}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_UNIT=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialUnit,jdbcType=VARCHAR}
+    </foreach>
+    ,MATERIAL_ORDER=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialOrder,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_TYPE_STATUS=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeStatus,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_ISINWARD=
+    <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+      when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialIsinward,jdbcType=DECIMAL}
+    </foreach>
+    where MATERIAL_TYPE_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.materialTypeId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from RMS_MATERIAL_TYPE
-    where MATERIAL_TYPE_ID in 
+    where MATERIAL_TYPE_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -348,6 +483,9 @@
   RMT.MATERIAL_TYPE_NAME AS "materialTypeName"
   FROM
   RMS_MATERIAL_TYPE RMT
+  <if test="con != null">
+    where MATERIAL_TYPE_NAME like #{con}
+  </if>
   )
   WHERE rownum &lt; 100
   <where>
@@ -367,6 +505,16 @@
   </where>
   <include refid="orderBy"></include>
 </select>
+  <select id="getInwardContractMaterial" resultType="java.util.Map">
+    select RMT.MATERIAL_TYPE_ID "materialTypeId",
+           RMT.MATERIAL_TYPE_NAME "materialTypeName"
+           from RMS_MATERIAL_TYPE RMT
+    where rmt.MATERIAL_ISINWARD = 1
+    <if test="con != null">
+      and rmt.MATERIAL_TYPE_NAME like #{con}
+    </if>
+    order by RMT.MATERIAL_TYPE_ID DESC
+  </select>
   <sql id="orderBy">
     <if test="orderField!=null and orderField !=''">
       order by "${orderField}"