新增物资修改。

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

@@ -31,4 +31,6 @@ public interface RmsMaterialMapper extends IBaseMapper<RmsMaterial, BigDecimal>
 
     //通过物资名称查找是否存在同样的位置
     int selectMaterialByMaterialName(String materialName);
+
+    int selectMaterialByMaterialNameAndSpecification(RmsMaterial rmsMaterial);
 }

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

@@ -142,7 +142,11 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
      */
     @Override
     public int insertMaterial(RmsMaterial rmsMaterial) {
-        int i = rmsMaterialMapper.selectMaterialByMaterialName(rmsMaterial.getMaterialName());
+        //int i = rmsMaterialMapper.selectMaterialByMaterialName(rmsMaterial.getMaterialName());
+        int i = rmsMaterialMapper.selectMaterialByMaterialNameAndSpecification(rmsMaterial);
+        System.out.println("物资名称：" + rmsMaterial.getMaterialName());
+        System.out.println("物资规格：" + rmsMaterial.getMaterialSpecification());
+        System.out.println("物资型号：" + rmsMaterial.getMaterialModel());
         if (i==0) {
             String code = "lx";
             Integer id = rmsMaterialMapper.getMaterialId().intValue();
@@ -152,6 +156,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
             rmsMaterial.setMaterialId(new BigDecimal(id));
             rmsMaterial.setInsertTime(new Date());
             rmsMaterial.setInsertUsername("admin");
+            rmsMaterial.setEasMaterialId(materialCode);
         }else {
             return -1;
         }

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

@@ -699,4 +699,15 @@
     <select id="selectMaterialByMaterialName" resultType="int" parameterType="java.lang.String">
         select count(*) from RMS_MATERIAL RM where RM.MATERIAL_NAME=#{materialName} and RM.DELETED!=1
     </select>
+
+    <select id="selectMaterialByMaterialNameAndSpecification" resultType="int" parameterType="com.steerinfo.dil.model.RmsMaterial">
+        select count(*) from RMS_MATERIAL RM where RM.MATERIAL_NAME=#{materialName}
+                                            <if test="materialSpecification != null and materialSpecification != ''">
+                                               and RM.MATERIAL_SPECIFICATION = #{materialSpecification}
+                                            </if>
+                                            <if test="materialModel != null and materialModel != ''">
+                                               and RM.MATERIAL_MODEL = #{materialModel}
+                                            </if>
+                                               and RM.DELETED!=1
+    </select>
 </mapper>